Skip to content

Commit bf6a584

Browse files
committed
nix: use lzallright through an overlay
so it matches with how unblob-native and pyperscan is used
1 parent 71126d7 commit bf6a584

File tree

7 files changed

+11
-950
lines changed

7 files changed

+11
-950
lines changed

flake.nix

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
url = "github:onekey-sec/unblob-native";
88
inputs.nixpkgs.follows = "nixpkgs";
99
};
10+
inputs.lzallright = {
11+
url = "github:vlaci/lzallright";
12+
inputs.nixpkgs.follows = "nixpkgs";
13+
};
1014
inputs.pyperscan = {
1115
url = "github:vlaci/pyperscan";
1216
inputs.nixpkgs.follows = "nixpkgs";
@@ -27,7 +31,7 @@
2731
];
2832
};
2933

30-
outputs = { self, nixpkgs, filter, unblob-native, pyperscan, sasquatch, ... }:
34+
outputs = { self, nixpkgs, filter, unblob-native, lzallright, pyperscan, sasquatch, ... }:
3135
let
3236
# System types to support.
3337
supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
@@ -48,6 +52,7 @@
4852
filter.overlays.default
4953
sasquatch.overlays.default
5054
unblob-native.overlays.default
55+
lzallright.overlays.default
5156
pyperscan.overlays.default
5257
(import ./overlay.nix)
5358
];

nix/_sources/generated.json

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -54,31 +54,6 @@
5454
},
5555
"version": "0.13.2"
5656
},
57-
"lzallright": {
58-
"cargoLocks": {
59-
"Cargo.lock": [
60-
"./lzallright-v0.2.3/Cargo.lock",
61-
{}
62-
]
63-
},
64-
"date": null,
65-
"extract": null,
66-
"name": "lzallright",
67-
"passthru": null,
68-
"pinned": false,
69-
"src": {
70-
"deepClone": false,
71-
"fetchSubmodules": false,
72-
"leaveDotGit": false,
73-
"name": null,
74-
"owner": "vlaci",
75-
"repo": "lzallright",
76-
"rev": "v0.2.3",
77-
"sha256": "sha256-Zzif6WtecgAkNmml0kt0Z+Ewx0L30ahr+kwzYR5aUAM=",
78-
"type": "github"
79-
},
80-
"version": "v0.2.3"
81-
},
8257
"pyfatfs": {
8358
"cargoLocks": null,
8459
"date": null,
@@ -124,4 +99,4 @@
12499
},
125100
"version": "0.8.9"
126101
}
127-
}
102+
}

nix/_sources/generated.nix

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
pname = "jefferson";
1717
version = "0.4.5";
1818
src = fetchurl {
19-
url = "https://pypi.org/packages/source/j/jefferson/jefferson-0.4.5.tar.gz";
19+
url = "https://files.pythonhosted.org/packages/source/j/jefferson/jefferson-0.4.5.tar.gz";
2020
sha256 = "sha256-+cPOzzO3bCQAu8LrbjUJ5S/SR5OFitOYLIu5L9t/q+k=";
2121
};
2222
};
@@ -31,44 +31,27 @@
3131
sha256 = "sha256-lH4SqwPB2Jp/wUI2Cll67PQbHbwMqpNuLy/ei8roiHg=";
3232
};
3333
};
34-
lzallright = {
35-
pname = "lzallright";
36-
version = "v0.2.3";
37-
src = fetchFromGitHub {
38-
owner = "vlaci";
39-
repo = "lzallright";
40-
rev = "v0.2.3";
41-
fetchSubmodules = false;
42-
sha256 = "sha256-Zzif6WtecgAkNmml0kt0Z+Ewx0L30ahr+kwzYR5aUAM=";
43-
};
44-
cargoLock."Cargo.lock" = {
45-
lockFile = ./lzallright-v0.2.3/Cargo.lock;
46-
outputHashes = {
47-
48-
};
49-
};
50-
};
5134
pyfatfs = {
5235
pname = "pyfatfs";
5336
version = "1.0.5";
5437
src = fetchurl {
55-
url = "https://pypi.org/packages/source/p/pyfatfs/pyfatfs-1.0.5.tar.gz";
38+
url = "https://files.pythonhosted.org/packages/source/p/pyfatfs/pyfatfs-1.0.5.tar.gz";
5639
sha256 = "sha256-5J6gYhGf32GYx7u8/ghYnYkZ40rCH19gTQ7YtcREly0=";
5740
};
5841
};
5942
treelib = {
6043
pname = "treelib";
6144
version = "1.7.0";
6245
src = fetchurl {
63-
url = "https://pypi.org/packages/source/t/treelib/treelib-1.7.0.tar.gz";
46+
url = "https://files.pythonhosted.org/packages/source/t/treelib/treelib-1.7.0.tar.gz";
6447
sha256 = "sha256-m/8a9Ba55kKmzQ4EMdFe3yaiS40MiuaK+9OAG14w+2E=";
6548
};
6649
};
6750
ubi_reader = {
6851
pname = "ubi_reader";
6952
version = "0.8.9";
7053
src = fetchurl {
71-
url = "https://pypi.org/packages/source/u/ubi_reader/ubi_reader-0.8.9.tar.gz";
54+
url = "https://files.pythonhosted.org/packages/source/u/ubi_reader/ubi_reader-0.8.9.tar.gz";
7255
sha256 = "sha256-b6Jp8xB6jie35F/oLEea1RF+F8J64AiiQE3/ufwu1mE=";
7356
};
7457
};

0 commit comments

Comments
 (0)