Bump nixpkgs and support newer GHCs

obsidiansystems · Aug 22, 2023 · 4b3fd0c · 4b3fd0c
1 parent d9a2b0a
commit 4b3fd0c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/.ci/default.nix b/.ci/default.nix
@@ -9,8 +9,11 @@ let
     ghc884 = nixos2003;
     ghc8107 = unstable;
     ghc902 = unstable;
+    ghc928 = unstable;
+    ghc946 = unstable;
+    ghc962 = unstable;
   };
-  build = 
+  build =
     { nixpkgs ? import ./dep/nixpkgs {}
     , ghc ? null
     }:

diff --git a/.ci/nixpkgs/unstable/github.json b/.ci/nixpkgs/unstable/github.json
@@ -3,6 +3,6 @@
   "repo": "nixpkgs",
   "branch": "nixpkgs-unstable",
   "private": false,
-  "rev": "e0a42267f73ea52adc061a64650fddc59906fc99",
-  "sha256": "0r1dsj51x2rm016xwvdnkm94v517jb1rpn4rk63k6krc4d0n3kh9"
+  "rev": "0b07d4957ee1bd7fd3bdfd12db5f361bd70175a6",
+  "sha256": "0v40jjffymg1z0cmvsqwjnmp0hw3yblnn7s89kizybd8m1jss8sc"
 }
diff --git a/.ci/nixpkgs/unstable/thunk.nix b/.ci/nixpkgs/unstable/thunk.nix
@@ -2,7 +2,10 @@
 let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
   if !fetchSubmodules && !private then builtins.fetchTarball {
     url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
-  } else (import <nixpkgs> {}).fetchFromGitHub {
+  } else (import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
+  sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
+}) {}).fetchFromGitHub {
     inherit owner repo rev sha256 fetchSubmodules private;
   };
   json = builtins.fromJSON (builtins.readFile ./github.json);

diff --git a/gargoyle-postgresql-connect/gargoyle-postgresql-connect.cabal b/gargoyle-postgresql-connect/gargoyle-postgresql-connect.cabal
@@ -18,7 +18,7 @@ library
   ghc-options:      -Wall
   ghc-prof-options: -fprof-auto-exported
   build-depends:
-      base                     >=4.12  && <4.17
+      base                     >=4.12  && <4.18
     , bytestring               >=0.10  && <0.12
     , directory                >=1.3   && <1.4
     , gargoyle                 >=0.1.1.0 && < 0.2

diff --git a/gargoyle-postgresql-nix/gargoyle-postgresql-nix.cabal b/gargoyle-postgresql-nix/gargoyle-postgresql-nix.cabal
@@ -24,7 +24,7 @@ library
   ghc-options:      -Wall
   ghc-prof-options: -fprof-auto-exported
   build-depends:
-      base                 >=4.12 && <4.17
+      base                 >=4.12 && <4.18
     , bytestring           >=0.10 && <0.12
     , gargoyle             >=0.1  && <0.2
     , gargoyle-postgresql  >=0.2  && <0.3

diff --git a/gargoyle-postgresql/gargoyle-postgresql.cabal b/gargoyle-postgresql/gargoyle-postgresql.cabal
@@ -45,7 +45,7 @@ library
   ghc-options:      -Wall
   ghc-prof-options: -fprof-auto-exported
   build-depends:
-      base          >=4.12  && <4.17
+      base          >=4.12  && <4.18
     , bytestring    >=0.10  && <0.12
     , directory     >=1.3   && <1.4
     , gargoyle      >=0.1.1.0 && < 0.2

diff --git a/gargoyle/gargoyle.cabal b/gargoyle/gargoyle.cabal
@@ -29,7 +29,7 @@ library
   ghc-options:      -Wall
   ghc-prof-options: -fprof-auto-exported
   build-depends:
-      base       >=4.12.0 && <4.17
+      base       >=4.12.0 && <4.18
     , directory  >=1.3.3  && <1.4
     , filelock   >=0.1.1  && <0.2
     , filepath   >=1.4.2  && <1.5