diff options
author | Adam Stephens <adam@valkor.net> | 2023-10-27 12:56:52 -0400 |
---|---|---|
committer | Adam Stephens <adam@valkor.net> | 2023-11-28 15:13:56 -0500 |
commit | 92ee9598125f78f4c625f7bb49746a9830d2c85c (patch) | |
tree | 599739e55889841c631134a1a8c61604d0f9768f /pkgs/tools/virtualization | |
parent | b0dbba562dc99d14aaa80a50db4330d75fc16582 (diff) | |
download | nixlib-92ee9598125f78f4c625f7bb49746a9830d2c85c.tar nixlib-92ee9598125f78f4c625f7bb49746a9830d2c85c.tar.gz nixlib-92ee9598125f78f4c625f7bb49746a9830d2c85c.tar.bz2 nixlib-92ee9598125f78f4c625f7bb49746a9830d2c85c.tar.lz nixlib-92ee9598125f78f4c625f7bb49746a9830d2c85c.tar.xz nixlib-92ee9598125f78f4c625f7bb49746a9830d2c85c.tar.zst nixlib-92ee9598125f78f4c625f7bb49746a9830d2c85c.zip |
distrobuilder: 2.1 -> 3.0
Diffstat (limited to 'pkgs/tools/virtualization')
-rw-r--r-- | pkgs/tools/virtualization/distrobuilder/default.nix | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index a1a0cfde0fe7..71fbb1722ee4 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -8,7 +8,6 @@ , gnutar , squashfsTools , debootstrap -, fetchpatch }: let @@ -22,35 +21,20 @@ let in buildGoModule rec { pname = "distrobuilder"; - version = "2.1"; + version = "3.0"; - vendorHash = "sha256-yRMsf8KfpNmVUX4Rn4ZPLUPFZCT/g78MKAfgbFDPVkE="; + vendorHash = "sha256-pFrEkZnrcx0d3oM1klQrNHH+MiLvO4V1uFQdE0kXUqM="; src = fetchFromGitHub { owner = "lxc"; repo = "distrobuilder"; - rev = "distrobuilder-${version}"; - sha256 = "sha256-t3ECLtb0tvIzTWgjmVQDFza+kcm3abTZZMSGYjvw1qQ="; + rev = "refs/tags/distrobuilder-${version}"; + sha256 = "sha256-JfME9VaqaQnrhnzhSLGUy9uU+tki1hXdnwqBUD/5XH0="; fetchSubmodules = false; }; buildInputs = bins; - patches = [ - # go.mod update: needed to to include a newer lxd which contains - # https://github.com/canonical/lxd/commit/d83f061a21f509d42b7a334b97403d2a019a7b52 - # which is needed to fix the build w/glibc-2.36. - (fetchpatch { - url = "https://github.com/lxc/distrobuilder/commit/5346bcc77dd7f141a36a8da851f016d0b929835e.patch"; - sha256 = "sha256-H6cSbY0v/FThx72AvoAvUCs2VCYN/PQ0W4H82mQQ3SI="; - }) - # Fixup to keep it building after go.mod update. - (fetchpatch { - url = "https://github.com/lxc/distrobuilder/commit/2c8cbfbf603e7446efce9f30812812336ccf4f2c.patch"; - sha256 = "sha256-qqofghcHGosR2qycGb02c8rwErFyRRhsRKdQfyah8Ds="; - }) - ]; - # tests require a local keyserver (mkg20001/nixpkgs branch distrobuilder-with-tests) but gpg is currently broken in tests doCheck = false; |