Merge pull request #46 from alexfmpe/deprecated

Fix deprecation warning
obsidiansystems · May 28, 2024 · 32f0147 · 32f0147
2 parents cc736d7 + acd7e6b
commit 32f0147
Show file tree

Hide file tree

Showing 16 changed files with 48 additions and 64 deletions.
diff --git a/.ci/default.nix b/.ci/default.nix
@@ -1,34 +1,26 @@
 { }:
 let
-  nixpkgsSets = import ./nixpkgs.nix;
-  inherit (nixpkgsSets) nixos1809 nixos2003 unstable;
-  inherit (unstable) lib;
-  inherit (nixos2003.haskell.lib) doJailbreak dontCheck markUnbroken overrideCabal;
-  ghcs = rec {
-    ghc865 = nixos2003;
-    ghc884 = nixos2003;
-    ghc8107 = unstable;
-    ghc902 = unstable;
+  nixos2311 = import ./nixpkgs/23.11 {};
+  pkgs = nixos2311;
+  inherit (pkgs) lib;
+  inherit (pkgs.haskell.lib) doJailbreak dontCheck markUnbroken overrideCabal;
+  ghcs = {
+
+    "ghc8107" = pkgs;
+    "ghc902" = pkgs;
+    "ghc928" = pkgs;
+    "ghc948" = pkgs;
+    "ghc963" = pkgs;
+    "ghc981" = import ./nixpkgs/unstable {};
   };
-  build = 
-    { nixpkgs ? import ./dep/nixpkgs {}
+  build =
+    { nixpkgs
     , ghc ? null
     }:
     let
       baseHaskellPackages = if ghc != null then nixpkgs.haskell.packages.${ghc} else nixpkgs.haskellPackages;
       haskellPackages = baseHaskellPackages.override {
-        overrides = self: super: import ../. { haskellPackages = self; } // {
-          which = self.callHackageDirect {
-            pkg = "which";
-            ver = "0.2.0.1";
-            sha256 = "0kfbzaz1wgzmyqvw4m57yj43x4ihalk5a7y703fa0pjv0cvvx0ss";
-          } {};
-          shelly = self.callHackageDirect {
-            pkg = "shelly";
-            ver = "1.9.0";
-            sha256 = "1x9d86pswkncyhnzpbx4a1kmn847kjqs0ivishn84h0w6lpf12pc";
-          } {};
-        };
+        overrides = self: super: import ../. { haskellPackages = self; };
       };
     in {
       inherit (haskellPackages)

diff --git a/.ci/nixpkgs/nixos1809/default.nix → .ci/nixpkgs/23.11/default.nix b/.ci/nixpkgs/nixos1809/default.nix → .ci/nixpkgs/23.11/default.nix
diff --git a/.ci/nixpkgs/23.11/github.json b/.ci/nixpkgs/23.11/github.json
@@ -0,0 +1,8 @@
+{
+  "owner": "nixos",
+  "repo": "nixpkgs",
+  "branch": "nixos-23.11",
+  "private": false,
+  "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e",
+  "sha256": "0bkrjx4x6sy4g9kmcddhlwrl4cpm4yvj7cljd7b8crf7kxpvaaf6"
+}
diff --git a/.ci/nixpkgs/nixos2003/thunk.nix → .ci/nixpkgs/23.11/thunk.nix b/.ci/nixpkgs/nixos2003/thunk.nix → .ci/nixpkgs/23.11/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/.ci/nixpkgs/nixos1809/github.json b/.ci/nixpkgs/nixos1809/github.json
diff --git a/.ci/nixpkgs/nixos1809/thunk.nix b/.ci/nixpkgs/nixos1809/thunk.nix
diff --git a/.ci/nixpkgs/nixos2003/default.nix b/.ci/nixpkgs/nixos2003/default.nix
diff --git a/.ci/nixpkgs/nixos2003/github.json b/.ci/nixpkgs/nixos2003/github.json
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": "e2dd4e18cc1c7314e24154331bae07df76eb582f",
+  "sha256": "19zbxf7rb787jvyrfhl4z9sn3aisd6xvx6ikybbi75ym9sy39jds"
 }
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/ChangeLog.md b/gargoyle-postgresql-connect/ChangeLog.md
@@ -1,5 +1,9 @@
 # Revision history for gargoyle-postgresql-connect
 
+## 0.1.0.2
+
+* Require resource-pool 0.4.*
+
 ## 0.1.0.1
 
 * Add support for ghc 9.0.2

diff --git a/gargoyle-postgresql-connect/gargoyle-postgresql-connect.cabal b/gargoyle-postgresql-connect/gargoyle-postgresql-connect.cabal
@@ -1,5 +1,5 @@
 name:               gargoyle-postgresql-connect
-version:            0.1.0.1
+version:            0.1.0.2
 author:             Obsidian Systems LLC
 maintainer:         [email protected]
 copyright:          Copyright (C) 2019 Obsidian Systems LLC
@@ -19,13 +19,13 @@ library
   ghc-prof-options: -fprof-auto-exported
   build-depends:
       base                     >=4.12  && <4.20
-    , bytestring               >=0.10  && <0.12
+    , bytestring               >=0.10  && <0.13
     , directory                >=1.3   && <1.4
     , gargoyle                 >=0.1.1.0 && < 0.2
     , gargoyle-postgresql      >=0.2.0.1 && < 0.3
     , gargoyle-postgresql-nix  >=0.3.0.0 && < 0.4
     , postgresql-simple        >=0.5   && <0.8
-    , resource-pool            >=0.2.3
+    , resource-pool            >=0.4 && <0.5
 
   hs-source-dirs:   src
   default-language: Haskell2010
diff --git a/gargoyle-postgresql-connect/src/Gargoyle/PostgreSQL/Connect.hs b/gargoyle-postgresql-connect/src/Gargoyle/PostgreSQL/Connect.hs
@@ -1,9 +1,10 @@
+{-# LANGUAGE TypeApplications #-}
 module Gargoyle.PostgreSQL.Connect (withDb, withDb', openDb) where
 
 import Control.Monad ((>=>))
 import Data.ByteString (ByteString)
 import qualified Data.ByteString.Char8 as C8
-import Data.Pool (Pool, createPool)
+import Data.Pool (Pool, defaultPoolConfig, newPool, setNumStripes)
 import Database.PostgreSQL.Simple (Connection, close, connectPostgreSQL)
 import Gargoyle (withGargoyle)
 import Gargoyle.PostgreSQL.Nix (postgresNix)
@@ -17,7 +18,7 @@ withDb dbPath f = either error pure =<< withDb' dbPath (openDb >=> f)
 
 -- | Convert a connection string into a connection 'Pool'.
 openDb :: ByteString -> IO (Pool Connection)
-openDb dbUri = createPool (connectPostgreSQL dbUri) close 1 5 20
+openDb dbUri = newPool $ setNumStripes (Just 1) $ defaultPoolConfig (connectPostgreSQL dbUri) close (realToFrac @Int 5) 20
 
 -- | Connects to a database using information at the given filepath.
 -- The given filepath can be either a folder (for a local db)

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

diff --git a/gargoyle-postgresql/gargoyle-postgresql.cabal b/gargoyle-postgresql/gargoyle-postgresql.cabal
@@ -46,14 +46,14 @@ library
   ghc-prof-options: -fprof-auto-exported
   build-depends:
       base          >=4.12  && <4.20
-    , bytestring    >=0.10  && <0.12
+    , bytestring    >=0.10  && <0.13
     , directory     >=1.3   && <1.4
     , gargoyle      >=0.1.1.0 && < 0.2
     , posix-escape  >=0.1   && <0.2
     , process       >=1.5   && <1.7
     , stringsearch  >=0.3   && <0.4
-    , text          >=1.2   && <1.3
-    , unix          >=2.7.2 && <2.8
+    , text          >=1.2   && <2.2
+    , unix          >=2.7.2 && <2.9
 
   hs-source-dirs:   src
   default-language: Haskell2010

diff --git a/gargoyle/gargoyle.cabal b/gargoyle/gargoyle.cabal
@@ -35,7 +35,7 @@ library
     , filepath   >=1.4.2  && <1.5
     , network    >=2.6.0  && <3.2
     , process    >=1.5.0  && <1.7
-    , unix       >=2.7.2  && <2.8
+    , unix       >=2.7.2  && <2.9
 
   hs-source-dirs:   src
   default-language: Haskell2010