haskellPackages.cabal2nix-unstable: 2024-12-04 -> 2024-12-22

Includes https://github.com/NixOS/cabal2nix/pull/638.

maintainers/scripts/haskell/update-cabal2nix-unstable.sh

@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils curl jq gnused haskellPackages.cabal2nix-unstable -I nixpkgs=.
+#! nix-shell -i bash -p coreutils curl jq gnused haskellPackages.cabal2nix-unstable nixfmt-rfc-style -I nixpkgs=.
 
 # Updates cabal2nix-unstable to the latest master of the nixos/cabal2nix repository.
 # See regenerate-hackage-packages.sh for details on the purpose of this script.
@@ -13,5 +13,7 @@ commit="$(jq -r .commit.sha <<< "$head_info")"
 # extract commit timestamp and convert to date
 date="$(date "--date=$(jq -r .commit.commit.committer.date <<< "$head_info")" +%F)"
 # generate nix expression from cabal file, replacing the version with the commit date
-echo '# This file defines cabal2nix-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.' > pkgs/development/haskell-modules/cabal2nix-unstable.nix
+output=pkgs/development/haskell-modules/cabal2nix-unstable.nix
-cabal2nix --subpath cabal2nix "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -e 's/version = ".*"/version = "'"unstable-$date"'"/' >> pkgs/development/haskell-modules/cabal2nix-unstable.nix
+echo '# This file defines cabal2nix-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.' > "$output"
+cabal2nix --subpath cabal2nix "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -e 's/version = ".*"/version = "'"unstable-$date"'"/' >> "$output"
+nixfmt "$output"

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

@@ -34,10 +34,10 @@
 }:
 mkDerivation {
   pname = "cabal2nix";
-  version = "unstable-2024-12-04";
+  version = "unstable-2024-12-22";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/af1bc25377f7a44e008def494bda77a83578d9be.tar.gz";
+    url = "https://github.com/NixOS/cabal2nix/archive/cc5c0285bac65da2be0afd123f1cee94104c25fd.tar.gz";
-    sha256 = "0jjsy77vm88x81a5pwq5nhgnbiywjza8qyjsr2kclsdh860m3hmp";
+    sha256 = "1jrjgjjg1nkdc4fhk9m8hp5j5zq9bs0lvvk4v3kx6xmvjx93hk8h";
   };
   postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
   isLibrary = true;

pkgs/development/haskell-modules/configuration-common.nix

@@ -1253,9 +1253,6 @@ self: super: {
   # 2023-07-14: Restrictive upper bounds: https://github.com/luke-clifton/shh/issues/76
   shh = doJailbreak super.shh;
 
-  # This package refers to the wrong library (itself in fact!)
-  vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; };
-
   # Compiles some C or C++ source which requires these headers
   VulkanMemoryAllocator = addExtraLibrary pkgs.vulkan-headers super.VulkanMemoryAllocator;
   # dontCheck can be removed on the next package set bump

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

@@ -45111,6 +45111,7 @@ self: {
        description = "Extract recent daily AWS costs";
        license = lib.licenses.gpl2Only;
        mainProgram = "aws-spend-summary";
+       maintainers = [ lib.maintainers.danielrolls ];
      }) {};
 
   "aws-transcribe-ws" = callPackage
@@ -100618,8 +100619,6 @@ self: {
        testHaskellDepends = [ base bytestring HUnit QuickCheck ];
        description = "A library for various character encodings";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "encoding-io" = callPackage
@@ -131411,17 +131410,19 @@ self: {
      }) {};
 
   "gpu-vulkan-core" = callPackage
-    ({ mkDerivation, base, c-enum, c-struct, nowdoc, text, vulkan }:
+    ({ mkDerivation, base, c-enum, c-struct, nowdoc, text
+     , vulkan-loader
+     }:
      mkDerivation {
        pname = "gpu-vulkan-core";
        version = "0.1.0.8";
        sha256 = "1539ara1achh8anhgyijlrmipsxsm6n7plsr4181g3rvljadp9m7";
        libraryHaskellDepends = [ base c-enum c-struct nowdoc text ];
-       libraryPkgconfigDepends = [ vulkan ];
+       libraryPkgconfigDepends = [ vulkan-loader ];
        testHaskellDepends = [ base c-enum c-struct nowdoc text ];
        description = "Thin wrapper for Vulkan API";
        license = lib.licenses.bsd3;
-     }) {vulkan = null;};
+     }) {inherit (pkgs) vulkan-loader;};
 
   "gpu-vulkan-middle" = callPackage
     ({ mkDerivation, base, bytestring, c-enum, containers, data-default
@@ -136836,8 +136837,6 @@ self: {
        ];
        description = "Mailgun REST api interface for Haskell";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "hailgun-send" = callPackage
@@ -275971,8 +275970,6 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "servant-server/servant-auth compatibility";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-swagger" = callPackage
@@ -307585,8 +307582,6 @@ self: {
        testToolDepends = [ hspec-discover tasty-discover ];
        description = "Docker containers for your integration tests";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "testing-feat" = callPackage
@@ -316666,8 +316661,6 @@ self: {
        testHaskellDepends = [ base containers template-haskell time ];
        description = "Template Haskell hack to violate module abstractions";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "truelevel" = callPackage
@@ -329262,14 +329255,14 @@ self: {
   "vulkan" = callPackage
     ({ mkDerivation, base, bytestring, containers, inline-c, tasty
      , tasty-discover, tasty-hunit, template-haskell, transformers
-     , vector, vulkan
+     , vector, vulkan-loader
      }:
      mkDerivation {
        pname = "vulkan";
        version = "3.26.2";
        sha256 = "1y0yrcc2z43s98gyics9v56j0nkh6xk8knmqwslndsznzma6ga0c";
        libraryHaskellDepends = [ base bytestring transformers vector ];
-       libraryPkgconfigDepends = [ vulkan ];
+       libraryPkgconfigDepends = [ vulkan-loader ];
        testHaskellDepends = [
          base containers inline-c tasty tasty-hunit template-haskell
        ];
@@ -329279,7 +329272,7 @@ self: {
        badPlatforms = [
          "i686-linux" "armv7l-linux"
        ] ++ lib.platforms.darwin;
-     }) {vulkan = null;};
+     }) {inherit (pkgs) vulkan-loader;};
 
   "vulkan-api" = callPackage
     ({ mkDerivation, base }: