Merge remote-tracking branch 'origin/rvl/musl-test' into hkm/fix-build-depends

Author: hamishmack

docs/dev/tests.md

@@ -0,0 +1 @@
+../../test/README.md

mkdocs.yml

@@ -42,4 +42,5 @@ pages:
     - 'Removing withPackage wrapper': dev/removing-with-package-wrapper.md
     - 'Maintainer Scripts': dev/maintainer-scripts.md
     - 'Nixpkgs Pin': dev/nixpkgs-pin.md
+    - 'Test Suite': dev/tests.md
   - 'ChangeLog': changelog.md

nixpkgs/github.json

@@ -1,7 +1,6 @@
 {
   "url": "https://github.com/NixOS/nixpkgs",
-  "rev": "538639a55ce915effc543b3e9c6c901f8ea624c1",
-  "date": "2019-06-07T01:19:18+02:00",
-  "sha256": "1chkvpwj44xk8j7756sn1cymvzrv1nwryr8p13z1fv28lqjflz4p",
+  "rev": "fe797e0adefc0ff50867a9898d445aee0d4e8f49",
+  "sha256": "0ddhhfh87bl165j8jxscyq9bzzvykqz1f1r00nad0g6c7b59rifz",
   "fetchSubmodules": false
 }

release.nix

@@ -20,8 +20,11 @@ let
     tests = filterAttrs (_: nonEmpty) (mapAttrs (name: removeDisabled) jobs.tests);
   };
 
+  inherit (systems.examples) musl64;
+
   jobs = {
     native = filterTests (mapTestOn (packagePlatforms pkgs));
+    "${musl64.config}" = filterTests (mapTestOnCross musl64 (packagePlatforms pkgs));
   } // {
     # On IOHK Hydra, "required" is a special job that updates the
     # GitHub CI status.

test/README.md

@@ -1,6 +1,6 @@
 ### Haskell infrastructure test cases
 
-To build the test cases, run from this directory:
+To build the test cases, run from the `test` directory:
 
     nix-build --no-out-link default.nix
 

test/builder-haddock/default.nix

@@ -39,7 +39,7 @@ in
       ########################################################################
       # test haddock
 
-      doc="${toString library.doc}"
+      doc="${toString library.doc or null}"
       docDir="${toString library.haddockDir}"
 
       # exeDoc="$ disabled {toString packages.test-haddock.components.exes.test-haddock.doc}"
@@ -78,4 +78,5 @@ in
     '';
 
     meta.platforms = platforms.all;
+    meta.disabled = stdenv.hostPlatform.isMusl;
 } // { inherit packages pkgSet; }

test/cabal-22/default.nix

@@ -25,7 +25,7 @@ in
 
       printf "checking that executable is dynamically linked to system libraries... " >& 2
     '' + optionalString stdenv.isLinux ''
-      ldd $exe | grep libpthread
+      ldd $exe | grep libgmp
     '' + optionalString stdenv.isDarwin ''
       otool -L $exe | grep "libSystem.B"
     '' + ''
@@ -37,12 +37,13 @@ in
       sofile=$(find "${packages.project.components.library}" | grep -e '\.dylib$')
     '' + ''
       echo "$sofile"
+    '' + optionalString (!stdenv.hostPlatform.isMusl) (''
       printf "checking that dynamic library is dynamically linked to prim... " >& 2
     '' + optionalString stdenv.isLinux ''
       ldd $sofile | grep libHSghc-prim
     '' + optionalString stdenv.isDarwin ''
       otool -L $sofile | grep libHSghc-prim
-    '' + ''
+    '') + ''
       touch $out
     '';
 

test/cabal-simple/default.nix

@@ -1,5 +1,5 @@
 # Test a package set
-{ stdenv, util, mkCabalProjectPkgSet }:
+{ stdenv, util, mkCabalProjectPkgSet, gmp6, zlib }:
 
 with stdenv.lib;
 
@@ -11,6 +11,19 @@ let
        # Package has no exposed modules which causes
        #   haddock: No input file(s)
        packages.cabal-simple.doHaddock = false;
+
+       # When compiling with musl ghc, build a statically linked
+       # executable against static libraries.
+       # Ref: https://vaibhavsagar.com/blog/2018/01/03/static-haskell-nix/
+       packages.cabal-simple.components.exes.cabal-simple.configureFlags =
+         optionals stdenv.hostPlatform.isMusl [
+           "--disable-executable-dynamic"
+           "--disable-shared"
+           "--ghc-option=-optl=-pthread"
+           "--ghc-option=-optl=-static"
+           "--ghc-option=-optl=-L${gmp6.override { withStatic = true; }}/lib"
+           # "--ghc-option=-optl=-L${zlib.static}/lib"
+         ];
      }
     ];
   };
@@ -30,13 +43,16 @@ in
       # fixme: run on target platform when cross-compiled
       printf "checking whether executable runs... " >& 2
       $exe
-
-      printf "checking that executable is dynamically linked to system libraries... " >& 2
-    '' + optionalString stdenv.isLinux ''
-      ldd $exe | grep libpthread
-    '' + optionalString stdenv.isDarwin ''
-      otool -L $exe |grep .dylib
-    '' + ''
+    '' + (if stdenv.hostPlatform.isMusl then ''
+        printf "checking that executable is statically linked... " >& 2
+        (ldd $exe 2>&1 || true) | grep -i "not a"
+      '' else ''
+        printf "checking that executable is dynamically linked to system libraries... " >& 2
+      '' + optionalString stdenv.isLinux ''
+        ldd $exe | grep libpthread
+      '' + optionalString stdenv.isDarwin ''
+        otool -L $exe |grep .dylib
+    '') + ''
 
       printf "Checking that \"all\" component has the programs... " >& 2
       all_exe="${packages.cabal-simple.components.all}/bin/cabal-simple"

test/cabal-simple/pkgs.nix

@@ -4,7 +4,7 @@
       packages = {
         "binary".revision = (((hackage."binary")."0.8.5.1").revisions).default;
         "ghc-prim".revision = (((hackage."ghc-prim")."0.5.2.0").revisions).default;
-        "extra".revision = (((hackage."extra")."1.6.15").revisions).default;
+        "extra".revision = (((hackage."extra")."1.6.17").revisions).default;
         "stm".revision = (((hackage."stm")."2.4.5.1").revisions).default;
         "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;
         "rts".revision = (((hackage."rts")."1.0").revisions).default;
@@ -45,11 +45,11 @@
         "vector".flags.internalchecks = false;
         "vector".flags.wall = false;
         "vector".flags.boundschecks = true;
-        "primitive".revision = (((hackage."primitive")."0.6.4.0").revisions).default;
-        "time-locale-compat".revision = (((hackage."time-locale-compat")."0.1.1.5").revisions).default;
-        "time-locale-compat".flags.old-locale = false;
+        "primitive".revision = (((hackage."primitive")."0.7.0.0").revisions).default;
         "safe".revision = (((hackage."safe")."0.3.17").revisions).default;
         "base-compat".revision = (((hackage."base-compat")."0.10.5").revisions).default;
+        "time-compat".revision = (((hackage."time-compat")."1.9.2.2").revisions).default;
+        "time-compat".flags.old-locale = false;
         "ansi-terminal".revision = (((hackage."ansi-terminal")."0.9.1").revisions).default;
         "ansi-terminal".flags.example = false;
         "tagged".revision = (((hackage."tagged")."0.8.6").revisions).default;
@@ -62,8 +62,8 @@
         "bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;
         "ansi-wl-pprint".revision = (((hackage."ansi-wl-pprint")."0.6.9").revisions).default;
         "ansi-wl-pprint".flags.example = false;
-        "StateVar".revision = (((hackage."StateVar")."1.1.1.1").revisions).default;
-        "contravariant".revision = (((hackage."contravariant")."1.5.1").revisions).default;
+        "StateVar".revision = (((hackage."StateVar")."1.2").revisions).default;
+        "contravariant".revision = (((hackage."contravariant")."1.5.2").revisions).default;
         "contravariant".flags.semigroups = true;
         "contravariant".flags.tagged = true;
         "contravariant".flags.statevar = true;
@@ -73,7 +73,7 @@
         "base".revision = (((hackage."base")."4.11.1.0").revisions).default;
         "time".revision = (((hackage."time")."1.8.0.2").revisions).default;
         "transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;
-        "hashable".revision = (((hackage."hashable")."1.2.7.0").revisions).default;
+        "hashable".revision = (((hackage."hashable")."1.3.0.0").revisions).default;
         "hashable".flags.sse2 = true;
         "hashable".flags.integer-gmp = true;
         "hashable".flags.sse41 = false;
@@ -84,12 +84,13 @@
         "filepath".revision = (((hackage."filepath")."1.4.2").revisions).default;
         "process".revision = (((hackage."process")."1.6.5.0").revisions).default;
         "pretty".revision = (((hackage."pretty")."1.1.3.6").revisions).default;
-        "aeson".revision = (((hackage."aeson")."1.4.3.0").revisions).default;
+        "aeson".revision = (((hackage."aeson")."1.4.4.0").revisions).default;
         "aeson".flags.cffi = false;
         "aeson".flags.fast = false;
         "aeson".flags.bytestring-builder = false;
         "aeson".flags.developer = false;
         "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.4.4").revisions).default;
+        "base-orphans".revision = (((hackage."base-orphans")."0.8.1").revisions).default;
         "th-abstraction".revision = (((hackage."th-abstraction")."0.3.1.0").revisions).default;
         "array".revision = (((hackage."array")."0.5.2.0").revisions).default;
         "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;

test/cabal-sublib/default.nix

@@ -33,7 +33,7 @@ in
 
       printf "checking that executable is dynamically linked to system libraries... " >& 2
     '' + optionalString stdenv.isLinux ''
-      ldd $exe | grep libpthread
+      ldd $exe | grep libgmp
     '' + optionalString stdenv.isDarwin ''
       otool -L $exe |grep .dylib
     '' + ''

test/cabal-sublib/pkgs.nix

@@ -4,7 +4,7 @@
       packages = {
         "binary".revision = (((hackage."binary")."0.8.5.1").revisions).default;
         "ghc-prim".revision = (((hackage."ghc-prim")."0.5.2.0").revisions).default;
-        "extra".revision = (((hackage."extra")."1.6.15").revisions).default;
+        "extra".revision = (((hackage."extra")."1.6.17").revisions).default;
         "stm".revision = (((hackage."stm")."2.4.5.1").revisions).default;
         "unix".revision = (((hackage."unix")."2.7.2.2").revisions).default;
         "rts".revision = (((hackage."rts")."1.0").revisions).default;
@@ -45,11 +45,11 @@
         "vector".flags.internalchecks = false;
         "vector".flags.wall = false;
         "vector".flags.boundschecks = true;
-        "primitive".revision = (((hackage."primitive")."0.6.4.0").revisions).default;
-        "time-locale-compat".revision = (((hackage."time-locale-compat")."0.1.1.5").revisions).default;
-        "time-locale-compat".flags.old-locale = false;
+        "primitive".revision = (((hackage."primitive")."0.7.0.0").revisions).default;
         "safe".revision = (((hackage."safe")."0.3.17").revisions).default;
         "base-compat".revision = (((hackage."base-compat")."0.10.5").revisions).default;
+        "time-compat".revision = (((hackage."time-compat")."1.9.2.2").revisions).default;
+        "time-compat".flags.old-locale = false;
         "ansi-terminal".revision = (((hackage."ansi-terminal")."0.9.1").revisions).default;
         "ansi-terminal".flags.example = false;
         "tagged".revision = (((hackage."tagged")."0.8.6").revisions).default;
@@ -62,8 +62,8 @@
         "bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;
         "ansi-wl-pprint".revision = (((hackage."ansi-wl-pprint")."0.6.9").revisions).default;
         "ansi-wl-pprint".flags.example = false;
-        "StateVar".revision = (((hackage."StateVar")."1.1.1.1").revisions).default;
-        "contravariant".revision = (((hackage."contravariant")."1.5.1").revisions).default;
+        "StateVar".revision = (((hackage."StateVar")."1.2").revisions).default;
+        "contravariant".revision = (((hackage."contravariant")."1.5.2").revisions).default;
         "contravariant".flags.semigroups = true;
         "contravariant".flags.tagged = true;
         "contravariant".flags.statevar = true;
@@ -73,7 +73,7 @@
         "base".revision = (((hackage."base")."4.11.1.0").revisions).default;
         "time".revision = (((hackage."time")."1.8.0.2").revisions).default;
         "transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;
-        "hashable".revision = (((hackage."hashable")."1.2.7.0").revisions).default;
+        "hashable".revision = (((hackage."hashable")."1.3.0.0").revisions).default;
         "hashable".flags.sse2 = true;
         "hashable".flags.integer-gmp = true;
         "hashable".flags.sse41 = false;
@@ -84,12 +84,13 @@
         "filepath".revision = (((hackage."filepath")."1.4.2").revisions).default;
         "process".revision = (((hackage."process")."1.6.5.0").revisions).default;
         "pretty".revision = (((hackage."pretty")."1.1.3.6").revisions).default;
-        "aeson".revision = (((hackage."aeson")."1.4.3.0").revisions).default;
+        "aeson".revision = (((hackage."aeson")."1.4.4.0").revisions).default;
         "aeson".flags.cffi = false;
         "aeson".flags.fast = false;
         "aeson".flags.bytestring-builder = false;
         "aeson".flags.developer = false;
         "ghc-boot-th".revision = (((hackage."ghc-boot-th")."8.4.4").revisions).default;
+        "base-orphans".revision = (((hackage."base-orphans")."0.8.1").revisions).default;
         "th-abstraction".revision = (((hackage."th-abstraction")."0.3.1.0").revisions).default;
         "array".revision = (((hackage."array")."0.5.2.0").revisions).default;
         "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;

test/shell-for/default.nix

@@ -50,6 +50,8 @@ in
     '';
 
     meta.platforms = platforms.all;
+    meta.disabled = stdenv.hostPlatform.isMusl;
+
     passthru = {
       # Used for debugging with nix repl
       inherit pkgSet;

test/shell-for/pkgs.nix

@@ -39,8 +39,8 @@
         "deepseq".revision = (((hackage."deepseq")."1.4.3.0").revisions).default;
         "random".revision = (((hackage."random")."1.1").revisions).default;
         "optparse-applicative".revision = (((hackage."optparse-applicative")."0.14.3.0").revisions).default;
-        "network".revision = (((hackage."network")."3.1.0.0").revisions).default;
-        "async".revision = (((hackage."async")."2.2.1").revisions).default;
+        "network".revision = (((hackage."network")."3.1.0.1").revisions).default;
+        "async".revision = (((hackage."async")."2.2.2").revisions).default;
         "async".flags.bench = false;
         "conduit".revision = (((hackage."conduit")."1.3.1.1").revisions).default;
         "semigroups".revision = (((hackage."semigroups")."0.19").revisions).default;
@@ -102,14 +102,14 @@
         "reflection".revision = (((hackage."reflection")."2.1.4").revisions).default;
         "reflection".flags.slow = false;
         "reflection".flags.template-haskell = true;
-        "streaming-commons".revision = (((hackage."streaming-commons")."0.2.1.0").revisions).default;
+        "streaming-commons".revision = (((hackage."streaming-commons")."0.2.1.1").revisions).default;
         "streaming-commons".flags.use-bytestring-builder = false;
         "bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;
         "ansi-wl-pprint".revision = (((hackage."ansi-wl-pprint")."0.6.9").revisions).default;
         "ansi-wl-pprint".flags.example = false;
-        "StateVar".revision = (((hackage."StateVar")."1.1.1.1").revisions).default;
-        "typed-process".revision = (((hackage."typed-process")."0.2.4.0").revisions).default;
-        "contravariant".revision = (((hackage."contravariant")."1.5.1").revisions).default;
+        "StateVar".revision = (((hackage."StateVar")."1.2").revisions).default;
+        "typed-process".revision = (((hackage."typed-process")."0.2.5.0").revisions).default;
+        "contravariant".revision = (((hackage."contravariant")."1.5.2").revisions).default;
         "contravariant".flags.semigroups = true;
         "contravariant".flags.tagged = true;
         "contravariant".flags.statevar = true;
@@ -131,7 +131,7 @@
         "vector-algorithms".flags.bench = true;
         "vector-algorithms".flags.properties = true;
         "transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;
-        "hashable".revision = (((hackage."hashable")."1.2.7.0").revisions).default;
+        "hashable".revision = (((hackage."hashable")."1.3.0.0").revisions).default;
         "hashable".flags.sse2 = true;
         "hashable".flags.integer-gmp = true;
         "hashable".flags.sse41 = false;
@@ -151,7 +151,7 @@
         "base-orphans".revision = (((hackage."base-orphans")."0.8.1").revisions).default;
         "th-abstraction".revision = (((hackage."th-abstraction")."0.3.1.0").revisions).default;
         "array".revision = (((hackage."array")."0.5.2.0").revisions).default;
-        "conduit-extra".revision = (((hackage."conduit-extra")."1.3.1.1").revisions).default;
+        "conduit-extra".revision = (((hackage."conduit-extra")."1.3.3").revisions).default;
         "integer-gmp".revision = (((hackage."integer-gmp")."1.0.2.0").revisions).default;
         };
       compiler = {

test/stack-simple/pkgs.nix

@@ -6,5 +6,5 @@
         "process" = (((hackage.process)."1.6.5.0").revisions).default;
         } // { stack-simple = ./stack-simple.nix; };
       };
-  resolver = "lts-13.18";
+  resolver = "lts-13.26";
   }

test/stack-simple/stack.yaml

@@ -17,7 +17,7 @@
 #
 # resolver: ./custom-snapshot.yaml
 # resolver: https://example.com/snapshots/2018-01-01.yaml
-resolver: lts-13.18
+resolver: lts-13.26
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.

test/with-packages/default.nix

@@ -73,6 +73,8 @@ in
     '';
 
     meta.platforms = platforms.all;
+    meta.disabled = stdenv.hostPlatform.isMusl;
+
     passthru = {
       # Used for debugging with nix repl
       inherit packages pkgSet;

test/with-packages/pkgs.nix

@@ -81,8 +81,8 @@
         "reflection".flags.slow = false;
         "reflection".flags.template-haskell = true;
         "bytestring".revision = (((hackage."bytestring")."0.10.8.2").revisions).default;
-        "StateVar".revision = (((hackage."StateVar")."1.1.1.1").revisions).default;
-        "contravariant".revision = (((hackage."contravariant")."1.5.1").revisions).default;
+        "StateVar".revision = (((hackage."StateVar")."1.2").revisions).default;
+        "contravariant".revision = (((hackage."contravariant")."1.5.2").revisions).default;
         "contravariant".flags.semigroups = true;
         "contravariant".flags.tagged = true;
         "contravariant".flags.statevar = true;
@@ -97,7 +97,7 @@
         "comonad".flags.containers = true;
         "time".revision = (((hackage."time")."1.8.0.2").revisions).default;
         "transformers".revision = (((hackage."transformers")."0.5.6.2").revisions).default;
-        "hashable".revision = (((hackage."hashable")."1.2.7.0").revisions).default;
+        "hashable".revision = (((hackage."hashable")."1.3.0.0").revisions).default;
         "hashable".flags.sse2 = true;
         "hashable".flags.integer-gmp = true;
         "hashable".flags.sse41 = false;