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/development/dhall-modules/Prelude.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/development/dhall-modules/Prelude.nix')
-rw-r--r-- | pkgs/development/dhall-modules/Prelude.nix | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/pkgs/development/dhall-modules/Prelude.nix b/pkgs/development/dhall-modules/Prelude.nix index c689f7156fb4..6af08edf88a7 100644 --- a/pkgs/development/dhall-modules/Prelude.nix +++ b/pkgs/development/dhall-modules/Prelude.nix @@ -1,26 +1,17 @@ -{ buildDhallPackage, fetchFromGitHub, lib }: +{ buildDhallGitHubPackage, lib }: let makePrelude = - version: - lib.makeOverridable - ( { rev, sha256, file ? "package.dhall" }: - buildDhallPackage { - name = "Prelude-${version}"; - - code = - let - src = fetchFromGitHub { - owner = "dhall-lang"; - repo = "dhall-lang"; - - inherit rev sha256; - }; - - in - "${src}/Prelude/${file}"; - } - ); + version: { rev, sha256 }: + buildDhallGitHubPackage { + name = "Prelude-${version}"; + owner = "dhall-lang"; + repo = "dhall-lang"; + directory = "Prelude"; + file = "package.dhall"; + + inherit rev sha256; + }; in lib.mapAttrs makePrelude { |