From b9cae33009fc80c32f151fbe768b69e718cf2a57 Mon Sep 17 00:00:00 2001 From: maralorn Date: Mon, 5 Feb 2024 23:31:51 +0100 Subject: [PATCH] haskellPackages.cabal2nix-unstable: 2024-01-04 -> 2024-02-05 --- maintainers/scripts/haskell/regenerate-hackage-packages.sh | 4 ---- pkgs/development/haskell-modules/cabal2nix-unstable.nix | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh index 96a18aa8ed87..8f629c53102f 100755 --- a/maintainers/scripts/haskell/regenerate-hackage-packages.sh +++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh @@ -66,10 +66,6 @@ done HACKAGE2NIX="${HACKAGE2NIX:-hackage2nix}" -# To prevent hackage2nix fails because of encoding. -# See: https://github.com/NixOS/nixpkgs/pull/122023 -export LC_ALL=C.UTF-8 - config_dir=pkgs/development/haskell-modules/configuration-hackage2nix run_hackage2nix() { diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index cd517534d649..8e7396a3fb48 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2024-01-04"; + version = "unstable-2024-02-05"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/e394e96c51cc7a2858145e710fbedbb2cb57f6ec.tar.gz"; - sha256 = "0rzmyx2i2z3w2ibg4rbaasq0581sa7bf8n1cih6v3j6phzgl3058"; + url = "https://github.com/NixOS/cabal2nix/archive/173e8a5fa70dc95a1aeb0bd877bf5fee6d5e6b4a.tar.gz"; + sha256 = "1pld7jfsjmw486ch6li1fqci1jj5p2nvfq7nrkxrmf5p2ja5528g"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true;