From 2e1d84e9fb5385eb4bb2f4cb93177fc1ee0dcc39 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Mon, 1 Nov 2021 13:44:50 +0900 Subject: [PATCH] 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(-) diff --git a/doc/languages-frameworks/dhall.section.md b/doc/languages-frameworks/dhall.section.md index 20470e337c13..4ea26682d56d 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 54aa775ef144..5dce209a6b0f 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 487e045bab52..bdb33acf0238 100644 --- a/pkgs/test/dhall/default.nix +++ b/pkgs/test/dhall/default.nix @@ -3,4 +3,3 @@ lib.recurseIntoAttrs { buildDhallUrl = callPackage ./buildDhallUrl { }; } -