From 4f7efec8516720497bf2d004d7c62097bda2e8a1 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 31 Dec 2024 23:06:13 +0100 Subject: [PATCH] haskell.packages.ghc96.htree: restrict to < 0.2 --- .../configuration-ghc-9.10.x.nix | 1 + .../configuration-ghc-9.12.x.nix | 1 + .../configuration-hackage2nix/main.yaml | 2 ++ .../haskell-modules/hackage-packages.nix | 18 ++++++++++++++++++ 4 files changed, 22 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix index b1c8c56fad64..ad9cbf204fed 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -73,6 +73,7 @@ self: super: { ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_10_0_0; http2 = doDistribute self.http2_5_3_9; http-semantics = doDistribute self.http-semantics_0_3_0; + htree = doDistribute self.htree_0_2_0_0; lens = doDistribute self.lens_5_3_2; lukko = doDistribute self.lukko_0_1_2; network-control = super.network-control_0_1_3; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix index eb2f1af1418a..8fea913cb2c9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix @@ -58,6 +58,7 @@ self: super: { xhtml = null; # Version upgrades + htree = doDistribute self.htree_0_2_0_0; primitive = doDistribute self.primitive_0_9_0_0; splitmix = doDistribute self.splitmix_0_1_1; tagged = doDistribute self.tagged_0_8_9; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index bf1b3d0eaf40..42e07f4fa4a8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -40,6 +40,8 @@ default-package-overrides: - http-semantics < 0.3.0 # 2024-12-23: last version to be compatible with Stackage LTS 22/23 (due to data-default) - diagrams-input < 0.1.4 + # 2024-12-31: last version that's compatible with GHC < 9.9 + - htree < 0.2.0.0 extra-packages: - Cabal == 3.2.* # Used for packages needing newer Cabal on ghc 8.6 and 8.8 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 33698ba7ef38..b6673651a14c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -168551,6 +168551,23 @@ self: { }) {}; "htree" = callPackage + ({ mkDerivation, base, containers, hspec, QuickCheck + , quickcheck-instances, template-haskell, th-compat + }: + mkDerivation { + pname = "htree"; + version = "0.1.1.0"; + sha256 = "1m95win8gy5h2343pa2zjij9v092az0fdq3xc3qsfycs6f1w06id"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers hspec QuickCheck quickcheck-instances + template-haskell th-compat + ]; + description = "a library to build and work with heterogeneous, type level indexed rose trees"; + license = lib.licenses.agpl3Plus; + }) {}; + + "htree_0_2_0_0" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck , quickcheck-instances, template-haskell, th-compat }: @@ -168565,6 +168582,7 @@ self: { ]; description = "a library to build and work with heterogeneous, type level indexed rose trees"; license = lib.licenses.agpl3Plus; + hydraPlatforms = lib.platforms.none; }) {}; "hts" = callPackage