Skip to content

Commit fb82288

Browse files
lukts30bjornfor
authored andcommitted
libguestfs: format with nixfmt-rfc-style
1 parent 2612971 commit fb82288

File tree

3 files changed

+118
-97
lines changed

3 files changed

+118
-97
lines changed

pkgs/by-name/li/libguestfs-appliance/package.nix

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
{ lib
2-
, stdenvNoCC
3-
, fetchurl
1+
{
2+
lib,
3+
stdenvNoCC,
4+
fetchurl,
45
}:
56

67
stdenvNoCC.mkDerivation rec {
@@ -24,8 +25,14 @@ stdenvNoCC.mkDerivation rec {
2425
meta = with lib; {
2526
description = "VM appliance disk image used in libguestfs package";
2627
homepage = "https://libguestfs.org";
27-
license = with licenses; [ gpl2Plus lgpl2Plus ];
28-
platforms = [ "i686-linux" "x86_64-linux" ];
28+
license = with licenses; [
29+
gpl2Plus
30+
lgpl2Plus
31+
];
32+
platforms = [
33+
"i686-linux"
34+
"x86_64-linux"
35+
];
2936
hydraPlatforms = [ ]; # Hydra fails with "Output limit exceeded"
3037
};
3138
}
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
{
2-
libguestfs,
3-
libguestfs-appliance,
4-
}:
1+
{ libguestfs, libguestfs-appliance }:
52

6-
libguestfs.override {
7-
appliance = libguestfs-appliance;
8-
}
3+
libguestfs.override { appliance = libguestfs-appliance; }

pkgs/by-name/li/libguestfs/package.nix

Lines changed: 104 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,45 @@
1-
{ lib
2-
, stdenv
3-
, fetchurl
4-
, pkg-config
5-
, autoreconfHook
6-
, makeWrapper
7-
, libxcrypt
8-
, ncurses
9-
, cpio
10-
, gperf
11-
, cdrkit
12-
, flex
13-
, bison
14-
, qemu
15-
, pcre2
16-
, augeas
17-
, libxml2
18-
, acl
19-
, libcap
20-
, libcap_ng
21-
, libconfig
22-
, systemd
23-
, fuse
24-
, yajl
25-
, libvirt
26-
, hivex
27-
, db
28-
, gmp
29-
, readline
30-
, file
31-
, numactl
32-
, libapparmor
33-
, jansson
34-
, getopt
35-
, perlPackages
36-
, ocaml-ng
37-
, libtirpc
38-
, appliance ? null
39-
, javaSupport ? false
40-
, jdk
41-
, zstd
1+
{
2+
lib,
3+
stdenv,
4+
fetchurl,
5+
pkg-config,
6+
autoreconfHook,
7+
makeWrapper,
8+
libxcrypt,
9+
ncurses,
10+
cpio,
11+
gperf,
12+
cdrkit,
13+
flex,
14+
bison,
15+
qemu,
16+
pcre2,
17+
augeas,
18+
libxml2,
19+
acl,
20+
libcap,
21+
libcap_ng,
22+
libconfig,
23+
systemd,
24+
fuse,
25+
yajl,
26+
libvirt,
27+
hivex,
28+
db,
29+
gmp,
30+
readline,
31+
file,
32+
numactl,
33+
libapparmor,
34+
jansson,
35+
getopt,
36+
perlPackages,
37+
ocaml-ng,
38+
libtirpc,
39+
appliance ? null,
40+
javaSupport ? false,
41+
jdk,
42+
zstd,
4243
}:
4344

4445
assert appliance == null || lib.isDerivation appliance;
@@ -57,46 +58,63 @@ stdenv.mkDerivation rec {
5758
};
5859

5960
strictDeps = true;
60-
nativeBuildInputs = [
61-
autoreconfHook
62-
bison
63-
cdrkit
64-
cpio
65-
flex
66-
getopt
67-
gperf
68-
makeWrapper
69-
pkg-config
70-
qemu
71-
zstd
72-
] ++ (with perlPackages; [ perl libintl-perl GetoptLong ModuleBuild ])
73-
++ (with ocamlPackages'; [ ocaml findlib ]);
74-
buildInputs = [
75-
libxcrypt
76-
ncurses
77-
jansson
78-
pcre2
79-
augeas
80-
libxml2
81-
acl
82-
libcap
83-
libcap_ng
84-
libconfig
85-
systemd
86-
fuse
87-
yajl
88-
libvirt
89-
gmp
90-
readline
91-
file
92-
hivex
93-
db
94-
numactl
95-
libapparmor
96-
perlPackages.ModuleBuild
97-
libtirpc
98-
] ++ (with ocamlPackages'; [ ocamlbuild ocaml_libvirt gettext-stub ounit ])
99-
++ lib.optional javaSupport jdk;
61+
nativeBuildInputs =
62+
[
63+
autoreconfHook
64+
bison
65+
cdrkit
66+
cpio
67+
flex
68+
getopt
69+
gperf
70+
makeWrapper
71+
pkg-config
72+
qemu
73+
zstd
74+
]
75+
++ (with perlPackages; [
76+
perl
77+
libintl-perl
78+
GetoptLong
79+
ModuleBuild
80+
])
81+
++ (with ocamlPackages'; [
82+
ocaml
83+
findlib
84+
]);
85+
buildInputs =
86+
[
87+
libxcrypt
88+
ncurses
89+
jansson
90+
pcre2
91+
augeas
92+
libxml2
93+
acl
94+
libcap
95+
libcap_ng
96+
libconfig
97+
systemd
98+
fuse
99+
yajl
100+
libvirt
101+
gmp
102+
readline
103+
file
104+
hivex
105+
db
106+
numactl
107+
libapparmor
108+
perlPackages.ModuleBuild
109+
libtirpc
110+
]
111+
++ (with ocamlPackages'; [
112+
ocamlbuild
113+
ocaml_libvirt
114+
gettext-stub
115+
ounit
116+
])
117+
++ lib.optional javaSupport jdk;
100118

101119
prePatch = ''
102120
# build-time scripts
@@ -116,9 +134,7 @@ stdenv.mkDerivation rec {
116134
"--with-distro=NixOS"
117135
"--with-guestfs-path=${placeholder "out"}/lib/guestfs"
118136
] ++ lib.optionals (!javaSupport) [ "--without-java" ];
119-
patches = [
120-
./libguestfs-syms.patch
121-
];
137+
patches = [ ./libguestfs-syms.patch ];
122138

123139
createFindlibDestdir = true;
124140

@@ -162,7 +178,10 @@ stdenv.mkDerivation rec {
162178

163179
meta = with lib; {
164180
description = "Tools for accessing and modifying virtual machine disk images";
165-
license = with licenses; [ gpl2Plus lgpl21Plus ];
181+
license = with licenses; [
182+
gpl2Plus
183+
lgpl21Plus
184+
];
166185
homepage = "https://libguestfs.org/";
167186
maintainers = with maintainers; [ offline ];
168187
platforms = platforms.linux;

0 commit comments

Comments
 (0)