diff options
| author | Maciej Krüger <mkg20001@gmail.com> | 2021-04-28 03:59:32 +0200 |
|---|---|---|
| committer | Maciej Krüger <mkg20001@gmail.com> | 2021-06-28 06:17:26 +0200 |
| commit | 110a85fd367e6e0d2443a403863548247abe1be4 (patch) | |
| tree | 52871046dc17390596de019e28553f895039cfa8 /pkgs/tools/virtualization | |
| parent | bb62664a1a5c8e35842d58504a9aa31abadad336 (diff) | |
distrobuilder: 2019_10_07 -> 1.2
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Diffstat (limited to 'pkgs/tools/virtualization')
| -rw-r--r-- | pkgs/tools/virtualization/distrobuilder/default.nix | 49 |
1 files changed, 34 insertions, 15 deletions
diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index d06a2b4a17ef..a6f479dc71ab 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -1,31 +1,51 @@ -{ lib, pkg-config, buildGoPackage, fetchFromGitHub -, makeWrapper, coreutils, gnupg, gnutar, squashfsTools, debootstrap +{ lib +, pkg-config +, buildGoModule +, fetchFromGitHub +, makeWrapper +, coreutils +, gnupg +, gnutar +, squashfsTools +, debootstrap }: -let binPath = lib.makeBinPath [ - coreutils gnupg gnutar squashfsTools debootstrap -]; +let + bins = [ + coreutils + gnupg + gnutar + squashfsTools + debootstrap + ]; in -buildGoPackage rec { +buildGoModule rec { pname = "distrobuilder"; - version = "2019_10_07"; - rev = "d686c88c21838f5505c3ec14711b2413604d7f5c"; + version = "1.2"; - goPackagePath = "github.com/lxc/distrobuilder"; + vendorSha256 = "sha256-G5FUO6Ul4dA4MZZI9Ho1kE9ptX31tAWak9rWAoD/iuU="; src = fetchFromGitHub { - inherit rev; owner = "lxc"; repo = "distrobuilder"; - sha256 = "0k59czgasy4d58bkrin6hvgmh7y3nf177lwd0y4g47af27bgnyc4"; + rev = "distrobuilder-${version}"; + sha256 = "CE3Tq0oWpVZnSfBBY3/2E2GdZLFsO0NzkPABT8lu+TY="; + fetchSubmodules = false; }; - goDeps = ./deps.nix; + buildInputs = bins; + + # tests require a local keyserver (mkg20001/nixpkgs branch distrobuilder-with-tests) but gpg is currently broken in tests + doCheck = false; + + nativeBuildInputs = [ + pkg-config + makeWrapper + ] ++ bins; postInstall = '' - wrapProgram $out/bin/distrobuilder --prefix PATH ":" ${binPath} + wrapProgram $out/bin/distrobuilder --prefix PATH ":" ${lib.makeBinPath bins} ''; - nativeBuildInputs = [ pkg-config makeWrapper ]; meta = with lib; { description = "System container image builder for LXC and LXD"; @@ -35,4 +55,3 @@ buildGoPackage rec { platforms = platforms.linux; }; } - |