pyrox.dev
Merge pull request #242652 from doronbehar/pkg/gnirehtet
gnirehtet: 2.5 -> 2.5.1
authored by Guillaume Girol and committed by GitHub 441c510d 1bea85f8
+7
-27
pkgs/tools/networking/gnirehtet/default.nix
+7
-27
pkgs/tools/networking/gnirehtet/default.nix
···
8
8
, makeWrapper
9
9
}:
10
10
let
11
-
version = "2.5";
11
+
version = "2.5.1";
12
12
apk = stdenv.mkDerivation {
13
13
pname = "gnirehtet.apk";
14
14
inherit version;
15
15
src = fetchzip {
16
16
url = "https://github.com/Genymobile/gnirehtet/releases/download/v${version}/gnirehtet-rust-linux64-v${version}.zip";
17
-
hash = "sha256-+H35OoTFILnJudW6+hOaLDMVZcraYT8hfJGiX958YLU=";
17
+
hash = "sha256-e1wwMhcco9VNoBUzbEq1ESbkX2bqTOkCbPmnV9CpvGo=";
18
18
};
19
19
installPhase = ''
20
20
mkdir $out
···
30
30
owner = "Genymobile";
31
31
repo = "gnirehtet";
32
32
rev = "v${version}";
33
-
hash = "sha256-6KBHRgFvHLqPXkMo1ij0D0ERQICCFGvI7EnaJxCwZnI=";
33
+
hash = "sha256-ewLYCZgkjbh6lR9e4iTddCIrB+5dxyviIXhOqlZsLqc=";
34
+
};
35
+
passthru = {
36
+
inherit apk;
34
37
};
35
38
36
39
sourceRoot = "source/relay-rust";
37
40
38
-
cargoPatches = [
39
-
(fetchpatch {
40
-
name = "fix-trailing-semicolon-in-macro.patch";
41
-
url = "https://github.com/Genymobile/gnirehtet/commit/537b3d87344a456e1310f10dcef37592063f4e54.patch";
42
-
hash = "sha256-6U4ZEcqyXcXrfLRtynepS7gp+Uh5sujRyHVLXbWvpq8=";
43
-
stripLen = 1;
44
-
})
45
-
# Updates Cargo.lock and is needed to apply the subsequent patch
46
-
(fetchpatch {
47
-
name = "prefix-unused-field-with-underscore.patch";
48
-
url = "https://github.com/Genymobile/gnirehtet/commit/2f695503dd80519ce73a80c5aa360b08a97c029d.patch";
49
-
hash = "sha256-YVd1B2PVLRGpJNkKb7gpUQWmccfvYaeAmayOmWg8D+Y=";
50
-
stripLen = 1;
51
-
})
52
-
# https://github.com/Genymobile/gnirehtet/pull/478
53
-
(fetchpatch {
54
-
name = "fix-for-rust-1.64.patch";
55
-
url = "https://github.com/Genymobile/gnirehtet/commit/8eeed2084d0d1e2f83056bd11622beaa1fa61281.patch";
56
-
hash = "sha256-Wwc+4vG48/qpusGjlE+mSJvvarYq2mQ2CkDkrtKHAwo=";
57
-
stripLen = 1;
58
-
})
59
-
];
60
-
61
-
cargoHash = "sha256-3iYOeHIQHwxmh8b8vKUf5fQS2fXP2g3orLquvLXzZwE=";
41
+
cargoHash = "sha256-3oVWFMFzYsuCec1wxZiHXW6O45qbdL1npqYrg/m4SPc=";
62
42
63
43
nativeBuildInputs = [ makeWrapper ];
64
44