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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-01-18 01:16:03 +00:00
committed by GitHub
parent 4bdb892722 3fc28a93b0
commit b7f20dcd02
270 changed files with 1545 additions and 952 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/acpi/default.nix
+1 -1
View File
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
battery and thermal information.
'';
homepage = "https://sourceforge.net/projects/acpiclient/";
license = stdenv.lib.licenses.gpl2Plus;
license = lib.licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ ];
};
pkgs/os-specific/linux/acpitool/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, fetchpatch}:
{lib, stdenv, fetchurl, fetchpatch}:
let
acpitool-patch-051-4 = params: fetchpatch rec {
@@ -44,8 +44,8 @@ in stdenv.mkDerivation rec {
meta = {
description = "A small, convenient command-line ACPI client with a lot of features";
homepage = "https://sourceforge.net/projects/acpitool/";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.guibert ];
platforms = stdenv.lib.platforms.unix;
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.guibert ];
platforms = lib.platforms.unix;
};
}
pkgs/os-specific/linux/afuse/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, fuse }:
{ lib, stdenv, fetchurl, pkgconfig, autoreconfHook, fuse }:
stdenv.mkDerivation {
name = "afuse-0.4.1";
@@ -14,8 +14,8 @@ stdenv.mkDerivation {
meta = {
description = "Automounter in userspace";
homepage = "https://github.com/pcarrier/afuse";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.marcweber ];
platforms = lib.platforms.linux;
};
}
pkgs/os-specific/linux/alsa-firmware/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch }:
{ lib, stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch }:
stdenv.mkDerivation rec {
name = "alsa-firmware-1.2.1";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://www.alsa-project.org/";
description = "Soundcard firmwares from the alsa project";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
};
}
pkgs/os-specific/linux/alsa-utils/default.nix
+1 -1
View File
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
installFlags = [ "ASOUND_STATE_DIR=$(TMPDIR)/dummy" ];
postFixup = ''
wrapProgram $out/bin/alsa-info.sh --prefix PATH : "${stdenv.lib.makeBinPath [ which pciutils ]}"
wrapProgram $out/bin/alsa-info.sh --prefix PATH : "${lib.makeBinPath [ which pciutils ]}"
'';
meta = with lib; {
pkgs/os-specific/linux/amdgpu-pro/default.nix
+1 -1
View File
@@ -7,7 +7,7 @@
assert (!libsOnly) -> kernel != null;
with stdenv.lib;
with lib;
let
pkgs/os-specific/linux/anbox/default.nix
+1 -1
View File
@@ -115,7 +115,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/anbox \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [libGL libglvnd]} \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [libGL libglvnd]} \
--prefix PATH : ${git}/bin
mkdir -p $out/share/dbus-1/services
pkgs/os-specific/linux/apparmor/default.nix
+10 -10
View File
@@ -17,7 +17,7 @@ let
apparmor-patchver = "6";
apparmor-version = apparmor-series + "." + apparmor-patchver;
apparmor-meta = component: with stdenv.lib; {
apparmor-meta = component: with lib; {
homepage = "https://apparmor.net/";
description = "A mandatory access control system - ${component}";
license = licenses.gpl2;
@@ -39,7 +39,7 @@ let
substituteInPlace ./common/Make.rules --replace "/usr/share/man" "share/man"
'';
patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
patches = lib.optionals stdenv.hostPlatform.isMusl [
(fetchpatch {
url = "https://git.alpinelinux.org/aports/plain/testing/apparmor/0003-Added-missing-typedef-definitions-on-parser.patch?id=74b8427cc21f04e32030d047ae92caa618105b53";
name = "0003-Added-missing-typedef-definitions-on-parser.patch";
@@ -75,8 +75,8 @@ let
];
buildInputs = []
++ stdenv.lib.optional withPerl perl
++ stdenv.lib.optional withPython python;
++ lib.optional withPerl perl
++ lib.optional withPython python;
# required to build apparmor-parser
dontDisableStatic = true;
@@ -84,21 +84,21 @@ let
prePatch = prePatchCommon + ''
substituteInPlace ./libraries/libapparmor/swig/perl/Makefile.am --replace install_vendor install_site
substituteInPlace ./libraries/libapparmor/swig/perl/Makefile.in --replace install_vendor install_site
substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${stdenv.lib.getDev stdenv.cc.libc}/include/netinet/in.h"
substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${stdenv.lib.getDev stdenv.cc.libc}/include/netinet/in.h"
substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${lib.getDev stdenv.cc.libc}/include/netinet/in.h"
substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${lib.getDev stdenv.cc.libc}/include/netinet/in.h"
'';
inherit patches;
postPatch = "cd ./libraries/libapparmor";
# https://gitlab.com/apparmor/apparmor/issues/1
configureFlags = [
(stdenv.lib.withFeature withPerl "perl")
(stdenv.lib.withFeature withPython "python")
(lib.withFeature withPerl "perl")
(lib.withFeature withPython "python")
];
outputs = [ "out" ] ++ stdenv.lib.optional withPython "python";
outputs = [ "out" ] ++ lib.optional withPython "python";
postInstall = stdenv.lib.optionalString withPython ''
postInstall = lib.optionalString withPython ''
mkdir -p $python/lib
mv $out/lib/python* $python/lib/
'';
pkgs/os-specific/linux/ati-drivers/default.nix
+1 -1
View File
@@ -9,7 +9,7 @@
assert (!libsOnly) -> kernel != null;
with stdenv.lib;
with lib;
# This derivation requires a maximum of gcc49, Linux kernel 4.1 and xorg.xserver 1.17
# and will not build or run using versions newer
pkgs/os-specific/linux/audit/default.nix
+7 -7
View File
@@ -1,5 +1,5 @@
{
stdenv, buildPackages, fetchurl, fetchpatch,
lib, stdenv, buildPackages, fetchurl, fetchpatch,
runCommand,
autoconf, automake, libtool,
enablePython ? false, python ? null,
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" "man" ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = stdenv.lib.optionals stdenv.hostPlatform.isMusl
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isMusl
[ autoconf automake libtool ];
buildInputs = stdenv.lib.optional enablePython python;
buildInputs = lib.optional enablePython python;
configureFlags = [
# z/OS plugin is not useful on Linux,
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
# TODO: Remove the musl patches when
# https://github.com/linux-audit/audit-userspace/pull/25
# is available with the next release.
patches = stdenv.lib.optional stdenv.hostPlatform.isMusl [
patches = lib.optional stdenv.hostPlatform.isMusl [
(
let patch = fetchpatch {
url = "https://github.com/linux-audit/audit-userspace/commit/d579a08bb1cde71f939c13ac6b2261052ae9f77e.patch";
@@ -59,8 +59,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Audit Library";
homepage = "https://people.redhat.com/sgrubb/audit/";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ ];
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ ];
};
}
pkgs/os-specific/linux/autofs/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs
{ lib, stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs
, libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }:
let
@@ -44,8 +44,8 @@ in stdenv.mkDerivation {
meta = {
description = "Kernel-based automounter";
homepage = "https://www.kernel.org/pub/linux/daemons/autofs/";
license = stdenv.lib.licenses.gpl2Plus;
license = lib.licenses.gpl2Plus;
executables = [ "automount" ];
platforms = stdenv.lib.platforms.linux;
platforms = lib.platforms.linux;
};
}
pkgs/os-specific/linux/batman-adv/alfred.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }:
{ lib, stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }:
let cfg = import ./version.nix; in
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://www.open-mesh.org/projects/batman-adv/wiki/Wiki";
description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, information distribution tool";
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ fpletz ];
platforms = with stdenv.lib.platforms; linux;
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ fpletz ];
platforms = with lib.platforms; linux;
};
}
pkgs/os-specific/linux/batman-adv/batctl.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libnl }:
{ lib, stdenv, fetchurl, pkgconfig, libnl }:
let cfg = import ./version.nix; in
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://www.open-mesh.org/projects/batman-adv/wiki/Wiki";
description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, control tool";
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ fpletz ];
platforms = with stdenv.lib.platforms; linux;
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ fpletz ];
platforms = with lib.platforms; linux;
};
}
pkgs/os-specific/linux/batman-adv/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, kernel }:
{ lib, stdenv, fetchurl, kernel }:
let cfg = import ./version.nix; in
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://www.open-mesh.org/projects/batman-adv/wiki/Wiki";
description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2";
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ fpletz ];
platforms = with stdenv.lib.platforms; linux;
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ fpletz ];
platforms = with lib.platforms; linux;
};
}
pkgs/os-specific/linux/bcc/default.nix
+1 -1
View File
@@ -31,7 +31,7 @@ python.pkgs.buildPythonApplication rec {
propagatedBuildInputs = [ python.pkgs.netaddr ];
nativeBuildInputs = [ makeWrapper cmake flex bison ]
# libelf is incompatible with elfutils-libelf
++ stdenv.lib.filter (x: x != libelf) kernel.moduleBuildDependencies;
++ lib.filter (x: x != libelf) kernel.moduleBuildDependencies;
cmakeFlags = [
"-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules"
pkgs/os-specific/linux/blktrace/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libaio }:
{ lib, stdenv, fetchurl, libaio }:
stdenv.mkDerivation {
name = "blktrace-1.2.0";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
meta = {
description = "Block layer IO tracing mechanism";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
};
}
pkgs/os-specific/linux/bolt/default.nix
+1 -1
View File
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
meson
ninja
pkgconfig
] ++ stdenv.lib.optional (!doCheck) python3;
] ++ lib.optional (!doCheck) python3;
buildInputs = [
glib
pkgs/os-specific/linux/bpftrace/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig flex bison ]
# libelf is incompatible with elfutils-libelf
++ stdenv.lib.filter (x: x != libelf) kernel.moduleBuildDependencies;
++ lib.filter (x: x != libelf) kernel.moduleBuildDependencies;
# patch the source, *then* substitute on @NIX_KERNEL_SRC@ in the result. we could
# also in theory make this an environment variable around bpftrace, but this works
pkgs/os-specific/linux/bridge-utils/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoreconfHook }:
{ lib, stdenv, fetchurl, autoreconfHook }:
stdenv.mkDerivation rec {
name = "bridge-utils-1.5";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
meta = {
description = "https://sourceforge.net/projects/bridge/";
homepage = "https://wiki.linuxfoundation.org/networking/bridge";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
};
}
pkgs/os-specific/linux/broadcom-sta/default.nix
+6 -6
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, kernel }:
{ lib, stdenv, fetchurl, kernel }:
let
version = "6.30.223.271";
@@ -7,8 +7,8 @@ let
x86_64-linux = "1gj485qqr190idilacpxwgqyw21il03zph2rddizgj7fbd6pfyaz";
};
arch = stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "_64";
tarballVersion = stdenv.lib.replaceStrings ["."] ["_"] version;
arch = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "_64";
tarballVersion = lib.replaceStrings ["."] ["_"] version;
tarball = "hybrid-v35${arch}-nodebug-pcoem-${tarballVersion}.tar.gz";
in
stdenv.mkDerivation {
@@ -62,8 +62,8 @@ stdenv.mkDerivation {
meta = {
description = "Kernel module driver for some Broadcom's wireless cards";
homepage = "http://www.broadcom.com/support/802.11/linux_sta.php";
license = stdenv.lib.licenses.unfreeRedistributable;
maintainers = with stdenv.lib.maintainers; [ phreedom ];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.unfreeRedistributable;
maintainers = with lib.maintainers; [ phreedom ];
platforms = lib.platforms.linux;
};
}
pkgs/os-specific/linux/busybox/default.nix
+1 -1
View File
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
patches = [
./busybox-in-store.patch
] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch;
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch;
postPatch = "patchShebangs .";
pkgs/os-specific/linux/checkpolicy/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, bison, flex, libsepol }:
{ lib, stdenv, fetchurl, bison, flex, libsepol }:
stdenv.mkDerivation rec {
pname = "checkpolicy";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
makeFlags = [
"PREFIX=$(out)"
"LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a"
"LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a"
];
meta = removeAttrs libsepol.meta ["outputsToInstall"] // {
pkgs/os-specific/linux/checksec/default.nix
+1 -1
View File
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
installPhase = let
path = stdenv.lib.makeBinPath [
path = lib.makeBinPath [
findutils file binutils-unwrapped sysctl openssl
];
in ''
pkgs/os-specific/linux/cifs-utils/default.nix
+1 -1
View File
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ kerberos keyutils pam talloc ];
configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# AC_FUNC_MALLOC is broken on cross builds.
"ac_cv_func_malloc_0_nonnull=yes"
"ac_cv_func_realloc_0_nonnull=yes"
pkgs/os-specific/linux/conky/default.nix
+1 -1
View File
@@ -64,7 +64,7 @@ assert weatherMetarSupport -> curlSupport;
assert weatherXoapSupport -> curlSupport && libxml2 != null;
assert journalSupport -> systemd != null;
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "conky";
pkgs/os-specific/linux/conspy/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, autoconf, automake, ncurses}:
{lib, stdenv, fetchurl, autoconf, automake, ncurses}:
let
s = # Generated upstream information
rec {
@@ -30,8 +30,8 @@ stdenv.mkDerivation {
meta = {
inherit (s) version;
description = "Linux text console viewer";
license = stdenv.lib.licenses.epl10 ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.epl10 ;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
};
}
pkgs/os-specific/linux/cpuid/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl }:
{ lib, stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
pname = "cpuid";
@@ -42,9 +42,9 @@ stdenv.mkDerivation rec {
'';
platforms = [ "i686-linux" "x86_64-linux" ];
license = stdenv.lib.licenses.gpl2;
license = lib.licenses.gpl2;
homepage = "http://etallen.com/cpuid.html";
maintainers = with stdenv.lib.maintainers; [ blitz ];
maintainers = with lib.maintainers; [ blitz ];
};
}
pkgs/os-specific/linux/cpupower/default.nix
+1 -1
View File
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
"LD=${stdenv.cc.targetPrefix}cc"
];
installFlags = stdenv.lib.mapAttrsToList
installFlags = lib.mapAttrsToList
(n: v: "${n}dir=${placeholder "out"}/${v}") {
bin = "bin";
sbin = "sbin";
pkgs/os-specific/linux/cryptodev/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ fetchFromGitHub, stdenv, kernel ? false }:
{ fetchFromGitHub, lib, stdenv, kernel ? false }:
stdenv.mkDerivation rec {
pname = "cryptodev-linux-1.11";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Device that allows access to Linux kernel cryptographic drivers";
homepage = "http://cryptodev-linux.org/";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
};
}
pkgs/os-specific/linux/cryptsetup/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, lvm2, json_c
{ lib, stdenv, fetchurl, lvm2, json_c
, openssl, libuuid, pkgconfig, popt }:
stdenv.mkDerivation rec {
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://gitlab.com/cryptsetup/cryptsetup/";
description = "LUKS for dm-crypt";
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ ];
platforms = with stdenv.lib.platforms; linux;
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ ];
platforms = with lib.platforms; linux;
};
}
pkgs/os-specific/linux/device-tree/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenvNoCC, dtc, findutils }:
{ lib, stdenvNoCC, dtc, findutils }:
with stdenvNoCC.lib; {
with lib; {
applyOverlays = (base: overlays': stdenvNoCC.mkDerivation {
name = "device-tree-overlays";
nativeBuildInputs = [ dtc findutils ];
pkgs/os-specific/linux/device-tree/raspberrypi.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenvNoCC, raspberrypifw }:
{ lib, stdenvNoCC, raspberrypifw }:
stdenvNoCC.mkDerivation {
name = "raspberrypi-dtbs-${raspberrypifw.version}";
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation {
# Compatible overlays that may be used
overlays = "${raspberrypifw}/share/raspberrypi/boot/overlays";
};
meta = with stdenvNoCC.lib; {
meta = with lib; {
inherit (raspberrypifw.meta) homepage license;
description = "DTBs for the Raspberry Pi";
};
pkgs/os-specific/linux/digimend/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel }:
assert stdenv.lib.versionAtLeast kernel.version "3.5";
assert lib.versionAtLeast kernel.version "3.5";
stdenv.mkDerivation rec {
pname = "digimend";
pkgs/os-specific/linux/disk-indicator/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, libX11 }:
{ lib, stdenv, fetchgit, libX11 }:
stdenv.mkDerivation {
name = "disk-indicator-2014-05-19";
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
Small program for Linux that will turn your Scroll, Caps or Num Lock LED
or LED on your ThinkPad laptop into a hard disk activity indicator.
'';
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl3;
platforms = lib.platforms.linux;
};
}
pkgs/os-specific/linux/dmraid/default.nix
+6 -6
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, lvm2 }:
{ lib, stdenv, fetchurl, fetchpatch, lvm2 }:
stdenv.mkDerivation rec {
name = "dmraid-1.0.0.rc16";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
patches = [ ./hardening-format.patch ]
++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
++ lib.optionals stdenv.hostPlatform.isMusl [
(fetchpatch {
url = "https://raw.githubusercontent.com/void-linux/void-packages/fceed4b8e96b3c1da07babf6f67b6ed1588a28b2/srcpkgs/dmraid/patches/006-musl-libc.patch";
sha256 = "1j8xda0fpz8lxjxnqdidy7qb866qrzwpbca56yjdg6vf4x21hx6w";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
postPatch = ''
sed -i 's/\[\[[^]]*\]\]/[ "''$''${n##*.}" = "so" ]/' */lib/Makefile.in
'' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE"
'';
@@ -42,8 +42,8 @@ stdenv.mkDerivation rec {
its volumes. May be needed for rescuing an older system or nuking
the metadata when reformatting.
'';
maintainers = [ stdenv.lib.maintainers.raskin ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.raskin ];
platforms = lib.platforms.linux;
license = lib.licenses.gpl2Plus;
};
}
pkgs/os-specific/linux/e1000e/default.nix
+3 -3
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, kernel }:
{ lib, stdenv, fetchurl, kernel }:
assert stdenv.lib.versionOlder kernel.version "4.10";
assert lib.versionOlder kernel.version "4.10";
stdenv.mkDerivation rec {
name = "e1000e-${version}-${kernel.version}";
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
meta = {
description = "Linux kernel drivers for Intel Ethernet adapters and LOMs (LAN On Motherboard)";
homepage = "http://e1000.sf.net/";
license = stdenv.lib.licenses.gpl2;
license = lib.licenses.gpl2;
};
}
pkgs/os-specific/linux/earlyoom/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "16iyn51xlrsbshc7p5xl2338yyfzknaqc538sa7mamgccqwgyvvq";
};
nativeBuildInputs = stdenv.lib.optionals withManpage [ pandoc installShellFiles ];
nativeBuildInputs = lib.optionals withManpage [ pandoc installShellFiles ];
patches = [ ./fix-dbus-path.patch ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
installPhase = ''
install -D earlyoom $out/bin/earlyoom
'' + stdenv.lib.optionalString withManpage ''
'' + lib.optionalString withManpage ''
installManPage earlyoom.1
'';
pkgs/os-specific/linux/edac-utils/default.nix
+1 -1
View File
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
postInstall = ''
wrapProgram "$out/sbin/edac-ctl" \
--set PATH ${stdenv.lib.makeBinPath [ dmidecode kmod ]}
--set PATH ${lib.makeBinPath [ dmidecode kmod ]}
'';
meta = with lib; {
pkgs/os-specific/linux/eudev/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, glib, gperf, util-linux, kmod}:
{lib, stdenv, fetchurl, pkgconfig, glib, gperf, util-linux, kmod}:
let
s = # Generated upstream information
rec {
@@ -50,9 +50,9 @@ stdenv.mkDerivation {
meta = {
inherit (s) version;
description = ''An udev fork by Gentoo'';
license = stdenv.lib.licenses.gpl2Plus ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2Plus ;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
homepage = ''https://www.gentoo.org/proj/en/eudev/'';
downloadPage = ''http://dev.gentoo.org/~blueness/eudev/'';
updateWalker = true;
pkgs/os-specific/linux/exfat/default.nix
+1 -1
View File
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
makeFlags = [
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"ARCH=${stdenv.hostPlatform.platform.kernelArch}"
] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
];
pkgs/os-specific/linux/facetimehd/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, kernel }:
# facetimehd is not supported for kernels older than 3.19";
assert stdenv.lib.versionAtLeast kernel.version "3.19";
assert lib.versionAtLeast kernel.version "3.19";
let
# Note: When updating this revision:
@@ -14,7 +14,7 @@ let
# e. see if the module loads back (apps using the camera won't
# recover and will have to be restarted) and the camera
# still works.
srcParams = if (stdenv.lib.versionAtLeast kernel.version "4.8") then
srcParams = if (lib.versionAtLeast kernel.version "4.8") then
{ # Use mainline branch
version = "unstable-2020-04-16";
rev = "82626d4892eeb9eb704538bf0dc49a00725ff451";
pkgs/os-specific/linux/firejail/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, fetchpatch, which, xdg-dbus-proxy, nixosTests}:
{lib, stdenv, fetchurl, fetchpatch, which, xdg-dbus-proxy, nixosTests}:
let
s = # Generated upstream information
rec {
@@ -81,9 +81,9 @@ stdenv.mkDerivation {
meta = {
inherit (s) version;
description = ''Namespace-based sandboxing tool for Linux'';
license = stdenv.lib.licenses.gpl2Plus ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2Plus ;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
homepage = "https://firejail.wordpress.com/";
downloadPage = "https://sourceforge.net/projects/firejail/files/firejail/";
};
pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "b43-fwcutter-019";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Firmware extractor for cards supported by the b43 kernel module";
homepage = "http://wireless.kernel.org/en/users/Drivers/b43";
license = stdenv.lib.licenses.free;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.free;
platforms = lib.platforms.linux;
};
}
pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, b43FirmwareCutter }:
{ lib, stdenv, fetchurl, b43FirmwareCutter }:
let version = "5.100.138"; in
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
meta = {
description = "Firmware for cards supported by the b43 kernel module";
homepage = "http://wireless.kernel.org/en/users/Drivers/b43";
license = stdenv.lib.licenses.unfree;
license = lib.licenses.unfree;
};
}
pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+1 -1
View File
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec {
outputHashAlgo = "sha256";
outputHash = "1p7vn2hfwca6w69jhw5zq70w44ji8mdnibm1z959aalax6ndy146";
meta = with stdenvNoCC.lib; {
meta = with lib; {
description = "Binary firmware collection packaged by kernel.org";
homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
license = licenses.unfreeRedistributableFirmware;
pkgs/os-specific/linux/firmware/fwupd/default.nix
+8 -8
View File
@@ -160,7 +160,7 @@ let
pango
tpm2-tss
efivar
] ++ stdenv.lib.optionals haveDell [
] ++ lib.optionals haveDell [
libsmbios
];
@@ -187,12 +187,12 @@ let
# Our builder only adds $lib/lib to rpath but some things link
# against libfwupdplugin which is in $out/lib.
"-Dc_link_args=-Wl,-rpath,${placeholder "out"}/lib"
] ++ stdenv.lib.optionals (!haveDell) [
] ++ lib.optionals (!haveDell) [
"-Dplugin_dell=false"
"-Dplugin_synaptics=false"
] ++ stdenv.lib.optionals (!haveRedfish) [
] ++ lib.optionals (!haveRedfish) [
"-Dplugin_redfish=false"
] ++ stdenv.lib.optionals haveFlashrom [
] ++ lib.optionals haveFlashrom [
"-Dplugin_flashrom=true"
];
@@ -250,12 +250,12 @@ let
efibootmgr
bubblewrap
tpm2-tools
] ++ stdenv.lib.optional haveFlashrom flashrom;
] ++ lib.optional haveFlashrom flashrom;
in ''
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
# See programs reached with fu_common_find_program_in_path in source
--prefix PATH : "${stdenv.lib.makeBinPath binPath}"
--prefix PATH : "${lib.makeBinPath binPath}"
)
'';
@@ -291,7 +291,7 @@ let
"pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata"
"pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service"
"pki/fwupd-metadata/LVFS-CA.pem"
] ++ stdenv.lib.optionals haveDell [
] ++ lib.optionals haveDell [
"fwupd/remotes.d/dell-esrt.conf"
];
@@ -302,7 +302,7 @@ let
];
tests = let
listToPy = list: "[${stdenv.lib.concatMapStringsSep ", " (f: "'${f}'") list}]";
listToPy = list: "[${lib.concatMapStringsSep ", " (f: "'${f}'") list}]";
in {
installedTests = nixosTests.installed-tests.fwupd;
pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig }:
let
inherit (stdenv.lib) optionals;
inherit (lib) optionals;
in
stdenv.mkDerivation {
pname = "raspberrypi-armstubs";
pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenvNoCC, fetchFromGitHub }:
{ lib, stdenvNoCC, fetchFromGitHub }:
stdenvNoCC.mkDerivation rec {
# NOTE: this should be updated with linux_rpi
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
dontBuild = true;
dontFixup = true;
meta = with stdenvNoCC.lib; {
meta = with lib; {
description = "Firmware for the Raspberry Pi board";
homepage = "https://github.com/raspberrypi/firmware";
license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom
pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix
+1 -1
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub }:
with stdenv.lib;
with lib;
stdenv.mkDerivation {
name = "rtl8192su-unstable-2016-10-05";
pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix
+1 -1
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, linuxPackages }:
with stdenv.lib;
with lib;
stdenv.mkDerivation {
name = "rtl8723bs-firmware-${linuxPackages.rtl8723bs.version}";
inherit (linuxPackages.rtl8723bs) src;
pkgs/os-specific/linux/firmware/sof-firmware/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub }:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "sof-firmware";
version = "1.6";
pkgs/os-specific/linux/firmware/zd1211/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchzip }:
{ lib, stdenv, fetchzip }:
let
pname = "zd1211-firmware";
@@ -19,6 +19,6 @@ in fetchzip rec {
description = "Firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip";
homepage = "https://sourceforge.net/projects/zd1211/";
license = "GPL";
platforms = stdenv.lib.platforms.linux;
platforms = lib.platforms.linux;
};
}
pkgs/os-specific/linux/forktty/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl}:
{lib, stdenv, fetchurl}:
let
s = # Generated upstream information
rec {
@@ -29,8 +29,8 @@ stdenv.mkDerivation {
meta = {
inherit (s) version;
description = ''Tool to detach from controlling TTY and attach to another'';
license = stdenv.lib.licenses.gpl2 ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2 ;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
};
}
pkgs/os-specific/linux/fswebcam/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libv4l, gd }:
{ lib, stdenv, fetchurl, libv4l, gd }:
stdenv.mkDerivation rec {
name = "fswebcam-20200725";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Neat and simple webcam app";
homepage = "http://www.sanslogic.co.uk/fswebcam";
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl2;
platforms = lib.platforms.linux;
license = lib.licenses.gpl2;
};
}
pkgs/os-specific/linux/fuse/common.nix
+4 -4
View File
@@ -8,7 +8,7 @@
}:
let
isFuse3 = stdenv.lib.hasPrefix "3" version;
isFuse3 = lib.hasPrefix "3" version;
in stdenv.mkDerivation rec {
pname = "fuse";
inherit version;
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
preAutoreconf = "touch config.rpath";
patches =
stdenv.lib.optional
lib.optional
(!isFuse3 && stdenv.isAarch64)
(fetchpatch {
url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch";
@@ -37,9 +37,9 @@ in stdenv.mkDerivation rec {
then [ meson ninja pkg-config ]
else [ autoreconfHook gettext ];
outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common";
outputs = [ "out" ] ++ lib.optional isFuse3 "common";
mesonFlags = stdenv.lib.optionals isFuse3 [
mesonFlags = lib.optionals isFuse3 [
"-Dudevrulesdir=/udev/rules.d"
"-Duseroot=false"
];
pkgs/os-specific/linux/gfxtablet/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{stdenv, fetchFromGitHub, linuxHeaders}:
{lib, stdenv, fetchFromGitHub, linuxHeaders}:
stdenv.mkDerivation rec {
version = "1.4";
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
meta = {
description = ''Uinput driver for Android GfxTablet tablet-as-input-device app'';
license = stdenv.lib.licenses.mit ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.mit ;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
};
}
pkgs/os-specific/linux/guvcview/default.nix
+7 -7
View File
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
intltool
pkgconfig
]
++ stdenv.lib.optionals (useGtk) [ wrapGAppsHook ]
++ stdenv.lib.optionals (useQt) [ wrapQtAppsHook ]
++ lib.optionals (useGtk) [ wrapGAppsHook ]
++ lib.optionals (useQt) [ wrapQtAppsHook ]
;
buildInputs = [
@@ -55,17 +55,17 @@ stdenv.mkDerivation rec {
libpng
sfml
]
++ stdenv.lib.optionals (pulseaudioSupport) [ libpulseaudio ]
++ stdenv.lib.optionals (useGtk) [ gtk3 ]
++ stdenv.lib.optionals (useQt) [
++ lib.optionals (pulseaudioSupport) [ libpulseaudio ]
++ lib.optionals (useGtk) [ gtk3 ]
++ lib.optionals (useQt) [
qtbase
]
;
configureFlags = [
"--enable-sfml"
]
++ stdenv.lib.optionals (useGtk) [ "--enable-gtk3" ]
++ stdenv.lib.optionals (useQt) [ "--enable-qt5" ]
++ lib.optionals (useGtk) [ "--enable-gtk3" ]
++ lib.optionals (useQt) [ "--enable-qt5" ]
;
meta = with lib; {
pkgs/os-specific/linux/hdapsd/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ lib, stdenv, fetchurl }:
let version = "20141203"; in
stdenv.mkDerivation {
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
postInstall = builtins.readFile ./postInstall.sh;
meta = with stdenv.lib;
meta = with lib;
{ description = "Hard Drive Active Protection System Daemon";
homepage = "http://hdaps.sf.net/";
license = licenses.gpl2;
pkgs/os-specific/linux/hibernate/default.nix
+5 -5
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, gawk }:
{ lib, stdenv, fetchurl, gawk }:
let version = "2.0";
in
@@ -35,12 +35,12 @@ in
description = "The `hibernate' script for swsusp and Tux-on-Ice";
longDescription = ''
This package provides the `hibernate' script, a command-line utility
that saves the computer's state to disk and switches it off, turning
it into "hibernation". It works both with Linux swsusp and Tux-on-Ice.
that saves the computer's state to disk and switches it off, turning
it into "hibernation". It works both with Linux swsusp and Tux-on-Ice.
'';
license = stdenv.lib.licenses.gpl2Plus;
license = lib.licenses.gpl2Plus;
homepage = "http://www.tuxonice.net/";
platforms = stdenv.lib.platforms.linux;
platforms = lib.platforms.linux;
};
}
pkgs/os-specific/linux/hostapd/default.nix
+1 -1
View File
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
CONFIG_HS20=y
CONFIG_ACS=y
CONFIG_GETRANDOM=y
'' + stdenv.lib.optionalString (sqlite != null) ''
'' + lib.optionalString (sqlite != null) ''
CONFIG_SQLITE=y
'';
pkgs/os-specific/linux/hwdata/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub }:
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "hwdata";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://github.com/vcrhonek/hwdata";
description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
};
}
pkgs/os-specific/linux/i810switch/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pciutils }:
{ lib, stdenv, fetchurl, pciutils }:
stdenv.mkDerivation {
name = "i810switch-0.6.5";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
meta = {
description = "A utility for switching between the LCD and external VGA display on Intel graphics cards";
homepage = "http://www16.plala.or.jp/mano-a-mano/i810switch.html";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
};
}
pkgs/os-specific/linux/ifenslave/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "ifenslave";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Utility for enslaving networking interfaces under a bond";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
};
}
pkgs/os-specific/linux/ima-evm-utils/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, autoreconfHook, pkgconfig, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }:
{ lib, stdenv, fetchgit, autoreconfHook, pkgconfig, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }:
stdenv.mkDerivation rec {
pname = "ima-evm-utils";
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
meta = {
description = "evmctl utility to manage digital signatures of the Linux kernel integrity subsystem (IMA/EVM)";
homepage = "https://sourceforge.net/projects/linux-ima/";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ tstrobel ];
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ tstrobel ];
};
}
pkgs/os-specific/linux/intel-compute-runtime/default.nix
+1 -1
View File
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
'';
postFixup = ''
patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ intel-gmmlib intel-graphics-compiler libva stdenv.cc.cc.lib ]} \
patchelf --set-rpath ${lib.makeLibraryPath [ intel-gmmlib intel-graphics-compiler libva stdenv.cc.cc.lib ]} \
$out/lib/intel-opencl/libigdrcl.so
'';
pkgs/os-specific/linux/intel-ocl/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchzip, rpmextract, ncurses5, numactl, zlib }:
{ lib, stdenv, fetchzip, rpmextract, ncurses5, numactl, zlib }:
stdenv.mkDerivation rec {
pname = "intel-ocl";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sourceRoot = ".";
libPath = stdenv.lib.makeLibraryPath [
libPath = lib.makeLibraryPath [
stdenv.cc.cc.lib
ncurses5
numactl
@@ -66,8 +66,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Official OpenCL runtime for Intel CPUs";
homepage = "https://software.intel.com/en-us/articles/opencl-drivers";
license = stdenv.lib.licenses.unfree;
license = lib.licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = [ stdenv.lib.maintainers.kierdavis ];
maintainers = [ lib.maintainers.kierdavis ];
};
}
pkgs/os-specific/linux/iptables/default.nix
+2 -2
View File
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, pkgconfig, pruneLibtoolFiles, flex, bison
{ lib, stdenv, fetchurl, pkgconfig, pruneLibtoolFiles, flex, bison
, libmnl, libnetfilter_conntrack, libnfnetlink, libnftnl, libpcap
, nftablesCompat ? false
}:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
version = "1.8.6";
pkgs/os-specific/linux/iputils/default.nix
+2 -2
View File
@@ -1,9 +1,9 @@
{ stdenv, fetchFromGitHub, fetchpatch
{ lib, stdenv, fetchFromGitHub, fetchpatch
, meson, ninja, pkgconfig, gettext, libxslt, docbook_xsl_ns
, libcap, libidn2
}:
with stdenv.lib;
with lib;
let
version = "20200821";
pkgs/os-specific/linux/irqbalance/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, libcap_ng }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, libcap_ng }:
stdenv.mkDerivation rec {
pname = "irqbalance";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://github.com/Irqbalance/irqbalance";
description = "A daemon to help balance the cpu load generated by interrupts across all of a systems cpus";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
};
}
pkgs/os-specific/linux/iw/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config, libnl }:
{ lib, stdenv, fetchurl, pkg-config, libnl }:
stdenv.mkDerivation rec {
pname = "iw";
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
deprecated and it's strongly recommended to switch to iw and nl80211.
'';
homepage = "https://wireless.wiki.kernel.org/en/users/Documentation/iw";
license = stdenv.lib.licenses.isc;
maintainers = with stdenv.lib.maintainers; [ viric primeos ];
platforms = with stdenv.lib.platforms; linux;
license = lib.licenses.isc;
maintainers = with lib.maintainers; [ viric primeos ];
platforms = with lib.platforms; linux;
};
}
pkgs/os-specific/linux/iwd/default.nix
+3 -3
View File
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
};
outputs = [ "out" "man" ]
++ stdenv.lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "test";
++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "test";
nativeBuildInputs = [
autoreconfHook
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
# wrapPython wraps the scripts in $test. They pull in gobject-introspection,
# which doesn't cross-compile.
pythonPath = stdenv.lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [
pythonPath = lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [
python3Packages.dbus-python
python3Packages.pygobject3
];
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/share
cp -a doc $out/share/
cp -a README AUTHORS TODO $out/share/doc/
'' + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
'' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
mkdir -p $test/bin
cp -a test/* $test/bin/
'';
pkgs/os-specific/linux/jfbview/default.nix
+1 -1
View File
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
buildInputs = [
freetype harfbuzz jbig2dec libjpeg libX11 mupdf_1_17 ncurses openjpeg
openssl
] ++ stdenv.lib.optionals imageSupport [
] ++ lib.optionals imageSupport [
imlib2
];
pkgs/os-specific/linux/jujuutils/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, linuxHeaders }:
{ lib, stdenv, fetchurl, linuxHeaders }:
stdenv.mkDerivation {
name = "jujuutils-0.2";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
meta = {
homepage = "https://github.com/cladisch/linux-firewire-utils";
description = "Utilities around FireWire devices connected to a Linux computer";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
};
}
pkgs/os-specific/linux/kbd/default.nix
+1 -1
View File
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
# We get a warning in armv5tel-linux and the fuloong2f, so we
# disable -Werror in it.
${stdenv.lib.optionalString (stdenv.isAarch32 || stdenv.hostPlatform.isMips) ''
${lib.optionalString (stdenv.isAarch32 || stdenv.hostPlatform.isMips) ''
sed -i s/-Werror// src/Makefile.am
''}
'';
pkgs/os-specific/linux/kernel/common-config.nix
+4 -4
View File
@@ -10,14 +10,14 @@
# hardware problems with a new one.
# Configuration
{ stdenv, version
{ lib, stdenv, version
, features ? { grsecurity = false; xen_dom0 = false; }
}:
with stdenv.lib;
with stdenv.lib.kernel;
with (stdenv.lib.kernel.whenHelpers version);
with lib;
with lib.kernel;
with (lib.kernel.whenHelpers version);
let
pkgs/os-specific/linux/kernel/generic.nix
+4 -6
View File
@@ -6,6 +6,7 @@
, gmp ? null
, libmpc ? null
, mpfr ? null
, lib
, stdenv
, # The kernel source tarball.
@@ -66,9 +67,6 @@
assert stdenv.isLinux;
let
lib = stdenv.lib;
# Combine the `features' attribute sets of all the kernel patches.
kernelFeatures = lib.fold (x: y: (x.features or {}) // y) ({
iwlwifi = true;
@@ -81,7 +79,7 @@ let
} // features) kernelPatches;
commonStructuredConfig = import ./common-config.nix {
inherit stdenv version ;
inherit lib stdenv version;
features = kernelFeatures; # Ensure we know of all extra patches, etc.
};
@@ -113,7 +111,7 @@ let
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ perl gmp libmpc mpfr ]
++ lib.optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ];
++ lib.optionals (lib.versionAtLeast version "4.16") [ bison flex ];
platformName = stdenv.hostPlatform.platform.name;
# e.g. "defconfig"
@@ -173,7 +171,7 @@ let
}; # end of configfile derivation
kernel = (callPackage ./manual-config.nix {}) {
inherit version modDirVersion src kernelPatches randstructSeed stdenv extraMeta configfile;
inherit version modDirVersion src kernelPatches randstructSeed lib stdenv extraMeta configfile;
config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; };
};
pkgs/os-specific/linux/kernel/hardened/config.nix
+4 -4
View File
@@ -8,11 +8,11 @@
#
# See also <nixos/modules/profiles/hardened.nix>
{ stdenv, version }:
{ lib, stdenv, version }:
with stdenv.lib;
with stdenv.lib.kernel;
with (stdenv.lib.kernel.whenHelpers version);
with lib;
with lib.kernel;
with (lib.kernel.whenHelpers version);
assert (versionAtLeast version "4.9");
pkgs/os-specific/linux/kernel/linux-4.14.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
with stdenv.lib;
with lib;
buildLinux (args // rec {
version = "4.14.215";
pkgs/os-specific/linux/kernel/linux-4.19.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
with stdenv.lib;
with lib;
buildLinux (args // rec {
version = "4.19.167";
pkgs/os-specific/linux/kernel/linux-5.10.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
with stdenv.lib;
with lib;
buildLinux (args // rec {
version = "5.10.7";
pkgs/os-specific/linux/kernel/linux-5.4.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
with stdenv.lib;
with lib;
buildLinux (args // rec {
version = "5.4.89";
pkgs/os-specific/linux/kernel/linux-5.9.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
with stdenv.lib;
with lib;
buildLinux (args // rec {
version = "5.9.16";
pkgs/os-specific/linux/kernel/linux-lqx.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
{ lib, stdenv, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
let
version = "5.10.6";
@@ -18,7 +18,7 @@ buildLinux (args // {
extraMeta = {
branch = "5.10/master";
maintainers = with stdenv.lib.maintainers; [ atemu ];
maintainers = with lib.maintainers; [ atemu ];
description = linux_zen.meta.description + " (Same as linux_zen but less aggressive release schedule)";
};
pkgs/os-specific/linux/kernel/linux-mptcp-95.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args:
{ lib, stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args:
let
mptcpVersion = "0.95";
modDirVersion = "4.19.55";
@@ -9,7 +9,7 @@ buildLinux ({
extraMeta = {
branch = "4.19";
maintainers = with stdenv.lib.maintainers; [ teto layus ];
maintainers = with lib.maintainers; [ teto layus ];
};
src = fetchFromGitHub {
@@ -19,8 +19,8 @@ buildLinux ({
sha256 = "04a66iq5vsiz8mkpszfxmqknz7y4w3lsckrcz6q1syjpk0pdyiyw";
};
structuredExtraConfig = stdenv.lib.mkMerge [
(import ./mptcp-config.nix { inherit stdenv; })
structuredExtraConfig = lib.mkMerge [
(import ./mptcp-config.nix { inherit lib; })
structuredExtraConfig
];
pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args:
{ lib, stdenv, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args:
buildLinux (args // {
version = "5.9.0-2020.11.20";
@@ -16,7 +16,7 @@ buildLinux (args // {
extraMeta = {
branch = "master";
hydraPlatforms = []; # Should the testing kernels ever be built on Hydra?
maintainers = with stdenv.lib.maintainers; [ davidak chiiruno ];
maintainers = with lib.maintainers; [ davidak chiiruno ];
platforms = [ "x86_64-linux" ];
};
pkgs/os-specific/linux/kernel/linux-testing.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
with stdenv.lib;
with lib;
buildLinux (args // rec {
version = "5.11-rc3";
pkgs/os-specific/linux/kernel/linux-zen.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildLinux, ... } @ args:
{ lib, stdenv, fetchFromGitHub, buildLinux, ... } @ args:
let
version = "5.10.6";
@@ -18,7 +18,7 @@ buildLinux (args // {
extraMeta = {
branch = "5.10/master";
maintainers = with stdenv.lib.maintainers; [ atemu andresilva ];
maintainers = with lib.maintainers; [ atemu andresilva ];
description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads.";
};
pkgs/os-specific/linux/kernel/manual-config.nix
+20 -19
View File
@@ -1,4 +1,4 @@
{ buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl
{ lib, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl
, libelf, cpio, elfutils, zstd, gawk
, writeTextFile
}:
@@ -14,6 +14,7 @@ let
echo "}" >> $out
'').outPath;
in {
lib,
# Allow overriding stdenv on each buildLinux call
stdenv,
# The kernel version
@@ -28,7 +29,7 @@ in {
configfile,
# Manually specified nixexpr representing the config
# If unspecified, this will be autodetected from the .config
config ? stdenv.lib.optionalAttrs allowImportFromDerivation (readConfig configfile),
config ? lib.optionalAttrs allowImportFromDerivation (readConfig configfile),
# Custom seed used for CONFIG_GCC_PLUGIN_RANDSTRUCT if enabled. This is
# automatically extended with extra per-version and per-config values.
randstructSeed ? "",
@@ -48,11 +49,11 @@ in {
}:
let
inherit (stdenv.lib)
inherit (lib)
hasAttr getAttr optional optionals optionalString optionalAttrs maintainers platforms;
# Dependencies that are required to build kernel modules
moduleBuildDependencies = optional (stdenv.lib.versionAtLeast version "4.14") libelf;
moduleBuildDependencies = optional (lib.versionAtLeast version "4.14") libelf;
installkernel = writeTextFile { name = "installkernel"; executable=true; text = ''
#!${stdenv.shell} -e
@@ -63,7 +64,7 @@ let
commonMakeFlags = [
"O=$(buildRoot)"
] ++ stdenv.lib.optionals (stdenv.hostPlatform.platform ? kernelMakeFlags)
] ++ lib.optionals (stdenv.hostPlatform.platform ? kernelMakeFlags)
stdenv.hostPlatform.platform.kernelMakeFlags;
drvAttrs = config_: platform: kernelPatches: configfile:
@@ -88,14 +89,14 @@ let
installsFirmware = (config.isEnabled "FW_LOADER") &&
(isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")) &&
(stdenv.lib.versionOlder version "4.14");
(lib.versionOlder version "4.14");
in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // {
passthru = {
inherit version modDirVersion config kernelPatches configfile
moduleBuildDependencies stdenv;
inherit isXen isZen isHardened isLibre;
kernelOlder = stdenv.lib.versionOlder version;
kernelAtLeast = stdenv.lib.versionAtLeast version;
kernelOlder = lib.versionOlder version;
kernelAtLeast = lib.versionAtLeast version;
};
inherit src;
@@ -103,9 +104,9 @@ let
patches =
map (p: p.patch) kernelPatches
# Required for deterministic builds along with some postPatch magic.
++ optional (stdenv.lib.versionAtLeast version "4.13") ./randstruct-provide-seed.patch
++ optional (lib.versionAtLeast version "4.13") ./randstruct-provide-seed.patch
# Fixes determinism by normalizing metadata for the archive of kheaders
++ optional (stdenv.lib.versionAtLeast version "5.2" && stdenv.lib.versionOlder version "5.4") ./gen-kheaders-metadata.patch;
++ optional (lib.versionAtLeast version "5.2" && lib.versionOlder version "5.4") ./gen-kheaders-metadata.patch;
prePatch = ''
for mf in $(find -name Makefile -o -name Makefile.include -o -name install.sh); do
@@ -282,9 +283,9 @@ let
"The Linux kernel" +
(if kernelPatches == [] then "" else
" (with patches: "
+ stdenv.lib.concatStringsSep ", " (map (x: x.name) kernelPatches)
+ lib.concatStringsSep ", " (map (x: x.name) kernelPatches)
+ ")");
license = stdenv.lib.licenses.gpl2;
license = lib.licenses.gpl2;
homepage = "https://www.kernel.org/";
repositories.git = "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git";
maintainers = [
@@ -296,8 +297,8 @@ let
};
in
assert (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") -> libelf != null;
assert stdenv.lib.versionAtLeast version "5.8" -> elfutils != null;
assert (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") -> libelf != null;
assert lib.versionAtLeast version "5.8" -> elfutils != null;
stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches configfile) // {
pname = "linux";
@@ -308,11 +309,11 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr gawk zstd ]
++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools
++ optional (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") libelf
++ optional (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") libelf
# Removed util-linuxMinimal since it should not be a dependency.
++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ]
++ optional (stdenv.lib.versionAtLeast version "5.2") cpio
++ optional (stdenv.lib.versionAtLeast version "5.8") elfutils
++ optionals (lib.versionAtLeast version "4.16") [ bison flex ]
++ optional (lib.versionAtLeast version "5.2") cpio
++ optional (lib.versionAtLeast version "5.8") elfutils
;
hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ];
@@ -322,7 +323,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches
"CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
"HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"
"ARCH=${stdenv.hostPlatform.platform.kernelArch}"
] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
];
pkgs/os-specific/linux/kernel/mptcp-config.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv }:
with stdenv.lib.kernel;
{ lib }:
with lib.kernel;
{
# DRM_AMDGPU = yes;
pkgs/os-specific/linux/kernel/perf.nix
+3 -3
View File
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
buildInputs = [
elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl
libopcodes python3 perl
] ++ stdenv.lib.optional withGtk gtk2
] ++ lib.optional withGtk gtk2
++ (if (versionAtLeast kernel.version "4.19") then [ python3 ] else [ python2 ]);
# Note: we don't add elfutils to buildInputs, since it provides a
@@ -72,7 +72,7 @@ stdenv.mkDerivation {
meta = {
homepage = "https://perf.wiki.kernel.org/";
description = "Linux tools to profile with performance counters";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
maintainers = with lib.maintainers; [viric];
platforms = with lib.platforms; linux;
};
}
pkgs/os-specific/linux/keyutils/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
./conf-symlink.patch
];
makeFlags = stdenv.lib.optionals stdenv.hostPlatform.isStatic "NO_SOLIB=1";
makeFlags = lib.optionals stdenv.hostPlatform.isStatic "NO_SOLIB=1";
BUILDDATE = "1970-01-01";
outputs = [ "out" "lib" "dev" ];
pkgs/os-specific/linux/klibc/default.nix
+2 -2
View File
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
"KLIBCKERNELSRC=${linuxHeaders}"
] # TODO(@Ericson2314): We now can get the ABI from
# `stdenv.hostPlatform.parsed.abi`, is this still a good idea?
++ stdenv.lib.optional (stdenv.hostPlatform.platform.kernelArch == "arm") "CONFIG_AEABI=y"
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "CROSS_COMPILE=${stdenv.cc.targetPrefix}";
++ lib.optional (stdenv.hostPlatform.platform.kernelArch == "arm") "CONFIG_AEABI=y"
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "CROSS_COMPILE=${stdenv.cc.targetPrefix}";
# Install static binaries as well.
postInstall = ''
pkgs/os-specific/linux/latencytop/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, glib, pkgconfig, gtk2 }:
{ lib, stdenv, fetchurl, ncurses, glib, pkgconfig, gtk2 }:
stdenv.mkDerivation rec {
name = "latencytop-0.5";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://latencytop.org";
description = "Tool to show kernel reports on latencies (LATENCYTOP option)";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.viric ];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.viric ];
platforms = lib.platforms.linux;
};
}
pkgs/os-specific/linux/ldm/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, udev, util-linux, mountPath ? "/media/" }:
{ lib, stdenv, fetchgit, udev, util-linux, mountPath ? "/media/" }:
assert mountPath != "";
@@ -35,9 +35,9 @@ stdenv.mkDerivation rec {
meta = {
description = "A lightweight device mounter, with libudev as only dependency";
license = stdenv.lib.licenses.mit;
license = lib.licenses.mit;
platforms = stdenv.lib.platforms.linux;
platforms = lib.platforms.linux;
repositories.git = git;
};
}
pkgs/os-specific/linux/libaio/default.nix
+5 -5
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch }:
{ lib, stdenv, fetchurl, fetchpatch }:
stdenv.mkDerivation rec {
version = "0.3.112";
@@ -21,15 +21,15 @@ stdenv.mkDerivation rec {
"prefix=${placeholder ''out''}"
];
hardeningDisable = stdenv.lib.optional (stdenv.isi686) "stackprotector";
hardeningDisable = lib.optional (stdenv.isi686) "stackprotector";
checkTarget = "partcheck"; # "check" needs root
meta = {
description = "Library for asynchronous I/O in Linux";
homepage = "http://lse.sourceforge.net/io/aio.html";
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.lgpl21;
maintainers = with stdenv.lib.maintainers; [ ];
platforms = lib.platforms.linux;
license = lib.licenses.lgpl21;
maintainers = with lib.maintainers; [ ];
};
}
pkgs/os-specific/linux/libcap-ng/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, swig ? null, python2 ? null, python3 ? null }:
{ lib, stdenv, fetchurl, swig ? null, python2 ? null, python3 ? null }:
assert python2 != null || python3 != null -> swig != null;
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
(if python3 != null then "--with-python3" else "--without-python3")
];
meta = let inherit (stdenv.lib) platforms licenses; in {
meta = let inherit (lib) platforms licenses; in {
description = "Library for working with POSIX capabilities";
homepage = "https://people.redhat.com/sgrubb/libcap-ng/";
platforms = platforms.linux;
pkgs/os-specific/linux/libcap/default.nix
+3 -3
View File
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
${lib.optionalString (!isStatic) ''rm "$lib"/lib/*.a''}
mkdir -p "$doc/share/doc/${pname}-${version}"
cp License "$doc/share/doc/${pname}-${version}/"
'' + stdenv.lib.optionalString usePam ''
'' + lib.optionalString usePam ''
mkdir -p "$pam/lib/security"
mv "$lib"/lib/security "$pam/lib"
'';
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Library for working with POSIX capabilities";
homepage = "https://sites.google.com/site/fullycapable";
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.bsd3;
platforms = lib.platforms.linux;
license = lib.licenses.bsd3;
};
}
pkgs/os-specific/linux/libcgroup/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, pam, yacc, flex }:
{ lib, stdenv, fetchurl, fetchpatch, pam, yacc, flex }:
stdenv.mkDerivation rec {
pname = "libcgroup";
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Library and tools to manage Linux cgroups";
homepage = "http://libcg.sourceforge.net/";
license = stdenv.lib.licenses.lgpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
license = lib.licenses.lgpl2;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.thoughtpolice ];
};
}
pkgs/os-specific/linux/libselinux/default.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pcre, pkgconfig, libsepol
{ lib, stdenv, fetchurl, pcre, pkgconfig, libsepol
, enablePython ? true, swig ? null, python3 ? null
, fts
}:
assert enablePython -> swig != null && python3 != null;
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "libselinux";
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
"SBINDIR=$(bin)/sbin"
"SHLIBDIR=$(out)/lib"
"LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a"
"LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a"
];
preInstall = ''
pkgs/os-specific/linux/libsemanage/default.nix
+3 -3
View File
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, pkgconfig, bison, flex, libsepol, libselinux, bzip2, audit
{ lib, stdenv, fetchurl, pkgconfig, bison, flex, libsepol, libselinux, bzip2, audit
, enablePython ? true, swig ? null, python ? null
}:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "libsemanage";
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
meta = removeAttrs libsepol.meta ["outputsToInstall"] // {
description = "Policy management tools for SELinux";
license = stdenv.lib.licenses.lgpl21;
license = lib.licenses.lgpl21;
};
}

Some files were not shown because too many files have changed in this diff Show More