mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(third_party/overlays/dhall): revert fix dhall-nix attr key ge…

Browse source 
Okay, we do need the bugfix again lol

This reverts commit b8c300f939.

Change-Id: If85cf61f32e31f7f6041a1ae76b38eeb2c93a368
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5885
Reviewed-by: Profpatsch <mail@profpatsch.de>
Tested-by: BuildkiteCI
This commit is contained in:
Profpatsch 2022-06-18 14:33:51 +02:00
parent c2e67547b1
commit 786e515cb8
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
third_party/overlays/dhall/default.nix vendored
View file

@ -1,8 +1,17 @@
{ ... }:
pkgs: _:
self: super:
let
dhall-source = subdir: pkg: super.haskell.lib.overrideSrc pkg {
src = "${super.fetchFromGitHub {
owner = "Profpatsch";
repo = "dhall-haskell";
rev = "fix-dhall-to-nix-key-encoding";
sha256 = "sha256-P4MmQfyQ7MC5Jbs1o/+AJX/kdps2CjeOrtdpK85Tg68=";
}}/${subdir}";
};
# 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.
@ -12,15 +21,22 @@ let
url = "https://github.com/justinwoo/easy-dhall-nix/archive/dce9acbb99776a7f1344db4751d6080380f76f57.tar.gz";
sha256 = "0ckp6515gfvbxm08yyll87d9vg8sq2l21gwav2npzvwc3xz2lccf";
})
{ inherit pkgs; };
{ inherit self; };
in
{
dhall = easy-dhall-nix.dhall-simple;
# 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;
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;
dhall-nix = easy-dhall-nix.dhall-nix-simple;
# not yet in dhall-simple
# dhall-nixpkgs = easy-dhall-nix.dhall-nixpkgs-simple;
dhall-yaml = easy-dhall-nix.dhall-yaml-simple;