Update nixpkgs pins to include 20.03 (#557)

michaelpj · web-flow · commit 701c83fb4317 · 2020-04-29T02:49:36.000+12:00
* Update nixpkgs pins to include 20.03, wobble

- Add 20.03
- Remove 19.03 (and old 18.09 file)
- Update 19.09 to latest
- Update github pin to 20.03
- Remove workarounds for 19.03

* Mark openssl as allowedInsecure

* Force python3 for mkdocs
diff --git a/build.nix b/build.nix
@@ -25,12 +25,7 @@ in rec {
     update-stackage = haskell.callPackage ./scripts/update-stackage.nix {};
     update-pins = haskell.callPackage ./scripts/update-pins.nix {};
     update-docs = pkgs.buildPackages.callPackage ./scripts/update-docs.nix {
-      generatedOptions = import ./scripts/options-doc.nix {
-        # nixpkgs 19.09 changes "Option has no description" from an
-        # error into a warning. That is quite helpful when hardly any
-        # of our options are documented, thanks @oxij.
-        pkgs = import (import ./nixpkgs/default.nix).nixpkgs-1909 {};
-      };
+      generatedOptions = pkgs.callPackage ./scripts/options-doc.nix { };
     };
     # Because this is going to be used to test caching on hydra, it must not
     # use the darcs package from the haskell.nix we are testing.  For that reason
diff --git a/builder/default.nix b/builder/default.nix
@@ -39,10 +39,9 @@ let
 
 
   hoogleLocal = let
-    # Use the latest default nixpkgs hoogle.nix, as the 19.03 one does not work with cross compilers
-    nixpkgsHoogleLocal = import ((import (import ../nixpkgs).nixpkgs-default {}).path + /pkgs/development/haskell-modules/hoogle.nix);
+    nixpkgsHoogle = import (pkgs.path + /pkgs/development/haskell-modules/hoogle.nix);
   in { packages ? [], hoogle ? pkgs.buildPackages.haskell-nix.haskellPackages.hoogle.components.exes.hoogle }:
-    haskellLib.weakCallPackage pkgs nixpkgsHoogleLocal {
+    haskellLib.weakCallPackage pkgs nixpkgsHoogle { 
       # For musl we can use haddock from the buildGHC
       ghc = if stdenv.hostPlatform.isLinux && stdenv.targetPlatform.isMusl
         then ghc.buildGHC
diff --git a/ci.nix b/ci.nix
@@ -8,8 +8,8 @@ let
   inherit (import ./ci-lib.nix) dimension platformFilterGeneric filterAttrsOnlyRecursive;
   inherit (import ./default.nix {}) sources nixpkgsArgs;
   nixpkgsVersions = {
-    "R1903" = "nixpkgs-1903";
     "R1909" = "nixpkgs-1909";
+    "R2003" = "nixpkgs-2003";
   };
   systems = nixpkgs: nixpkgs.lib.filterAttrs (_: v: builtins.elem v supportedSystems) {
     # I wanted to take these from 'lib.systems.examples', but apparently there isn't one for linux!
@@ -20,8 +20,8 @@ let
     # We need to use the actual nixpkgs version we're working with here, since the values
     # of 'lib.systems.examples' are not understood between all versions
     let lib = nixpkgs.lib;
-    in lib.optionalAttrs (system == "x86_64-linux" || nixpkgsName == "R1903") {
-    # Windows cross compilation is currently broken on macOS for nixpkgs 19.09 (works on 19.03)
+    in lib.optionalAttrs (system == "x86_64-linux") {
+    # Windows cross compilation is currently broken on macOS
     inherit (lib.systems.examples) mingwW64;
   } // lib.optionalAttrs (system == "x86_64-linux") {
     # Musl cross only works on linux
diff --git a/config.nix b/config.nix
@@ -6,6 +6,9 @@
   wine.build = "wine64";
   wine.release = "stable";
 
+  # This is marked insecure on 20.03, but many packages still depend on it
+  permittedInsecurePackages = [ "openssl-1.0.2u" ];
+
   # sadly we need to patch GHC a bit.
   packageOverrides = ps: with ps; let
   in rec {
diff --git a/default.nix b/default.nix
@@ -1,6 +1,6 @@
 let haskellNix = rec {
     sources = {
-      inherit (import ./nixpkgs/default.nix) nixpkgs-1903 nixpkgs-1909 nixpkgs-default;
+      inherit (import ./nixpkgs/default.nix) nixpkgs-1909 nixpkgs-2003 nixpkgs-default;
     };
 
     config   = import ./config.nix;
diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix
@@ -10,7 +10,7 @@ let
     };
 in
 {
+  nixpkgs-2003 = fetch (./. + "/release-20.03.json");
   nixpkgs-1909 = fetch (./. + "/release-19.09.json");
-  nixpkgs-1903 = fetch (./. + "/release-19.03.json");
   nixpkgs-default = fetch (./. + "/github.json");
 }
diff --git a/nixpkgs/github.json b/nixpkgs/github.json
@@ -1,7 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs",
-  "rev": "a81842b6994ce710ebad13303fde29438f610e8c",
-  "date": "2020-03-07T09:04:39+01:00",
-  "sha256": "0ch8mnx4iicsh8j6a2a6sgdshbgn6wxhzgf35pnq72avc9pdf2xi",
-  "fetchSubmodules": false
+  "rev": "cac363c661817666e43d047addfaa722610d425f",
+  "date": "2020-03-24T13:44:58+01:00",
+  "sha256": "0fi8hgddy8qh2jrsa40jw7jxnr5lrhq2ji6a2xbndllivhzc31kf",
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
 }
diff --git a/nixpkgs/release-18.09.json b/nixpkgs/release-18.09.json
diff --git a/nixpkgs/release-19.03.json b/nixpkgs/release-19.03.json
diff --git a/nixpkgs/release-19.09.json b/nixpkgs/release-19.09.json
@@ -1,7 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs",
-  "rev": "a81842b6994ce710ebad13303fde29438f610e8c",
-  "date": "2020-03-07T09:04:39+01:00",
-  "sha256": "0ch8mnx4iicsh8j6a2a6sgdshbgn6wxhzgf35pnq72avc9pdf2xi",
-  "fetchSubmodules": false
+  "rev": "9237a09d8edbae9951a67e9a3434a07ef94035b7",
+  "date": "2020-04-19T11:10:38+05:30",
+  "sha256": "05bizymljzzd665bpsjbhxamcgzq7bkjjzjfapkl2nicy774ak4x",
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
 }
diff --git a/nixpkgs/release-20.03.json b/nixpkgs/release-20.03.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://github.com/NixOS/nixpkgs",
+  "rev": "cac363c661817666e43d047addfaa722610d425f",
+  "date": "2020-03-24T13:44:58+01:00",
+  "sha256": "0fi8hgddy8qh2jrsa40jw7jxnr5lrhq2ji6a2xbndllivhzc31kf",
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/overlays/default.nix b/overlays/default.nix
@@ -2,7 +2,6 @@
     # Hide nixpkgs haskell and haskellPackages from the haskell-nix overlays.
     # This should prevent us inadvertantly depending on them.
     (_: super: { haskell = {}; haskellPackages = {}; haskell-nix-super = super; })
-    (import ./release-19.03.nix)
     (import ./wine.nix)
     #(import ./ghcjs-asterius-triple.nix)
     #(import ./python.nix)
@@ -15,4 +14,4 @@
     (import ./musl.nix)
     # Restore nixpkgs haskell and haskellPackages
     (_: super: { inherit (super.haskell-nix-super) haskell haskellPackages; })
-]
+]
diff --git a/overlays/release-19.03.nix b/overlays/release-19.03.nix
diff --git a/release.nix b/release.nix
@@ -15,9 +15,9 @@ in allJobs // {
     required = genericPkgs.releaseTools.aggregate {
       name = "haskell.nix-required";
       meta.description = "All jobs required to pass CI";
-      # Hercules will require all of these, we just require the 1909 jobs
+      # Hercules will require all of these, we just require the 20.03 jobs
       # to avoid stressing Hydra too much
-      constituents = lib.collect lib.isDerivation allJobs.R1909.linux.native;
+      constituents = lib.collect lib.isDerivation allJobs.R2003.linux.native;
     };
   }
 
diff --git a/scripts/update-docs.nix b/scripts/update-docs.nix
@@ -1,19 +1,21 @@
 { stdenv, writeScript, coreutils, glibc, git, openssh, gnused, mkdocs
-, generatedOptions }:
+, python3, generatedOptions }:
 
 with stdenv.lib;
 
 let
   repo = "git@github.com:input-output-hk/haskell.nix.git";
   sshKey = "/run/keys/buildkite-haskell-dot-nix-ssh-private";
+  # Doesn't work with Python 2 in 20.03, fixed in master in https://github.com/NixOS/nixpkgs/commit/ee17a6a8379ffd791309b13143d76431f2f671df
+  py3mkdocs = mkdocs.override { python = python3; };
 in
   # update-docs depends on glibc which doesn't build on darwin
   meta.addMetaAttrs { platforms = platforms.linux; } (writeScript "update-docs.sh" ''
     #!${stdenv.shell}
 
     set -euo pipefail
 
-    export PATH="${makeBinPath [ coreutils glibc git openssh gnused mkdocs ]}"
+    export PATH="${makeBinPath [ coreutils glibc git openssh gnused py3mkdocs ]}"
 
     source ${./git.env}
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ let`
`10`	`10`	`};`
`11`	`11`	`in`
`12`	`12`	`{`
	`13`	`+ nixpkgs-2003 = fetch (./. + "/release-20.03.json");`
`13`	`14`	`nixpkgs-1909 = fetch (./. + "/release-19.09.json");`
`14`		`- nixpkgs-1903 = fetch (./. + "/release-19.03.json");`
`15`	`15`	`nixpkgs-default = fetch (./. + "/github.json");`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"url": "https://github.com/NixOS/nixpkgs",`
`3`		`- "rev": "a81842b6994ce710ebad13303fde29438f610e8c",`
`4`		`- "date": "2020-03-07T09:04:39+01:00",`
`5`		`- "sha256": "0ch8mnx4iicsh8j6a2a6sgdshbgn6wxhzgf35pnq72avc9pdf2xi",`
`6`		`- "fetchSubmodules": false`
	`3`	`+ "rev": "cac363c661817666e43d047addfaa722610d425f",`
	`4`	`+ "date": "2020-03-24T13:44:58+01:00",`
	`5`	`+ "sha256": "0fi8hgddy8qh2jrsa40jw7jxnr5lrhq2ji6a2xbndllivhzc31kf",`
	`6`	`+ "fetchSubmodules": false,`
	`7`	`+ "deepClone": false,`
	`8`	`+ "leaveDotGit": false`
`7`	`9`	`}`