Bump nixpkgs to latest master

cabal.project.freeze

@@ -1,110 +1,113 @@
 -- Run nix-shell .. -A check-cabal-freeze to update this file
-constraints: any.FloatingHex ==0.4,
-             any.HUnit ==1.6.0.0,
+active-repositories: :none
+constraints: any.FloatingHex ==0.5,
+             any.HUnit ==1.6.2.0,
              any.MonadRandom ==0.5.2,
              any.QuickCheck ==2.14.2,
-             any.StateVar ==1.2,
-             any.aeson ==1.4.7.1,
-             any.ansi-terminal ==0.10.3,
+             any.StateVar ==1.2.1,
+             any.aeson ==1.5.6.0,
+             any.ansi-terminal ==0.11,
              any.ansi-wl-pprint ==0.6.9,
              any.appar ==0.1.8,
              any.array ==0.5.4.0,
              any.asn1-encoding ==0.9.6,
              any.asn1-parse ==0.9.5,
              any.asn1-types ==0.3.4,
-             any.async ==2.2.2,
+             any.assoc ==1.0.2,
+             any.async ==2.2.3,
              any.atomic-write ==0.2.0.7,
-             any.attoparsec ==0.13.2.4,
+             any.attoparsec ==0.13.2.5,
              any.auto-update ==0.1.6,
-             any.base ==4.13.0.0,
-             any.base-compat ==0.11.1,
-             any.base-compat-batteries ==0.11.1,
-             any.base-orphans ==0.8.2,
-             any.base16-bytestring ==0.1.1.7,
+             any.base ==4.14.1.0,
+             any.base-compat ==0.11.2,
+             any.base-compat-batteries ==0.11.2,
+             any.base-orphans ==0.8.4,
+             any.base16-bytestring ==1.0.1.0,
              any.base32 ==0.1.1.2,
              any.base64-bytestring ==1.1.0.0,
              any.basement ==0.0.11,
-             any.bifunctors ==5.5.7,
-             any.binary ==0.8.7.0,
+             any.bifunctors ==5.5.10,
+             any.binary ==0.8.8.0,
              any.bindings-DSL ==1.0.25,
-             any.blaze-builder ==0.4.1.0,
+             any.blaze-builder ==0.4.2.1,
              any.blaze-html ==0.9.1.2,
-             any.blaze-markup ==0.8.2.7,
+             any.blaze-markup ==0.8.2.8,
              any.bsb-http-chunked ==0.0.0.4,
              any.byte-order ==0.1.2.0,
              any.byteorder ==1.0.4,
-             any.bytestring ==0.10.10.1,
-             any.call-stack ==0.2.0,
+             any.bytestring ==0.10.12.0,
+             any.call-stack ==0.3.0,
              any.candid ==0.1,
              any.case-insensitive ==1.2.1.0,
              any.cborg ==0.2.4.0,
              any.cereal ==0.5.8.1,
              any.clock ==0.8,
              any.colour ==2.3.5,
-             any.comonad ==5.0.6,
+             any.comonad ==5.0.8,
              any.connection ==0.3.1,
              any.constraints ==0.12,
              any.containers ==0.6.2.1,
-             any.contravariant ==1.5.2,
+             any.contravariant ==1.5.3,
              any.cookie ==0.4.5,
-             any.crc ==0.1.0.0,
-             any.cryptonite ==0.27,
+             any.crc ==0.1.1.1,
+             any.cryptonite ==0.28,
              any.data-default-class ==0.1.2.0,
-             any.data-fix ==0.2.1,
+             any.data-fix ==0.3.1,
              any.deepseq ==1.4.4.0,
              any.directory ==1.3.6.0,
-             any.distributive ==0.6.2,
+             any.distributive ==0.6.2.1,
              any.dlist ==0.8.0.8,
              any.easy-file ==0.2.2,
              any.ed25519 ==0.0.5.0,
              any.exceptions ==0.10.4,
-             any.fast-logger ==3.0.1,
+             any.fast-logger ==3.0.3,
              any.filepath ==1.4.2.1,
              any.generic-deriving ==1.13.1,
              any.generic-lens ==2.0.0.0,
              any.generic-lens-core ==2.0.0.0,
-             any.ghc-boot-th ==8.8.4,
-             any.ghc-prim ==0.5.3,
-             any.half ==0.3,
+             any.ghc-boot-th ==8.10.4,
+             any.ghc-prim ==0.6.1,
+             any.half ==0.3.1,
              any.hashable ==1.3.0.0,
-             any.hex-text ==0.1.0.0,
+             any.hex-text ==0.1.0.4,
              any.hourglass ==0.2.12,
              any.http-client ==0.6.4.1,
              any.http-client-tls ==0.3.5.3,
-             any.http-date ==0.0.8,
+             any.http-date ==0.0.11,
              any.http-types ==0.12.3,
-             any.http2 ==2.0.5,
+             any.http2 ==2.0.6,
              ic-ref -release,
              any.indexed-profunctors ==0.1,
-             any.integer-gmp ==1.0.2.0,
-             any.integer-logarithms ==1.0.3,
-             any.iproute ==1.7.9,
+             any.indexed-traversable ==0.1.1,
+             any.integer-gmp ==1.0.3.0,
+             any.integer-logarithms ==1.0.3.1,
+             any.iproute ==1.7.11,
              any.leb128-cereal ==1.2,
              any.lifted-base ==0.2.3.12,
              any.megaparsec ==8.0.0,
              any.memory ==0.15.0,
-             any.microlens ==0.4.11.2,
-             any.microlens-ghc ==0.4.12,
+             any.microlens ==0.4.12.0,
+             any.microlens-ghc ==0.4.13,
              any.microlens-mtl ==0.2.0.1,
-             any.microlens-platform ==0.4.1,
-             any.microlens-th ==0.4.3.5,
+             any.microlens-platform ==0.4.2,
+             any.microlens-th ==0.4.3.9,
              any.mime-types ==0.1.0.9,
              any.monad-control ==1.0.2.3,
              any.mtl ==2.2.2,
              any.nats ==1.1.2,
              any.network ==3.1.1.1,
-             any.network-byte-order ==0.1.5,
-             any.network-uri ==2.6.3.0,
+             any.network-byte-order ==0.1.6,
+             any.network-uri ==2.6.4.1,
              any.old-locale ==1.0.0.7,
              any.old-time ==1.1.0.3,
-             any.optparse-applicative ==0.15.1.0,
+             any.optparse-applicative ==0.16.1.0,
              any.parallel ==3.2.2.0,
              any.parsec ==3.1.14.0,
              any.parser-combinators ==1.2.1,
              any.pem ==0.2.4,
              any.pretty ==1.1.3.6,
-             any.prettyprinter ==1.6.2,
-             any.primitive ==0.7.0.1,
+             any.prettyprinter ==1.7.0,
+             any.primitive ==0.7.1.0,
              any.primitive-unaligned ==0.1.1.1,
              any.process ==1.6.9.0,
              any.profunctors ==5.5.2,
@@ -123,40 +126,42 @@ constraints: any.FloatingHex ==0.4,
              any.splitmix ==0.1.0.3,
              any.stm ==2.5.0.0,
              any.streaming-commons ==0.2.2.1,
-             any.tagged ==0.8.6,
-             any.tasty ==1.2.3,
-             any.tasty-ant-xml ==1.1.6,
-             any.tasty-html ==0.4.1.2,
-             any.tasty-hunit ==0.10.0.2,
-             any.tasty-quickcheck ==0.10.1.1,
-             any.tasty-rerun ==1.1.17,
-             any.template-haskell ==2.15.0.0,
+             any.strict ==0.4.0.1,
+             any.tagged ==0.8.6.1,
+             any.tasty ==1.4.1,
+             any.tasty-ant-xml ==1.1.8,
+             any.tasty-html ==0.4.1.4,
+             any.tasty-hunit ==0.10.0.3,
+             any.tasty-quickcheck ==0.10.1.2,
+             any.tasty-rerun ==1.1.18,
+             any.template-haskell ==2.16.0.0,
              any.temporary ==1.3,
-             any.text ==1.2.4.0,
-             any.th-abstraction ==0.3.2.0,
+             any.text ==1.2.4.1,
+             any.th-abstraction ==0.4.2.0,
+             any.th-compat ==0.1.2,
+             any.these ==1.1.1.1,
              any.time ==1.9.3,
-             any.time-compat ==1.9.3,
+             any.time-compat ==1.9.5,
              any.time-manager ==0.0.0,
-             any.tls ==1.5.4,
+             any.tls ==1.5.5,
              any.transformers ==0.5.6.2,
              any.transformers-base ==0.4.5.2,
-             any.transformers-compat ==0.6.5,
+             any.transformers-compat ==0.6.6,
              any.type-equality ==1,
-             any.unbounded-delays ==0.1.1.0,
+             any.unbounded-delays ==0.1.1.1,
              any.unix ==2.7.2.2,
-             any.unix-compat ==0.5.2,
+             any.unix-compat ==0.5.3,
              any.unix-time ==0.4.7,
-             any.unliftio-core ==0.1.2.0,
-             any.unordered-containers ==0.2.10.0,
-             any.utf8-string ==1.0.1.1,
-             any.uuid-types ==1.0.3,
-             any.vault ==0.3.1.4,
-             any.vector ==0.12.1.2,
-             any.void ==0.7.3,
-             any.wai ==3.2.2.1,
-             any.wai-extra ==3.0.29.2,
+             any.unliftio-core ==0.2.0.1,
+             any.unordered-containers ==0.2.13.0,
+             any.utf8-string ==1.0.2,
+             any.uuid-types ==1.0.4,
+             any.vault ==0.3.1.5,
+             any.vector ==0.12.2.0,
+             any.wai ==3.2.3,
+             any.wai-extra ==3.1.6,
              any.wai-logger ==2.3.6,
-             any.warp ==3.3.13,
+             any.warp ==3.3.14,
              any.wcwidth ==0.0.2,
              any.winter ==1.0.0,
              any.word8 ==0.1.3,
@@ -165,4 +170,5 @@ constraints: any.FloatingHex ==0.4,
              any.x509-system ==1.6.6,
              any.x509-validation ==1.6.11,
              any.xml ==1.3.14,
-             any.zlib ==0.6.2.2
+             any.zlib ==0.6.2.3
+index-state: HEAD

default.nix

@@ -11,7 +11,7 @@ let universal-canister = (naersk.buildPackage rec {
     name = "universal-canister";
     src = subpath ./universal-canister;
     root = ./universal-canister;
-    CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER = "${nixpkgs.llvmPackages_9.lld}/bin/lld";
+    CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER = "${nixpkgs.llvmPackages_11.lld}/bin/lld";
     RUSTFLAGS = "-C link-arg=-s"; # much smaller wasm
     cargoBuildOptions = x : x ++ [ "--target wasm32-unknown-unknown" ];
     doCheck = false;

nix/default.nix

@@ -14,9 +14,6 @@ let
     name = "nixpkgs-patched";
     src = nixpkgs_src;
     patches = [
-      ./patches/0001-ghc865-binary-Use-binary-distribution-which-links-ag.patch
-      ./patches/0002-openblas-0.3.10-0.3.13.patch
-      ./patches/fb063991b26b2b93dece6d09f37041451a5ef4cb.patch
     ];
   };
 
@@ -35,8 +32,10 @@ let
             configureFlags = self.lib.lists.forEach old.configureFlags (flag:
               if self.lib.strings.hasPrefix "--target=" flag
               then flag + ",wasm32-unknown-unknown"
-              else flag
-            );
+              else flag) ++ [
+                # https://github.com/rust-lang/rust/issues/76526
+		"--set=build.docs=false"
+	      ];
           });
 
           all-cabal-hashes = self.fetchurl {

nix/generate.nix

@@ -73,6 +73,9 @@ let
     random = pkgs.haskellPackages.hackage2nix "random" "1.2.0";
     splitmix = pkgs.haskellPackages.hackage2nix "splitmix" "0.1.0.3";
     QuickCheck = pkgs.haskellPackages.hackage2nix "QuickCheck" "2.14.2";
+
+     # for haskell-candid, support for newer versions already on a branch
+    row-types = pkgs.haskellPackages.hackage2nix "row-types" "0.4.0.0";
   };
 
   allGenerated = pkgs.runCommandNoCC "generated" {

nix/generated/QuickCheck.nix

@@ -2,10 +2,10 @@
 , base
 , containers
 , deepseq
+, lib
 , process
 , random
 , splitmix
-, stdenv
 , template-haskell
 , transformers
 }:
@@ -25,5 +25,5 @@ mkDerivation {
   testHaskellDepends = [ base deepseq process ];
   homepage = "https://github.com/nick8325/quickcheck";
   description = "Automatic testing of Haskell programs";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }

nix/generated/base32.nix

@@ -3,9 +3,9 @@
 , bytestring
 , criterion
 , deepseq
+, lib
 , memory
 , random-bytestring
-, stdenv
 , tasty
 , tasty-hunit
 , text
@@ -35,5 +35,5 @@ mkDerivation {
   ];
   homepage = "https://github.com/emilypi/base32";
   description = "RFC 4648-compliant Base32 encodings/decodings";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }

nix/generated/base64-bytestring.nix

@@ -5,9 +5,9 @@
 , criterion
 , deepseq
 , HUnit
+, lib
 , QuickCheck
 , split
-, stdenv
 , test-framework
 , test-framework-hunit
 , test-framework-quickcheck2
@@ -37,5 +37,5 @@ mkDerivation {
   ];
   homepage = "https://github.com/haskell/base64-bytestring";
   description = "Fast base64 encoding and decoding for ByteStrings";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }

nix/generated/candid.nix

@@ -16,6 +16,7 @@
 , filepath
 , hex-text
 , leb128-cereal
+, lib
 , megaparsec
 , mtl
 , optparse-applicative
@@ -24,7 +25,6 @@
 , scientific
 , smallcheck
 , split
-, stdenv
 , tasty
 , tasty-hunit
 , tasty-quickcheck
@@ -95,5 +95,5 @@ mkDerivation {
   ];
   homepage = "https://github.com/dfinity/candid";
   description = "Candid integration";
-  license = stdenv.lib.licenses.asl20;
+  license = lib.licenses.asl20;
 }

nix/generated/ic-ref.nix

@@ -29,6 +29,7 @@
 , http-client-tls
 , http-types
 , leb128-cereal
+, lib
 , memory
 , MonadRandom
 , mtl
@@ -44,7 +45,6 @@
 , serialise
 , split
 , splitmix
-, stdenv
 , tasty
 , tasty-ant-xml
 , tasty-html
@@ -181,5 +181,5 @@ mkDerivation {
   ];
   doCheck = false;
   license = "unknown";
-  hydraPlatforms = stdenv.lib.platforms.none;
+  hydraPlatforms = lib.platforms.none;
 }

nix/generated/leb128-cereal.nix

@@ -6,7 +6,7 @@
 , base
 , bytestring
 , cereal
-, stdenv
+, lib
 , tasty
 , tasty-hunit
 , tasty-quickcheck
@@ -24,5 +24,5 @@ mkDerivation {
     tasty-quickcheck
   ];
   description = "LEB128 and SLEB128 encoding";
-  license = stdenv.lib.licenses.mit;
+  license = lib.licenses.mit;
 }