mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
tvl-depot/third_party/overlays/dhall/default.nix

45 lines
1.5 KiB
Nix
Raw Normal View History

fix(third_party/nixpkgs): always use easy-dhall-nix tools Using the dhall executables from nixpkgs is basically always a mistake, they have to be built and are regularly broken. We don’t want to care about that, but just use the official statically built binary releases. Change-Id: Ia6d9254076ca21f55e020ae81548e80d6be8281d Reviewed-on: https://cl.tvl.fyi/c/depot/+/3041 Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: zseri <zseri.devel@ytrizja.de>
2021-04-18 10:29:49 +02:00
{ ... }:
chore(third_party/overlays/dhall): revert fix dhall-nix attr key ge… Okay, we do need the bugfix again lol This reverts commit b8c300f939f3b998fb5984eb2e62e7c97e4b5d03. Change-Id: If85cf61f32e31f7f6041a1ae76b38eeb2c93a368 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5885 Reviewed-by: Profpatsch <mail@profpatsch.de> Tested-by: BuildkiteCI
2022-06-18 14:33:51 +02:00
self: super:
refactor(3p/dhall): Move easy-dhall-nix import into separate folder This is part of paving the way for clearly distinguishing between packages from nixpkgs and //third_party. See also: b/108, cl/2910 Change-Id: I28b5abd1f0f9fa3c4478c9f255b2025f4a4139f1 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2917 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: Profpatsch <mail@profpatsch.de> Reviewed-by: tazjin <mail@tazj.in>
2021-04-10 14:00:13 +02:00
let
chore(third_party/overlays/dhall): revert fix dhall-nix attr key ge… Okay, we do need the bugfix again lol This reverts commit b8c300f939f3b998fb5984eb2e62e7c97e4b5d03. Change-Id: If85cf61f32e31f7f6041a1ae76b38eeb2c93a368 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5885 Reviewed-by: Profpatsch <mail@profpatsch.de> Tested-by: BuildkiteCI
2022-06-18 14:33:51 +02:00
dhall-source = subdir: pkg: super.haskell.lib.overrideSrc pkg {
src = "${super.fetchFromGitHub {
owner = "Profpatsch";
repo = "dhall-haskell";
chore(third_party/overlays/dhall): bump dhall to bugfix PR Change-Id: I5f745d3c968bf23275320834f614892a80de426c Reviewed-on: https://cl.tvl.fyi/c/depot/+/5886 Reviewed-by: Profpatsch <mail@profpatsch.de> Tested-by: BuildkiteCI
2022-06-19 14:46:44 +02:00
# https://github.com/dhall-lang/dhall-haskell/pull/2426
rev = "82123817316192d39f9a3e68b8ce9c9cff0a48ed";
sha256 = "sha256-gbHoUKIdLPIttqeV471jsT8OJz6uiI6LpHOwtLbBGHY=";
chore(third_party/overlays/dhall): revert fix dhall-nix attr key ge… Okay, we do need the bugfix again lol This reverts commit b8c300f939f3b998fb5984eb2e62e7c97e4b5d03. Change-Id: If85cf61f32e31f7f6041a1ae76b38eeb2c93a368 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5885 Reviewed-by: Profpatsch <mail@profpatsch.de> Tested-by: BuildkiteCI
2022-06-18 14:33:51 +02:00
}}/${subdir}";
};
refactor(3p/dhall): Move easy-dhall-nix import into separate folder This is part of paving the way for clearly distinguishing between packages from nixpkgs and //third_party. See also: b/108, cl/2910 Change-Id: I28b5abd1f0f9fa3c4478c9f255b2025f4a4139f1 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2917 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: Profpatsch <mail@profpatsch.de> Reviewed-by: tazjin <mail@tazj.in>
2021-04-10 14:00:13 +02:00
# binary releases of dhall tools, since the build in nixpkgs is
# broken most of the time. The binaries are also fully static
# builds, instead of the half-static crap that nixpkgs produces.
easy-dhall-nix =
style: format entire depot with nixpkgs-fmt This CL can be used to compare the style of nixpkgs-fmt against other formatters (nixpkgs, alejandra). Change-Id: I87c6abff6bcb546b02ead15ad0405f81e01b6d9e Reviewed-on: https://cl.tvl.fyi/c/depot/+/4397 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: lukegb <lukegb@tvl.fyi> Reviewed-by: wpcarro <wpcarro@gmail.com> Reviewed-by: Profpatsch <mail@profpatsch.de> Reviewed-by: kanepyork <rikingcoding@gmail.com> Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: cynthia <cynthia@tvl.fyi> Reviewed-by: edef <edef@edef.eu> Reviewed-by: eta <tvl@eta.st> Reviewed-by: grfn <grfn@gws.fyi>
2022-01-30 17:06:58 +01:00
import
(builtins.fetchTarball {
chore(overlays/dhall): bump dhall to 1.41.1 Change-Id: Id1d5550ecd27c311446aa7ec140fb98865ad19d5 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5336 Tested-by: BuildkiteCI Reviewed-by: Profpatsch <mail@profpatsch.de> Autosubmit: Profpatsch <mail@profpatsch.de>
2022-02-28 15:24:14 +01:00
url = "https://github.com/justinwoo/easy-dhall-nix/archive/dce9acbb99776a7f1344db4751d6080380f76f57.tar.gz";
sha256 = "0ckp6515gfvbxm08yyll87d9vg8sq2l21gwav2npzvwc3xz2lccf";
style: format entire depot with nixpkgs-fmt This CL can be used to compare the style of nixpkgs-fmt against other formatters (nixpkgs, alejandra). Change-Id: I87c6abff6bcb546b02ead15ad0405f81e01b6d9e Reviewed-on: https://cl.tvl.fyi/c/depot/+/4397 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: lukegb <lukegb@tvl.fyi> Reviewed-by: wpcarro <wpcarro@gmail.com> Reviewed-by: Profpatsch <mail@profpatsch.de> Reviewed-by: kanepyork <rikingcoding@gmail.com> Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: cynthia <cynthia@tvl.fyi> Reviewed-by: edef <edef@edef.eu> Reviewed-by: eta <tvl@eta.st> Reviewed-by: grfn <grfn@gws.fyi>
2022-01-30 17:06:58 +01:00
})
chore(third_party/overlays/dhall): bump dhall to bugfix PR Change-Id: I5f745d3c968bf23275320834f614892a80de426c Reviewed-on: https://cl.tvl.fyi/c/depot/+/5886 Reviewed-by: Profpatsch <mail@profpatsch.de> Tested-by: BuildkiteCI
2022-06-19 14:46:44 +02:00
{ pkgs = self; };
style: format entire depot with nixpkgs-fmt This CL can be used to compare the style of nixpkgs-fmt against other formatters (nixpkgs, alejandra). Change-Id: I87c6abff6bcb546b02ead15ad0405f81e01b6d9e Reviewed-on: https://cl.tvl.fyi/c/depot/+/4397 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: lukegb <lukegb@tvl.fyi> Reviewed-by: wpcarro <wpcarro@gmail.com> Reviewed-by: Profpatsch <mail@profpatsch.de> Reviewed-by: kanepyork <rikingcoding@gmail.com> Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: cynthia <cynthia@tvl.fyi> Reviewed-by: edef <edef@edef.eu> Reviewed-by: eta <tvl@eta.st> Reviewed-by: grfn <grfn@gws.fyi>
2022-01-30 17:06:58 +01:00
in
{
chore(third_party/overlays/dhall): revert fix dhall-nix attr key ge… Okay, we do need the bugfix again lol This reverts commit b8c300f939f3b998fb5984eb2e62e7c97e4b5d03. Change-Id: If85cf61f32e31f7f6041a1ae76b38eeb2c93a368 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5885 Reviewed-by: Profpatsch <mail@profpatsch.de> Tested-by: BuildkiteCI
2022-06-18 14:33:51 +02:00
# TODO: this is to fix a bug in dhall-nix
haskellPackages = super.haskellPackages.override {
overrides = hsSelf: hsSuper: {
dhall = dhall-source "dhall" hsSuper.dhall;
dhall-nix = dhall-source "dhall-nix" hsSuper.dhall-nix;
};
};
# dhall = easy-dhall-nix.dhall-simple;
# dhall-nix = easy-dhall-nix.dhall-nix-simple;
refactor(3p/dhall): Move easy-dhall-nix import into separate folder This is part of paving the way for clearly distinguishing between packages from nixpkgs and //third_party. See also: b/108, cl/2910 Change-Id: I28b5abd1f0f9fa3c4478c9f255b2025f4a4139f1 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2917 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: Profpatsch <mail@profpatsch.de> Reviewed-by: tazjin <mail@tazj.in>
2021-04-10 14:00:13 +02:00
dhall-bash = easy-dhall-nix.dhall-bash-simple;
dhall-docs = easy-dhall-nix.dhall-docs-simple;
dhall-json = easy-dhall-nix.dhall-json-simple;
dhall-lsp-server = easy-dhall-nix.dhall-lsp-simple;
# not yet in dhall-simple
# dhall-nixpkgs = easy-dhall-nix.dhall-nixpkgs-simple;
dhall-yaml = easy-dhall-nix.dhall-yaml-simple;
}
Reference in a new issue Copy permalink