From a6ee38a2365d4244d9ebe1a72ba95593b4f17ecb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 4 Dec 2024 01:43:01 +0100 Subject: [PATCH] FromCabal.Name: fix libsoup attribute names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `pkgconfig-depends: libsoup-3.0` was being incorrectly resolved to `libsoup` attribute. Additionally, https://github.com/NixOS/nixpkgs/pull/360908 renamed `libsoup` attribute to `libsoup_2_4`. Let’s use the correct package attribute names for all libsoup pkg-config files. All libsoup dependent Haskell-packages use `pkgconfig-depends` with one of those names: https://hackage.haskell.org/package/gi-soup-3.0.3/src/gi-soup.cabal https://hackage.haskell.org/package/gi-soup-2.4.29/src/gi-soup.cabal https://hackage.haskell.org/package/spike-0.3/src/spike.cabal --- cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs b/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs index 5075a718..9f2e0478 100644 --- a/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs +++ b/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs @@ -120,7 +120,9 @@ libNixName "libpcre2-8" = libNixName "libpcre2" libNixName "libqrencode" = return "qrencode" libNixName "libR" = return "R" libNixName "libsecp256k1" = return "secp256k1" -libNixName "libsoup-gnome-2.4" = return "libsoup" +libNixName "libsoup-2.4" = return "libsoup_2_4" +libNixName "libsoup-gnome-2.4" = return "libsoup_2_4" +libNixName "libsoup-3.0" = return "libsoup_3" libNixName "libsystemd" = return "systemd" libNixName "libudev" = return "systemd" libNixName "libxml-2.0" = return "libxml2"