From 6fb7c460bab8d17009a5a50d6ca9e65d6245b677 Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Mon, 10 Jul 2023 09:52:44 +0200 Subject: [PATCH] haskellPackages.cabal-plan-bounds: Unbreak, add myself as maintainer --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/configuration-hackage2nix/main.yaml | 3 ++- pkgs/development/haskell-modules/hackage-packages.nix | 3 +-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2328d32145933..2c2f0a6d9264f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2080,6 +2080,11 @@ self: super: { Cabal-syntax = self.Cabal-syntax_3_10_1_0; }); + # 2023-07-10: cabal-plan-bounds needs Cabal-syntax 3.10 + cabal-plan-bounds = super.cabal-plan-bounds.overrideScope (self: super: { + Cabal-syntax = self.Cabal-syntax_3_10_1_0; + }); + large-hashable = lib.pipe (super.large-hashable.override { # https://github.com/factisresearch/large-hashable/commit/5ec9d2c7233fc4445303564047c992b693e1155c utf8-light = null; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 50e1ac50597ac..ac9c1a12224c3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -568,7 +568,6 @@ broken-packages: - cabal-meta - cabal-mon - cabal-nirvana - - cabal-plan-bounds - cabal-progdeps - cabalQuery - CabalSearch diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 32c72dba6cad2..33bf18be6e451 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -322,11 +322,12 @@ package-maintainers: ncfavier: - lambdabot nomeata: + - cabal-plan-bounds - candid - leb128-cereal - - tasty-expected-failure - lhs2tex - rec-def + - tasty-expected-failure pacien: - ldgallery-compiler peti: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b2ca017da4986..94af3f57efce7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -53704,9 +53704,8 @@ self: { ]; description = "Derives cabal bounds from build plans"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; mainProgram = "cabal-plan-bounds"; - broken = true; + maintainers = [ lib.maintainers.nomeata ]; }) {}; "cabal-progdeps" = callPackage