Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

guestfs-tools: avoid building on hydra #353995

Merged
merged 3 commits into from
Nov 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,31 +1,32 @@
{ lib
, stdenv
, fetchurl
, bash-completion
, bison
, cdrkit
, cpio
, curl
, flex
, getopt
, glib
, gnupg
, hivex
, jansson
, libguestfs-with-appliance
, libosinfo
, libvirt
, libxml2
, makeWrapper
, ncurses
, ocamlPackages
, openssl
, pcre2
, perlPackages
, pkg-config
, qemu
, xz
, gitUpdater
{
lib,
stdenv,
fetchurl,
bash-completion,
bison,
cdrkit,
cpio,
curl,
flex,
getopt,
glib,
gnupg,
hivex,
jansson,
libguestfs-with-appliance,
libosinfo,
libvirt,
libxml2,
makeWrapper,
ncurses,
ocamlPackages,
openssl,
pcre2,
perlPackages,
pkg-config,
qemu,
xz,
gitUpdater,
}:

stdenv.mkDerivation (finalAttrs: {
Expand All @@ -37,28 +38,29 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-02khDS2NLG1QOSqswtDoqBX2Mg6sE/OiUoP9JFs4vTU=";
};

nativeBuildInputs = [
bison
cdrkit
cpio
flex
getopt
makeWrapper
pkg-config
qemu
] ++
(with perlPackages; [
GetoptLong
libintl-perl
ModuleBuild
perl
Po4a
]) ++
(with ocamlPackages; [
findlib
ocaml
ounit2
]);
nativeBuildInputs =
[
bison
cdrkit
cpio
flex
getopt
makeWrapper
pkg-config
qemu
]
++ (with perlPackages; [
GetoptLong
libintl-perl
ModuleBuild
perl
Po4a
])
++ (with ocamlPackages; [
findlib
ocaml
ounit2
]);

buildInputs = [
bash-completion
Expand Down Expand Up @@ -100,10 +102,22 @@ stdenv.mkDerivation (finalAttrs: {
postInstall = ''
wrapProgram $out/bin/virt-builder \
--argv0 virt-builder \
--prefix PATH : ${lib.makeBinPath [ curl gnupg ]}:$out/bin \
--prefix PATH : ${
lib.makeBinPath [
curl
gnupg
]
}:$out/bin \
--suffix VIRT_BUILDER_DIRS : /etc:$out/etc
wrapProgram $out/bin/virt-win-reg \
--prefix PERL5LIB : ${with perlPackages; makeFullPerlPath [ hivex libintl-perl libguestfs-with-appliance ]}
--prefix PERL5LIB : ${
with perlPackages;
makeFullPerlPath [
hivex
libintl-perl
libguestfs-with-appliance
]
}
'';

passthru.updateScript = gitUpdater {
Expand All @@ -114,10 +128,14 @@ stdenv.mkDerivation (finalAttrs: {

meta = {
description = "Extra tools for accessing and modifying virtual machine disk images";
license = with lib.licenses; [ gpl2Plus lgpl21Plus ];
license = with lib.licenses; [
gpl2Plus
lgpl21Plus
];
homepage = "https://libguestfs.org/";
changelog = "https://www.libguestfs.org/guestfs-tools-release-notes-${lib.versions.majorMinor finalAttrs.version}.1.html";
maintainers = [ ];
platforms = lib.platforms.linux;
hydraPlatforms = [ ];
};
})
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1758,8 +1758,6 @@ with pkgs;

grizzly = callPackage ../tools/misc/grizzly { };

guestfs-tools = callPackage ../tools/virtualization/guestfs-tools { };

fabs = callPackage ../tools/backup/fabs { };

fm = callPackage ../applications/file-managers/fm { };
Expand Down