[feat] nixpkgs bump (#3781)

* [feat] nixpkgs bump * [fix] dontCheck markov-chain-usage-model because its doctests are broken * [fix] change override of base-compat*
wireapp · Dec 18, 2023 · e39b966 · e39b966
1 parent 6019eab
commit e39b966
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/changelog.d/5-internal/nixpkgs-bump-libcurl b/changelog.d/5-internal/nixpkgs-bump-libcurl
@@ -0,0 +1 @@
+bump the nixpkgs version to allow updating curl
diff --git a/integration/test/Testlib/Mock.hs b/integration/test/Testlib/Mock.hs
@@ -1,5 +1,6 @@
 module Testlib.Mock (startMockServer, MockServerConfig (..), codensityApp) where
 
+import Control.Arrow ((>>>))
 import Control.Concurrent.Async
 import Control.Concurrent.MVar
 import Control.Exception
@@ -29,15 +30,16 @@ spawnServer wsettings sock app = liftIO $ Warp.runSettingsSocket wsettings sock
 spawnTLSServer :: Warp.Settings -> Socket.Socket -> Wai.Application -> App ()
 spawnTLSServer wsettings sock app = do
   (cert, key) <-
-    asks (.servicesCwdBase) <&> \case
-      Nothing ->
-        ( "/etc/wire/federator/secrets/tls.crt",
-          "/etc/wire/federator/secrets/tls.key"
-        )
-      Just base ->
-        ( base <> "/federator/test/resources/integration-leaf.pem",
-          base <> "/federator/test/resources/integration-leaf-key.pem"
-        )
+    asks do
+      servicesCwdBase >>> \case
+        Nothing ->
+          ( "/etc/wire/federator/secrets/tls.crt",
+            "/etc/wire/federator/secrets/tls.key"
+          )
+        Just base ->
+          ( base <> "/federator/test/resources/integration-leaf.pem",
+            base <> "/federator/test/resources/integration-leaf-key.pem"
+          )
   liftIO $ Warp.runTLSSocket (Warp.tlsSettings cert key) wsettings sock app
 
 startMockServer :: MockServerConfig -> Wai.Application -> Codensity App Warp.Port

diff --git a/nix/manual-overrides.nix b/nix/manual-overrides.nix
@@ -56,6 +56,9 @@ hself: hsuper: {
   # PR with fix: https://github.com/freckle/hspec-junit-formatter/pull/23
   hspec-junit-formatter = hlib.markUnbroken (hlib.dontCheck hsuper.hspec-junit-formatter);
 
+  # fails doctest
+  markov-chain-usage-model = hlib.markUnbroken (hlib.dontCheck hsuper.markov-chain-usage-model);
+
   # Some test seems to be broken
   hsaml2 = hlib.dontCheck hsuper.hsaml2;
   saml2-web-sso = hlib.dontCheck hsuper.saml2-web-sso;

diff --git a/nix/sources.json b/nix/sources.json
@@ -17,10 +17,10 @@
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "01441e14af5e29c9d27ace398e6dd0b293e25a54",
-        "sha256": "0yvkamjbk3aj4lvhm6vdgdk4b2j0xdv3gx9n4p7wfky52j2529dy",
+        "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d",
+        "sha256": "114ggf0xbwq16djg4qql3jljknk9xr8h7dw18ccalwqg9k1cgv0g",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/01441e14af5e29c9d27ace398e6dd0b293e25a54.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-cargo": {

diff --git a/nix/wire-server.nix b/nix/wire-server.nix
@@ -436,8 +436,8 @@ let
 
   inherit (pkgs.haskellPackages.override {
     overrides = _hfinal: hprev: {
-      base-compat = hprev.base-compat_0_13_0;
-      base-compat-batteries = hprev.base-compat-batteries_0_13_0;
+      base-compat = hprev.base-compat_0_13_1;
+      base-compat-batteries = hprev.base-compat-batteries_0_13_1;
       cabal-plan = hlib.markUnbroken (hlib.doJailbreak hprev.cabal-plan);
     };
   }) cabal-plan;