From bb62d57a851706efd5a69149acd5fe64c76b1de1 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 25 Feb 2023 19:32:49 +0100
Subject: haskellPackages.cabal2nix-unstable: 2023-02-15 -> 2023-02-25

Correctly resolves gmodule pkg-config name now:
https://github.com/NixOS/cabal2nix/commit/6c1dc8908ba4d3c81549b3131539d0ce289cb92c
---
 pkgs/development/haskell-modules/cabal2nix-unstable.nix |  6 +++---
 pkgs/development/haskell-modules/hackage-packages.nix   | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix
index be6d368db1e34..faab9f8391e07 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-2023-02-15";
+  version = "unstable-2023-02-25";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/5cd07f1df825084fd47cf49cf49f14569859a51c.tar.gz";
-    sha256 = "1zwl5h6xqadw7fw3mkr5jljczcyrbhvi6kas19mj1wiyx6bj34yw";
+    url = "https://github.com/NixOS/cabal2nix/archive/6c1dc8908ba4d3c81549b3131539d0ce289cb92c.tar.gz";
+    sha256 = "0b83phblqrw659n0bzf6z3255xlgf9yhl95axrsl3mlvhdjmv79b";
   };
   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 a5219a63badd8..c13331175e144 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -112895,9 +112895,9 @@ self: {
      }) {inherit (pkgs) glib;};
 
   "gi-gmodule" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
-     , gmodule, haskell-gi, haskell-gi-base, haskell-gi-overloading
-     , text, transformers
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
+     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
+     , transformers
      }:
      mkDerivation {
        pname = "gi-gmodule";
@@ -112908,10 +112908,10 @@ self: {
          base bytestring containers gi-glib haskell-gi haskell-gi-base
          haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ gmodule ];
+       libraryPkgconfigDepends = [ glib ];
        description = "GModule bindings";
        license = lib.licenses.lgpl21Only;
-     }) {gmodule = null;};
+     }) {inherit (pkgs) glib;};
 
   "gi-gobject" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
-- 
cgit 1.4.1