diff options
author | Peter Simons <simons@cryp.to> | 2015-06-05 12:42:34 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2015-06-05 12:42:34 +0200 |
commit | 7acb77ca2bfd54578ad4a37c05666ea5da967457 (patch) | |
tree | 8d978ec6cdd94fd0d62976fdf71f09a186b93cc9 /pkgs/development/tools/haskell | |
parent | c1c4ca08def84f339447e23b0ee4ead3c2568b6f (diff) | |
download | nixpkgs-7acb77ca2bfd54578ad4a37c05666ea5da967457.tar nixpkgs-7acb77ca2bfd54578ad4a37c05666ea5da967457.tar.gz nixpkgs-7acb77ca2bfd54578ad4a37c05666ea5da967457.tar.bz2 nixpkgs-7acb77ca2bfd54578ad4a37c05666ea5da967457.tar.lz nixpkgs-7acb77ca2bfd54578ad4a37c05666ea5da967457.tar.xz nixpkgs-7acb77ca2bfd54578ad4a37c05666ea5da967457.tar.zst nixpkgs-7acb77ca2bfd54578ad4a37c05666ea5da967457.zip |
cabal2nix: run "git reset --hard" to clean up the source to avoid the "-dirty" tag
Diffstat (limited to 'pkgs/development/tools/haskell')
-rw-r--r-- | pkgs/development/tools/haskell/cabal2nix/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 240353b6e75..3da457bdf76 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -32,7 +32,7 @@ mkDerivation rec { ]; buildTools = [ gitMinimal makeWrapper ]; preConfigure = '' - sed -i -e 's|, "--dirty"||' generate-cabal-file.hs + git reset --hard # Re-create the index that fetchgit destroyed in the name of predictable hashes. runhaskell $setupCompileFlags generate-cabal-file --release >cabal2nix.cabal ''; postInstall = '' @@ -41,7 +41,7 @@ mkDerivation rec { rm -rf $out/{bin,lib,share} makeWrapper $exe $out/bin/cabal2nix --prefix PATH ":" "${nix-prefetch-scripts}/bin" mkdir -p $out/share/bash-completion/completions - $exe --bash-completion-script $out/bin/cabal2nix >$out/share/bash-completion/completions/cabal2nix + $exe --bash-completion-script $exe >$out/share/bash-completion/completions/cabal2nix ''; homepage = "http://github.com/NixOS/cabal2nix/"; description = "Convert Cabal files into Nix build instructions"; |