nix: use lzallright through an overlay

so it matches with how unblob-native and pyperscan is used
onekey-sec · Dec 15, 2023 · b50a5ff · b50a5ff
1 parent 21e61ce
commit b50a5ff
Show file tree

Hide file tree

Showing 8 changed files with 137 additions and 957 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -7,6 +7,10 @@
     url = "github:onekey-sec/unblob-native";
     inputs.nixpkgs.follows = "nixpkgs";
   };
+  inputs.lzallright = {
+    url = "github:vlaci/lzallright";
+    inputs.nixpkgs.follows = "nixpkgs";
+  };
   inputs.pyperscan = {
     url = "git+https://github.com/vlaci/pyperscan/?ref=main&submodules=1";
     inputs.nixpkgs.follows = "nixpkgs";
@@ -27,7 +31,7 @@
     ];
   };
 
-  outputs = { self, nixpkgs, filter, unblob-native, pyperscan, sasquatch, ... }:
+  outputs = { self, nixpkgs, filter, unblob-native, lzallright, pyperscan, sasquatch, ... }:
     let
       # System types to support.
       supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
@@ -48,6 +52,7 @@
         filter.overlays.default
         sasquatch.overlays.default
         unblob-native.overlays.default
+        lzallright.overlays.default
         pyperscan.overlays.default
         (import ./overlay.nix)
       ];

diff --git a/nix/_sources/generated.json b/nix/_sources/generated.json
@@ -54,31 +54,6 @@
         },
         "version": "0.13.2"
     },
-    "lzallright": {
-        "cargoLocks": {
-            "Cargo.lock": [
-                "./lzallright-v0.2.3/Cargo.lock",
-                {}
-            ]
-        },
-        "date": null,
-        "extract": null,
-        "name": "lzallright",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "deepClone": false,
-            "fetchSubmodules": false,
-            "leaveDotGit": false,
-            "name": null,
-            "owner": "vlaci",
-            "repo": "lzallright",
-            "rev": "v0.2.3",
-            "sha256": "sha256-Zzif6WtecgAkNmml0kt0Z+Ewx0L30ahr+kwzYR5aUAM=",
-            "type": "github"
-        },
-        "version": "v0.2.3"
-    },
     "pyfatfs": {
         "cargoLocks": null,
         "date": null,
@@ -124,4 +99,4 @@
         },
         "version": "0.8.9"
     }
-}
+}
diff --git a/nix/_sources/generated.nix b/nix/_sources/generated.nix
@@ -16,7 +16,7 @@
     pname = "jefferson";
     version = "0.4.5";
     src = fetchurl {
-      url = "https://pypi.org/packages/source/j/jefferson/jefferson-0.4.5.tar.gz";
+      url = "https://files.pythonhosted.org/packages/source/j/jefferson/jefferson-0.4.5.tar.gz";
       sha256 = "sha256-+cPOzzO3bCQAu8LrbjUJ5S/SR5OFitOYLIu5L9t/q+k=";
     };
   };
@@ -31,44 +31,27 @@
       sha256 = "sha256-lH4SqwPB2Jp/wUI2Cll67PQbHbwMqpNuLy/ei8roiHg=";
     };
   };
-  lzallright = {
-    pname = "lzallright";
-    version = "v0.2.3";
-    src = fetchFromGitHub {
-      owner = "vlaci";
-      repo = "lzallright";
-      rev = "v0.2.3";
-      fetchSubmodules = false;
-      sha256 = "sha256-Zzif6WtecgAkNmml0kt0Z+Ewx0L30ahr+kwzYR5aUAM=";
-    };
-    cargoLock."Cargo.lock" = {
-      lockFile = ./lzallright-v0.2.3/Cargo.lock;
-      outputHashes = {
-
-      };
-    };
-  };
   pyfatfs = {
     pname = "pyfatfs";
     version = "1.0.5";
     src = fetchurl {
-      url = "https://pypi.org/packages/source/p/pyfatfs/pyfatfs-1.0.5.tar.gz";
+      url = "https://files.pythonhosted.org/packages/source/p/pyfatfs/pyfatfs-1.0.5.tar.gz";
       sha256 = "sha256-5J6gYhGf32GYx7u8/ghYnYkZ40rCH19gTQ7YtcREly0=";
     };
   };
   treelib = {
     pname = "treelib";
     version = "1.7.0";
     src = fetchurl {
-      url = "https://pypi.org/packages/source/t/treelib/treelib-1.7.0.tar.gz";
+      url = "https://files.pythonhosted.org/packages/source/t/treelib/treelib-1.7.0.tar.gz";
       sha256 = "sha256-m/8a9Ba55kKmzQ4EMdFe3yaiS40MiuaK+9OAG14w+2E=";
     };
   };
   ubi_reader = {
     pname = "ubi_reader";
     version = "0.8.9";
     src = fetchurl {
-      url = "https://pypi.org/packages/source/u/ubi_reader/ubi_reader-0.8.9.tar.gz";
+      url = "https://files.pythonhosted.org/packages/source/u/ubi_reader/ubi_reader-0.8.9.tar.gz";
       sha256 = "sha256-b6Jp8xB6jie35F/oLEea1RF+F8J64AiiQE3/ufwu1mE=";
     };
   };