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

Merge branch 'staging' into audit-static

Browse Source
This commit is contained in:
Guillaume Girol
2021-01-23 16:48:41 +00:00
committed by GitHub
parent c938459ce0 963286d5b6
commit 264abb7c7e
7966 changed files with 79026 additions and 60106 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
+5 -5
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, fuse }:
{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, fuse }:
stdenv.mkDerivation {
name = "afuse-0.4.1";
@@ -8,14 +8,14 @@ stdenv.mkDerivation {
sha256 = "1sfhicmxppkvdd4z9klfn63snb71gr9hff6xij1gzk94xg6m0ycc";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ fuse ];
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-lib/default.nix
+10 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, alsa-ucm-conf, alsa-topology-conf }:
{ lib, stdenv, fetchurl, fetchpatch, alsa-ucm-conf, alsa-topology-conf }:
stdenv.mkDerivation rec {
pname = "alsa-lib";
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
patches = [
./alsa-plugin-conf-multilib.patch
(fetchpatch {
# plucked from upstream master, delete in next release
# without this patch alsa 1.2.4 fails to compile against musl-libc
# due to an overly conservative ifdef gate in a new feature
name = "fix-dlo.patch";
url = "https://github.com/alsa-project/alsa-lib/commit/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e.patch";
sha256 = "QQP4C1dSnJP1MNKt2el7Wn3KmtwtYzvyIHWdrHs+Jw4=";
})
];
enableParallelBuilding = true;
@@ -36,7 +44,7 @@ stdenv.mkDerivation rec {
MIDI functionality to the Linux-based operating system.
'';
license = licenses.gpl3Plus;
license = licenses.lgpl21Plus;
platforms = platforms.linux;
};
}
pkgs/os-specific/linux/alsa-plugins/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }:
{ stdenv, fetchurl, lib, pkg-config, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }:
stdenv.mkDerivation rec {
pname = "alsa-plugins";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0z9k3ssbfk2ky2w13avgyf202j1drsz9sv3834bp33cj1i2hc3qw";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
# ToDo: a52, etc.?
buildInputs =
pkgs/os-specific/linux/alsa-tools/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, alsaLib, pkgconfig, gtk2, gtk3, fltk13 }:
{ lib, stdenv, fetchurl, alsaLib, pkg-config, gtk2, gtk3, fltk13 }:
# Comes from upstream as as bundle of several tools,
# some use gtk2, some gtk3 (and some even fltk13).
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0jbkjmq038zapj66a7nkppdf644v2mwj581xbmh6k4i8w6mcglxz";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ alsaLib gtk2 gtk3 fltk13 ];
patchPhase = ''
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
+14 -14
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchpatch, makeWrapper, autoreconfHook
, pkgconfig, which
, pkg-config, which
, flex, bison
, linuxHeaders ? stdenv.cc.libc.linuxHeaders
, gawk
@@ -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";
@@ -67,7 +67,7 @@ let
autoreconfHook
bison
flex
pkgconfig
pkg-config
swig
ncurses
which
@@ -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/
'';
@@ -154,7 +154,7 @@ let
src = apparmor-sources;
nativeBuildInputs = [
pkgconfig
pkg-config
libapparmor
gawk
which
@@ -206,7 +206,7 @@ let
name = "apparmor-pam-${apparmor-version}";
src = apparmor-sources;
nativeBuildInputs = [ pkgconfig which ];
nativeBuildInputs = [ pkg-config which ];
buildInputs = [ libapparmor pam ];
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
+8 -8
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,8 +36,8 @@ 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 = [ ./patches/weak-symbols.patch ] ++
stdenv.lib.optional stdenv.hostPlatform.isMusl [
patches = [ ./patches/weak-symbols.patch ]
++ lib.optional stdenv.hostPlatform.isMusl [
(
let patch = fetchpatch {
url = "https://github.com/linux-audit/audit-userspace/commit/d579a08bb1cde71f939c13ac6b2261052ae9f77e.patch";
@@ -67,8 +67,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
+6 -6
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }:
{ lib, stdenv, fetchurl, pkg-config, gpsd, libcap, libnl }:
let cfg = import ./version.nix; in
@@ -11,18 +11,18 @@ stdenv.mkDerivation rec {
sha256 = cfg.sha256.${pname};
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gpsd libcap libnl ];
preBuild = ''
makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config"
makeFlags="PREFIX=$out PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config"
'';
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
+6 -6
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libnl }:
{ lib, stdenv, fetchurl, pkg-config, libnl }:
let cfg = import ./version.nix; in
@@ -11,18 +11,18 @@ stdenv.mkDerivation rec {
sha256 = cfg.sha256.${pname};
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libnl ];
preBuild = ''
makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config"
makeFlags="PREFIX=$out PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config"
'';
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
+3 -3
View File
@@ -6,13 +6,13 @@
python.pkgs.buildPythonApplication rec {
pname = "bcc";
version = "0.17.0";
version = "0.18.0";
disabled = !stdenv.isLinux;
src = fetchurl {
url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz";
sha256 = "sha256-aEy8WwtKGaf7GZOTK5IHhwzenqU2U+vpWrcNWMCGvMw=";
sha256 = "sha256-0F8tppVFu7cnuSnlgcEvbEdykxYhGJnTc04I98/yIVs=";
};
format = "other";
@@ -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/beefi/default.nix
+44
View File
@@ -0,0 +1,44 @@
{ stdenv
, lib
, fetchFromGitHub
, installShellFiles
, binutils-unwrapped
, systemd }:
stdenv.mkDerivation rec {
pname = "beefi";
version = "0.1.1";
src = fetchFromGitHub {
owner = "jfeick";
repo = "beefi";
rev = version;
sha256 = "1180avalbw414q1gnfqdgc9zg3k9y0401kw9qvcn51qph81d04v5";
};
nativeBuildInputs = [ installShellFiles ];
buildInputs = [
binutils-unwrapped
systemd
];
patchPhase = ''
substituteInPlace beefi \
--replace objcopy ${binutils-unwrapped}/bin/objcopy \
--replace /usr/lib/systemd ${systemd}/lib/systemd
'';
installPhase = ''
install -Dm755 beefi $out/bin/beefi
installManPage beefi.1
'';
meta = with lib; {
description = "A small script to create bootable EFISTUB kernel images";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ tu-maurice ];
homepage = "https://github.com/jfeick/beefi";
};
}
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/bluez/default.nix
+2 -2
View File
@@ -6,7 +6,7 @@
, glib
, json_c
, libical
, pkgconfig
, pkg-config
, python3
, readline
, systemd
@@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
];
nativeBuildInputs = [
pkgconfig
pkg-config
python3.pkgs.wrapPython
];
pkgs/os-specific/linux/bolt/default.nix
+3 -3
View File
@@ -1,7 +1,7 @@
{ lib, stdenv
, meson
, ninja
, pkgconfig
, pkg-config
, fetchFromGitLab
, fetchpatch
, python3
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
libxslt
meson
ninja
pkgconfig
] ++ stdenv.lib.optional (!doCheck) python3;
pkg-config
] ++ lib.optional (!doCheck) python3;
buildInputs = [
glib
pkgs/os-specific/linux/bpftrace/default.nix
+3 -3
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub
, cmake, pkgconfig, flex, bison
, cmake, pkg-config, flex, bison
, llvmPackages, kernel, elfutils
, libelf, libbfd, libbpf, libopcodes, bcc
}:
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
libbpf libbfd libopcodes
];
nativeBuildInputs = [ cmake pkgconfig flex bison ]
nativeBuildInputs = [ cmake pkg-config 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/btfs/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
, python3, boost, fuse, libtorrent-rasterbar, curl }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1cfjhyn9cjyyxyd0f08b2ra258pzkljwvkj0iwrjpd0nrbl6wkq5";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [
boost fuse libtorrent-rasterbar curl python3
];
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/can-isotp/default.nix
+3 -3
View File
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
version = "20200910";
hardeningDisable = [ "pic" ];
src = fetchFromGitHub {
owner = "hartkopp";
repo = "can-isotp";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
'';
nativeBuildInputs = kernel.moduleBuildDependencies;
meta = with lib; {
description = "Kernel module for ISO-TP (ISO 15765-2)";
homepage = "https://github.com/hartkopp/can-isotp";
@@ -33,4 +33,4 @@ stdenv.mkDerivation {
platforms = platforms.linux;
maintainers = [ maintainers.evck ];
};
}
}
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
+2 -2
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 ''
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A tool for checking security bits on executables";
homepage = "http://www.trapkit.de/tools/checksec.html";
homepage = "https://www.trapkit.de/tools/checksec/";
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = with maintainers; [ thoughtpolice globin ];
pkgs/os-specific/linux/cifs-utils/default.nix
+8 -10
View File
@@ -1,29 +1,27 @@
{ stdenv, lib, fetchurl, autoreconfHook, docutils, pkgconfig
, kerberos, keyutils, pam, talloc }:
{ stdenv, lib, fetchurl, autoreconfHook, docutils, pkg-config
, kerberos, keyutils, pam, talloc, python3 }:
stdenv.mkDerivation rec {
pname = "cifs-utils";
version = "6.9";
version = "6.12";
src = fetchurl {
url = "mirror://samba/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2";
sha256 = "175cp509wn1zv8p8mv37hkf6sxiskrsxdnq22mhlsg61jazz3n0q";
sha256 = "1vw570pvir73kl4y6fhd6ns936ankimkhb1ii43yh8lr0p1xqbcj";
};
nativeBuildInputs = [ autoreconfHook docutils pkgconfig ];
nativeBuildInputs = [ autoreconfHook docutils pkg-config ];
buildInputs = [ kerberos keyutils pam talloc ];
buildInputs = [ kerberos keyutils pam talloc python3 ];
configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
configureFlags = [ "ROOTSBINDIR=$(out)/sbin" ] ++ 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"
];
makeFlags = [ "root_sbindir=$(out)/sbin" ];
meta = with lib; {
homepage = "http://www.samba.org/linux-cifs/cifs-utils/";
homepage = "https://wiki.samba.org/index.php/LinuxCIFS_utils";
description = "Tools for managing Linux CIFS client filesystems";
platforms = platforms.linux;
license = licenses.lgpl3;
pkgs/os-specific/linux/compsize/default.nix
+3 -3
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "compsize";
version = "1.3";
version = "1.4";
src = fetchFromGitHub {
owner = "kilobyte";
repo = "compsize";
repo = pname;
rev = "v${version}";
sha256 = "1c69whla844nwis30jxbj00zkpiw3ccndhkmzjii8av5358mjn43";
sha256 = "0gk2vibfl9fh7biznlbr3dwknrwbm5q5602q95jbjvk185g9z126";
};
buildInputs = [ btrfs-progs ];
pkgs/os-specific/linux/conky/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ config, lib, stdenv, fetchFromGitHub, pkgconfig, cmake
{ config, lib, stdenv, fetchFromGitHub, pkg-config, cmake
# dependencies
, glib, libXinerama
@@ -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";
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = "-lgcc_s";
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ glib libXinerama ]
++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ]
++ optional ncursesSupport ncurses
pkgs/os-specific/linux/conntrack-tools/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ fetchurl, lib, stdenv, flex, bison, pkgconfig, libmnl, libnfnetlink
{ fetchurl, lib, stdenv, flex, bison, pkg-config, libmnl, libnfnetlink
, libnetfilter_conntrack, libnetfilter_queue, libnetfilter_cttimeout
, libnetfilter_cthelper, systemd
, libtirpc
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
libmnl libnfnetlink libnetfilter_conntrack libnetfilter_queue
libnetfilter_cttimeout libnetfilter_cthelper systemd libtirpc
];
nativeBuildInputs = [ flex bison pkgconfig ];
nativeBuildInputs = [ flex bison pkg-config ];
meta = with lib; {
homepage = "http://conntrack-tools.netfilter.org/";
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/crda/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, libgcrypt, libnl, pkgconfig, python3Packages, wireless-regdb }:
{ lib, stdenv, fetchurl, fetchpatch, libgcrypt, libnl, pkg-config, python3Packages, wireless-regdb }:
stdenv.mkDerivation rec {
pname = "crda";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libgcrypt libnl ];
nativeBuildInputs = [
pkgconfig
pkg-config
python3Packages.pycrypto
];
pkgs/os-specific/linux/criu/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, protobuf, protobufc, asciidoc, iptables
, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig
, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkg-config
, which, python3, makeWrapper, docbook_xml_dtd_45 }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython ];
nativeBuildInputs = [ pkg-config docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython ];
buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet iptables ];
propagatedBuildInputs = with python3.pkgs; [ python python3.pkgs.protobuf ];
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
+6 -6
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, lvm2, json_c
, openssl, libuuid, pkgconfig, popt }:
{ lib, stdenv, fetchurl, lvm2, json_c
, openssl, libuuid, pkg-config, popt }:
stdenv.mkDerivation rec {
pname = "cryptsetup";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
"--with-crypto_backend=openssl"
];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ lvm2 json_c openssl libuuid popt ];
doCheck = true;
@@ -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/dbus-broker/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, docutils, meson, ninja, pkgconfig
{ lib, stdenv, fetchFromGitHub, docutils, meson, ninja, pkg-config
, dbus, linuxHeaders, systemd }:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
nativeBuildInputs = [ docutils meson ninja pkgconfig ];
nativeBuildInputs = [ docutils meson ninja pkg-config ];
buildInputs = [ dbus linuxHeaders systemd ];
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/directvnc/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xorgproto }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, directfb, zlib, libjpeg, xorgproto }:
stdenv.mkDerivation {
pname = "directvnc";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "16x7mr7x728qw7nbi6rqhrwsy73zsbpiz8pbgfzfl2aqhfdiz88b";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ directfb zlib libjpeg xorgproto ];
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/dpdk/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv, lib
, kernel
, fetchurl
, pkgconfig, meson, ninja
, pkg-config, meson, ninja
, libbsd, numactl, libbpf, zlib, libelf, jansson, openssl, libpcap
, doxygen, python3
, shared ? false }:
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
doxygen
meson
ninja
pkgconfig
pkg-config
python3
python3.pkgs.sphinx
];
pkgs/os-specific/linux/dropwatch/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
, libnl, readline, libbfd, ncurses, zlib }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1qmax0l7z1qik42c949fnvjh5r6awk4gpgzdsny8iwnmwzjyp8b8";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libbfd libnl ncurses readline zlib ];
# To avoid running into https://sourceware.org/bugzilla/show_bug.cgi?id=14243 we need to define:
pkgs/os-specific/linux/dstat/default.nix
+23 -8
View File
@@ -1,21 +1,36 @@
{ lib, stdenv, fetchurl, python2Packages }:
{ lib, fetchFromGitHub, fetchpatch, python3Packages }:
python2Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "dstat";
format = "other";
version = "0.7.3";
version = "0.7.4";
src = fetchurl {
url = "https://github.com/dagwieers/dstat/archive/${version}.tar.gz";
sha256 = "16286z3y2lc9nsq8njzjkv6k2vyxrj9xiixj1k3gnsbvhlhkirj6";
src = fetchFromGitHub {
owner = "dstat-real";
repo = "dstat";
rev = "v${version}";
sha256 = "1qnmkhqmjd1m3if05jj29dvr5hn6kayq9bkkkh881w472c0zhp8v";
};
propagatedBuildInputs = with python2Packages; [ python-wifi ];
propagatedBuildInputs = with python3Packages; [ six ];
patches = [ ./fix_pluginpath.patch ];
patches = [
./fix_pluginpath.patch
# this fixes another bug with python3
(fetchpatch {
url = https://github.com/efexgee/dstat/commit/220a785321b13b6df92a536080aca6ef1cb644ad.patch ;
sha256 = "08kcz3yxvl35m55y7g1pr73x3bjcqnv0qlswxqyq8cqxg9zd64cn";
})
];
makeFlags = [ "prefix=$(out)" ];
# remove deprecation warnings
preFixup = ''
sed -i "s/import collections/import collections.abc/g" $out/share/dstat/dstat.py $out/bin/dstat
sed -i "s/collections.Sequence/collections.abc.Sequence/g" "$out"/bin/dstat
'';
meta = with lib; {
homepage = "http://dag.wieers.com/home-made/dstat/";
description = "Versatile resource statistics tool";
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/ebtables/default.nix
+11 -5
View File
@@ -9,16 +9,22 @@ stdenv.mkDerivation rec {
sha256 = "0apxgmkhsk3vxn9q3libxn3dgrdljrxyy4mli2gk49m7hi3na7xp";
};
makeFlags =
[ "LIBDIR=$(out)/lib" "BINDIR=$(out)/sbin" "MANDIR=$(out)/share/man"
"ETCDIR=$(out)/etc" "INITDIR=$(TMPDIR)" "SYSCONFIGDIR=$(out)/etc/sysconfig"
"LOCALSTATEDIR=/var"
];
makeFlags = [
"LIBDIR=$(out)/lib" "BINDIR=$(out)/sbin" "MANDIR=$(out)/share/man"
"ETCDIR=$(out)/etc" "INITDIR=$(TMPDIR)" "SYSCONFIGDIR=$(out)/etc/sysconfig"
"LOCALSTATEDIR=/var"
];
NIX_CFLAGS_COMPILE = "-Wno-error";
preInstall = "mkdir -p $out/etc/sysconfig";
postInstall = ''
ln -s $out/sbin/ebtables-legacy $out/sbin/ebtables
ln -s $out/sbin/ebtables-legacy-restore $out/sbin/ebtables-restore
ln -s $out/sbin/ebtables-legacy-save $out/sbin/ebtables-save
'';
meta = with lib; {
description = "A filtering tool for Linux-based bridging firewalls";
homepage = "http://ebtables.sourceforge.net/";
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/ell/0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch
-84
View File
@@ -1,84 +0,0 @@
From 55d499f4cd5667c04c21f7201d7f10484e187907 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 27 Dec 2020 13:03:12 +0100
Subject: [PATCH] unit/test-dbus: pick up dbus-daemon from $PATH
This allows running the unit tests in environments where `dbus-daemon`
isn't in /usr/bin, but in $PATH.
Signed-off-by: Florian Klink <flokli@flokli.de>
---
unit/test-dbus-message-fds.c | 4 ++--
unit/test-dbus-properties.c | 4 ++--
unit/test-dbus.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/unit/test-dbus-message-fds.c b/unit/test-dbus-message-fds.c
index 6f68bae..4b5662e 100644
--- a/unit/test-dbus-message-fds.c
+++ b/unit/test-dbus-message-fds.c
@@ -51,7 +51,7 @@ static bool start_dbus_daemon(void)
char *prg_envp[1];
pid_t pid;
- prg_argv[0] = "/usr/bin/dbus-daemon";
+ prg_argv[0] = "dbus-daemon";
prg_argv[1] = "--nopidfile";
prg_argv[2] = "--nofork";
prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
@@ -68,7 +68,7 @@ static bool start_dbus_daemon(void)
}
if (pid == 0) {
- execve(prg_argv[0], prg_argv, prg_envp);
+ execvpe(prg_argv[0], prg_argv, prg_envp);
exit(EXIT_SUCCESS);
}
diff --git a/unit/test-dbus-properties.c b/unit/test-dbus-properties.c
index b435062..049f0f4 100644
--- a/unit/test-dbus-properties.c
+++ b/unit/test-dbus-properties.c
@@ -49,7 +49,7 @@ static bool start_dbus_daemon(void)
char *prg_envp[1];
pid_t pid;
- prg_argv[0] = "/usr/bin/dbus-daemon";
+ prg_argv[0] = "dbus-daemon";
prg_argv[1] = "--nopidfile";
prg_argv[2] = "--nofork";
prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
@@ -66,7 +66,7 @@ static bool start_dbus_daemon(void)
}
if (pid == 0) {
- execve(prg_argv[0], prg_argv, prg_envp);
+ execvpe(prg_argv[0], prg_argv, prg_envp);
exit(EXIT_SUCCESS);
}
diff --git a/unit/test-dbus.c b/unit/test-dbus.c
index 67f0a7b..582847e 100644
--- a/unit/test-dbus.c
+++ b/unit/test-dbus.c
@@ -45,7 +45,7 @@ static void start_dbus_daemon(void)
char *prg_envp[1];
pid_t pid;
- prg_argv[0] = "/usr/bin/dbus-daemon";
+ prg_argv[0] = "dbus-daemon";
prg_argv[1] = "--nopidfile";
prg_argv[2] = "--nofork";
prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
@@ -62,7 +62,7 @@ static void start_dbus_daemon(void)
}
if (pid == 0) {
- execve(prg_argv[0], prg_argv, prg_envp);
+ execvpe(prg_argv[0], prg_argv, prg_envp);
exit(EXIT_SUCCESS);
}
--
2.29.2
pkgs/os-specific/linux/ell/default.nix
+4 -9
View File
@@ -1,29 +1,24 @@
{ lib, stdenv
, fetchgit
, autoreconfHook
, pkgconfig
, pkg-config
, dbus
}:
stdenv.mkDerivation rec {
pname = "ell";
version = "0.35";
version = "0.36";
outputs = [ "out" "dev" ];
src = fetchgit {
url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git";
rev = version;
sha256 = "16z7xwlrpx1bsr2y1rgxxxixzwc84cwn2g557iqxhwsxfzy6q3dk";
sha256 = "0w7v2hihwwmnqd56bsmbjsiw8yyadr7zbdssjamqxx0pyl3dnrda";
};
patches = [
# Sent upstream in https://lists.01.org/hyperkitty/list/ell@lists.01.org/thread/SQEZAIS2LZXSXGTXOW3GTAM5ZPXRLTN4/
./0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch
];
nativeBuildInputs = [
pkgconfig
pkg-config
autoreconfHook
];
pkgs/os-specific/linux/erofs-utils/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, autoreconfHook, pkgconfig, fuse, libuuid, lz4 }:
{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, fuse, libuuid, lz4 }:
stdenv.mkDerivation rec {
pname = "erofs-utils";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "07hvijq2hsn3gg1kb8abrfk23n83j57yx8kyv4wqgwhhvd30myjc";
};
buildInputs = [ autoreconfHook pkgconfig fuse libuuid lz4 ];
buildInputs = [ autoreconfHook pkg-config fuse libuuid lz4 ];
configureFlags = [ "--enable-fuse" ];
pkgs/os-specific/linux/eudev/default.nix
+5 -5
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, glib, gperf, util-linux, kmod}:
{lib, stdenv, fetchurl, pkg-config, glib, gperf, util-linux, kmod}:
let
s = # Generated upstream information
rec {
@@ -9,7 +9,7 @@ let
sha256 = "1z6lfhhbjs6j7pbp6ybn17ywjsdl87ql6g1p3m2y26aa10cqcqc9";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
glib gperf util-linux kmod
];
@@ -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/fbterm/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses, libx86}:
{stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkg-config, ncurses, libx86}:
let
s = # Generated upstream information
{
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
inherit (s) url sha256;
};
nativeBuildInputs = [ pkgconfig ncurses ];
nativeBuildInputs = [ pkg-config ncurses ];
inherit buildInputs;
preConfigure = ''
pkgs/os-specific/linux/ffado/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
, libiec61883
, libraw1394
, libxmlxx3
, pkgconfig
, pkg-config
, python3
, sconsPackages
, which
@@ -46,7 +46,7 @@ mkDerivation rec {
nativeBuildInputs = [
desktop-file-utils
sconsPackages.scons_3_1_2
pkgconfig
pkg-config
which
python
pyqt5
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/bt-fw-converter/default.nix
+1 -1
View File
@@ -32,4 +32,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
maintainers = with maintainers; [ zraexy ];
};
}
}
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/firmware-manager/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ rustPlatform, lib, fetchFromGitHub, lzma, pkgconfig, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }:
{ rustPlatform, lib, fetchFromGitHub, lzma, pkg-config, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }:
rustPlatform.buildRustPackage rec {
pname = "firmware-manager";
version = "0.1.1";
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0x9604jsflqxvbkfp139mzjicpyx8v21139jj8bp88c14ngvmdlw";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
buildInputs = [ lzma openssl dbus glib udev cairo pango atk gdk-pixbuf gtk3 ];
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
+2 -2
View File
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig }:
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }:
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/system76-firmware/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ rustPlatform, lib, fetchFromGitHub, lzma, pkgconfig, openssl, dbus, efibootmgr, makeWrapper }:
{ rustPlatform, lib, fetchFromGitHub, lzma, pkg-config, openssl, dbus, efibootmgr, makeWrapper }:
rustPlatform.buildRustPackage rec {
pname = "system76-firmware";
# Check Makefile when updating, make sure postInstall matches make install
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0yjv3a8r01ks91gc33rdwqmw52cqqwhq9f3rvw2xv3h8cqa5hfz0";
};
nativeBuildInputs = [ pkgconfig makeWrapper ];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ lzma openssl dbus ];
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/fwts/default.nix
+4 -4
View File
@@ -1,17 +1,17 @@
{ lib, stdenv, fetchzip, autoreconfHook, pkgconfig, glib, libtool, pcre
{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, glib, libtool, pcre
, json_c, flex, bison, dtc, pciutils, dmidecode, iasl, libbsd }:
stdenv.mkDerivation rec {
pname = "fwts";
version = "20.09.00";
version = "20.11.00";
src = fetchzip {
url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz";
sha256 = "1vzzlb7xdrk8rhi27jdw9baskild4dmk7g5d0hhfh6z3fx4lfhgk";
sha256 = "0s8iz6c9qhyndcsjscs3qail2mzfywpbiys1x232igm5kl089vvr";
stripRoot = false;
};
nativeBuildInputs = [ autoreconfHook pkgconfig libtool ];
nativeBuildInputs = [ autoreconfHook pkg-config libtool ];
buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode iasl libbsd ];
postPatch = ''
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
+9 -9
View File
@@ -2,7 +2,7 @@
, lib, stdenv
, fetchurl
, intltool
, pkgconfig
, pkg-config
, portaudio
, SDL2
, ffmpeg
@@ -37,10 +37,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
intltool
pkgconfig
pkg-config
]
++ 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/hal-flash/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, autoconf, automake, dbus, glib, libtool, pkgconfig, udisks2 }:
{ lib, stdenv, fetchurl, autoconf, automake, dbus, glib, libtool, pkg-config, udisks2 }:
stdenv.mkDerivation {
name = "hal-flash-0.3.3";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "0dw9bx190mrh0dycw4rfvfmwwvh2sgypffr99nfnr36b38jrd6y6";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ autoconf automake dbus glib libtool udisks2 ];
preConfigure = "libtoolize && aclocal && autoconf && automake --add-missing";
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
+3 -3
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }:
{ lib, stdenv, fetchurl, pkg-config, libnl, openssl, sqlite ? null }:
stdenv.mkDerivation rec {
pname = "hostapd";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1mrbvg4v7vm7mknf0n29mf88k3s4a4qj6r4d51wq8hmjj1m7s7c8";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libnl openssl sqlite ];
patches = [
@@ -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/iio-sensor-proxy/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, autoconf-archive, gettext, libtool, intltool, autoconf, automake
, glib, gtk3, gtk-doc, libgudev, pkgconfig, systemd }:
, glib, gtk3, gtk-doc, libgudev, pkg-config, systemd }:
stdenv.mkDerivation rec {
pname = "iio-sensor-proxy";
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
gettext
intltool
libtool
pkgconfig
pkg-config
];
meta = with lib; {
pkgs/os-specific/linux/ima-evm-utils/default.nix
+5 -5
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, autoreconfHook, pkgconfig, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }:
{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }:
stdenv.mkDerivation rec {
pname = "ima-evm-utils";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1dhfw6d9z4dv82q9zg2g025hgr179kamz9chy7v5w9b71aam8jf8";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ openssl attr keyutils asciidoc libxslt ];
patches = [ ./xattr.patch ];
@@ -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/input-utils/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
pname = "input-utils";
version = "1.3";
src = fetchurl {
url = "https://www.kraxel.org/releases/input/input-${version}.tar.gz";
sha256 = "11w0pp20knx6qpgzmawdbk1nj2z3fzp8yd6nag6s8bcga16w6hli";
pkgs/os-specific/linux/intel-compute-runtime/default.nix
+3 -3
View File
@@ -2,7 +2,7 @@
, fetchFromGitHub
, patchelf
, cmake
, pkgconfig
, pkg-config
, intel-gmmlib
, intel-graphics-compiler
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
sha256 = "19scbbr6jf3yp2v7z8xyzzm01g44jym7xfkf1dz64d5nhvjw6ig5";
};
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ intel-gmmlib intel-graphics-compiler libva ];
@@ -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/ipset/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, libmnl }:
{ lib, stdenv, fetchurl, pkg-config, libmnl }:
stdenv.mkDerivation rec {
pname = "ipset";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "02mkp7vmsh609dcp02xi290sxmsgq2fsch3875dxkwfxkrl16p5p";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libmnl ];
configureFlags = [ "--with-kmod=no" ];
pkgs/os-specific/linux/iptables/default.nix
+3 -3
View File
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, pkgconfig, pruneLibtoolFiles, flex, bison
{ lib, stdenv, fetchurl, pkg-config, pruneLibtoolFiles, flex, bison
, libmnl, libnetfilter_conntrack, libnfnetlink, libnftnl, libpcap
, nftablesCompat ? false
}:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
version = "1.8.6";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0rvp0k8a72h2snrdx48cfn75bfa0ycrd2xl3kjysbymq7q6gxx50";
};
nativeBuildInputs = [ pkgconfig pruneLibtoolFiles flex bison ];
nativeBuildInputs = [ pkg-config pruneLibtoolFiles flex bison ];
buildInputs = [ libmnl libnetfilter_conntrack libnfnetlink libnftnl libpcap ];
pkgs/os-specific/linux/iputils/default.nix
+4 -4
View File
@@ -1,9 +1,9 @@
{ stdenv, fetchFromGitHub, fetchpatch
, meson, ninja, pkgconfig, gettext, libxslt, docbook_xsl_ns
{ lib, stdenv, fetchFromGitHub, fetchpatch
, meson, ninja, pkg-config, gettext, libxslt, docbook_xsl_ns
, libcap, libidn2
}:
with stdenv.lib;
with lib;
let
version = "20200821";
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
# Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111):
++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false";
nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt.bin docbook_xsl_ns ];
nativeBuildInputs = [ meson ninja pkg-config gettext libxslt.bin docbook_xsl_ns ];
buildInputs = [ libcap ]
++ optional (!stdenv.hostPlatform.isMusl) libidn2;
pkgs/os-specific/linux/ipvsadm/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, libnl, popt, gnugrep }:
{ lib, stdenv, fetchurl, pkg-config, libnl, popt, gnugrep }:
stdenv.mkDerivation rec {
pname = "ipvsadm";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile --replace "-lnl" "$(pkg-config --libs libnl-genl-3.0)"
'';
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libnl popt ];
preBuild = ''
pkgs/os-specific/linux/irqbalance/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, libcap_ng }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, ncurses, libcap_ng }:
stdenv.mkDerivation rec {
pname = "irqbalance";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1677ap6z4hvwga0vb8hrvpc0qggyarg9mlg11pxywz7mq94vdx19";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ glib ncurses libcap_ng ];
LDFLAGS = "-lncurses";
@@ -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;
};
}

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