From 5c80983e75a749b8e90feb9e0b676ff04daa4776 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 22 Jun 2018 12:50:54 +0200 Subject: [PATCH] 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. --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 {