From 9be3d05d7ce0b7681a9c5e0c1739959ba13d686e Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Mon, 25 Oct 2021 14:53:15 +0900 Subject: tests.dhall.buildDhallUrl: add test --- pkgs/test/default.nix | 2 ++ pkgs/test/dhall/buildDhallUrl/default.nix | 14 ++++++++++++++ pkgs/test/dhall/default.nix | 6 ++++++ 3 files changed, 22 insertions(+) create mode 100644 pkgs/test/dhall/buildDhallUrl/default.nix create mode 100644 pkgs/test/dhall/default.nix (limited to 'pkgs/test') diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index ebf732839ce..4523567a6a8 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -55,4 +55,6 @@ with pkgs; trivial-overriding = callPackage ../build-support/trivial-builders/test-overriding.nix {}; writers = callPackage ../build-support/writers/test.nix {}; + + dhall = callPackage ./dhall { }; } diff --git a/pkgs/test/dhall/buildDhallUrl/default.nix b/pkgs/test/dhall/buildDhallUrl/default.nix new file mode 100644 index 00000000000..37992c4783b --- /dev/null +++ b/pkgs/test/dhall/buildDhallUrl/default.nix @@ -0,0 +1,14 @@ +{ dhallPackages, lib }: + +# This file tests that dhallPackages.buildDhallUrl is able to successfully +# build a Nix Dhall package for a given remote Dhall import. +# +# TODO: It would be nice to extend this test to make sure that the resulting +# Nix Dhall package is has the expected contents. + +dhallPackages.buildDhallUrl { + url = "https://raw.githubusercontent.com/cdepillabout/example-dhall-nix/e6a675c72ecd4dd23d254a02aea8181fe875747f/mydhallfile.dhall"; + hash = "sha256-434x+QjHRzuprBdw0h6wmwB1Zj6yZqQb533me8XdO4c="; + dhall-hash = "sha256:e37e31f908c7473ba9ac1770d21eb09b0075663eb266a41be77de67bc5dd3b87"; + source = true; +} diff --git a/pkgs/test/dhall/default.nix b/pkgs/test/dhall/default.nix new file mode 100644 index 00000000000..487e045bab5 --- /dev/null +++ b/pkgs/test/dhall/default.nix @@ -0,0 +1,6 @@ +{ lib, callPackage }: + +lib.recurseIntoAttrs { + buildDhallUrl = callPackage ./buildDhallUrl { }; +} + -- cgit 1.4.1 From 2e1d84e9fb5385eb4bb2f4cb93177fc1ee0dcc39 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Mon, 1 Nov 2021 13:44:50 +0900 Subject: dhallPackages.buildDhallUrl: small formatting fixes Co-authored-by: Sandro --- doc/languages-frameworks/dhall.section.md | 2 +- pkgs/development/interpreters/dhall/build-dhall-url.nix | 4 +--- pkgs/test/dhall/default.nix | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'pkgs/test') diff --git a/doc/languages-frameworks/dhall.section.md b/doc/languages-frameworks/dhall.section.md index 20470e337c1..4ea26682d56 100644 --- a/doc/languages-frameworks/dhall.section.md +++ b/doc/languages-frameworks/dhall.section.md @@ -345,7 +345,7 @@ $ dhall-to-nixpkgs directory ~/proj/dhall-semver ### Remote imports as fixed-output derivations {#ssec-dhall-remote-imports-as-fod} `dhall-to-nixpkgs` has the ability to fetch and build remote imports as -fixed-output derivations by using their Dhall integrity check. This is +fixed-output derivations by using their Dhall integrity check. This is sometimes easier than manually packaging all remote imports. This can be used like the following: diff --git a/pkgs/development/interpreters/dhall/build-dhall-url.nix b/pkgs/development/interpreters/dhall/build-dhall-url.nix index 54aa775ef14..5dce209a6b0 100644 --- a/pkgs/development/interpreters/dhall/build-dhall-url.nix +++ b/pkgs/development/interpreters/dhall/build-dhall-url.nix @@ -79,12 +79,10 @@ in runCommand name { } ('' set -eu - mkdir -p ${cacheDhall} + mkdir -p ${cacheDhall} $out/${cacheDhall} export XDG_CACHE_HOME=$PWD/${cache} - mkdir -p $out/${cacheDhall} - SHA_HASH="${dhall-hash}" HASH_FILE="''${SHA_HASH/sha256:/1220}" diff --git a/pkgs/test/dhall/default.nix b/pkgs/test/dhall/default.nix index 487e045bab5..bdb33acf023 100644 --- a/pkgs/test/dhall/default.nix +++ b/pkgs/test/dhall/default.nix @@ -3,4 +3,3 @@ lib.recurseIntoAttrs { buildDhallUrl = callPackage ./buildDhallUrl { }; } - -- cgit 1.4.1 From 10c5a4cca54d21071ded19f553a466eb10567f40 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Mon, 8 Nov 2021 13:15:17 +0900 Subject: dhallPackages.buildDhallUrl: change argument from dhall-hash to dhallHash --- doc/languages-frameworks/dhall.section.md | 2 +- pkgs/development/interpreters/dhall/build-dhall-url.nix | 6 +++--- pkgs/test/dhall/buildDhallUrl/default.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/test') diff --git a/doc/languages-frameworks/dhall.section.md b/doc/languages-frameworks/dhall.section.md index 4ea26682d56..2e57392e083 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 5dce209a6b0..766fe3c1c2e 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 37992c4783b..d2e214fb977 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; } -- cgit 1.4.1