diff options
| -rw-r--r-- | doc/languages-frameworks/dhall.section.md | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/dhall/build-dhall-url.nix | 6 | ||||
| -rw-r--r-- | pkgs/test/dhall/buildDhallUrl/default.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/languages-frameworks/dhall.section.md b/doc/languages-frameworks/dhall.section.md index 4ea26682d56d2..2e57392e083ae 100644 --- a/doc/languages-frameworks/dhall.section.md +++ b/doc/languages-frameworks/dhall.section.md @@ -363,7 +363,7 @@ $ dhall-to-nixpkgs directory --fixed-output-derivations ~/proj/dhall-semver (buildDhallUrl { url = "https://prelude.dhall-lang.org/v17.0.0/package.dhall"; hash = "sha256-ENs8kZwl6QRoM9+Jeo/+JwHcOQ+giT2VjDQwUkvlpD4="; - dhall-hash = "sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e"; + dhallHash = "sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e"; }) ]; } diff --git a/pkgs/development/interpreters/dhall/build-dhall-url.nix b/pkgs/development/interpreters/dhall/build-dhall-url.nix index 5dce209a6b0f6..766fe3c1c2e3f 100644 --- a/pkgs/development/interpreters/dhall/build-dhall-url.nix +++ b/pkgs/development/interpreters/dhall/build-dhall-url.nix @@ -22,7 +22,7 @@ # Dhall hash of the input Dhall file. # example: "sha256:6534a24145e93db3df3ef4bc39e2ba743404ea3e8d6cfdbb868d5c83d61f10d2" -, dhall-hash +, dhallHash # Name for this derivation. , name ? (baseNameOf url + "-cache") @@ -61,7 +61,7 @@ let nativeBuildInputs = [ cacert ]; } '' - echo "${url} ${dhall-hash}" > in-dhall-file + echo "${url} ${dhallHash}" > in-dhall-file ${dhall}/bin/dhall --alpha --plain --file in-dhall-file | ${dhallNoHTTP}/bin/dhall encode > $out ''; @@ -83,7 +83,7 @@ in export XDG_CACHE_HOME=$PWD/${cache} - SHA_HASH="${dhall-hash}" + SHA_HASH="${dhallHash}" HASH_FILE="''${SHA_HASH/sha256:/1220}" diff --git a/pkgs/test/dhall/buildDhallUrl/default.nix b/pkgs/test/dhall/buildDhallUrl/default.nix index 37992c4783b25..d2e214fb9770c 100644 --- a/pkgs/test/dhall/buildDhallUrl/default.nix +++ b/pkgs/test/dhall/buildDhallUrl/default.nix @@ -9,6 +9,6 @@ dhallPackages.buildDhallUrl { url = "https://raw.githubusercontent.com/cdepillabout/example-dhall-nix/e6a675c72ecd4dd23d254a02aea8181fe875747f/mydhallfile.dhall"; hash = "sha256-434x+QjHRzuprBdw0h6wmwB1Zj6yZqQb533me8XdO4c="; - dhall-hash = "sha256:e37e31f908c7473ba9ac1770d21eb09b0075663eb266a41be77de67bc5dd3b87"; + dhallHash = "sha256:e37e31f908c7473ba9ac1770d21eb09b0075663eb266a41be77de67bc5dd3b87"; source = true; } |