Merge remote-tracking branch 'origin/master' into hkm/ghc901

Author: hamishmack

builder/comp-builder.nix

@@ -30,7 +30,7 @@ let self =
     ( haskellLib.isTest componentId &&
       lib.any (x: x.identifier.name or "" == "cabal-doctest") package.setup-depends
     )
-, allComponent # Used when `configureAllComponents` is set to get a suitable configuration. 
+, allComponent # Used when `configureAllComponents` is set to get a suitable configuration.
 
 , build-tools ? component.build-tools
 , pkgconfig ? component.pkgconfig
@@ -259,7 +259,7 @@ let
         (lib.optionalString (cleanSrc.subDir != "") ''
             cd ${lib.removePrefix "/" cleanSrc.subDir}
           ''
-        ) + 
+        ) +
         (if cabalFile != null
           then ''cat ${cabalFile} > ${package.identifier.name}.cabal''
           else
@@ -485,19 +485,21 @@ let
       # DB (probably empty unless this is a library component).
       # We also have to remove any refernces to $out to avoid
       # circular references.
-      if configureAllComponents
-        then ''
-          mv dist dist-tmp-dir
-          mkdir -p dist/build
+      lib.optionalString (configureAllComponents || keepSource) ''
+        mv dist dist-tmp-dir
+        mkdir -p dist/build
+        if [ -d dist-tmp-dir/build/${componentId.cname} ]; then
           mv dist-tmp-dir/build/${componentId.cname}/autogen dist/build/
-          mv dist-tmp-dir/package.conf.inplace dist/
-          remove-references-to -t $out dist/build/autogen/*
-          rm -rf dist-tmp-dir
-        ''
-        else lib.optionalString keepSource ''
-          rm -rf dist
-        ''
-    ) + (lib.optionalString (haskellLib.isTest componentId) ''
+        else
+          mv dist-tmp-dir/build/autogen dist/build/
+        fi
+        mv dist-tmp-dir/package.conf.inplace dist/
+        remove-references-to -t $out dist/build/autogen/*
+        rm -rf dist-tmp-dir
+      ''
+    ) + (lib.optionalString (keepSource && haskellLib.isLibrary componentId) ''
+        remove-references-to -t $out ${name}.conf
+    '') + (lib.optionalString (haskellLib.isTest componentId) ''
       echo The test ${package.identifier.name}.components.tests.${componentId.cname} was built.  To run the test build ${package.identifier.name}.checks.${componentId.cname}.
     '');
 

hackage-src.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/input-output-hk/hackage.nix",
-  "rev": "eec7087871114b53d42093d2f0832168d0491f6e",
-  "date": "2021-03-20T01:10:35+00:00",
-  "path": "/nix/store/3k96lxnmwh5cpanz56g482qdh3wczk4x-hackage.nix-eec7087",
-  "sha256": "0yc9wgs4mk1cjccgdnm6mwrcyx45qyiz49l465zy4gp04wshwbyd",
+  "rev": "85dcd3f167a11a7f34d746065eef21f161a588df",
+  "date": "2021-03-26T01:12:31+00:00",
+  "path": "/nix/store/4rx7i14b4si0d12kp393ldbhykznbcqy-hackage.nix-85dcd3f",
+  "sha256": "00srjmf525kcf1mfl22k3z159nkqw95zbsb994l9fzgpyahw6mr2",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false

overlays/musl.nix

@@ -9,6 +9,7 @@ final: prev: prev.lib.optionalAttrs prev.stdenv.hostPlatform.isMusl ({
   zlib = prev.zlib.override { splitStaticOutput = false; };
 
   # and a few more packages that need their static libs explicitly enabled
+  bzip2 = prev.bzip2.overrideAttrs (_: { dontDisableStatic = true; });
   gmp = prev.gmp.override { withStatic = true; };
   ncurses = prev.ncurses.override { enableStatic = true; };
   libsodium = prev.libsodium.overrideAttrs (_: { dontDisableStatic = true; });

stackage-src.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/input-output-hk/stackage.nix",
-  "rev": "736c6784ddc081688c40fd9c4be1fad22360fe42",
-  "date": "2021-03-19T01:05:52+00:00",
-  "path": "/nix/store/aqr73x5kbx2b87p5x6hcag0kzrqv9b3l-stackage.nix-736c678",
-  "sha256": "17x0aakrcpv98abkyrr1drfhjb1q0hscg2aqksy1kw4nq411551q",
+  "rev": "08a56e26a089d74d998c4e439a6034894326044a",
+  "date": "2021-03-26T01:03:31+00:00",
+  "path": "/nix/store/v1ds4d57lyp5s36ih2ihigqiw9z66ylm-stackage.nix-08a56e2",
+  "sha256": "13mqm9bh5siik7msgxcq1439h977g4nsrf91vjw5dd2as4ghwvb3",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false