diff options
| author | Benjamin Staffin <benley@gmail.com> | 2020-06-17 17:22:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 17:22:24 -0400 |
| commit | 19d3665b75f59eb98ca656c2b643a4adc0f0744e (patch) | |
| tree | 455aed025973e748f264df336d5dc0e7ae40dad5 /pkgs/top-level/dhall-packages.nix | |
| parent | 13a14e2bfe4ff3b7da222624ce5749218105e465 (diff) | |
| parent | 19dfc1b01149e5d60860cd0f4b0f8abcb3faabbf (diff) | |
| download | nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.gz nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.bz2 nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.lz nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.xz nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.zst nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.zip | |
Merge branch 'master' into benley/melonDS
Diffstat (limited to 'pkgs/top-level/dhall-packages.nix')
| -rw-r--r-- | pkgs/top-level/dhall-packages.nix | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/pkgs/top-level/dhall-packages.nix b/pkgs/top-level/dhall-packages.nix index 6cdd84c22799..9d4801e9dc5c 100644 --- a/pkgs/top-level/dhall-packages.nix +++ b/pkgs/top-level/dhall-packages.nix @@ -8,20 +8,40 @@ let let callPackage = newScope self; + prefer = version: path: + let + packages = callPackage path { }; + + in + packages."${version}".overrideAttrs (_: { + passthru = packages; + } + ); + buildDhallPackage = callPackage ../development/interpreters/dhall/build-dhall-package.nix { }; + buildDhallGitHubPackage = + callPackage ../development/interpreters/dhall/build-dhall-github-package.nix { }; + + buildDhallDirectoryPackage = + callPackage ../development/interpreters/dhall/build-dhall-directory-package.nix { }; + in - { inherit buildDhallPackage; + { inherit + buildDhallPackage + buildDhallGitHubPackage + buildDhallDirectoryPackage + ; dhall-kubernetes = - callPackage ../development/dhall-modules/dhall-kubernetes.nix { }; + prefer "3.0.0" ../development/dhall-modules/dhall-kubernetes.nix; dhall-packages = - callPackage ../development/dhall-modules/dhall-packages.nix { }; + prefer "0.11.1" ../development/dhall-modules/dhall-packages.nix; Prelude = - callPackage ../development/dhall-modules/Prelude.nix { }; + prefer "13.0.0" ../development/dhall-modules/Prelude.nix; }; in |