public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgs/applications: stdenv.lib -> lib

Browse Source
This commit is contained in:
Ben Siraphob
2021-01-15 14:24:03 +07:00
parent 2e34288f0d
commit 108bdac3d9
427 changed files with 1160 additions and 1154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/virtualization/8086tiny/default.nix
+3 -3
View File
@@ -16,12 +16,12 @@ stdenv.mkDerivation rec {
sha256 = "00aydg8f28sgy8l3rd2a7jvp56lx3b63hhak43p7g7vjdikv495w";
};
buildInputs = with stdenv.lib;
buildInputs = with lib;
optionals localBios [ nasm ]
++ optionals sdlSupport [ SDL ];
bios = localBios;
builder = ./builder.sh;
meta = with lib; {
pkgs/applications/virtualization/OVMF/default.nix
+1 -1
View File
@@ -59,7 +59,7 @@ edk2.mkDerivation projectDscPath {
meta = {
description = "Sample UEFI firmware for QEMU and KVM";
homepage = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF";
license = stdenv.lib.licenses.bsd2;
license = lib.licenses.bsd2;
platforms = ["x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin"];
};
}
pkgs/applications/virtualization/bochs/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl
{ lib, stdenv, fetchurl
, pkgconfig, libtool
, gtk2, libGLU, libGL, readline, libX11, libXpm
, docbook_xml_dtd_45, docbook_xsl
@@ -15,7 +15,7 @@ assert wxSupport -> (gtk2 != null && wxGTK != null);
assert wgetSupport -> (wget != null);
assert curlSupport -> (curl != null);
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "bochs";
pkgs/applications/virtualization/charliecloud/default.nix
+5 -5
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, python3, python3Packages, docker, autoreconfHook, coreutils, makeWrapper, gnused, gnutar, gzip, findutils, sudo, nixosTests }:
{ lib, stdenv, fetchFromGitHub, python3, python3Packages, docker, autoreconfHook, coreutils, makeWrapper, gnused, gnutar, gzip, findutils, sudo, nixosTests }:
stdenv.mkDerivation rec {
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
# Here we wrap those deps so they are resolved inside nixpkgs.
postInstall = ''
for file in $out/bin/* ; do \
wrapProgram $file --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils docker gnused gnutar gzip findutils sudo ]}
wrapProgram $file --prefix PATH : ${lib.makeBinPath [ coreutils docker gnused gnutar gzip findutils sudo ]}
done
'';
@@ -54,9 +54,9 @@ stdenv.mkDerivation rec {
on offer.
'';
homepage = "https://hpc.github.io/charliecloud";
license = stdenv.lib.licenses.asl20;
maintainers = [ stdenv.lib.maintainers.bzizou ];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.bzizou ];
platforms = lib.platforms.linux;
};
}
pkgs/applications/virtualization/conmon/default.nix
+1 -1
View File
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib systemd ]
++ stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
# manpage requires building the vendored go-md2man
makeFlags = [ "bin/conmon" ];
pkgs/applications/virtualization/cri-o/default.nix
+1 -1
View File
@@ -37,7 +37,7 @@ buildGoModule rec {
libseccomp
libselinux
lvm2
] ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ];
] ++ lib.optionals (glibc != null) [ glibc glibc.static ];
BUILDTAGS = "apparmor seccomp selinux containers_image_openpgp containers_image_ostree_stub";
buildPhase = ''
pkgs/applications/virtualization/docker-compose/default.nix
+2 -2
View File
@@ -25,8 +25,8 @@ buildPythonApplication rec {
ipaddress jsonschema requests six texttable websocket_client
docopt cached-property paramiko distro python-dotenv
] ++
stdenv.lib.optional (pythonOlder "3.4") enum34 ++
stdenv.lib.optional (pythonOlder "3.2") functools32;
lib.optional (pythonOlder "3.4") enum34 ++
lib.optional (pythonOlder "3.2") functools32;
postPatch = ''
# Remove upper bound on requires, see also
pkgs/applications/virtualization/docker/gc.nix
+1 -1
View File
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
cp docker-gc $out/bin
chmod +x $out/bin/docker-gc
wrapProgram $out/bin/docker-gc \
--prefix PATH : "${stdenv.lib.makeBinPath [ docker coreutils procps gnused findutils gnugrep ]}"
--prefix PATH : "${lib.makeBinPath [ docker coreutils procps gnused findutils gnugrep ]}"
'';
meta = {
pkgs/applications/virtualization/driver/win-pvdrivers/default.nix
+1 -1
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
buildPhase =
let unpack = x: "tar xf $src/${x}.tar; mkdir -p x86/${x} amd64/${x}; cp ${x}/x86/* x86/${x}/.; cp ${x}/x64/* amd64/${x}/.";
in stdenv.lib.concatStringsSep "\n" (map unpack ["xenbus" "xeniface" "xenvif" "xennet" "xenvbd"]);
in lib.concatStringsSep "\n" (map unpack ["xenbus" "xeniface" "xenvif" "xennet" "xenvbd"]);
installPhase = ''
mkdir -p $out
pkgs/applications/virtualization/driver/win-virtio/default.nix
+1 -1
View File
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
{input="viorng"; output="viorng";}
];
in
stdenv.lib.concatStringsSep "\n" ((map (copy "amd64" "w8.1") virtio) ++ (map (copy "x86" "w8.1") virtio));
lib.concatStringsSep "\n" ((map (copy "amd64" "w8.1") virtio) ++ (map (copy "x86" "w8.1") virtio));
meta = with lib; {
description = "Windows VirtIO Drivers";
pkgs/applications/virtualization/gvisor/default.nix
+1 -1
View File
@@ -87,7 +87,7 @@ in buildBazelPackage rec {
# Needed for the 'runsc do' subcomand
wrapProgram $out/bin/runsc \
--prefix PATH : ${stdenv.lib.makeBinPath [ iproute iptables procps ]}
--prefix PATH : ${lib.makeBinPath [ iproute iptables procps ]}
'';
};
pkgs/applications/virtualization/podman/default.nix
+2 -2
View File
@@ -33,7 +33,7 @@ buildGoModule rec {
nativeBuildInputs = [ pkg-config go-md2man installShellFiles ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [
buildInputs = lib.optionals stdenv.isLinux [
btrfs-progs
gpgme
libapparmor
@@ -51,7 +51,7 @@ buildGoModule rec {
make docs
'';
installPhase = stdenv.lib.optionalString stdenv.isDarwin ''
installPhase = lib.optionalString stdenv.isDarwin ''
mv bin/{podman-remote,podman}
'' + ''
install -Dm555 bin/podman $out/bin/podman
pkgs/applications/virtualization/qboot/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, meson, ninja, fetchFromGitHub, nixosTests }:
{ lib, stdenv, meson, ninja, fetchFromGitHub, nixosTests }:
stdenv.mkDerivation {
name = "qboot-20200423";
@@ -24,8 +24,8 @@ stdenv.mkDerivation {
meta = {
description = "A simple x86 firmware for booting Linux";
homepage = "https://github.com/bonzini/qboot";
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ tstrobel ];
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ tstrobel ];
platforms = ["x86_64-linux" "i686-linux"];
};
}
pkgs/applications/virtualization/qemu/default.nix
+5 -5
View File
@@ -29,7 +29,7 @@
, nixosTestRunner ? false
}:
with stdenv.lib;
with lib;
let
audio = optionalString alsaSupport "alsa,"
+ optionalString pulseSupport "pa,"
@@ -40,9 +40,9 @@ in
stdenv.mkDerivation rec {
version = "5.1.0";
pname = "qemu"
+ stdenv.lib.optionalString xenSupport "-xen"
+ stdenv.lib.optionalString hostCpuOnly "-host-cpu-only"
+ stdenv.lib.optionalString nixosTestRunner "-for-vm-tests";
+ lib.optionalString xenSupport "-xen"
+ lib.optionalString hostCpuOnly "-host-cpu-only"
+ lib.optionalString nixosTestRunner "-for-vm-tests";
src = fetchurl {
url= "https://download.qemu.org/qemu-${version}.tar.xz";
@@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
++ optional smartcardSupport "--enable-smartcard"
++ optional spiceSupport "--enable-spice"
++ optional usbredirSupport "--enable-usb-redir"
++ optional (hostCpuTargets != null) "--target-list=${stdenv.lib.concatStringsSep "," hostCpuTargets}"
++ optional (hostCpuTargets != null) "--target-list=${lib.concatStringsSep "," hostCpuTargets}"
++ optional stdenv.isDarwin "--enable-cocoa"
++ optional stdenv.isDarwin "--enable-hvf"
++ optional stdenv.isLinux "--enable-linux-aio"
pkgs/applications/virtualization/qtemu/default.nix
+1 -1
View File
@@ -30,7 +30,7 @@ mkDerivation rec {
install -D -t $out/bin qtemu
# make sure that the qemu-* executables are found
wrapProgram $out/bin/qtemu --prefix PATH : ${stdenv.lib.makeBinPath [ qemu ]}
wrapProgram $out/bin/qtemu --prefix PATH : ${lib.makeBinPath [ qemu ]}
runHook postInstall
'';
pkgs/applications/virtualization/singularity/default.nix
+3 -3
View File
@@ -39,7 +39,7 @@ buildGoPackage rec {
cd go/src/github.com/sylabs/singularity
patchShebangs .
sed -i 's|defaultPath := "[^"]*"|defaultPath := "${stdenv.lib.makeBinPath propagatedBuildInputs}"|' cmd/internal/cli/actions.go
sed -i 's|defaultPath := "[^"]*"|defaultPath := "${lib.makeBinPath propagatedBuildInputs}"|' cmd/internal/cli/actions.go
./mconfig -V ${version} -p $out --localstatedir=/var
@@ -59,8 +59,8 @@ buildGoPackage rec {
chmod 755 $out/libexec/singularity/bin/starter-suid
# Explicitly configure paths in the config file
sed -i 's|^# mksquashfs path =.*$|mksquashfs path = ${stdenv.lib.makeBinPath [squashfsTools]}/mksquashfs|' $out/etc/singularity/singularity.conf
sed -i 's|^# cryptsetup path =.*$|cryptsetup path = ${stdenv.lib.makeBinPath [cryptsetup]}/cryptsetup|' $out/etc/singularity/singularity.conf
sed -i 's|^# mksquashfs path =.*$|mksquashfs path = ${lib.makeBinPath [squashfsTools]}/mksquashfs|' $out/etc/singularity/singularity.conf
sed -i 's|^# cryptsetup path =.*$|cryptsetup path = ${lib.makeBinPath [cryptsetup]}/cryptsetup|' $out/etc/singularity/singularity.conf
runHook postInstall
'';
pkgs/applications/virtualization/spice-vdagent/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, alsaLib, spice-protocol, glib,
{lib, stdenv, fetchurl, pkgconfig, alsaLib, spice-protocol, glib,
libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, libdrm,
systemd}:
stdenv.mkDerivation rec {
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
* Multiple displays
'';
homepage = "https://www.spice-space.org/";
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.aboseley ];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.aboseley ];
platforms = lib.platforms.linux;
};
}
pkgs/applications/virtualization/tinyemu/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, openssl, curl, SDL }:
{ lib, stdenv, fetchurl, openssl, curl, SDL }:
stdenv.mkDerivation rec {
pname = "tinyemu";
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
homepage = "https://bellard.org/tinyemu/";
description = "A system emulator for the RISC-V and x86 architectures";
longDescription = "TinyEMU is a system emulator for the RISC-V and x86 architectures. Its purpose is to be small and simple while being complete.";
license = with stdenv.lib.licenses; [ mit bsd2 ];
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ jhhuh ];
license = with lib.licenses; [ mit bsd2 ];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ jhhuh ];
};
}
pkgs/applications/virtualization/virt-manager/default.nix
+1 -1
View File
@@ -7,7 +7,7 @@
, cpio, e2fsprogs, findutils, gzip
}:
with stdenv.lib;
with lib;
python3Packages.buildPythonApplication rec {
pname = "virt-manager";
pkgs/applications/virtualization/virt-viewer/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, shared-mime-info, wrapGAppsHook
{ lib, stdenv, fetchurl, pkgconfig, intltool, shared-mime-info, wrapGAppsHook
, glib, gsettings-desktop-schemas, gtk-vnc, gtk3, libvirt, libvirt-glib, libxml2, vte
, spiceSupport ? true
, spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null
@@ -7,7 +7,7 @@
assert spiceSupport ->
spice-gtk != null && spice-protocol != null && libcap != null && gdbm != null;
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
baseName = "virt-viewer";
pkgs/applications/virtualization/virtinst/default.nix
+5 -5
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, python2Packages, intltool, libxml2Python }:
{ lib, stdenv, fetchurl, python2Packages, intltool, libxml2Python }:
with stdenv.lib;
with lib;
let version = "0.600.4"; in
@@ -39,9 +39,9 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://virt-manager.org";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [qknight];
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [qknight];
description = "Command line tool which provides an easy way to provision operating systems into virtual machines";
platforms = with stdenv.lib.platforms; linux;
platforms = with lib.platforms; linux;
};
}
pkgs/applications/virtualization/virtualbox/default.nix
+1 -1
View File
@@ -16,7 +16,7 @@
, enable32bitGuests ? true
}:
with stdenv.lib;
with lib;
let
python = python3;
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
let
version = virtualbox.version;
xserverVListFunc = builtins.elemAt (stdenv.lib.splitVersion xorg.xorgserver.version);
xserverVListFunc = builtins.elemAt (lib.splitVersion xorg.xorgserver.version);
# Forced to 1.18 in <nixpkgs/nixos/modules/services/x11/xserver.nix>
# as it even fails to build otherwise. Still, override this even here,
pkgs/applications/virtualization/x11docker/default.nix
+5 -5
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute }:
{ lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute }:
stdenv.mkDerivation rec {
pname = "x11docker";
version = "6.6.2";
@@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
installPhase = ''
install -D x11docker "$out/bin/x11docker";
wrapProgram "$out/bin/x11docker" \
--prefix PATH : "${stdenv.lib.makeBinPath [ getopt gnugrep gawk ps mount iproute nx-libs xorg.xdpyinfo xorg.xhost xorg.xinit ]}"
--prefix PATH : "${lib.makeBinPath [ getopt gnugrep gawk ps mount iproute nx-libs xorg.xdpyinfo xorg.xhost xorg.xinit ]}"
'';
meta = {
description = "Run graphical applications with Docker";
homepage = "https://github.com/mviereck/x11docker";
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ jD91mZM2 ];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ jD91mZM2 ];
platforms = lib.platforms.linux;
};
}
pkgs/applications/virtualization/xen/4.10.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, callPackage, fetchurl, fetchpatch, fetchgit
{ lib, stdenv, callPackage, fetchurl, fetchpatch, fetchgit
, ocaml-ng
, withInternalQemu ? true
, withInternalTraditionalQemu ? true
@@ -16,7 +16,7 @@
assert withInternalSeabios -> !withSeabios;
assert withInternalOVMF -> !withOVMF;
with stdenv.lib;
with lib;
# Patching XEN? Check the XSAs at
# https://xenbits.xen.org/xsa/
pkgs/applications/virtualization/xen/generic.nix
+4 -4
View File
@@ -1,5 +1,5 @@
config:
{ stdenv, cmake, pkg-config, which
{ lib, stdenv, cmake, pkg-config, which
# Xen
, bison, bzip2, checkpolicy, dev86, figlet, flex, gettext, glib
@@ -24,7 +24,7 @@ config:
, ...} @ args:
with stdenv.lib;
with lib;
let
#TODO: fix paths instead
@@ -252,7 +252,7 @@ stdenv.mkDerivation (rec {
+ "\nIncludes:\n"
+ withXenfiles (name: x: ''* ${name}: ${x.meta.description or "(No description)"}.'');
platforms = [ "x86_64-linux" ];
maintainers = with stdenv.lib.maintainers; [ eelco tstrobel oxij ];
license = stdenv.lib.licenses.gpl2;
maintainers = with lib.maintainers; [ eelco tstrobel oxij ];
license = lib.licenses.gpl2;
} // (config.meta or {});
} // removeAttrs config [ "xenfiles" "buildInputs" "patches" "postPatch" "meta" ])