chore(nix): move e2fsprogs to nvfetcher definition.

onekey-sec · Dec 14, 2023 · 92b5dc8 · 92b5dc8
1 parent 41e1c03
commit 92b5dc8
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 6 deletions.
diff --git a/nix/_sources/generated.json b/nix/_sources/generated.json
@@ -1,4 +1,24 @@
 {
+    "e2fsprogs": {
+        "cargoLocks": null,
+        "date": null,
+        "extract": null,
+        "name": "e2fsprogs",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "onekey-sec",
+            "repo": "e2fsprogs",
+            "rev": "v1.47.0-3.ok1",
+            "sha256": "sha256-lGv1l9/guOEskvIE6DIsg/nRiDTvORZI0h7n623/fgU=",
+            "type": "github"
+        },
+        "version": "v1.47.0-3.ok1"
+    },
     "jefferson": {
         "cargoLocks": null,
         "date": null,

diff --git a/nix/_sources/generated.nix b/nix/_sources/generated.nix
@@ -1,6 +1,17 @@
 # This file was generated by nvfetcher, please do not modify it manually.
 { fetchgit, fetchurl, fetchFromGitHub, dockerTools }:
 {
+  e2fsprogs = {
+    pname = "e2fsprogs";
+    version = "v1.47.0-3.ok1";
+    src = fetchFromGitHub {
+      owner = "onekey-sec";
+      repo = "e2fsprogs";
+      rev = "v1.47.0-3.ok1";
+      fetchSubmodules = false;
+      sha256 = "sha256-lGv1l9/guOEskvIE6DIsg/nRiDTvORZI0h7n623/fgU=";
+    };
+  };
   jefferson = {
     pname = "jefferson";
     version = "0.4.5";

diff --git a/nvfetcher.toml b/nvfetcher.toml
@@ -22,3 +22,7 @@ fetch.pypi = "pyfatfs"
 [lief]
 src.github_tag = "lief-project/LIEF"
 fetch.github = "lief-project/LIEF"
+
+[e2fsprogs]
+src.github_tag = "onekey-sec/e2fsprogs"
+fetch.github =  "onekey-sec/e2fsprogs"
diff --git a/overlay.nix b/overlay.nix
@@ -9,12 +9,6 @@ inputs: final: prev:
     (super: {
       pname = "e2fsprogs-nofortify";
       hardeningDisable = (super.hardeningDisable or [ ]) ++ [ "fortify3" ];
-
-      version = "1.47.0-3.ok1";
-      src = prev.fetchurl {
-        url = "https://github.com/onekey-sec/e2fsprogs/archive/refs/tags/v1.47.0-3.ok1.tar.gz";
-        hash = "sha256-fsLUySjAdgnRp5m405a4Egso+LXNLxR9Y7WHt8qAvFM=";
-      };
     });
 
   # Own package updated independently of nixpkgs