From 96de72a0c8fbb48f9cfcd5cfd6b00253e386bf34 Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Sun, 11 May 2025 10:01:45 +0800
Subject: [PATCH] packages.git-lfs-transfer: move to upstream

---
 flake.lock                    | 23 +++--------------------
 flake.nix                     |  1 -
 flake/src.nix                 |  1 -
 modules/packages/git.nix      |  3 +--
 packages/default.nix          |  2 --
 packages/git-lfs-transfer.nix |  6 ------
 6 files changed, 4 insertions(+), 32 deletions(-)
 delete mode 100644 packages/git-lfs-transfer.nix

diff --git a/flake.lock b/flake.lock
index a3725adb..26fdd933 100644
--- a/flake.lock
+++ b/flake.lock
@@ -509,22 +509,6 @@
         "type": "github"
       }
     },
-    "git-lfs-transfer": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1746438362,
-        "narHash": "sha256-cufY0CdkTIVHFH3LesAxMDV4KNIqjxFO2m3dLoBNM9U=",
-        "owner": "charmbracelet",
-        "repo": "git-lfs-transfer",
-        "rev": "0d51139d5979491e819ba4751235e2ab4b763c6e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "charmbracelet",
-        "repo": "git-lfs-transfer",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -1000,11 +984,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1746926443,
-        "narHash": "sha256-82Iu+T9xlnbsVcKbu17rVazetM6JzYTaVg/JYuPPpo0=",
+        "lastModified": 1746928690,
+        "narHash": "sha256-KJX4JZ8IxVhHIzf7guat/2pCjLP44V59OJ+UtjsQdgI=",
         "owner": "CHN-beta",
         "repo": "nixpkgs",
-        "rev": "fa20c1d562a01a115ebc06b95405bea1d7291ef9",
+        "rev": "7e7ed9e72c4c455d6bde8c8beb96e1b4b0b6187a",
         "type": "github"
       },
       "original": {
@@ -1317,7 +1301,6 @@
         "date": "date",
         "envfs": "envfs",
         "fancy-motd": "fancy-motd",
-        "git-lfs-transfer": "git-lfs-transfer",
         "gricad": "gricad",
         "hextra": "hextra",
         "highfive": "highfive",
diff --git a/flake.nix b/flake.nix
index f877e109..eee0a032 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,7 +54,6 @@
     openxlsx = { url = "github:troldal/OpenXLSX"; flake = false; };
     sqlite-orm = { url = "github:fnc12/sqlite_orm"; flake = false; };
     sockpp = { url = "github:fpagliughi/sockpp"; flake = false; };
-    git-lfs-transfer = { url = "github:charmbracelet/git-lfs-transfer"; flake = false; };
     nc4nix = { url = "github:helsinki-systems/nc4nix"; flake = false; };
     hextra = { url = "github:imfing/hextra"; flake = false; };
     nu-scripts = { url = "github:nushell/nu_scripts"; flake = false; };
diff --git a/flake/src.nix b/flake/src.nix
index 1f9c450a..e09471c7 100644
--- a/flake/src.nix
+++ b/flake/src.nix
@@ -1,6 +1,5 @@
 { inputs }: let inherit (inputs.self.packages.x86_64-linux) pkgs; in
 {
-  git-lfs-transfer = "sha256-qHQeBI2b8EmUinowixqEuR6iGwNYQy3pSc8iPVfJemE=";
   nvhpc =
   {
     src = pkgs.fetchurl
diff --git a/modules/packages/git.nix b/modules/packages/git.nix
index 3df47b02..78967852 100644
--- a/modules/packages/git.nix
+++ b/modules/packages/git.nix
@@ -8,7 +8,7 @@ inputs:
     {
       enable = true;
       package = inputs.pkgs.gitFull;
-      lfs.enable = true;
+      lfs = { enable = true; enablePureSSHTransfer = true; };
       config =
       {
         init.defaultBranch = "main";
@@ -18,6 +18,5 @@ inputs:
         merge.ours.driver = true; # 允许 .gitattributes 中设置的 merge=ours 生效
       };
     };
-    nixos.packages.packages._packages = [ inputs.pkgs.localPackages.git-lfs-transfer ]; # make pure ssh lfs work
   };
 }
diff --git a/packages/default.nix b/packages/default.nix
index 773c7337..1a772209 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -94,8 +94,6 @@ inputs: rec
   chn-bsub = inputs.pkgs.callPackage ./chn-bsub { inherit biu; };
   winjob = inputs.pkgs.callPackage ./winjob { stdenv = inputs.pkgs.gcc14Stdenv; };
   sockpp = inputs.pkgs.callPackage ./sockpp.nix { src = inputs.topInputs.sockpp; };
-  git-lfs-transfer = inputs.pkgs.callPackage ./git-lfs-transfer.nix
-    { src = inputs.topInputs.git-lfs-transfer; hash = inputs.topInputs.self.src.git-lfs-transfer; };
   py4vasp = inputs.pkgs.python3Packages.callPackage ./py4vasp.nix { src = inputs.topInputs.py4vasp; inherit nglview; };
   pocketfft = inputs.pkgs.callPackage ./pocketfft.nix { src = inputs.topInputs.pocketfft; };
   spectroscopy = inputs.pkgs.callPackage ./spectroscopy.nix { src = inputs.topInputs.spectroscopy; };
diff --git a/packages/git-lfs-transfer.nix b/packages/git-lfs-transfer.nix
deleted file mode 100644
index fa3c03a3..00000000
--- a/packages/git-lfs-transfer.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ buildGoModule, src, hash }: buildGoModule
-{
-  name = "git-lfs-transfer";
-  inherit src;
-  vendorHash = hash;
-}