Bump nix dependencies.

wireapp · Nov 22, 2024 · 26d0dcf · 26d0dcf
1 parent a4d47fb
commit 26d0dcf
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,8 +24,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        ghc-version: ['9.4']
-        cabal: ['3.10.2.1']
+        ghc-version: ['9.4', '9.6', '9.8']
+        cabal: ['3.10.3.0']
 
     steps:
     - uses: actions/checkout@v4

diff --git a/ldap-scim-bridge.cabal b/ldap-scim-bridge.cabal
@@ -22,35 +22,35 @@ extra-source-files:
   examples/wire-server/run.sh
   examples/wire-server/runlog
 
-tested-with:        GHC ==8.8.3
+tested-with:        GHC ==9.8.2
 
 source-repository head
   type:     git
   location: https://github.com/wireapp/ldap-scim-bridge.git
 
 common common-options
   build-depends:
-    , aeson                 >=2.1.2   && <2.2
-    , aeson-pretty          >=0.8.10  && <0.9
-    , base                  >=4.17.2  && <4.18
-    , bytestring            >=0.11.5  && <0.12
-    , containers            >=0.6.7   && <0.7
-    , email-validate        >=2.3.2   && <2.4
-    , hscim                 >=0.4.0.2 && <0.5
-    , http-client           >=0.7.16  && <0.8
-    , http-client-tls       >=0.3.6   && <0.4
-    , http-types            >=0.12.4  && <0.13
-    , ldap-client           >=0.4.2   && <0.5
-    , network               >=3.1.4   && <3.2
-    , relude                >=1.2.1   && <1.3
-    , servant               >=0.19.1  && <0.20
-    , servant-client        >=0.19    && <0.20
-    , servant-client-core   >=0.19    && <0.20
-    , string-conversions    >=0.4.0   && <0.5
-    , text                  >=2.0.2   && <2.1
-    , tinylog               >=0.15.0  && <0.16
-    , unordered-containers  >=0.2.20  && <0.3
-    , yaml                  >=0.11.11 && <0.12
+    , aeson                 >=2.1.2
+    , aeson-pretty          >=0.8.10
+    , base                  >=4.17.2
+    , bytestring            >=0.11.5
+    , containers            >=0.6.7
+    , email-validate        >=2.3.2
+    , hscim                 >=0.4.0.2
+    , http-client           >=0.7.16
+    , http-client-tls       >=0.3.6
+    , http-types            >=0.12.4
+    , ldap-client           >=0.4.2
+    , network               >=3.1.4
+    , relude                >=1.2.1
+    , servant               >=0.19.1
+    , servant-client        >=0.19
+    , servant-client-core   >=0.19
+    , string-conversions    >=0.4.0
+    , text                  >=2.0.2
+    , tinylog               >=0.15.0
+    , unordered-containers  >=0.2.20
+    , yaml                  >=0.11.11
 
   mixins:
     base hiding (Prelude),

diff --git a/shell.nix b/shell.nix
@@ -1,7 +1,7 @@
 let
   nixpkgs = fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/7eeacecff44e05a9fd61b9e03836b66ecde8a525.tar.gz";
-    sha256 = "sha256:0f6nv0pgk58d1962r8vswi7ks59fryh0yrdk99d30b3qj11a2045";
+    url = "https://github.com/NixOS/nixpkgs/archive/4f31540079322e6013930b5b2563fd10f96917f0.tar.gz";
+    sha256 = "sha256:12748r3h44hy3a41slm5hcihn1nhrxjlgp75qz6iwzazkxnclx00";
   };
   pkgs = import nixpkgs { config = { }; overlays = [ ]; };
 in
@@ -13,7 +13,7 @@ pkgs.mkShellNoCC rec {
     ghcid
     ghc
     zlib
-    (haskell.lib.justStaticExecutables pkgs.haskell.packages.ghc94.ormolu_0_5_2_0)
+    (haskell.lib.justStaticExecutables pkgs.haskell.packages.ghc94.ormolu)
     (haskell.lib.justStaticExecutables haskellPackages.cabal-fmt)
     nixpkgs-fmt
     treefmt