diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-09 00:10:05 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-09 00:10:05 +0000 |
commit | e1766085b3541a3e68bbfc844e67b27adfb43cea (patch) | |
tree | b1c3a6bccbc47026fb2c6d9efae9ba2c5cd883d8 /pkgs/test | |
parent | 398a9481917df6eb4d61b8ba3237941ab32fdf67 (diff) | |
parent | db6044d5debaff0749420c3553d1b89fc6c5c5f8 (diff) | |
download | nixpkgs-e1766085b3541a3e68bbfc844e67b27adfb43cea.tar nixpkgs-e1766085b3541a3e68bbfc844e67b27adfb43cea.tar.gz nixpkgs-e1766085b3541a3e68bbfc844e67b27adfb43cea.tar.bz2 nixpkgs-e1766085b3541a3e68bbfc844e67b27adfb43cea.tar.lz nixpkgs-e1766085b3541a3e68bbfc844e67b27adfb43cea.tar.xz nixpkgs-e1766085b3541a3e68bbfc844e67b27adfb43cea.tar.zst nixpkgs-e1766085b3541a3e68bbfc844e67b27adfb43cea.zip |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/test')
-rw-r--r-- | pkgs/test/default.nix | 2 | ||||
-rw-r--r-- | pkgs/test/dhall/buildDhallUrl/default.nix | 14 | ||||
-rw-r--r-- | pkgs/test/dhall/default.nix | 5 |
3 files changed, 21 insertions, 0 deletions
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 80d82e5bee0..d1ec7169e17 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -58,4 +58,6 @@ with pkgs; }; 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..d2e214fb977 --- /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="; + dhallHash = "sha256:e37e31f908c7473ba9ac1770d21eb09b0075663eb266a41be77de67bc5dd3b87"; + source = true; +} diff --git a/pkgs/test/dhall/default.nix b/pkgs/test/dhall/default.nix new file mode 100644 index 00000000000..bdb33acf023 --- /dev/null +++ b/pkgs/test/dhall/default.nix @@ -0,0 +1,5 @@ +{ lib, callPackage }: + +lib.recurseIntoAttrs { + buildDhallUrl = callPackage ./buildDhallUrl { }; +} |