Merge pull request #13 from commercialhaskell/b/update-dep-fix

Fix and rerun update-deps

Author: chreekat

flake.lock

@@ -7,14 +7,14 @@ mkDerivation {
   pname = "Cabal-syntax";
   version = "3.16.1.0";
   sha256 = "6bd561449b4d96aca4896e17a34cb504d1b0fd83b338380d131b16b50b36bda7";
-  revision = "1";
-  editedCabalFile = "1jh16xcdzbhwhdracim2b234nqg0irdvki1czphg30blgg91hvsj";
+  revision = "2";
+  editedCabalFile = "01652fri0f6l24cgsag421ghdbx8p095j1549fi5x9ksgp859kqp";
   libraryHaskellDepends = [
     array base binary bytestring containers deepseq directory filepath
     mtl parsec pretty text time transformers
   ];
   libraryToolDepends = [ alex ];
   homepage = "http://www.haskell.org/cabal/";
   description = "A library for working with .cabal files";
-  license = lib.licensesSpdx."BSD-3-Clause";
+  license = lib.licenses.bsd3;
 }

nix/packages/Cabal-syntax.nix

@@ -7,6 +7,8 @@ mkDerivation {
   pname = "Cabal";
   version = "3.16.1.0";
   sha256 = "c6b8a37d21dc67c1c68d36a6258ea529391d4bb8bcc1caebaa9b483d93ef2556";
+  revision = "1";
+  editedCabalFile = "1ji7cr3fwis7hlh6jrdj94580z5rrn8jrmrzgia98lc9mcbk71rr";
   setupHaskellDepends = [ mtl parsec ];
   libraryHaskellDepends = [
     array base bytestring Cabal-syntax containers deepseq directory
@@ -15,5 +17,5 @@ mkDerivation {
   doCheck = false;
   homepage = "http://www.haskell.org/cabal/";
   description = "A framework for packaging Haskell software";
-  license = lib.licensesSpdx."BSD-3-Clause";
+  license = lib.licenses.bsd3;
 }

nix/packages/Cabal.nix

@@ -32,5 +32,5 @@ mkDerivation {
   ];
   homepage = "https://github.com/brendanhay/amazonka";
   description = "Core data types and functionality for Amazonka libraries";
-  license = lib.licensesSpdx."MPL-2.0";
+  license = lib.licenses.mpl20;
 }

nix/packages/amazonka-core.nix

@@ -20,5 +20,5 @@ mkDerivation {
   ];
   homepage = "https://github.com/brendanhay/amazonka";
   description = "Amazon Simple Storage Service SDK";
-  license = lib.licensesSpdx."MPL-2.0";
+  license = lib.licenses.mpl20;
 }

nix/packages/amazonka-s3.nix

@@ -20,5 +20,5 @@ mkDerivation {
   ];
   homepage = "https://github.com/brendanhay/amazonka";
   description = "Amazon Single Sign-On SDK";
-  license = lib.licensesSpdx."MPL-2.0";
+  license = lib.licenses.mpl20;
 }

nix/packages/amazonka-sso.nix

@@ -20,5 +20,5 @@ mkDerivation {
   ];
   homepage = "https://github.com/brendanhay/amazonka";
   description = "Amazon Security Token Service SDK";
-  license = lib.licensesSpdx."MPL-2.0";
+  license = lib.licenses.mpl20;
 }

nix/packages/amazonka-sts.nix

@@ -26,5 +26,5 @@ mkDerivation {
   ];
   homepage = "https://github.com/brendanhay/amazonka";
   description = "Comprehensive Amazon Web Services SDK";
-  license = lib.licensesSpdx."MPL-2.0";
+  license = lib.licenses.mpl20;
 }

nix/packages/amazonka.nix

@@ -58,25 +58,27 @@ echo "=== Fetching LTS and Cabal versions (parallel) ==="
 
     search_result=$(retry gh api "search/commits" \
         -X GET \
-        -f q="repo:NixOS/nixpkgs haskellPackages stackage LTS committer-date:<=$nixpkgs_date_iso" \
+        -f q="repo:NixOS/nixpkgs \"haskellPackages: stackage LTS\" committer-date:<=$nixpkgs_date_iso" \
         -f sort="committer-date" \
         -f order="desc" \
         -f per_page=1 \
-        --jq '.items[0].commit.message')
+        --jq '.items[0].commit.message | split("\n")[0]')
 
     if [[ -z "$search_result" || "$search_result" == "null" ]]; then
         echo "Error: Could not find LTS commit" >&2
         exit 1
     fi
 
-    lts_version=$(echo "$search_result" | grep -oP 'LTS \K[0-9]+\.[0-9]+' | tail -1)
+    # `|| true` prevents set -e from silently killing the subshell when
+    # grep finds no match — we want the explicit empty-check below to fire.
+    lts_version=$(echo "$search_result" | grep -oP 'LTS \K[0-9]+\.[0-9]+' | tail -1 || true)
     if [[ -z "$lts_version" ]]; then
         echo "Error: Could not parse LTS version" >&2
         exit 1
     fi
 
-    echo "$lts_version"
-) > "$lts_result" &
+    echo "$lts_version" > "$lts_result"
+) &
 lts_pid=$!
 
 # Background job: Get latest Cabal versions from Hackage
@@ -85,8 +87,8 @@ lts_pid=$!
         "https://hackage.haskell.org/package/Cabal/preferred" | jq -r '.["normal-version"][0]')
     cabal_syntax_ver=$(retry curl -sH "Accept: application/json" \
         "https://hackage.haskell.org/package/Cabal-syntax/preferred" | jq -r '.["normal-version"][0]')
-    echo "$cabal_ver $cabal_syntax_ver"
-) > "$cabal_result" &
+    echo "$cabal_ver $cabal_syntax_ver" > "$cabal_result"
+) &
 cabal_pid=$!
 
 # Wait for both
@@ -145,9 +147,13 @@ cd nix/packages
 gen_pkg() {
     local name="$1"
     shift
+    (
+    set -Eeou pipefail
+    trap 'rm -f "${name}.nix.tmp"' EXIT # Error cleanup
     echo "# Generated by update-deps" > "${name}.nix.tmp"
     retry cabal2nix "$@" >> "${name}.nix.tmp"
     mv "${name}.nix.tmp" "${name}.nix"
+    )
     echo "  ${name}: done"
 }
 

nix/scripts/update-deps.sh

@@ -1,5 +1,5 @@
 # DO NOT EDIT SNAPSHOT. It is generated from `just update-deps`.
-snapshot: lts-24.29
+snapshot: lts-24.38
 
 extra-deps:
 # Not in snapshot.