diff options
| author | Peter Simons <simons@cryp.to> | 2015-04-01 13:52:21 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-04-01 22:54:45 +0200 |
| commit | 943bc26762793b21e0c84ee523c1f5fe23bb624d (patch) | |
| tree | 2871c7f892252776edcd8665535a4cdc41f81f17 | |
| parent | 1afa8d28ea4e95e1d607f9a78566cdcdeab8da07 (diff) | |
| download | nixpkgs-943bc26762793b21e0c84ee523c1f5fe23bb624d.tar nixpkgs-943bc26762793b21e0c84ee523c1f5fe23bb624d.tar.gz nixpkgs-943bc26762793b21e0c84ee523c1f5fe23bb624d.tar.bz2 nixpkgs-943bc26762793b21e0c84ee523c1f5fe23bb624d.tar.lz nixpkgs-943bc26762793b21e0c84ee523c1f5fe23bb624d.tar.xz nixpkgs-943bc26762793b21e0c84ee523c1f5fe23bb624d.tar.zst nixpkgs-943bc26762793b21e0c84ee523c1f5fe23bb624d.zip | |
haskell-generic-builder: when replacing an edited Cabal file, show the download URL rather than the store path
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 30109b9a249..dfc7efe811b 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -55,8 +55,9 @@ let isGhcjs = ghc.isGhcjs or false; + newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal"; newCabalFile = fetchurl { - url = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal"; + url = newCabalFileUrl; sha256 = editedCabalFile; name = "${pname}-${version}-r${revision}.cabal"; }; @@ -134,7 +135,7 @@ stdenv.mkDerivation ({ LANG = "en_US.UTF-8"; # GHC needs the locale configured during the Haddock phase. prePatch = optionalString (editedCabalFile != null) '' - echo "Replacing Cabal file with edited version ${newCabalFile}." + echo "Replace Cabal file with edited version from ${newCabalFileUrl}." cp ${newCabalFile} ${pname}.cabal '' + optionalString jailbreak '' echo "Running jailbreak-cabal to lift version restrictions on build inputs." |