diff options
| -rw-r--r-- | third_party/overlays/dhall/default.nix | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/third_party/overlays/dhall/default.nix b/third_party/overlays/dhall/default.nix index 1cfb05ace829..74d2a999b90a 100644 --- a/third_party/overlays/dhall/default.nix +++ b/third_party/overlays/dhall/default.nix @@ -1,17 +1,8 @@ { ... }: -self: super: +pkgs: _: 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. @@ -21,22 +12,15 @@ let url = "https://github.com/justinwoo/easy-dhall-nix/archive/eae7f64c4d6c70681e5a56c84198236930ba425e.tar.gz"; sha256 = "1y2x15v8a679vlpxazjpibfwajp6zph60f8wjcm4xflbvazk0dx7"; }) - { inherit self; }; + { inherit pkgs; }; in { - # 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 = easy-dhall-nix.dhall-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; |