public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #85008 from Gabriel439/gabriel/default_dhall 

Upate `buildDhallPackage` to use default version of Dhall
This commit is contained in:
Domen Kožar 2020-04-11 20:21:58 +02:00 committed by GitHub
parent f5867d86fe 9f2dd99705
commit fa613bc7f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/interpreters/dhall/build-dhall-package.nix
View File

@ -1,4 +1,4 @@
{ haskell, haskellPackages, lib, lndir, runCommand, writeText }:
{ dhall, haskell, lib, lndir, runCommand, writeText }:
{ name
@ -34,18 +34,9 @@
}:
let
# `buildDhallPackage` requires version 1.25.0 or newer of the Haskell
# interpreter for Dhall. Given that the default version is 1.24.0 we choose
# the latest available version instead until the default is upgraded.
#
# HTTP support is disabled in order to force that HTTP dependencies are built
# using Nix instead of using Dhall's support for HTTP imports.
dhall =
haskell.lib.justStaticExecutables
(haskell.lib.appendConfigureFlag
haskellPackages.dhall_1_29_0
"-f-with-http"
);
dhallNoHTTP = haskell.lib.appendConfigureFlag dhall "-f-with-http";
file = writeText "${name}.dhall" code;
@ -69,13 +60,13 @@ in
mkdir -p $out/${cacheDhall}
${dhall}/bin/dhall --alpha --file '${file}' > $out/${sourceFile}
${dhallNoHTTP}/bin/dhall --alpha --file '${file}' > $out/${sourceFile}
SHA_HASH=$(${dhall}/bin/dhall hash <<< $out/${sourceFile})
SHA_HASH=$(${dhallNoHTTP}/bin/dhall hash <<< $out/${sourceFile})
HASH_FILE="''${SHA_HASH/sha256:/1220}"
${dhall}/bin/dhall encode --file $out/${sourceFile} > $out/${cacheDhall}/$HASH_FILE
${dhallNoHTTP}/bin/dhall encode --file $out/${sourceFile} > $out/${cacheDhall}/$HASH_FILE
echo "missing $SHA_HASH" > $out/binary.dhall