From b20733c8c797485c31dffe246a63997462e74ac1 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Tue, 31 Dec 2024 13:13:34 +0100
Subject: [PATCH] haskellPackages.cabal2nix-unstable: 2024-12-22 -> 2024-12-31

Adds support for some pkg config library names:

- libspa-0.2, libpipewire-0.3 from pipewire
- libnm from networkmanager
---
 .../haskell-modules/cabal2nix-unstable.nix    |  6 +++---
 .../haskell-modules/hackage-packages.nix      | 21 +++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix
index 9517feba1b88..2988834da820 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix
@@ -34,10 +34,10 @@
 }:
 mkDerivation {
   pname = "cabal2nix";
-  version = "unstable-2024-12-22";
+  version = "unstable-2024-12-31";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/cc5c0285bac65da2be0afd123f1cee94104c25fd.tar.gz";
-    sha256 = "1jrjgjjg1nkdc4fhk9m8hp5j5zq9bs0lvvk4v3kx6xmvjx93hk8h";
+    url = "https://github.com/NixOS/cabal2nix/archive/e290b906f056dd1414ede71b4bb6375be2d0aa5d.tar.gz";
+    sha256 = "0x94w4dfjfxp3f5h7w5738znkyb8barzjki0xsf94asiffiqsgxn";
   };
   postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
   isLibrary = true;
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d768c1e5ea75..820c650506d0 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -125923,7 +125923,7 @@ self: {
   "gi-nm" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
      , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, libnm, text, transformers
+     , haskell-gi-overloading, networkmanager, text, transformers
      }:
      mkDerivation {
        pname = "gi-nm";
@@ -125936,10 +125936,10 @@ self: {
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ libnm ];
+       libraryPkgconfigDepends = [ networkmanager ];
        description = "NM bindings";
        license = lib.licenses.lgpl21Only;
-     }) {libnm = null;};
+     }) {inherit (pkgs) networkmanager;};
 
   "gi-notify" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf
@@ -195437,8 +195437,8 @@ self: {
      }) {};
 
   "libremidi" = callPackage
-    ({ mkDerivation, base, containers, data-default, libpipewire, mtl
-     , stm, systemd, tasty, tasty-hunit, text, transformers
+    ({ mkDerivation, base, containers, data-default, mtl, pipewire, stm
+     , systemd, tasty, tasty-hunit, text, transformers
      }:
      mkDerivation {
        pname = "libremidi";
@@ -195449,7 +195449,7 @@ self: {
        libraryHaskellDepends = [
          base containers data-default mtl stm text transformers
        ];
-       libraryPkgconfigDepends = [ libpipewire systemd ];
+       libraryPkgconfigDepends = [ pipewire systemd ];
        executableHaskellDepends = [
          base containers data-default mtl stm text transformers
        ];
@@ -195460,7 +195460,7 @@ self: {
        description = "libremidi bindings for haskell";
        license = lib.licenses.bsd3;
        mainProgram = "libremidi-exe";
-     }) {libpipewire = null; inherit (pkgs) systemd;};
+     }) {inherit (pkgs) pipewire; inherit (pkgs) systemd;};
 
   "libretls" = callPackage
     ({ mkDerivation, base, containers, hspec, HUnit, libressl, libtls
@@ -214578,8 +214578,7 @@ self: {
   "monomer-flatpak-example" = callPackage
     ({ mkDerivation, async, base, bytestring, c2hs, containers
      , data-default, dbus, desktop-portal, directory, file-io, filepath
-     , libpipewire, libspa, modern-uri, monomer, monomer-hagrid, random
-     , text
+     , modern-uri, monomer, monomer-hagrid, pipewire, random, text
      }:
      mkDerivation {
        pname = "monomer-flatpak-example";
@@ -214593,13 +214592,13 @@ self: {
          directory file-io filepath modern-uri monomer monomer-hagrid random
          text
        ];
-       executablePkgconfigDepends = [ libpipewire libspa ];
+       executablePkgconfigDepends = [ pipewire ];
        executableToolDepends = [ c2hs ];
        description = "Monomer Flatpak Example Application";
        license = lib.licenses.mit;
        hydraPlatforms = lib.platforms.none;
        mainProgram = "monomer-flatpak-example";
-     }) {libpipewire = null; libspa = null;};
+     }) {inherit (pkgs) pipewire;};
 
   "monomer-hagrid" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default, hspec