From a9984348f21fd87109e9c4a79f20e4b9d7e6ba6c Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Sat, 12 Feb 2022 23:47:59 +1300 Subject: [PATCH 1/7] Merge 'mlabs-haskell/master' into hkm/update-pins --- flake.lock | 42 +++++++++++++++++++++--------------------- flake.nix | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 3305868d36..1794c6daf7 100644 --- a/flake.lock +++ b/flake.lock @@ -20,10 +20,10 @@ "flake": false, "locked": { "lastModified": 1603716527, - "narHash": "sha256-sDbrmur9Zfp4mPKohCD8IDZfXJ0Tjxpmr2R+kg5PpSY=", + "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", "owner": "haskell", "repo": "cabal", - "rev": "94aaa8e4720081f9c75497e2735b90f6a819b08e", + "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", "type": "github" }, "original": { @@ -36,11 +36,11 @@ "cabal-34": { "flake": false, "locked": { - "lastModified": 1622475795, - "narHash": "sha256-chwTL304Cav+7p38d9mcb+egABWmxo2Aq+xgVBgEb/U=", + "lastModified": 1640353650, + "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=", "owner": "haskell", "repo": "cabal", - "rev": "b086c1995cdd616fc8d91f46a21e905cc50a1049", + "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd", "type": "github" }, "original": { @@ -53,11 +53,11 @@ "cabal-36": { "flake": false, "locked": { - "lastModified": 1640163203, - "narHash": "sha256-TwDWP2CffT0j40W6zr0J1Qbu+oh3nsF1lUx9446qxZM=", + "lastModified": 1641652457, + "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=", "owner": "haskell", "repo": "cabal", - "rev": "ecf418050c1821f25e2e218f1be94c31e0465df1", + "rev": "f27667f8ec360c475027dcaee0138c937477b070", "type": "github" }, "original": { @@ -85,11 +85,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "owner": "numtide", "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { @@ -181,11 +181,11 @@ }, "nixpkgs-2105": { "locked": { - "lastModified": 1640283157, - "narHash": "sha256-6Ddfop+rKE+Gl9Tjp9YIrkfoYPzb8F80ergdjcq3/MY=", + "lastModified": 1642244250, + "narHash": "sha256-vWpUEqQdVP4srj+/YLJRTN9vjpTs4je0cdWKXPbDItc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dde1557825c5644c869c5efc7448dc03722a8f09", + "rev": "0fd9ee1aa36ce865ad273f4f07fdc093adeb5c00", "type": "github" }, "original": { @@ -197,11 +197,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1640283207, - "narHash": "sha256-SCwl7ZnCfMDsuSYvwIroiAlk7n33bW8HFfY8NvKhcPA=", + "lastModified": 1644358166, + "narHash": "sha256-BKkLT2QP/lMPebdB+WhiK95MyfLAFQJlFeeyQ4ljh5M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64c7e3388bbd9206e437713351e814366e0c3284", + "rev": "592b893530e1d864bb55c92141d8d2e427cf68bc", "type": "github" }, "original": { @@ -213,11 +213,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1641285291, - "narHash": "sha256-KYaOBNGar3XWTxTsYPr9P6u74KAqNq0wobEC236U+0c=", + "lastModified": 1644330694, + "narHash": "sha256-bxfJfDL8nKWR+LOwUf9xoZol8WKcahPS4EbD1U4kLT0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0432195a4b8d68faaa7d3d4b355260a3120aeeae", + "rev": "18a062b02d6eb382714187b06e3bfc3ba25ace78", "type": "github" }, "original": { @@ -257,7 +257,7 @@ "hpc-coveralls": "hpc-coveralls", "nix-tools": "nix-tools", "nixpkgs": [ - "nixpkgs-2111" + "nixpkgs-unstable" ], "nixpkgs-2003": "nixpkgs-2003", "nixpkgs-2105": "nixpkgs-2105", diff --git a/flake.nix b/flake.nix index ee0f21aa57..1a368b96a5 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Alternative Haskell Infrastructure for Nixpkgs"; inputs = { - nixpkgs.follows = "nixpkgs-2111"; + nixpkgs.follows = "nixpkgs-unstable"; nixpkgs-2003 = { url = "github:NixOS/nixpkgs/nixpkgs-20.03-darwin"; }; nixpkgs-2105 = { url = "github:NixOS/nixpkgs/nixpkgs-21.05-darwin"; }; nixpkgs-2111 = { url = "github:NixOS/nixpkgs/nixpkgs-21.11-darwin"; }; From df9dd937498ed24091ee6114a0a5dc8b29026133 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Sun, 13 Feb 2022 00:01:15 +1300 Subject: [PATCH 2/7] Bump to latest versions again --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 1794c6daf7..174987baba 100644 --- a/flake.lock +++ b/flake.lock @@ -197,11 +197,11 @@ }, "nixpkgs-2111": { "locked": { - "lastModified": 1644358166, - "narHash": "sha256-BKkLT2QP/lMPebdB+WhiK95MyfLAFQJlFeeyQ4ljh5M=", + "lastModified": 1644510859, + "narHash": "sha256-xjpVvL5ecbyi0vxtVl/Fh9bwGlMbw3S06zE5nUzFB8A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "592b893530e1d864bb55c92141d8d2e427cf68bc", + "rev": "0d1d5d7e3679fec9d07f2eb804d9f9fdb98378d3", "type": "github" }, "original": { @@ -213,11 +213,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1644330694, - "narHash": "sha256-bxfJfDL8nKWR+LOwUf9xoZol8WKcahPS4EbD1U4kLT0=", + "lastModified": 1644486793, + "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "18a062b02d6eb382714187b06e3bfc3ba25ace78", + "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", "type": "github" }, "original": { From ca944aba87f17f45768f9ceb84546922e7e6998c Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Sun, 13 Feb 2022 00:02:15 +1300 Subject: [PATCH 3/7] ifdLevel 1 --- release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.nix b/release.nix index d1d0ac36f5..ea25675f81 100644 --- a/release.nix +++ b/release.nix @@ -1,7 +1,7 @@ # 'supportedSystems' restricts the set of systems that we will evaluate for. Useful when you're evaluating # on a machine with e.g. no way to build the Darwin IFDs you need! { supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ] -, ifdLevel ? 3 +, ifdLevel ? 1 , checkMaterialization ? false }: let From 7184664ec06c4b59471433ca155acd24c1ade65c Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Mon, 14 Feb 2022 12:48:39 +1300 Subject: [PATCH 4/7] ifdLevel 2 --- release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.nix b/release.nix index ea25675f81..990558ebe8 100644 --- a/release.nix +++ b/release.nix @@ -1,7 +1,7 @@ # 'supportedSystems' restricts the set of systems that we will evaluate for. Useful when you're evaluating # on a machine with e.g. no way to build the Darwin IFDs you need! { supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ] -, ifdLevel ? 1 +, ifdLevel ? 2 , checkMaterialization ? false }: let From 4b27c6b32ab087877fa8777e8e4ea8cfb795b51a Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Mon, 14 Feb 2022 23:41:01 +1300 Subject: [PATCH 5/7] ifdLevel 3 --- release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.nix b/release.nix index 990558ebe8..d1d0ac36f5 100644 --- a/release.nix +++ b/release.nix @@ -1,7 +1,7 @@ # 'supportedSystems' restricts the set of systems that we will evaluate for. Useful when you're evaluating # on a machine with e.g. no way to build the Darwin IFDs you need! { supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ] -, ifdLevel ? 2 +, ifdLevel ? 3 , checkMaterialization ? false }: let From c34f0293b516eaaa3da4e4e3aac88a05319ce113 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Tue, 15 Feb 2022 02:16:21 +1300 Subject: [PATCH 6/7] Fix for new nixpkgsHoogle --- builder/default.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/builder/default.nix b/builder/default.nix index 6526abae57..7168e0fd15 100644 --- a/builder/default.nix +++ b/builder/default.nix @@ -46,17 +46,23 @@ let hoogleLocal = let nixpkgsHoogle = import (pkgs.path + /pkgs/development/haskell-modules/hoogle.nix); in { packages ? [], hoogle ? pkgs.buildPackages.haskell-nix.tool "ghc8107" "hoogle" { - version = "5.0.18.2"; + version = "5.0.18.3"; index-state = pkgs.haskell-nix.internalHackageIndexState; } }: - haskellLib.weakCallPackage pkgs nixpkgsHoogle { - # For musl we can use haddock from the buildGHC - ghc = if stdenv.hostPlatform.isLinux && stdenv.targetPlatform.isMusl && !haskellLib.isNativeMusl - then ghc.buildGHC - else ghc; - inherit packages hoogle; - }; + let + haskellPackages = { + # For musl we can use haddock from the buildGHC + ghc = if stdenv.hostPlatform.isLinux && stdenv.targetPlatform.isMusl && !haskellLib.isNativeMusl + then ghc.buildGHC + else ghc; + inherit packages hoogle; + }; + in if lib.versionAtLeast lib.trivial.release "22.05" + then haskellLib.weakCallPackage pkgs nixpkgsHoogle { + inherit haskellPackages; + } (p: p.packages) + else haskellLib.weakCallPackage pkgs nixpkgsHoogle haskellPackages; # Same as haskellPackages.shellFor in nixpkgs. shellFor = haskellLib.weakCallPackage pkgs ./shell-for.nix { From 1765ba401207f696ba300310cf9fd29d637bcfd1 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Tue, 15 Feb 2022 02:41:50 +1300 Subject: [PATCH 7/7] Another fix for latest nixpkgs --- scripts/options-doc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/options-doc.nix b/scripts/options-doc.nix index 475bdad2da..94228ab372 100644 --- a/scripts/options-doc.nix +++ b/scripts/options-doc.nix @@ -22,7 +22,7 @@ let singleMarkdown = name: value: '' ## ${name} - ${value.description} + ${lib.optionalString (value.description != null) value.description} **Type**: ${value.type}