about summary refs log tree commit diff
path: root/users/Profpatsch
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2022-12-27T13·32+0100
committertazjin <tazjin@tvl.su>2022-12-29T20·06+0000
commit5a063def51c72611c98fa2aadaa4c938a12271fa (patch)
tree7e16bd11cf6013fc6d472596b2d59df3889a3fd3 /users/Profpatsch
parent86361f0f4a754370b42ae3568ece4bc43850f36b (diff)
chore(3p/sources): Bump channels & overlays r/5543
The main change is that nixpkgs updated to GHC 9.2 and Stackage LTS-20,
so we suffer from a bit of churn.

* //3p/overlays/haskell:

  - use updated dhall-nix patch for hnix 0.16

  - use superrecord fork with fixes for GHC 9.2

  - use graphmod-1.4.5.1 which has support for GHC 9.2

* //users/Profpatsch: relax constraints on base in Haskell pkgs

* //users/Profpatsch/cas-serve: inherit superrecord from 3p

* //users/grfn/xanthous:

  - //3p/overlays/haskell for 8.10.7:

    * Provide missing dependency of binary-orphans. Fix already commited
      upstream as e238c3fdaab710a2ce0135e5a77cd7e6bb023a22, can be
      dropped when channel advances.

    * Downgrade to brick 0.71.1, the latest version xanthous supports.

  - Adjust to generic-arbitrary >= 1.0, providing Arg constraints where
    necessary.

  - Increase constraint-solver-iterations to 6 (default 4), so
    Xanthous.Command and Xanthous.Data can be typechecked.

  - Drop NFData instances for Key and Modifier which have been added to
    vty upstream.

Change-Id: I2170438c2ce8130b65f1a9fe07c4fecab5683d66
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7654
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: grfn <grfn@gws.fyi>
Reviewed-by: Profpatsch <mail@profpatsch.de>
Tested-by: BuildkiteCI
Diffstat (limited to 'users/Profpatsch')
-rw-r--r--users/Profpatsch/arglib/arglib-netencode.cabal2
-rw-r--r--users/Profpatsch/cas-serve/cas-serve.cabal2
-rw-r--r--users/Profpatsch/cas-serve/default.nix11
-rw-r--r--users/Profpatsch/execline/exec-helpers.cabal2
-rw-r--r--users/Profpatsch/ical-smolify/ical-smolify.cabal2
-rw-r--r--users/Profpatsch/my-prelude/my-prelude.cabal2
-rw-r--r--users/Profpatsch/netencode/netencode.cabal2
7 files changed, 7 insertions, 16 deletions
diff --git a/users/Profpatsch/arglib/arglib-netencode.cabal b/users/Profpatsch/arglib/arglib-netencode.cabal
index 461b42a93956..d9a049247395 100644
--- a/users/Profpatsch/arglib/arglib-netencode.cabal
+++ b/users/Profpatsch/arglib/arglib-netencode.cabal
@@ -8,7 +8,7 @@ library
     exposed-modules:          ArglibNetencode
 
     build-depends:
-        base ^>=4.15.1.0,
+        base >=4.15 && <5,
         my-prelude,
         netencode,
         exec-helpers,
diff --git a/users/Profpatsch/cas-serve/cas-serve.cabal b/users/Profpatsch/cas-serve/cas-serve.cabal
index 8740e8737de8..98a5ba1064b1 100644
--- a/users/Profpatsch/cas-serve/cas-serve.cabal
+++ b/users/Profpatsch/cas-serve/cas-serve.cabal
@@ -8,7 +8,7 @@ executable cas-serve
     main-is:          CasServe.hs
 
     build-depends:
-        base ^>=4.15.1.0,
+        base >=4.15 && <5,
         text,
         sqlite-simple,
         http-types,
diff --git a/users/Profpatsch/cas-serve/default.nix b/users/Profpatsch/cas-serve/default.nix
index 2236e92c8e13..b25a5ac04414 100644
--- a/users/Profpatsch/cas-serve/default.nix
+++ b/users/Profpatsch/cas-serve/default.nix
@@ -7,17 +7,8 @@ let
         pkgs.haskellPackages.wai
         pkgs.haskellPackages.warp
         pkgs.haskellPackages.sqlite-simple
+        pkgs.haskellPackages.superrecord
         depot.users.Profpatsch.my-prelude
-        (pkgs.haskell.lib.dontCheck
-          (pkgs.haskell.lib.overrideSrc pkgs.haskellPackages.superrecord {
-            src = pkgs.fetchFromGitHub {
-              owner = "Profpatsch";
-              repo = "superrecord";
-              rev = "c00e933f582e3fb8d209f6cece91d464faf09082";
-              sha256 = "sha256-UQ2wCoBpUEPcRsI7wNOFGH+vceKF4dcbbGHFVVTkOWw=";
-            };
-          }))
-
       ];
       ghcArgs = [ "-threaded" ];
 
diff --git a/users/Profpatsch/execline/exec-helpers.cabal b/users/Profpatsch/execline/exec-helpers.cabal
index 5441dff1d0f0..1262a36ec23b 100644
--- a/users/Profpatsch/execline/exec-helpers.cabal
+++ b/users/Profpatsch/execline/exec-helpers.cabal
@@ -8,7 +8,7 @@ library
     exposed-modules:          ExecHelpers
 
     build-depends:
-        base ^>=4.15.1.0,
+        base >=4.15 && <5,
         my-prelude
 
     default-language: Haskell2010
diff --git a/users/Profpatsch/ical-smolify/ical-smolify.cabal b/users/Profpatsch/ical-smolify/ical-smolify.cabal
index 6a1bb6ea8795..571b8267c8c3 100644
--- a/users/Profpatsch/ical-smolify/ical-smolify.cabal
+++ b/users/Profpatsch/ical-smolify/ical-smolify.cabal
@@ -8,7 +8,7 @@ executable ical-smolify
     main-is: IcalSmolify.hs
 
     build-depends:
-        base ^>=4.15.1.0,
+        base >=4.15 && <5,
         my-prelude,
         exec-helpers
         data-default
diff --git a/users/Profpatsch/my-prelude/my-prelude.cabal b/users/Profpatsch/my-prelude/my-prelude.cabal
index 7de057e9e151..731a075b80b4 100644
--- a/users/Profpatsch/my-prelude/my-prelude.cabal
+++ b/users/Profpatsch/my-prelude/my-prelude.cabal
@@ -13,7 +13,7 @@ library
     -- LANGUAGE extensions used by modules in this package.
     -- other-extensions:
     build-depends:
-       base ^>=4.15.1.0
+       base >=4.15 && <5
      , PyF
      , validation-selective
      , these
diff --git a/users/Profpatsch/netencode/netencode.cabal b/users/Profpatsch/netencode/netencode.cabal
index 23c09c9065b1..1bd1d6052ab2 100644
--- a/users/Profpatsch/netencode/netencode.cabal
+++ b/users/Profpatsch/netencode/netencode.cabal
@@ -8,7 +8,7 @@ library
     exposed-modules:          Netencode
 
     build-depends:
-        base ^>=4.15.1.0,
+        base >=4.15 && <5,
         hedgehog,
         nonempty-containers,
         deriving-compat,