Build against nixpkgs 24.05 (#74)

* Bump nixpkgs to 24.05 + `nix flake update`

* grpc: unpin

* net-mqtt: unpin

* `connection` -> `crypton-connection`

* large-records: unmark broken

* proto3-wire: update to 1.4.3

* proto3-suite: update to 0.8.1

* Increase upper bounds on vector and network-conduit-tls

* `x509-store` -> `crypton-x509-store`

flake.nix

@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/23.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/24.05";
     flake-utils.url = "github:numtide/flake-utils";
     gitignore = {
       url = "github:hercules-ci/gitignore.nix";
@@ -13,15 +13,13 @@
       let
         ghc = "ghc94";
 
-        grpcOverlay = import nix/overlays/grpc.nix { };
-
         haskellOverlay = import nix/overlays/haskell.nix {
           inherit gitignore ghc;
         };
 
         pkgs = import nixpkgs {
           inherit system;
-          overlays = [ grpcOverlay haskellOverlay ];
+          overlays = [ haskellOverlay ];
         };
       in {
         packages.default = pkgs.haskell.packages.${ghc}.grpc-mqtt;

grpc-mqtt.cabal

@@ -57,14 +57,14 @@ common common
     , grpc-haskell-core    >= 0.5.0    && < 0.6
     , mtl                  >= 2.2.2    && < 2.3
     , net-mqtt             >= 0.8.3    && < 0.9
-    , proto3-suite         >= 0.5.2    && < 0.8
+    , proto3-suite         >= 0.5.2    && < 0.9
     , proto3-wire          >= 1.2.2    && < 1.5
     , relude               >= 0.7.0    && < 1.3
     , stm                  >= 2.5.0    && < 2.6
     , text                 >= 0.2      && < 2.2
     , time                 >= 1.9.3    && < 1.13
     , turtle               >= 1.6.1    && < 1.7.0
-    , vector               >= 0.11     && < 0.13
+    , vector               >= 0.11     && < 0.14
 
 library
   import:      common
@@ -126,8 +126,8 @@ library
 
   build-depends:
     , conduit-extra        >= 1.3.5   && < 1.4
-    , connection           >= 0.3.1   && < 0.4
-    , network-conduit-tls  >= 1.3.2   && < 1.4
+    , crypton-connection   >= 0.3.1   && < 0.5
+    , network-conduit-tls  >= 1.3.2   && < 1.5
     , nonce                >= 1.0.7   && < 1.1
     , pqueue               >= 1.4.1.3 && < 1.6
     , safe-exceptions      >= 0.1.7   && < 0.2
@@ -189,7 +189,8 @@ test-suite test
   --   proto3-suite:compile-proto-file
 
   build-depends:
-    , connection
+    , crypton-connection
+    , crypton-x509-store
     , containers
     , data-default
     , grpc-mqtt
@@ -199,4 +200,3 @@ test-suite test
     , tasty-hunit
     , tls
     , uuid
-    , x509-store

nix/overlays/haskell.nix

@@ -23,9 +23,8 @@ final: prev: {
             record-dot-preprocessor = hfinal.callPackage ../packages/record-dot-preprocessor.nix { };
 
             turtle = hfinal.callPackage ../packages/turtle.nix { };
-          })
-          (hfinal: hprev: {
-            net-mqtt = final.haskell.lib.dontCheck (hfinal.callPackage ../packages/net-mqtt.nix { });
+
+            large-records = final.haskell.lib.unmarkBroken hprev.large-records;
           })
           (hfinal: hprev: {
             proto3-wire = final.haskell.lib.dontCheck (hfinal.callPackage ../packages/proto3-wire.nix  { });

nix/packages/proto3-suite.nix

@@ -1,7 +1,7 @@
 { mkDerivation, aeson, aeson-pretty, attoparsec, base
 , base64-bytestring, binary, bytestring, cereal, containers
 , contravariant, deepseq, dhall, doctest, fetchgit, filepath, foldl
-, generic-arbitrary, hashable, haskell-src, hedgehog
+, generic-arbitrary, ghc, hashable, hedgehog
 , insert-ordered-containers, large-generics, large-records, lens
 , lib, mtl, neat-interpolation, optparse-applicative
 , optparse-generic, parsec, parsers, pretty, pretty-show
@@ -12,11 +12,11 @@
 }:
 mkDerivation {
   pname = "proto3-suite";
-  version = "0.7.0";
+  version = "0.8.1";
   src = fetchgit {
     url = "https://github.com/awakesecurity/proto3-suite.git";
-    sha256 = "16x6acbcd4sqscjqdwmp0j6rlfn7lczp3vsyqv6v8r8zxwm244dk";
-    rev = "30599c127cc53838576992a33c8c9d91fd57b429";
+    sha256 = "1msy068045zbcw1wr99qf2cqjcd5065bn2qcipsc9hdqz6v35s65";
+    rev = "800bfa8ddd6e9a32eedca1005560648ba97084cf";
     fetchSubmodules = true;
   };
   isLibrary = true;
@@ -25,19 +25,19 @@ mkDerivation {
   libraryHaskellDepends = [
     aeson aeson-pretty attoparsec base base64-bytestring binary
     bytestring cereal containers contravariant deepseq dhall filepath
-    foldl hashable haskell-src insert-ordered-containers large-generics
+    foldl ghc hashable insert-ordered-containers large-generics
     large-records lens mtl neat-interpolation parsec parsers pretty
     pretty-show proto3-wire QuickCheck quickcheck-instances safe split
     swagger2 system-filepath text text-short time transformers turtle
     vector
   ];
   executableHaskellDepends = [
-    base containers mtl optparse-applicative optparse-generic
+    base containers ghc mtl optparse-applicative optparse-generic
     proto3-wire range-set-list system-filepath text turtle
   ];
   testHaskellDepends = [
     aeson attoparsec base base64-bytestring bytestring cereal
-    containers deepseq doctest generic-arbitrary hedgehog
+    containers deepseq doctest generic-arbitrary ghc hedgehog
     large-generics large-records mtl parsec pretty pretty-show
     proto3-wire QuickCheck record-hasfield swagger2 tasty
     tasty-hedgehog tasty-hunit tasty-quickcheck text text-short

nix/packages/proto3-wire.nix

@@ -1,18 +1,13 @@
 { mkDerivation, base, bytestring, cereal, containers, criterion
-, deepseq, doctest, fetchgit, hashable, lib, parameterized
-, primitive, QuickCheck, random, safe, tasty, tasty-hunit
-, tasty-quickcheck, template-haskell, text, text-short
-, transformers, unordered-containers, vector, word-compat
+, deepseq, doctest, hashable, lib, parameterized, primitive
+, QuickCheck, random, safe, tasty, tasty-hunit, tasty-quickcheck
+, template-haskell, text, text-short, transformers
+, unordered-containers, vector, word-compat
 }:
 mkDerivation {
   pname = "proto3-wire";
-  version = "1.4.1";
-  src = fetchgit {
-    url = "https://github.com/awakesecurity/proto3-wire.git";
-    sha256 = "1mq5qp778g5zjj17lj9d0db7b7j6bhv94lf68xlla5dba8vzfl8r";
-    rev = "938523213d5de2d0ad9ece051d1a03002ee539cc";
-    fetchSubmodules = true;
-  };
+  version = "1.4.3";
+  sha256 = "7fa316e7d309bd298ce6f28b85b5bb3d7ec9ce5ada895e2531febedb3f064b3f";
   libraryHaskellDepends = [
     base bytestring cereal containers deepseq hashable parameterized
     primitive QuickCheck safe template-haskell text text-short