From eae7f8f82d1004e30be984917934fb58a0bdddf7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 1 May 2025 17:37:38 +0200 Subject: [PATCH] haskellPackages.crux: provide simple-get-opt < 0.5 --- .../haskell-modules/configuration-common.nix | 4 ++++ .../configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 15 +++++++++++++-- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1730aae264a4..751fabf22a5d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3098,6 +3098,10 @@ self: super: # (i.e. tries to re-use the ghc package db / environment from dist-newstyle). sensei = dontCheck super.sensei; + crux = super.crux.override { + simple-get-opt = self.simple-get-opt_0_4; + }; + # 2025-04-23: jailbreak to allow megaparsec >= 9.7 # 2025-04-23: test data missing from tarball crucible-syntax = doJailbreak (dontCheck super.crucible-syntax); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index dd1e86a3bf02..4428623c2dd4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1084,7 +1084,6 @@ broken-packages: - cronus # failure in job https://hydra.nixos.org/build/233225303 at 2023-09-02 - cruncher-types # failure in job https://hydra.nixos.org/build/233229024 at 2023-09-02 - crunghc # failure in job https://hydra.nixos.org/build/233193295 at 2023-09-02 - - crux # simple-get-opt <0.5 https://hydra.nixos.org/build/295428379 - crypto-cipher-benchmarks # failure in job https://hydra.nixos.org/build/233195297 at 2023-09-02 - cryptocompare # failure in job https://hydra.nixos.org/build/233192898 at 2023-09-02 - cryptoconditions # failure in job https://hydra.nixos.org/build/233211816 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index cf2d718df6ac..bc0ea4ed5b1b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -109,6 +109,7 @@ extra-packages: - primitive-unlifted == 0.1.3.1 # 2024-03-16: preserve for ghc 9.2 - retrie < 1.2.0.0 # 2022-12-30: preserve for ghc < 9.2 - shake-cabal < 0.2.2.3 # 2023-07-01: last version to support Cabal 3.6.* + - simple-get-opt < 0.5 # 2025-05-01: for crux-0.7.2 - stylish-haskell == 0.14.4.0 # 2022-09-19: preserve for ghc 9.0 - stylish-haskell == 0.14.5.0 # 2025-04-14: needed for hls with ghc-lib 9.6 - tar == 0.6.0.0 # 2025-02-08: last version to not require os-string (which can't be built with GHC < 9.2) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7ef9ef329d90..1cd3822ba758 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -167656,8 +167656,6 @@ self: { ]; description = "Simple top-level library for Crucible Simulation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -607211,6 +607209,19 @@ self: { } ) { }; + "simple-get-opt_0_4" = callPackage ( + { mkDerivation, base }: + mkDerivation { + pname = "simple-get-opt"; + version = "0.4"; + sha256 = "0xr5gi22ifq6nw0q0w1rf66djsns4gfv2l9yjvxhbxr4j8bqmwik"; + libraryHaskellDepends = [ base ]; + description = "A simple library for processing command-line options"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + } + ) { }; + "simple-get-opt" = callPackage ( { mkDerivation, base }: mkDerivation {