From c84040edccc837590421bee28b76d583bcc9e29b Mon Sep 17 00:00:00 2001
From: Daniel Woffinden <daw@hey.com>
Date: Wed, 16 Sep 2026 22:16:08 +0100
Subject: [PATCH] cgtcalc: 0-unstable-2025-10-11 -> 0.2.0-unstable-2026-08-07

with swift 6 merged we can finally update this

https://github.com/NixOS/nixpkgs/pull/557896

use the new swiftpm machinery:
https://github.com/NixOS/nixpkgs/blob/staging-next/doc/languages-frameworks/swift.section.md#packaging-with-swiftpm-ssec-swift-packaging-with-swiftpm
---
 pkgs/by-name/cg/cgtcalc/generated/default.nix |  7 ------
 .../cg/cgtcalc/generated/workspace-state.json | 25 -------------------
 pkgs/by-name/cg/cgtcalc/package.nix           | 18 ++++++-------
 3 files changed, 8 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/by-name/cg/cgtcalc/generated/default.nix
 delete mode 100644 pkgs/by-name/cg/cgtcalc/generated/workspace-state.json

diff --git a/pkgs/by-name/cg/cgtcalc/generated/default.nix b/pkgs/by-name/cg/cgtcalc/generated/default.nix
deleted file mode 100644
index fcda4cfc1a87..000000000000
--- a/pkgs/by-name/cg/cgtcalc/generated/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file was generated by swiftpm2nix.
-{
-  workspaceStateFile = ./workspace-state.json;
-  hashes = {
-    "swift-argument-parser" = "sha256-lWQ9mzfRxHcy00Cqyrsm9rOlQzkpU1lNBmiK7MMp6dU=";
-  };
-}
diff --git a/pkgs/by-name/cg/cgtcalc/generated/workspace-state.json b/pkgs/by-name/cg/cgtcalc/generated/workspace-state.json
deleted file mode 100644
index 3a9ec58c7166..000000000000
--- a/pkgs/by-name/cg/cgtcalc/generated/workspace-state.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "object": {
-    "artifacts": [],
-    "dependencies": [
-      {
-        "basedOn": null,
-        "packageRef": {
-          "identity": "swift-argument-parser",
-          "kind": "remoteSourceControl",
-          "location": "https://github.com/apple/swift-argument-parser",
-          "name": "swift-argument-parser"
-        },
-        "state": {
-          "checkoutState": {
-            "revision": "f3c9084a71ef4376f2fabbdf1d3d90a49f1fabdb",
-            "version": "1.1.2"
-          },
-          "name": "sourceControlCheckout"
-        },
-        "subpath": "swift-argument-parser"
-      }
-    ]
-  },
-  "version": 6
-}
diff --git a/pkgs/by-name/cg/cgtcalc/package.nix b/pkgs/by-name/cg/cgtcalc/package.nix
index d90747cd9308..b7153d690a62 100644
--- a/pkgs/by-name/cg/cgtcalc/package.nix
+++ b/pkgs/by-name/cg/cgtcalc/package.nix
@@ -5,29 +5,27 @@
   stdenv,
   swift,
   swiftpm,
-  swiftpm2nix,
+  fetchSwiftPMDeps,
 }:
-let
-  generated = swiftpm2nix.helpers ./generated;
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cgtcalc";
-  version = "0-unstable-2025-10-11";
+  version = "0.2.0-unstable-2026-08-07";
 
   src = fetchFromGitHub {
     owner = "mattjgalloway";
     repo = "cgtcalc";
-    # Repo has no tags or releases.
-    # This is the last commit before requiring Swift 6
-    rev = "1cf63741ddc0a5070680cb1339ad0abff0b7d69b";
-    hash = "sha256-+qgvl5y9ipVQIZlLZbkzkqb9bO7X9VGDvVsloOLZU/k=";
+    rev = "29adf5bf39f870d4098bc828f356864190e41969";
+    hash = "sha256-koyvaeJSbhql7ERuJY6EBRTtT3MCYS6Sp+XANJmvMms=";
   };
   nativeBuildInputs = [
     swift
     swiftpm
   ];
 
-  configurePhase = generated.configure;
+  swiftpmDeps = fetchSwiftPMDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-FBoYVbVMdSZ2q89h7Mcn6vlPNScTJqzoSJKS6wgUGwY=";
+  };
 
   installPhase = ''
     runHook preInstall