diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/dhall-packages.nix | 28 |
2 files changed, 30 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb4016b49716..197639a4cbf4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9029,7 +9029,7 @@ in clooj = callPackage ../development/interpreters/clojure/clooj.nix { }; - dhall = callPackage ../development/interpreters/dhall { }; + dhall = haskell.lib.justStaticExecutables haskellPackages.dhall; dhall-nix = haskell.lib.justStaticExecutables haskellPackages.dhall-nix; @@ -9039,7 +9039,7 @@ in dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text; - dhallPackages = import ../development/dhall-modules { inherit pkgs; }; + dhallPackages = callPackages ./dhall-packages.nix { }; duktape = callPackage ../development/interpreters/duktape { }; diff --git a/pkgs/top-level/dhall-packages.nix b/pkgs/top-level/dhall-packages.nix new file mode 100644 index 000000000000..6cdd84c22799 --- /dev/null +++ b/pkgs/top-level/dhall-packages.nix @@ -0,0 +1,28 @@ +{ lib +, newScope +, overrides ? (self: super: {}) +}: + +let + packages = self: + let + callPackage = newScope self; + + buildDhallPackage = + callPackage ../development/interpreters/dhall/build-dhall-package.nix { }; + + in + { inherit buildDhallPackage; + + dhall-kubernetes = + callPackage ../development/dhall-modules/dhall-kubernetes.nix { }; + + dhall-packages = + callPackage ../development/dhall-modules/dhall-packages.nix { }; + + Prelude = + callPackage ../development/dhall-modules/Prelude.nix { }; + }; + +in + lib.fix' (lib.extends overrides packages) |