pyrox.dev
distrobuilder: 2.1 -> 3.0
+4
-20
pkgs/tools/virtualization/distrobuilder/default.nix
+4
-20
pkgs/tools/virtualization/distrobuilder/default.nix
···
8
8
, gnutar
9
9
, squashfsTools
10
10
, debootstrap
11
-
, fetchpatch
12
11
}:
13
12
14
13
let
···
22
21
in
23
22
buildGoModule rec {
24
23
pname = "distrobuilder";
25
-
version = "2.1";
24
+
version = "3.0";
26
25
27
-
vendorHash = "sha256-yRMsf8KfpNmVUX4Rn4ZPLUPFZCT/g78MKAfgbFDPVkE=";
26
+
vendorHash = "sha256-pFrEkZnrcx0d3oM1klQrNHH+MiLvO4V1uFQdE0kXUqM=";
28
27
29
28
src = fetchFromGitHub {
30
29
owner = "lxc";
31
30
repo = "distrobuilder";
32
-
rev = "distrobuilder-${version}";
33
-
sha256 = "sha256-t3ECLtb0tvIzTWgjmVQDFza+kcm3abTZZMSGYjvw1qQ=";
31
+
rev = "refs/tags/distrobuilder-${version}";
32
+
sha256 = "sha256-JfME9VaqaQnrhnzhSLGUy9uU+tki1hXdnwqBUD/5XH0=";
34
33
fetchSubmodules = false;
35
34
};
36
35
37
36
buildInputs = bins;
38
-
39
-
patches = [
40
-
# go.mod update: needed to to include a newer lxd which contains
41
-
# https://github.com/canonical/lxd/commit/d83f061a21f509d42b7a334b97403d2a019a7b52
42
-
# which is needed to fix the build w/glibc-2.36.
43
-
(fetchpatch {
44
-
url = "https://github.com/lxc/distrobuilder/commit/5346bcc77dd7f141a36a8da851f016d0b929835e.patch";
45
-
sha256 = "sha256-H6cSbY0v/FThx72AvoAvUCs2VCYN/PQ0W4H82mQQ3SI=";
46
-
})
47
-
# Fixup to keep it building after go.mod update.
48
-
(fetchpatch {
49
-
url = "https://github.com/lxc/distrobuilder/commit/2c8cbfbf603e7446efce9f30812812336ccf4f2c.patch";
50
-
sha256 = "sha256-qqofghcHGosR2qycGb02c8rwErFyRRhsRKdQfyah8Ds=";
51
-
})
52
-
];
53
37
54
38
# tests require a local keyserver (mkg20001/nixpkgs branch distrobuilder-with-tests) but gpg is currently broken in tests
55
39
doCheck = false;