Use nixpkgs 21.05

default.nix

@@ -20,8 +20,10 @@ let haskellPackages = nixpkgs.haskellPackages.override {
     }; in
 let
   rtsBuildInputs = with nixpkgs; [
-    clang_10 # for native/wasm building
-    lld_10 # for wasm building
+    # pulls in clang (wrapped) and clang-10 (unwrapped)
+    llvmPackages_10.clang
+    # pulls in wasm-ld
+    llvmPackages_10.lld
     llvmPackages_10.bintools
     rustc-nightly
     cargo-nightly
@@ -32,13 +34,19 @@ let
   ];
 
   llvmEnv = ''
+    # When compiling to wasm, we want to have more control over the flags,
+    # so we do not use the nix-provided wrapper in clang
+    export WASM_CLANG="clang-10"
+    export WASM_LD=wasm-ld
+    # because we use the unwrapped clang, we have to pass in some flags/paths
+    # that otherwise the wrapped clang would take care for us
+    export WASM_CLANG_LIB="${nixpkgs.llvmPackages_10.clang-unwrapped.lib}"
+
     # When compiling natively, we want to use `clang` (which is a nixpkgs
     # provided wrapper that sets various include paths etc).
     # But for some reason it does not handle building for Wasm well, so
     # there we use plain clang-10. There is no stdlib there anyways.
     export CLANG="${nixpkgs.clang_10}/bin/clang"
-    export WASM_CLANG="clang-10"
-    export WASM_LD=wasm-ld
   '';
 in
 
@@ -114,6 +122,12 @@ let ocaml_exe = name: bin: rts:
           -t ${nixpkgs.darwin.CF} \
           -t ${nixpkgs.libiconv} \
           $out/bin/*
+      '' + ''
+        # also, there is a refernece to /nix/store/…/share/menhir/standard.mly.
+        # Let's remove that, too
+        remove-references-to \
+          -t ${staticpkgs.ocamlPackages.menhir} \
+          $out/bin/*
         # sanity check
         $out/bin/* --help >/dev/null
       '';
@@ -284,7 +298,7 @@ rec {
       });
 
     qc = testDerivation {
-      buildInputs = [ moc /* nixpkgs.wasm */ wasmtime drun haskellPackages.qc-motoko ];
+      buildInputs = [ moc wasmtime drun haskellPackages.qc-motoko ];
       checkPhase = ''
 	export LANG=C.utf8 # for haskell
         qc-motoko${nixpkgs.lib.optionalString (replay != 0)
@@ -631,7 +645,7 @@ rec {
     TOMMATHSRC = nixpkgs.sources.libtommath;
     MUSLSRC = "${nixpkgs.sources.musl-wasi}/libc-top-half/musl";
     MUSL_WASI_SYSROOT = musl-wasi-sysroot;
-    LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux "${nixpkgs.glibcLocales}/lib/locale/locale-archive";
+    LOCALE_ARCHIVE = nixpkgs.lib.optionalString stdenv.isLinux "${nixpkgs.glibcLocales}/lib/locale/locale-archive";
     MOTOKO_BASE = base-src;
     CANDID_TESTS = "${nixpkgs.sources.candid}/test";
 

nix/default.nix

@@ -6,32 +6,45 @@ let
   };
   nixpkgs_src = (import sourcesnix { sourcesFile = ./sources.json; inherit pkgs; }).nixpkgs;
 
+  bootstrap-pkgs = import nixpkgs_src {
+    system = builtins.currentSystem;
+  };
+
+  nixpkgs-patched = bootstrap-pkgs.applyPatches {
+    name = "nixpkgs-patched";
+    src = nixpkgs_src;
+    patches = [
+      ./patches/124498.patch
+    ];
+  };
+
   pkgs =
-    import nixpkgs_src {
+    import nixpkgs-patched {
       inherit system;
       overlays = [
         # add nix/sources.json
         (self: super: {
            sources = import sourcesnix { sourcesFile = ./sources.json; pkgs = super; };
         })
 
-	# add a newer version of niv
+        # add a newer version of niv
         (self: super: {
            niv = (import self.sources.niv { pkgs = super; }).niv;
         })
 
         # Selecting the ocaml version
         # (self: super: { ocamlPackages = super.ocamlPackages; })
+
         (
           self: super: {
             # Additional ocaml package
             ocamlPackages = super.ocamlPackages // {
               vlq = import ./ocaml-vlq.nix {
-                inherit (self) stdenv fetchFromGitHub ocaml dune;
+                inherit (self) stdenv fetchFromGitHub ocaml dune_1;
                 inherit (self.ocamlPackages) findlib;
               };
               obelisk = import ./ocaml-obelisk.nix {
-                inherit (self) stdenv fetchFromGitHub ocaml dune_2;
+                inherit (self) stdenv lib fetchFromGitHub ocaml dune_2;
                 inherit (self) ocamlPackages;
               };
             };
@@ -45,11 +58,11 @@ let
         in rec {
           rustc-nightly = rust-channel.rust.override {
             targets = [
-	       "wasm32-unknown-unknown"
-	       "wasm32-unknown-emscripten"
-	       "wasm32-wasi"
-	       "i686-unknown-linux-gnu"
-	    ];
+               "wasm32-unknown-unknown"
+               "wasm32-unknown-emscripten"
+               "wasm32-wasi"
+               "i686-unknown-linux-gnu"
+            ];
             extensions = ["rust-src"];
           };
           cargo-nightly = rustc-nightly;
@@ -60,8 +73,8 @@ let
           xargo = self.callPackage ./xargo.nix {};
         })
 
-	# wasm-profiler
-	(self: super: import ./wasm-profiler.nix self)
+        # wasm-profiler
+        (self: super: import ./wasm-profiler.nix self)
 
         # to allow picking up more recent Haskell packages from Hackage
         (self: super: {

nix/generated/haskell-lsp-types.nix

@@ -8,9 +8,9 @@
 , filepath
 , hashable
 , lens
+, lib
 , network-uri
 , scientific
-, stdenv
 , text
 , unordered-containers
 }:
@@ -35,5 +35,5 @@ mkDerivation {
   ];
   homepage = "https://github.com/alanz/haskell-lsp";
   description = "Haskell library for the Microsoft Language Server Protocol, data types";
-  license = stdenv.lib.licenses.mit;
+  license = lib.licenses.mit;
 }

nix/generated/haskell-lsp.nix

@@ -14,13 +14,13 @@
 , hspec
 , hspec-discover
 , lens
+, lib
 , mtl
 , network-uri
 , QuickCheck
 , quickcheck-instances
 , rope-utf16-splay
 , sorted-list
-, stdenv
 , stm
 , temporary
 , text
@@ -80,5 +80,5 @@ mkDerivation {
   testToolDepends = [ hspec-discover ];
   homepage = "https://github.com/alanz/haskell-lsp";
   description = "Haskell library for the Microsoft Language Server Protocol";
-  license = stdenv.lib.licenses.mit;
+  license = lib.licenses.mit;
 }

nix/generated/lsp-int.nix

@@ -11,8 +11,8 @@
 , hspec
 , HUnit
 , lens
+, lib
 , lsp-test
-, stdenv
 , text
 }:
 mkDerivation {
@@ -35,5 +35,5 @@ mkDerivation {
   ];
   description = "Integration tests for the language server";
   license = "unknown";
-  hydraPlatforms = stdenv.lib.platforms.none;
+  hydraPlatforms = lib.platforms.none;
 }

nix/generated/lsp-test.nix

@@ -16,10 +16,10 @@
 , haskell-lsp
 , hspec
 , lens
+, lib
 , mtl
 , parser-combinators
 , process
-, stdenv
 , text
 , transformers
 , unix
@@ -72,5 +72,5 @@ mkDerivation {
   ];
   homepage = "https://github.com/bubba/lsp-test#readme";
   description = "Functional test framework for LSP servers";
-  license = stdenv.lib.licenses.bsd3;
+  license = lib.licenses.bsd3;
 }

nix/generated/random.nix

@@ -5,12 +5,12 @@
 , pkgs
 , base
 , exceptions
+, lib
 , managed
 , process
 , QuickCheck
 , quickcheck-text
 , quickcheck-unicode
-, stdenv
 , tasty
 , tasty-quickcheck
 , text
@@ -37,5 +37,5 @@ mkDerivation {
   ];
   description = "generate randomised tests for Motoko";
   license = "unknown";
-  hydraPlatforms = stdenv.lib.platforms.none;
+  hydraPlatforms = lib.platforms.none;
 }

nix/ocaml-obelisk.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, dune_2, ocamlPackages }:
+{ stdenv, lib, fetchFromGitHub, ocaml, dune_2, ocamlPackages }:
 stdenv.mkDerivation rec {
 	pname = "obelisk";
 	version = "0.5.2";
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
 
 	meta = {
 		description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)";
-		license = stdenv.lib.licenses.mit;
-		maintainers = [ stdenv.lib.maintainers.vbgl ];
+		license = lib.licenses.mit;
+		maintainers = [];
 		inherit (src.meta) homepage;
 		inherit (ocamlPackages.ocaml.meta) platforms;
 	};

nix/ocaml-vlq.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, dune }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune_1 }:
 
 let version = "v0.2.0"; in
 stdenv.mkDerivation {
@@ -11,17 +11,15 @@ stdenv.mkDerivation {
     sha256 = "09jdgih2n2qwpxnlbcca4xa193rwbd1nw7prxaqlg134l4mbya83";
   };
 
-  buildInputs = [ ocaml findlib dune ];
+  buildInputs = [ ocaml findlib dune_1 ];
 
   buildPhase = "dune build";
 
-  inherit (dune) installPhase;
+  installPhase = "dune install --prefix $out --libdir $OCAMLFIND_DESTDIR vlq";
 
   meta = {
     homepage = https://github.com/flowtype/ocaml-vlq;
     platforms = ocaml.meta.platforms or [];
     description = "A simple library for encoding variable-length quantities";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
   };
 }

nix/patches/124498.patch

@@ -0,0 +1,52 @@
+diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
+index d9853dd642a..4ff1b0ead72 100644
+--- a/pkgs/development/compilers/ocaml/generic.nix
++++ b/pkgs/development/compilers/ocaml/generic.nix
+@@ -58,6 +58,8 @@ stdenv.mkDerivation (args // {
+   ++ optional spaceTimeSupport (flags "--enable-spacetime" "-spacetime")
+   ;
+
++  hardeningDisable = lib.optional stdenv.targetPlatform.isMusl "pie";
++
+   buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
+   buildInputs = optional (!lib.versionAtLeast version "4.07") ncurses
+     ++ optionals useX11 [ libX11 xorgproto ];
+diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix
+index a917d634a19..a15452ec490 100644
+--- a/pkgs/development/ocaml-modules/menhir/generic.nix
++++ b/pkgs/development/ocaml-modules/menhir/generic.nix
+@@ -10,6 +10,8 @@ stdenv.mkDerivation {
+
+   createFindlibDestdir = true;
+
++  hardeningDisable = lib.optional stdenv.targetPlatform.isMusl "pie";
++
+   preBuild = ''
+     # fix makefiles.
+     RM=$(type -p rm)
+diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix
+index c8944926488..27e6bbe73fa 100644
+--- a/pkgs/development/ocaml-modules/wasm/default.nix
++++ b/pkgs/development/ocaml-modules/wasm/default.nix
+@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
+
+   buildInputs = [ ocaml findlib ocamlbuild ];
+
++  hardeningDisable = lib.optional stdenv.targetPlatform.isMusl "pie";
++
+   makeFlags = [ "-C" "interpreter" ];
+
+   createFindlibDestdir = true;
+diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix
+index c74794b35c9..b7d0a08c010 100644
+--- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix
++++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix
+@@ -17,6 +17,8 @@ stdenv.mkDerivation {
+
+   buildInputs = [ ocaml findlib ];
+
++  hardeningDisable = lib.optional stdenv.targetPlatform.isMusl "pie";
++
+   configurePhase = ''
+   make -f configure.make Makefile.config \
+     "OCAMLBUILD_PREFIX=$out" \

nix/sources.json

@@ -96,23 +96,23 @@
         "homepage": "https://github.com/nmattia/niv",
         "owner": "nmattia",
         "repo": "niv",
-        "rev": "af958e8057f345ee1aca714c1247ef3ba1c15f5e",
-        "sha256": "1qjavxabbrsh73yck5dcq8jggvh3r2jkbr6b5nlz5d9yrqm9255n",
+        "rev": "94080ae8286024820c570a2a24ed7c36d7ad04a9",
+        "sha256": "0wlk52zwlrq727x3z1vg9d9qq4zw62ab5jzg4068iqb6hyb0cr0w",
         "type": "tarball",
-        "url": "https://github.com/nmattia/niv/archive/af958e8057f345ee1aca714c1247ef3ba1c15f5e.tar.gz",
+        "url": "https://github.com/nmattia/niv/archive/94080ae8286024820c570a2a24ed7c36d7ad04a9.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "release-20.09",
+        "branch": "release-21.05",
         "builtin": true,
         "description": "Nixpkgs/NixOS branches that track the Nixpkgs/NixOS channels",
         "homepage": null,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "66cd39409e8ae1e2981edfb33bb06c164893d70d",
-        "sha256": "1c44akgqbqsm2b6k5b850lb0q7wq5l5p4hm6bqbaif1h05sc2bkx",
+        "rev": "97fc742ae64563093fd26c642db6748e24b01bd9",
+        "sha256": "0731aadb8kvs3b9dv21jr4ybzahma8rsc8pjvpj70fqkgpa2qsgn",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/66cd39409e8ae1e2981edfb33bb06c164893d70d.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/97fc742ae64563093fd26c642db6748e24b01bd9.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-mozilla": {

rts/Makefile

@@ -98,6 +98,7 @@ CLANG_FLAGS = \
    --target=wasm32-emscripten \
    -fno-builtin -ffreestanding \
    --optimize=s \
+   -resource-dir=$(WASM_CLANG_LIB)/lib/clang/10.0.1
 
 #
 # Build targets
@@ -161,8 +162,7 @@ TOMMATH_BINDINGS_RS=_build/tommath_bindings.rs
 
 
 $(TOMMATH_BINDINGS_RS): | _build
-	# use bash explicitly (work around nixpkgs bug https://github.com/NixOS/nixpkgs/issues/110126)
-	bash $$(command -v bindgen) $(TOMMATHSRC)/tommath.h \
+	bindgen $(TOMMATHSRC)/tommath.h \
 	    -o $@ \
 	    --use-core --ctypes-prefix=libc --no-layout-tests \
 	    --whitelist-function mp_init \
@@ -238,7 +238,7 @@ EXPORTED_SYMBOLS=\
   fmod \
   log \
 
-mo-rts.wasm: $(RTS_RUST_WASM_A) $(TOMMATH_WASM_A) $(MUSL_WASM_A)
+mo-rts.wasm: $(TOMMATH_WASM_A) $(MUSL_WASM_A) $(RTS_RUST_WASM_A)
 	$(WASM_LD) -o $@ \
 		--import-memory --shared --no-entry --gc-sections \
                 $(EXPORTED_SYMBOLS:%=--export=%) \

src/docs/.ocamlformat

@@ -1,3 +1,3 @@
-version=0.15.0
+version=0.18.0
 break-infix=fit-or-vertical
 doc-comments=before