Upgrade to lts-21.22 and nixos-23.11

NorfairKing · Dec 15, 2023 · def2556 · def2556
1 parent e6a33f1
commit def2556
Show file tree

Hide file tree

Showing 12 changed files with 149 additions and 159 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -5,8 +5,8 @@
     extra-trusted-public-keys = "smos.cachix.org-1:YOs/tLEliRoyhx7PnNw36cw2Zvbw5R0ASZaUlpUv+yM=";
   };
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-23.05";
-    home-manager.url = "github:nix-community/home-manager?ref=release-23.05";
+    nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-23.11";
+    home-manager.url = "github:nix-community/home-manager?ref=release-23.11";
     pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
     haskell-dependency-graph-nix.url = "github:NorfairKing/haskell-dependency-graph-nix";
     haskell-dependency-graph-nix.inputs.nixpkgs.follows = "nixpkgs";

diff --git a/nix/overlay.nix b/nix/overlay.nix
@@ -342,47 +342,28 @@ in
             };
 
 
+            servantPkg = name: subdir: self.callCabal2nix name
+              ((builtins.fetchGit {
+                url = "https://github.com/haskell-servant/servant";
+                rev = "552da96ff9a6d81a8553c6429843178d78356054";
+              }) + "/${subdir}")
+              { };
+            servantPackages = {
+              "servant" = servantPkg "servant" "servant";
+              "servant-client" = servantPkg "servant-client" "servant-client";
+              "servant-client-core" = servantPkg "servant-client-core" "servant-client-core";
+              "servant-server" = servantPkg "servant-server" "servant-server";
+              "servant-auth" = servantPkg "servant-auth-client" "servant-auth/servant-auth";
+              "servant-auth-client" = servantPkg "servant-auth-client" "servant-auth/servant-auth-client";
+              "servant-auth-server" = servantPkg "servant-auth-server" "servant-auth/servant-auth-server";
+            };
+
           in
           {
             inherit smosPackages;
             zip = dontCheck (enableCabalFlag (super.zip.override { bzlib-conduit = null; }) "disable-bzip2");
             # These are turned off for the same reason as the local packages tests
-            brick = self.callCabal2nix "brick"
-              (
-                builtins.fetchTarball {
-                  url = "https://hackage.haskell.org/package/brick-1.6/brick-1.6.tar.gz";
-                  sha256 = "0smfwip8pyzl48l4y1p23fgbl063zdf3yzrbq41hb7lvsa7lbdiy";
-                }
-              )
-              { };
-            bimap = self.callCabal2nix "bimap"
-              (
-                builtins.fetchTarball {
-                  url = "https://hackage.haskell.org/package/bimap-0.5.0/bimap-0.5.0.tar.gz";
-                  sha256 = "1p1bqvkbzjkwhrhhwcx0d4j52pa7287jdh45c8xzgksh1z33xg55";
-                }
-              )
-              { };
-            text-zipper = self.callCabal2nix "text-zipper"
-              (
-                builtins.fetchTarball {
-                  url = "https://hackage.haskell.org/package/text-zipper-0.13/text-zipper-0.13.tar.gz";
-                  sha256 = "1wdr8bksdlzaqm2nnmj0nxlw6hkhgipwgb4c6aia4lk19h7vyvms";
-                }
-              )
-              { };
-            vty = self.callCabal2nix "vty"
-              (
-                builtins.fetchTarball {
-                  url = "https://hackage.haskell.org/package/vty-5.36/vty-5.36.tar.gz";
-                  sha256 = "05gnrp2qyc6199s9m2y28sxszv4h03y6nwf5j42vbgj2vn3k71cq";
-                }
-              )
-              { };
-
-
-
-          } // amazonkaPackages // smosPackages
+          } // amazonkaPackages // servantPackages // smosPackages
       );
     }
     );

diff --git a/smos-data/src/Smos/Data.hs b/smos-data/src/Smos/Data.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE ImpredicativeTypes #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE RecordWildCards #-}
 
 module Smos.Data
@@ -132,7 +132,10 @@ versionCheck oldestSupported newestSupported versionToCheck =
 dataVersionCheck :: Version -> VersionCheck
 dataVersionCheck = versionCheck oldestParsableDataVersion newestParsableDataVersion
 
-parseWithVersionCheck :: (forall a. FromJSON a => ByteString -> Either String a) -> ByteString -> Either String SmosFile
+parseWithVersionCheck ::
+  (forall a. FromJSON a => ByteString -> Either String a) ->
+  ByteString ->
+  Either String SmosFile
 parseWithVersionCheck parseFunc sb =
   case parseFunc sb of
     Right sf -> Right sf

diff --git a/smos-notify/src/Smos/Notify/DB.hs b/smos-notify/src/Smos/Notify/DB.hs
@@ -9,6 +9,7 @@
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -Wno-orphans -Wno-name-shadowing #-}
 

diff --git a/smos-server/src/Smos/Server/DB.hs b/smos-server/src/Smos/Server/DB.hs
@@ -9,6 +9,7 @@
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -Wno-orphans -Wno-name-shadowing #-}
 

diff --git a/smos-server/src/Smos/Server/Handler/PostSync.hs b/smos-server/src/Smos/Server/Handler/PostSync.hs
@@ -2,6 +2,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeOperators #-}
 
 module Smos.Server.Handler.PostSync
   ( servePostSync,

diff --git a/smos-sync-client/src/Smos/Sync/Client/DB.hs b/smos-sync-client/src/Smos/Sync/Client/DB.hs
@@ -9,6 +9,7 @@
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -Wno-orphans -Wno-name-shadowing #-}
 

diff --git a/smos-web-server/src/Smos/Web/Server/Foundation.hs b/smos-web-server/src/Smos/Web/Server/Foundation.hs
@@ -7,6 +7,7 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE ViewPatterns #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 

diff --git a/smos-web-server/src/Smos/Web/Server/SmosSession.hs b/smos-web-server/src/Smos/Web/Server/SmosSession.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
 
 module Smos.Web.Server.SmosSession where
 

diff --git a/smos/src/Smos/Actions/Forest.hs b/smos/src/Smos/Actions/Forest.hs
@@ -1,5 +1,5 @@
+{-# LANGUAGE ImpredicativeTypes #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes #-}
 
 module Smos.Actions.Forest
   ( allForestPlainActions,

diff --git a/stack.yaml b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-20.25
+resolver: lts-21.22
 packages:
 - smos
 - smos-data
@@ -39,11 +39,16 @@ ghc-options:
   smos-stripe-client: -w # Turn off warnings for the generated code.
 
 extra-deps:
-# Newer brick
-- brick-1.6
-- vty-5.38
-- bimap-0.5.0@sha256:aba506d02a1c93fc2b50dcbe728d2a4d07cca89b7033945418061a0b08576ebd,1889
-- text-zipper-0.13@sha256:e1a48d69c9324ed3784bc39d5ded84d63ea3115b32a018ddf76158ed9d58dc0a,1472
+- github: NorfairKing/servant
+  commit: 552da96ff9a6d81a8553c6429843178d78356054
+  subdirs:
+  - servant
+  - servant-auth/servant-auth
+  - servant-auth/servant-auth-client
+  - servant-auth/servant-auth-server
+  - servant-client
+  - servant-client-core
+  - servant-server
 
 - github: NorfairKing/conformance
   commit: 2c236fd28c4cef63cd40d04631c5462d1df37759
@@ -66,7 +71,7 @@ extra-deps:
   - genvalidity-typed-uuid
 
 - github: NorfairKing/mergeful
-  commit: 3d65752421c2fa49377540dfd95bb26eba19be10
+  commit: 30812d2cd9ca71ea3716b89dbd8820502856706c
   subdirs:
     - mergeful
     - mergeful-persistent
@@ -205,13 +210,8 @@ extra-deps:
   subdirs:
     - template-haskell-reload
 
-- github-0.27@sha256:2288b807a4bd97fefeff75487ef5d2ed31f0faa18f306e01e5f5cb498e228208,7033
-
-- HaskellNet-0.6.0.1@sha256:061c503b5295e961cbe809b37305556a185ef99bc163d648c92870e3e2facca9,2376
-- HaskellNet-SSL-0.3.4.4@sha256:6a1a3c6d3804e857d183e702214476a383628eac83eb4bcbc7d5c4b8a2e05bf3,1704
-
 - github: brendanhay/amazonka
-  commit: 2dc498fe75ff47db2db3ee63e042b1aa3da57c0f
+  commit: 9c3594073a7787e27f13fa14c936f0fa5cb9f0e8
   subdirs:
   - lib/amazonka
   - lib/amazonka-core