Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f5867d86fef6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fa613bc7f135
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 11, 2020

  1. Upate buildDhallPackage to use default version of Dhall 

    Now that the default version is sufficiently new we don't need to
pin the Dhall version any longer in `buildDhallPackage`
    @Gabriella439
    Gabriella439 committed Apr 11, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    GPG key ID: E432E410B5E48C86
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9f2dd99 View commit details

  2. Merge pull request #85008 from Gabriel439/gabriel/default_dhall 

    Upate `buildDhallPackage` to use default version of Dhall
    @domenkozar
    domenkozar authored Apr 11, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    GPG key ID: E432E410B5E48C86
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fa613bc View commit details
Showing with 5 additions and 14 deletions.
  1. +5 −14 pkgs/development/interpreters/dhall/build-dhall-package.nix
19 changes: 5 additions & 14 deletions pkgs/development/interpreters/dhall/build-dhall-package.nix
View file
Original file line number Diff line number Diff line change
@@ -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