haskellPackages.cabal2nix-unstable: 2021-07-29 -> 2021-08-21

pkgs/development/haskell-modules/cabal2nix-unstable.nix

@@ -8,10 +8,10 @@
 }:
 mkDerivation {
   pname = "cabal2nix";
-  version = "unstable-2021-07-29";
+  version = "unstable-2021-08-21";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/614852fa4be21ffc283046b92ed9e5b75c7e38af.tar.gz";
-    sha256 = "00p6vmy5s016nkgjk5zf0hqym8y2glgwga81lm6xc1vc3zzkidmc";
+    url = "https://github.com/NixOS/cabal2nix/archive/51a4082fefad4642af67a0ae4bf3bb3a7d9b45e0.tar.gz";
+    sha256 = "1qd991ziv54drb0n655dg4ymknlfa0ndx9nq9wb5v00a15i4c04x";
   };
   isLibrary = true;
   isExecutable = true;

pkgs/development/haskell-modules/hackage-packages.nix

@@ -138745,7 +138745,7 @@ self: {
 
   "hsmagick" = callPackage
     ({ mkDerivation, base, bytestring, bzip2, directory, filepath
-     , freetype2, GraphicsMagick, jasper, lcms, libjpeg, libpng, libxml2
+     , freetype, GraphicsMagick, jasper, lcms, libjpeg, libpng, libxml2
      , pretty, process, tiff, wmflite, zlib
      }:
      mkDerivation {
@@ -138759,18 +138759,16 @@ self: {
        librarySystemDepends = [
          bzip2 jasper libjpeg libpng tiff wmflite zlib
        ];
-       libraryPkgconfigDepends = [
-         freetype2 GraphicsMagick lcms libxml2
-       ];
+       libraryPkgconfigDepends = [ freetype GraphicsMagick lcms libxml2 ];
        description = "FFI bindings for the GraphicsMagick library";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
        broken = true;
-     }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; 
-         inherit (pkgs) jasper; inherit (pkgs) lcms; 
-         inherit (pkgs) libjpeg; inherit (pkgs) libpng; 
-         inherit (pkgs) libxml2; tiff = null; wmflite = null; 
-         inherit (pkgs) zlib;};
+     }) {GraphicsMagick = null; inherit (pkgs) bzip2; 
+         inherit (pkgs) freetype; inherit (pkgs) jasper; 
+         inherit (pkgs) lcms; inherit (pkgs) libjpeg; 
+         inherit (pkgs) libpng; inherit (pkgs) libxml2; tiff = null; 
+         wmflite = null; inherit (pkgs) zlib;};
 
   "hsmisc" = callPackage
     ({ mkDerivation, base, containers, HUnit, mtl, old-locale, parsec
@@ -181014,7 +181012,7 @@ self: {
   "monomer" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, bytestring
      , bytestring-to-vector, c2hs, containers, data-default, directory
-     , exceptions, extra, formatting, GLEW, hspec, http-client, HUnit
+     , exceptions, extra, formatting, glew, hspec, http-client, HUnit
      , JuicyPixels, lens, mtl, nanovg, OpenGL, process, random, safe
      , scientific, sdl2, silently, stm, text, text-show, time
      , transformers, unordered-containers, vector, websockets, wreq
@@ -181032,7 +181030,7 @@ self: {
          lens mtl nanovg OpenGL process safe sdl2 stm text text-show time
          transformers unordered-containers vector wreq
        ];
-       librarySystemDepends = [ GLEW ];
+       librarySystemDepends = [ glew ];
        libraryToolDepends = [ c2hs ];
        executableHaskellDepends = [
          aeson async attoparsec base bytestring bytestring-to-vector
@@ -181051,7 +181049,7 @@ self: {
        description = "A GUI library for writing native Haskell applications";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
-     }) {GLEW = null;};
+     }) {inherit (pkgs) glew;};
 
   "monomorphic" = callPackage
     ({ mkDerivation, base }:
@@ -185844,9 +185842,8 @@ self: {
      }) {};
 
   "nanovg" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, containers, freetype, GLEW
-     , glew, hspec, inline-c, libGL, libGLU, libX11, QuickCheck, text
-     , vector
+    ({ mkDerivation, base, bytestring, c2hs, containers, freetype, glew
+     , hspec, inline-c, libGL, libGLU, libX11, QuickCheck, text, vector
      }:
      mkDerivation {
        pname = "nanovg";
@@ -185855,7 +185852,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers text vector ];
-       librarySystemDepends = [ freetype GLEW libGL libGLU libX11 ];
+       librarySystemDepends = [ freetype glew libGL libGLU libX11 ];
        libraryPkgconfigDepends = [ glew ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base containers hspec inline-c QuickCheck ];
@@ -185863,7 +185860,7 @@ self: {
        license = lib.licenses.isc;
        hydraPlatforms = lib.platforms.none;
        broken = true;
-     }) {GLEW = null; inherit (pkgs) freetype; inherit (pkgs) glew; 
+     }) {inherit (pkgs) freetype; inherit (pkgs) glew; 
          inherit (pkgs) libGL; inherit (pkgs) libGLU; 
          inherit (pkgs.xorg) libX11;};