From b2802415b0b440fdb6faa001b499ea495f09a4ab Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 19 Oct 2025 01:40:11 +0200 Subject: [PATCH] haskellPackages.cabal2nix-unstable: 2025-09-17 -> 2025-10-19 haskellPackages.aes-gcm: unbreak https://github.com/NixOS/cabal2nix/pull/673 --- .../cabal2nix-unstable/cabal2nix.nix | 6 +-- .../distribution-nixpkgs.nix | 6 +-- .../cabal2nix-unstable/hackage-db.nix | 6 +-- .../cabal2nix-unstable/language-nix.nix | 6 +-- .../configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/hackage-packages.nix | 38 +++++++++---------- 6 files changed, 30 insertions(+), 33 deletions(-) diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix index 2acec69475c0..1c63f38cdbec 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix @@ -35,10 +35,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "2.20.1-unstable-2025-09-17"; + version = "2.20.1-unstable-2025-10-19"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/3cc36a5df16a10bac9a858208845e3d05b79845d.tar.gz"; - sha256 = "1z1knv2ggm9ddyl0v120nhcnjmq50z7q1m88qj7rfz51gx1ifnim"; + url = "https://github.com/NixOS/cabal2nix/archive/26e5dba9259791d1e80ce68a07f6d20adb26c7eb.tar.gz"; + sha256 = "19y5smq0aji45zak6sxlimzw7ww33zbcmbbrvi2rq40i26mw6kxj"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix index eade3a05863b..3b5ebd4b0313 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix @@ -18,10 +18,10 @@ }: mkDerivation { pname = "distribution-nixpkgs"; - version = "1.7.1.1-unstable-2025-09-17"; + version = "1.7.1.1-unstable-2025-10-19"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/3cc36a5df16a10bac9a858208845e3d05b79845d.tar.gz"; - sha256 = "1z1knv2ggm9ddyl0v120nhcnjmq50z7q1m88qj7rfz51gx1ifnim"; + url = "https://github.com/NixOS/cabal2nix/archive/26e5dba9259791d1e80ce68a07f6d20adb26c7eb.tar.gz"; + sha256 = "19y5smq0aji45zak6sxlimzw7ww33zbcmbbrvi2rq40i26mw6kxj"; }; postUnpack = "sourceRoot+=/distribution-nixpkgs; echo source root reset to $sourceRoot"; enableSeparateDataOutput = true; diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix index 3ea1fab647d5..66d98bc6b8e1 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix @@ -17,10 +17,10 @@ }: mkDerivation { pname = "hackage-db"; - version = "2.1.3-unstable-2025-09-17"; + version = "2.1.3-unstable-2025-10-19"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/3cc36a5df16a10bac9a858208845e3d05b79845d.tar.gz"; - sha256 = "1z1knv2ggm9ddyl0v120nhcnjmq50z7q1m88qj7rfz51gx1ifnim"; + url = "https://github.com/NixOS/cabal2nix/archive/26e5dba9259791d1e80ce68a07f6d20adb26c7eb.tar.gz"; + sha256 = "19y5smq0aji45zak6sxlimzw7ww33zbcmbbrvi2rq40i26mw6kxj"; }; postUnpack = "sourceRoot+=/hackage-db; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix index d453e54c9bba..2af4404b9beb 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix @@ -13,10 +13,10 @@ }: mkDerivation { pname = "language-nix"; - version = "2.3.0-unstable-2025-09-17"; + version = "2.3.0-unstable-2025-10-19"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/3cc36a5df16a10bac9a858208845e3d05b79845d.tar.gz"; - sha256 = "1z1knv2ggm9ddyl0v120nhcnjmq50z7q1m88qj7rfz51gx1ifnim"; + url = "https://github.com/NixOS/cabal2nix/archive/26e5dba9259791d1e80ce68a07f6d20adb26c7eb.tar.gz"; + sha256 = "19y5smq0aji45zak6sxlimzw7ww33zbcmbbrvi2rq40i26mw6kxj"; }; postUnpack = "sourceRoot+=/language-nix; echo source root reset to $sourceRoot"; libraryHaskellDepends = [ diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 7345e8a79aa4..3d788a49093b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -73,7 +73,6 @@ broken-packages: - adp-multi # failure in job https://hydra.nixos.org/build/233256331 at 2023-09-02 - adtrees # failure in job https://hydra.nixos.org/build/233192320 at 2023-09-02 - AERN-Basics # failure in job https://hydra.nixos.org/build/233246999 at 2023-09-02 - - aes-gcm # failure in job https://hydra.nixos.org/build/309811668 at 2025-10-15 - aeson-applicative # failure in job https://hydra.nixos.org/build/233213824 at 2023-09-02 - aeson-bson # failure in job https://hydra.nixos.org/build/233201964 at 2023-09-02 - aeson-commit # failure in job https://hydra.nixos.org/build/233198515 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1331c38b9e24..9e7823811a4c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -53709,7 +53709,7 @@ self: { base, base16-bytestring, bytestring, - libcrypto, + openssl, tasty, tasty-hunit, }: @@ -53721,7 +53721,7 @@ self: { base bytestring ]; - libraryPkgconfigDepends = [ libcrypto ]; + libraryPkgconfigDepends = [ openssl ]; testHaskellDepends = [ base base16-bytestring @@ -53731,10 +53731,8 @@ self: { ]; description = "AES Galois/Counter Mode (GCM) AEAD Cipher"; license = lib.licenses.gpl2Plus; - hydraPlatforms = lib.platforms.none; - broken = true; } - ) { libcrypto = null; }; + ) { inherit (pkgs) openssl; }; aeson = callPackage ( { @@ -265729,9 +265727,9 @@ self: { haskell-gi, haskell-gi-base, haskell-gi-overloading, + javascriptcoregtk, text, transformers, - webkitgtk_4_0, }: mkDerivation { pname = "gi-javascriptcore4"; @@ -265756,12 +265754,12 @@ self: { text transformers ]; - libraryPkgconfigDepends = [ webkitgtk_4_0 ]; + libraryPkgconfigDepends = [ javascriptcoregtk ]; description = "JavaScriptCore 4.x bindings"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; } - ) { webkitgtk_4_0 = null; }; + ) { javascriptcoregtk = null; }; gi-javascriptcore6 = callPackage ( { @@ -266668,7 +266666,7 @@ self: { haskell-gi-overloading, text, transformers, - webkitgtk_4_0, + webkit2gtk, }: mkDerivation { pname = "gi-webkit2"; @@ -266707,13 +266705,13 @@ self: { text transformers ]; - libraryPkgconfigDepends = [ webkitgtk_4_0 ]; + libraryPkgconfigDepends = [ webkit2gtk ]; description = "WebKit2 bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; } - ) { webkitgtk_4_0 = null; }; + ) { webkit2gtk = null; }; gi-webkit2webextension = callPackage ( { @@ -266733,7 +266731,7 @@ self: { haskell-gi-overloading, text, transformers, - webkitgtk_4_0, + webkit2gtk-web-extension, }: mkDerivation { pname = "gi-webkit2webextension"; @@ -266766,14 +266764,14 @@ self: { text transformers ]; - libraryPkgconfigDepends = [ webkitgtk_4_0 ]; + libraryPkgconfigDepends = [ webkit2gtk-web-extension ]; description = "WebKit2-WebExtension 4.x bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; broken = true; } - ) { webkitgtk_4_0 = null; }; + ) { webkit2gtk-web-extension = null; }; gi-webkitwebprocessextension = callPackage ( { @@ -674212,7 +674210,7 @@ self: { unordered-containers, utf8-string, vector, - webkitgtk_4_0, + webkit2gtk, xdg-basedir, xmonad, xmonad-contrib, @@ -674265,7 +674263,7 @@ self: { ]; executablePkgconfigDepends = [ gtk3 - webkitgtk_4_0 + webkit2gtk ]; testHaskellDepends = [ aeson @@ -674308,7 +674306,7 @@ self: { ) { inherit (pkgs) gtk3; - webkitgtk_4_0 = null; + webkit2gtk = null; }; tibetan-utils = callPackage ( @@ -721953,7 +721951,7 @@ self: { base, Cabal, gtk2hs-buildtools, - webkitgtk_4_0, + webkit2gtk, }: mkDerivation { pname = "webkit2gtk3-javascriptcore"; @@ -721965,13 +721963,13 @@ self: { gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; - libraryPkgconfigDepends = [ webkitgtk_4_0 ]; + libraryPkgconfigDepends = [ webkit2gtk ]; description = "JavaScriptCore FFI from webkitgtk"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; } - ) { webkitgtk_4_0 = null; }; + ) { webkit2gtk = null; }; webkitgtk3 = callPackage ( {