diff options
| author | Gabriel Gonzalez <Gabriel439@gmail.com> | 2021-01-09 20:21:49 -0800 |
|---|---|---|
| committer | Emery Hemingway <ehmry@posteo.net> | 2021-01-10 10:54:10 +0100 |
| commit | 82425ca793a5c9e78afaf6ae7eeda9b0f7f77018 (patch) | |
| tree | 26fe290a12e90607d1dbb980ac0b188cd10dcb09 | |
| parent | db0adc9a44ee46b9dff898f4c6cb5374753f3844 (diff) | |
Fix support for extending Dhall package set
* Fix `dhallPackages` to be defined using `callPackage` instead of `callPackages` This enables the `pkgs.dhallPackages.override` method * Export `pkgs.dhallPackages.callPackage` This is also necessary in order to easily extend `pkgs.dhallPackages` with new packages
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/dhall-packages.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4060580edcebd..5cf5f776cad32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10615,7 +10615,7 @@ in dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text; - dhallPackages = callPackages ./dhall-packages.nix { }; + dhallPackages = callPackage ./dhall-packages.nix { }; duktape = callPackage ../development/interpreters/duktape { }; diff --git a/pkgs/top-level/dhall-packages.nix b/pkgs/top-level/dhall-packages.nix index c1c2c5f0e3bbc..5a3fb04748d09 100644 --- a/pkgs/top-level/dhall-packages.nix +++ b/pkgs/top-level/dhall-packages.nix @@ -19,6 +19,7 @@ let in { inherit + callPackage buildDhallPackage buildDhallGitHubPackage buildDhallDirectoryPackage |