haskellPackages: stackage LTS 23.21 -> LTS 23.24

maintainers/scripts/haskell/regenerate-hackage-packages.sh

@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-unstable git nix nixfmt-rfc-style -I nixpkgs=.
+#! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-unstable git nixfmt-rfc-style -I nixpkgs=.
 
 set -euo pipefail
 

maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh

@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils jq nix -I nixpkgs=.
+#! nix-shell -i bash -p coreutils jq -I nixpkgs=.
 
 set -euo pipefail
 

maintainers/scripts/haskell/update-hackage.sh

@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i bash -p nix curl jq git gnused -I nixpkgs=.
+#! nix-shell -i bash -p curl jq git gnused -I nixpkgs=.
 
 # See regenerate-hackage-packages.sh for details on the purpose of this script.
 

maintainers/scripts/haskell/update-stackage.sh

@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i bash -p nix curl jq git gnused gnugrep -I nixpkgs=.
+#! nix-shell -i bash -p curl jq git gnused gnugrep -I nixpkgs=.
 # shellcheck shell=bash
 
 set -eu -o pipefail

maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh

@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i bash -p nix curl gnused -I nixpkgs=.
+#! nix-shell -i bash -p curl gnused -I nixpkgs=.
 
 # On Hackage every package description shows a category "Distributions" which
 # lists a "NixOS" version.

pkgs/data/misc/hackage/pin.json

@@ -1,6 +1,6 @@
 {
-  "commit": "0541f1fcdc25b23b03d1296ea03886da83d12375",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0541f1fcdc25b23b03d1296ea03886da83d12375.tar.gz",
-  "sha256": "04ndjav4zirp0qzf8v3149m92ji092asiiyyrhkc8k4ca8hs8v8q",
-  "msg": "Update from Hackage at 2025-05-05T12:06:43Z"
+  "commit": "0b40331fe9f6ba2ce9cf1b8afe0a04aa79d36878",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0b40331fe9f6ba2ce9cf1b8afe0a04aa79d36878.tar.gz",
+  "sha256": "03mjsvybfh8bq5v475pqqs5bs9xdb0pm2qrw9w892q0q0ir5b6na",
+  "msg": "Update from Hackage at 2025-06-01T18:10:16Z"
 }

pkgs/development/compilers/elm/default.nix

@@ -8,6 +8,9 @@
 let
   fetchElmDeps = pkgs.callPackage ./lib/fetchElmDeps.nix { };
 
+  # Haskell packages that require ghc 9.8
+  hs98Pkgs = import ./packages/ghc9_8 { inherit pkgs lib; };
+
   # Haskell packages that require ghc 9.6
   hs96Pkgs = import ./packages/ghc9_6 {
     inherit
@@ -19,12 +22,6 @@ let
       ;
   };
 
-  # Haskell packages that require ghc 8.10
-  hs810Pkgs = import ./packages/ghc8_10 { inherit pkgs lib; };
-
-  # Haskell packages that require ghc 9.4
-  hs94Pkgs = import ./packages/ghc9_4 { inherit pkgs lib; };
-
   # Patched, originally npm-downloaded, packages
   patchedNodePkgs = import ./packages/node {
     inherit
@@ -37,11 +34,7 @@ let
 
   assembleScope =
     self: basics:
-    (hs96Pkgs self).elmPkgs
-    // (hs94Pkgs self).elmPkgs
-    // (hs810Pkgs self).elmPkgs
-    // (patchedNodePkgs self)
-    // basics;
+    (hs98Pkgs self).elmPkgs // (hs96Pkgs self).elmPkgs // (patchedNodePkgs self) // basics;
 in
 lib.makeScope pkgs.newScope (
   self:
@@ -53,21 +46,14 @@ lib.makeScope pkgs.newScope (
       /*
         Node/NPM based dependencies can be upgraded using script `packages/generate-node-packages.sh`.
 
-        * Packages which rely on `bin-wrap` will fail by default
-          and can be patched using `patchBinwrap` function defined in `packages/lib.nix`.
-
         * Packages which depend on npm installation of elm can be patched using
-          `patchNpmElm` function also defined in `packages/lib.nix`.
+          `patchNpmElm` function defined in `packages/lib.nix`.
       */
-      elmLib =
-        let
-          hsElmPkgs = (hs810Pkgs self) // (hs96Pkgs self);
-        in
-        import ./lib {
-          inherit lib;
-          inherit (pkgs) writeScriptBin stdenv;
-          inherit (self) elm;
-        };
+      elmLib = import ./lib {
+        inherit lib;
+        inherit (pkgs) writeScriptBin stdenv;
+        inherit (self) elm;
+      };
 
       elm-json = callPackage ./packages/elm-json { };
 

pkgs/development/compilers/elm/lib/default.nix

@@ -5,44 +5,6 @@
   elm,
 }:
 let
-  patchBinwrap =
-    let
-      # Patching binwrap by NoOp script
-      binwrap = writeScriptBin "binwrap" ''
-        #! ${stdenv.shell}
-        echo "binwrap called: Returning 0"
-        return 0
-      '';
-      binwrap-install = writeScriptBin "binwrap-install" ''
-        #! ${stdenv.shell}
-        echo "binwrap-install called: Doing nothing"
-      '';
-    in
-    targets: pkg:
-    pkg.override (old: {
-      nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
-        binwrap
-        binwrap-install
-      ];
-
-      # Manually install targets
-      # by symlinking binaries into `node_modules`
-      postInstall =
-        let
-          binFile = module: lib.strings.removeSuffix ("-" + module.version) module.name;
-        in
-        (old.postInstall or "")
-        + ''
-          ${lib.concatStrings (
-            map (module: ''
-              echo "linking ${binFile module}"
-              ln -sf ${module}/bin/${binFile module} \
-                  node_modules/${binFile module}/bin/${binFile module}
-            '') targets
-          )}
-        '';
-    });
-
   patchNpmElm =
     pkg:
     pkg.override (old: {
@@ -60,5 +22,5 @@ let
     });
 in
 {
-  inherit patchBinwrap patchNpmElm;
+  inherit patchNpmElm;
 }

pkgs/development/compilers/elm/packages/README.md

@@ -12,14 +12,3 @@ is part of its repository.
 Node dependencies are defined in [node-packages.json](node/node-packages.json).
 [Node2nix](https://github.com/svanderburg/node2nix) is used for generating nix expression
 from this file. Use [generate-node-packages.sh](node/generate-node-packages.sh) for updates of nix expressions.
-
-## Binwrap Patch
-
-Some node packages might use [binwrap](https://github.com/avh4/binwrap) typically for installing
-[elmi-to-json](https://github.com/stoeffel/elmi-to-json). Binwrap is not compatible with nix.
-To overcome issues with those packages apply [patch-binwrap.nix](../lib/default.nix) which essentially does 2 things.
-
-1. It replaces binwrap scripts with noop shell scripts
-2. It uses nix for installing the binaries to expected location in `node_modules`
-
-Example usage be found in `elm/default.nix`.