diff options
| author | Peter Simons <simons@cryp.to> | 2018-06-22 12:50:54 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2018-06-22 17:50:11 +0200 |
| commit | 5c80983e75a749b8e90feb9e0b676ff04daa4776 (patch) | |
| tree | 31afc8ab8a31598fd60b85773bb5767d01515fa6 /pkgs/development/haskell-modules | |
| parent | 1486fee1d3acc6f7e4dfa6c921042414cf20a671 (diff) | |
| download | nixpkgs-5c80983e75a749b8e90feb9e0b676ff04daa4776.tar nixpkgs-5c80983e75a749b8e90feb9e0b676ff04daa4776.tar.gz nixpkgs-5c80983e75a749b8e90feb9e0b676ff04daa4776.tar.bz2 nixpkgs-5c80983e75a749b8e90feb9e0b676ff04daa4776.tar.lz nixpkgs-5c80983e75a749b8e90feb9e0b676ff04daa4776.tar.xz nixpkgs-5c80983e75a749b8e90feb9e0b676ff04daa4776.tar.zst nixpkgs-5c80983e75a749b8e90feb9e0b676ff04daa4776.zip | |
haskell-generic-builder: bake the package name and version into --docdir
If we use a --docdir that's not specific to the package, then different builds will install their license files into the same location, which leads to file collisions if those are ever joined into the same environment. Fixes https://github.com/NixOS/nixpkgs/issues/35024.
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 3dd023f3430..9ac88dca83e 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -98,7 +98,7 @@ let else "package-conf"; # the target dir for haddock documentation - docdir = docoutput: docoutput + "/share/doc"; + docdir = docoutput: docoutput + "/share/doc/" + pname + "-" + version; newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal"; newCabalFile = fetchurl { |