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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Jan Tojnar
2021-04-06 16:01:14 +02:00
parent 44e3fc61fe 413e9561f8
commit c04a14edd6
493 changed files with 4687 additions and 2055 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/autofs/default.nix
View File

@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs
, libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }:
, libxml2, libkrb5, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }:
let
version = "5.1.6";
@@ -36,7 +36,7 @@ in stdenv.mkDerivation {
#make install SUBDIRS="samples" # impure!
'';
buildInputs = [ linuxHeaders libtirpc libxml2 kerberos kmod openldap sssd
buildInputs = [ linuxHeaders libtirpc libxml2 libkrb5 kmod openldap sssd
openssl cyrus_sasl rpcsvc-proto ];
nativeBuildInputs = [ flex bison ];

4
pkgs/os-specific/linux/cifs-utils/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, autoreconfHook, docutils, pkg-config
, kerberos, keyutils, pam, talloc, python3 }:
, libkrb5, keyutils, pam, talloc, python3 }:
stdenv.mkDerivation rec {
pname = "cifs-utils";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook docutils pkg-config ];
buildInputs = [ kerberos keyutils pam talloc python3 ];
buildInputs = [ libkrb5 keyutils pam talloc python3 ];
configureFlags = [ "ROOTSBINDIR=$(out)/sbin" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# AC_FUNC_MALLOC is broken on cross builds.

4
pkgs/os-specific/linux/firmware/firmware-manager/default.nix
View File

@@ -1,4 +1,4 @@
{ rustPlatform, lib, fetchFromGitHub, lzma, pkg-config, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }:
{ rustPlatform, lib, fetchFromGitHub, xz, pkg-config, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }:
rustPlatform.buildRustPackage rec {
pname = "firmware-manager";
version = "0.1.2";
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
buildInputs = [ lzma openssl dbus glib udev cairo pango atk gdk-pixbuf gtk3 ];
buildInputs = [ xz openssl dbus glib udev cairo pango atk gdk-pixbuf gtk3 ];
depsExtraArgs.postPatch = "make prefix='$(out)' toml-gen";

12
pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
View File

@@ -2,22 +2,22 @@
stdenv.mkDerivation {
pname = "raspberrypi-wireless-firmware";
version = "2020-12-01";
version = "2021-01-28";
srcs = [
(fetchFromGitHub {
name = "bluez-firmware";
owner = "RPi-Distro";
repo = "bluez-firmware";
rev = "1e4ee0c05bae10002124b56c0e44bb9ac6581ddc";
sha256 = "10n6ibr3ra71f4hlvbpy8csjlgrapawxrr6jmijn470vkcqcpq27";
rev = "e7fd166981ab4bb9a36c2d1500205a078a35714d";
sha256 = "1dkg8mzn7n4afi50ibrda2s33nw2qj52jjjdv9w560q601gms47b";
})
(fetchFromGitHub {
name = "firmware-nonfree";
owner = "RPi-Distro";
repo = "firmware-nonfree";
rev = "b66ab26cebff689d0d3257f56912b9bb03c20567";
sha256 = "0cffgsp0w7vv7ylpymdddx0bl9dx3pl7snlh30p4rr9srmn8869f";
rev = "83938f78ca2d5a0ffe0c223bb96d72ccc7b71ca5";
sha256 = "1l4zz86y2hjyvdwjy75abyjwh3wqknd71y3vh1iw5nd0hws8ranp";
})
];
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "17k9y499kjc4zv7ivnsfrgfibwj0ldr3sqdgia4dackbr70jfg2h";
outputHash = "0a54gyrq6jfxxvimaa4yjfiyfwf7wv58v0a32l74yrzyarr3ldby";
meta = with lib; {
description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3+ and Zero W";

4
pkgs/os-specific/linux/firmware/raspberrypi/default.nix
View File

@@ -3,13 +3,13 @@
stdenvNoCC.mkDerivation rec {
# NOTE: this should be updated with linux_rpi
pname = "raspberrypi-firmware";
version = "1.20201201";
version = "1.20210303";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "firmware";
rev = version;
sha256 = "09yha3k72yqx29rwnv2j2zm73lzc4jgmcbmcc6yrl1i07x84lx3n";
sha256 = "0pgiw93hq4gfph5dnwbi8w59g0f7yhmagwzam971k529mh5yl86m";
};
installPhase = ''

4
pkgs/os-specific/linux/firmware/system76-firmware/default.nix
View File

@@ -1,4 +1,4 @@
{ rustPlatform, lib, fetchFromGitHub, lzma, pkg-config, openssl, dbus, efibootmgr, makeWrapper }:
{ rustPlatform, lib, fetchFromGitHub, xz, pkg-config, openssl, dbus, efibootmgr, makeWrapper }:
rustPlatform.buildRustPackage rec {
pname = "system76-firmware";
# Check Makefile when updating, make sure postInstall matches make install
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ lzma openssl dbus ];
buildInputs = [ xz openssl dbus ];
cargoBuildFlags = [ "--workspace" ];

4
pkgs/os-specific/linux/gogoclient/default.nix
View File

@@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, openssl, nettools, iproute, sysctl}:
{lib, stdenv, fetchurl, openssl, nettools, iproute2, sysctl}:
let baseName = "gogoclient";
version = "1.2";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
substituteInPlace "$out/template/linux.sh" \
--replace "/sbin/ifconfig" "${nettools}/bin/ifconfig" \
--replace "/sbin/route" "${nettools}/bin/route" \
--replace "/sbin/ip" "${iproute}/sbin/ip" \
--replace "/sbin/ip" "${iproute2}/sbin/ip" \
--replace "/sbin/sysctl" "${sysctl}/bin/sysctl"
sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh
'';

4
pkgs/os-specific/linux/hyperv-daemons/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, lib, python, kernel, makeWrapper, writeText
, gawk, iproute }:
, gawk, iproute2 }:
let
libexec = "libexec/hypervkvpd";
@@ -42,7 +42,7 @@ let
postFixup = ''
wrapProgram $out/bin/hv_kvp_daemon \
--prefix PATH : $out/bin:${lib.makeBinPath [ gawk iproute ]}
--prefix PATH : $out/bin:${lib.makeBinPath [ gawk iproute2 ]}
'';
};

4
pkgs/os-specific/linux/iproute/mptcp.nix
View File

@@ -1,6 +1,6 @@
{ lib, iproute, fetchFromGitHub }:
{ lib, iproute2, fetchFromGitHub }:
iproute.overrideAttrs (oa: rec {
iproute2.overrideAttrs (oa: rec {
pname = "iproute_mptcp";
version = "0.95";

4
pkgs/os-specific/linux/ipsec-tools/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, linuxHeaders, readline, openssl, flex, kerberos, pam }:
{ lib, stdenv, fetchurl, fetchpatch, linuxHeaders, readline, openssl, flex, libkrb5, pam }:
# TODO: These tools are supposed to work under NetBSD and FreeBSD as
# well, so I guess it's not appropriate to place this expression in
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0b9gfbz78k2nj0k7jdlm5kajig628ja9qm0z5yksiwz22s3v7dlf";
};
buildInputs = [ readline openssl flex kerberos pam ];
buildInputs = [ readline openssl flex libkrb5 pam ];
patches = [
./dont-create-localstatedir-during-install.patch

37
pkgs/os-specific/linux/joycond/default.nix Normal file
View File

@@ -0,0 +1,37 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libevdev, udev }:
stdenv.mkDerivation rec {
pname = "joycond";
version = "unstable-2021-03-27";
src = fetchFromGitHub {
owner = "DanielOgorchock";
repo = "joycond";
rev = "2d3f553060291f1bfee2e49fc2ca4a768b289df8";
sha256 = "0dpmwspll9ar3pxg9rgnh224934par8h8bixdz9i2pqqbc3dqib7";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libevdev udev ];
# CMake has hardcoded install paths
installPhase = ''
mkdir -p $out/{bin,etc/{systemd/system,udev/rules.d},lib/modules-load.d}
cp ./joycond $out/bin
cp $src/udev/{89,72}-joycond.rules $out/etc/udev/rules.d
cp $src/systemd/joycond.service $out/etc/systemd/system
cp $src/systemd/joycond.conf $out/lib/modules-load.d
substituteInPlace $out/etc/systemd/system/joycond.service --replace \
"ExecStart=/usr/bin/joycond" "ExecStart=$out/bin/joycond"
'';
meta = with lib; {
homepage = "https://github.com/DanielOgorchock/joycond";
description = "Userspace daemon to combine joy-cons from the hid-nintendo kernel driver";
license = licenses.gpl3Only;
maintainers = [ maintainers.ivar ];
platforms = platforms.linux;
};
}

30
pkgs/os-specific/linux/kernel/hardened/patches.json
View File

@@ -1,32 +1,32 @@
{
"4.14": {
"extra": "-hardened1",
"name": "linux-hardened-4.14.227-hardened1.patch",
"sha256": "0g8s91cvcxin95is7hhap5i8vkn4k3570s28vnz8mf0jrcgwdgfd",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.227-hardened1/linux-hardened-4.14.227-hardened1.patch"
"name": "linux-hardened-4.14.228-hardened1.patch",
"sha256": "0pf3c98m2zlgxv9p10p7xw44f6mqnh8ac47jl1abz3yy3hiag0cd",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.228-hardened1/linux-hardened-4.14.228-hardened1.patch"
},
"4.19": {
"extra": "-hardened1",
"name": "linux-hardened-4.19.183-hardened1.patch",
"sha256": "1xi4fkvdvf1rjhrihi7im415x26hwmvhf3zrklm8hw2rmajdfrca",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.183-hardened1/linux-hardened-4.19.183-hardened1.patch"
"name": "linux-hardened-4.19.184-hardened1.patch",
"sha256": "1828kkq05808mahkfb0387b1k5qp6pysy4mny1xgpwqdphpp1pq9",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.184-hardened1/linux-hardened-4.19.184-hardened1.patch"
},
"5.10": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.26-hardened1.patch",
"sha256": "08f4yks3fjv5zi85zbxa3aqfllb6nbr58hm6kchd83l6rknnix4r",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.26-hardened1/linux-hardened-5.10.26-hardened1.patch"
"name": "linux-hardened-5.10.27-hardened1.patch",
"sha256": "12pzv36p0pdaqqklwv6rpk15c1z1nz2syw1si24514p63v46wmhn",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.27-hardened1/linux-hardened-5.10.27-hardened1.patch"
},
"5.11": {
"extra": "-hardened1",
"name": "linux-hardened-5.11.10-hardened1.patch",
"sha256": "16083fvl5km751dps7mzjc2fl1qp9jqnyn7lg8jlfxc8w32bbxwv",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.10-hardened1/linux-hardened-5.11.10-hardened1.patch"
"name": "linux-hardened-5.11.11-hardened1.patch",
"sha256": "0isq152z4h2kl3rviia9xlpsmdx331kx8p1x00jbf4gcw30amc78",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.11-hardened1/linux-hardened-5.11.11-hardened1.patch"
},
"5.4": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.108-hardened1.patch",
"sha256": "1m208j0svysyn3m0acn10pd4wqjm203ampkhf1wimzpzs8wfasgj",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.108-hardened1/linux-hardened-5.4.108-hardened1.patch"
"name": "linux-hardened-5.4.109-hardened1.patch",
"sha256": "19likbds74lzym969p6hbchlfii4qnsp8y4ryfkba1vv6hv51zzj",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.109-hardened1/linux-hardened-5.4.109-hardened1.patch"
}
}

4
pkgs/os-specific/linux/kernel/linux-4.14.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.14.227";
version = "4.14.228";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1iz029v407xv81prrvg4gr2ql8hvm0mpj21x9picwv05pk2d68h7";
sha256 = "0nw1jf6x5a990n69aw2da4s4lc1c7mnwiwcda40bl2rkmd24s1qm";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.19.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.19.183";
version = "4.19.184";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1xd5hjdjbsw7kpj9csgi8kk4ki3z46sqbiigjsr71psivxfxkkxs";
sha256 = "0z5pgal8775rf7pvpxq47dnghr42al2k9py0s9jl3js2wamgdyix";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.4.nix
View File

@@ -1,11 +1,11 @@
{ buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.4.263";
version = "4.4.264";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1qqh3n09pn87n6f7ain3am8k7j043vzm65qcvccq9as129y5w1a2";
sha256 = "1b0d735qnk0bcqn9gdsjqxhk8pkb3597ya9f34lv1vjfaqkkxk7l";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.9.nix
View File

@@ -1,11 +1,11 @@
{ buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.9.263";
version = "4.9.264";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1dhmgyg6asqg1pmhnzqymwz4bm6gy8gi0n2gr794as38dhn2szwz";
sha256 = "1df2dv26c9z6zsdlqzbcc60f2pszh0hx1n94v65jswlb72a2mipc";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.10.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.26";
version = "5.10.27";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "10hlc020imxxh71nvxhnnmd66bcxndfyi78v7wv7y5mcy4rjhlzw";
sha256 = "1nb95ll66kxiz702gs903n3gy5ialz8cin58l19rqaai55kck7fr";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.11.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.11.10";
version = "5.11.11";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "07fw48sy8p17jmm24x3rl99cwxiwhwjrxnmy3g542w9kzawaqwnk";
sha256 = "1fc3yl4srzla3cbihgnry0pqmgcc17zv0zlkk9zpx99371hpay0a";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.4.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.108";
version = "5.4.109";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0wi1ql7brfsdzvwbxrxvg12zfm54lbdjvfzxk1l3xlqvq83sq4pj";
sha256 = "1vmpc6yrr2zm4m3naflwik5111jr8hy0mnyddwk31l0p4xbg8smc";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-lqx.nix
View File

@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
let
version = "5.11.8";
version = "5.11.11";
suffix = "lqx1";
in
@@ -14,7 +14,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-${suffix}";
sha256 = "1zvd74l6vb0rwrkwwh67i8l6ipin0p981vzdmiwpbpfzasbw59xk";
sha256 = "1wycqy0m6vjaa39rq7ngwr2qmksqfca27z1711nag7j68dk3ywak";
};
extraMeta = {

19
pkgs/os-specific/linux/kernel/linux-rpi.nix
View File

@@ -2,8 +2,8 @@
let
# NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
modDirVersion = "5.4.79";
tag = "1.20201201";
modDirVersion = "5.10.17";
tag = "1.20210303";
in
lib.overrideDerivation (buildLinux (args // {
version = "${modDirVersion}-${tag}";
@@ -13,7 +13,7 @@ lib.overrideDerivation (buildLinux (args // {
owner = "raspberrypi";
repo = "linux";
rev = "raspberrypi-kernel_${tag}-1";
sha256 = "093p5kh5f27djkhbcw371w079lhhihvg3s4by3wzsd40di4fcgn9";
sha256 = "0ffsllayl18ka4mgp4rdy9h0da5gy1n6g0kfvinvzdzabb5wzvrx";
};
defconfig = {
@@ -23,15 +23,18 @@ lib.overrideDerivation (buildLinux (args // {
"4" = "bcm2711_defconfig";
}.${toString rpiVersion};
extraConfig = ''
# ../drivers/pci/controller/pcie-altera.c:679:8: error: too few arguments to function 'devm_of_pci_get_host_bridge_resources'
PCIE_ALTERA n
'';
features = {
efiBootStub = false;
} // (args.features or {});
extraConfig = ''
# ../drivers/gpu/drm/ast/ast_mode.c:851:18: error: initialization of 'void (*)(struct drm_crtc *, struct drm_atomic_state *)' from incompatible pointer type 'void (*)(struct drm_crtc *, struct drm_crtc_state *)' [-Werror=incompatible-pointer-types]
# 851 | .atomic_flush = ast_crtc_helper_atomic_flush,
# | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ../drivers/gpu/drm/ast/ast_mode.c:851:18: note: (near initialization for 'ast_crtc_helper_funcs.atomic_flush')
DRM_AST n
'';
extraMeta = if (rpiVersion < 3) then {
platforms = with lib.platforms; [ arm ];
hydraPlatforms = [];

4
pkgs/os-specific/linux/kernel/linux-testing.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.12-rc4";
version = "5.12-rc6";
extraMeta.branch = "5.12";
# modDirVersion needs to be x.y.z, will always add .0
@@ -11,7 +11,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "06i6xnfbyn522pj9zksx6ka01yxwv8dsrb2z517grv682sp8j70k";
sha256 = "0w0zk2byimdbcvn8myqaq0ab6lyd43493fnkv9a1407dimpxb03d";
};
# Should the testing kernels ever be built on Hydra?

4
pkgs/os-specific/linux/kernel/linux-zen.nix
View File

@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildLinux, ... } @ args:
let
version = "5.11.8";
version = "5.11.11";
suffix = "zen1";
in
@@ -14,7 +14,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-${suffix}";
sha256 = "1hb05shhqb6747m131sw30h36ak1m9bwzhfldjypn8phlfkflgkq";
sha256 = "0rldvgvdbsqvshrbv2g335qvwzk76l7rpnp9dwzsiv2qphrzxazi";
};
extraMeta = {

4
pkgs/os-specific/linux/libcgroup/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, pam, yacc, flex }:
{ lib, stdenv, fetchurl, fetchpatch, pam, bison, flex }:
stdenv.mkDerivation rec {
pname = "libcgroup";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0lgvyq37gq84sk30sg18admxaj0j0p5dq3bl6g74a1ppgvf8pqz4";
};
buildInputs = [ pam yacc flex ];
buildInputs = [ pam bison flex ];
patches = [
(fetchpatch {

29
pkgs/os-specific/linux/macchanger/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, texinfo }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, texinfo }:
stdenv.mkDerivation rec {
pname = "macchanger";
@@ -11,15 +11,38 @@ stdenv.mkDerivation rec {
sha256 = "1hypx6sxhd2b1nsxj314hpkhj7q4x9p2kfaaf20rjkkkig0nck9r";
};
patches = [
(fetchpatch {
url = "https://sources.debian.org/data/main/m/macchanger/1.7.0-5.3/debian/patches/02-fix_usage_message.patch";
sha256 = "0pxljmq0l0znylbhms09i19qwil74gm8gx3xx2ffx00dajaizj18";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/m/macchanger/1.7.0-5.3/debian/patches/06-update_OUI_list.patch";
sha256 = "04kbd784z9nwkjva5ckkvb0yb3pim9valb1viywn1yyh577d0y7w";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/m/macchanger/1.7.0-5.3/debian/patches/08-fix_random_MAC_choice.patch";
sha256 = "1vz3appxxsdf1imzrn57amazfwlbrvx6g78b6n88aqgwzy5dm34d";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/m/macchanger/1.7.0-5.3/debian/patches/check-random-device-read-errors.patch";
sha256 = "0pra6qnk39crjlidspg3l6hpaqiw43cypahx793l59mqn956cngc";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/m/macchanger/1.7.0-5.3/debian/patches/verify-changed-MAC.patch";
sha256 = "0vjhf2fnj1hlghjl821p6idrfc8hmd4lgps5lf1l68ylqvwjw0zj";
})
];
nativeBuildInputs = [ autoreconfHook texinfo ];
outputs = [ "out" "info" ];
meta = with lib; {
description = "A utility for viewing/manipulating the MAC address of network interfaces";
maintainers = with maintainers; [ joachifm ma27 ];
maintainers = with maintainers; [ joachifm ma27 dotlambda ];
license = licenses.gpl2Plus;
homepage = "https://www.gnu.org/software/macchanger";
homepage = "https://github.com/alobbs/macchanger";
platforms = platforms.linux;
};
}

10
pkgs/os-specific/linux/multipath-tools/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c }:
{ lib, stdenv, fetchurl, pkg-config, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c, kmod }:
stdenv.mkDerivation rec {
pname = "multipath-tools";
@@ -16,7 +16,13 @@ stdenv.mkDerivation rec {
];
postPatch = ''
substituteInPlace libmultipath/Makefile --replace /usr/include/libdevmapper.h ${lib.getDev lvm2}/include/libdevmapper.h
substituteInPlace libmultipath/Makefile \
--replace /usr/include/libdevmapper.h ${lib.getDev lvm2}/include/libdevmapper.h
substituteInPlace multipathd/multipathd.service \
--replace /sbin/modprobe ${lib.getBin kmod}/sbin/modprobe \
--replace /sbin/multipathd "$out/bin/multipathd"
sed -i -re '
s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'",
' libmultipath/defaults.h

12
pkgs/os-specific/linux/nfs-utils/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, lib, pkg-config, util-linux, libcap, libtirpc, libevent
, sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers
, sqlite, libkrb5, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers
, python3, buildPackages, nixosTests, rpcsvc-proto
, enablePython ? true
}:
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libtirpc libcap libevent sqlite lvm2
libuuid keyutils kerberos tcp_wrappers
libuuid keyutils libkrb5 tcp_wrappers
] ++ lib.optional enablePython python3;
enableParallelBuilding = true;
@@ -33,15 +33,15 @@ stdenv.mkDerivation rec {
preConfigure =
''
substituteInPlace configure \
--replace '$dir/include/gssapi' ${lib.getDev kerberos}/include/gssapi \
--replace '$dir/bin/krb5-config' ${lib.getDev kerberos}/bin/krb5-config
--replace '$dir/include/gssapi' ${lib.getDev libkrb5}/include/gssapi \
--replace '$dir/bin/krb5-config' ${lib.getDev libkrb5}/bin/krb5-config
'';
configureFlags =
[ "--enable-gss"
"--enable-svcgss"
"--with-statedir=/var/lib/nfs"
"--with-krb5=${lib.getLib kerberos}"
"--with-krb5=${lib.getLib libkrb5}"
"--with-systemd=${placeholder "out"}/etc/systemd/system"
"--enable-libmount-mount"
"--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap
@@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
# https://bugzilla.kernel.org/show_bug.cgi?id=203793
doCheck = false;
disallowedReferences = [ (lib.getDev kerberos) ];
disallowedReferences = [ (lib.getDev libkrb5) ];
passthru.tests = {
nfs3-simple = nixosTests.nfs3.simple;

2
pkgs/os-specific/linux/openvswitch/lts.nix
View File

@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which
, procps, libcap_ng, openssl, python2, iproute , perl
, procps, libcap_ng, openssl, python2, perl
, automake, autoconf, libtool, kernel ? null }:
with lib;

4
pkgs/os-specific/linux/pam_krb5/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pam, kerberos }:
{ lib, stdenv, fetchurl, pam, libkrb5 }:
stdenv.mkDerivation rec {
name = "pam-krb5-4.10";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "09wzxd5zrj5bzqpb01qf148npj5k8hmd2bx2ij1qsy40hdxqyq79";
};
buildInputs = [ pam kerberos ];
buildInputs = [ pam libkrb5 ];
meta = with lib; {
homepage = "https://www.eyrie.org/~eagle/software/pam-krb5/";

4
pkgs/os-specific/linux/pcmciautils/default.nix
View File

@@ -1,5 +1,5 @@
{ config, lib, stdenv, fetchurl
, yacc, flex
, bison, flex
, sysfsutils, kmod, udev
, firmware ? config.pcmciaUtils.firmware or [] # Special pcmcia cards.
, configOpts ? config.pcmciaUtils.config or null # Special hardware (map memory & port & irq)
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0sfm3w2n73kl5w7gb1m6q8gy5k4rgwvzz79n6yhs9w3sag3ix8sk";
};
buildInputs = [udev yacc sysfsutils kmod flex];
buildInputs = [udev bison sysfsutils kmod flex];
patchPhase = ''
sed -i "

4
pkgs/os-specific/linux/pipework/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper
, bridge-utils, iproute, lxc, openvswitch, docker, busybox, dhcpcd, dhcp
, bridge-utils, iproute2, lxc, openvswitch, docker, busybox, dhcpcd, dhcp
}:
stdenv.mkDerivation {
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
installPhase = ''
install -D pipework $out/bin/pipework
wrapProgram $out/bin/pipework --prefix PATH : \
${lib.makeBinPath [ bridge-utils iproute lxc openvswitch docker busybox dhcpcd dhcp ]};
${lib.makeBinPath [ bridge-utils iproute2 lxc openvswitch docker busybox dhcpcd dhcp ]};
'';
meta = with lib; {
description = "Software-Defined Networking tools for LXC";

4
pkgs/os-specific/linux/ply/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, p7zip, rsync }:
{ lib, stdenv, kernel, fetchFromGitHub, autoreconfHook, bison, flex, p7zip, rsync }:
assert kernel != null -> lib.versionAtLeast kernel.version "4.0";
@@ -7,7 +7,7 @@ let
in stdenv.mkDerivation {
pname = "ply";
inherit version;
nativeBuildInputs = [ autoreconfHook flex yacc p7zip rsync ];
nativeBuildInputs = [ autoreconfHook flex bison p7zip rsync ];
src = fetchFromGitHub {
owner = "iovisor";

6
pkgs/os-specific/linux/power-profiles-daemon/default.nix
View File

@@ -15,11 +15,12 @@
, libxslt
, upower
, systemd
, python3
}:
stdenv.mkDerivation rec {
pname = "power-profiles-daemon";
version = "0.1";
version = "0.8.1";
outputs = [ "out" "devdoc" ];
@@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
owner = "hadess";
repo = "power-profiles-daemon";
rev = version;
sha256 = "012w3aryw5d43dr9jj5i6wy2a0n21jidr4ggs9ix7d4z9byr175w";
sha256 = "sha256-OnCUr7KWVPpYGDseBUcJD/PdOobvFnyNA97NhnKbTKY=";
};
nativeBuildInputs = [
@@ -49,6 +50,7 @@ stdenv.mkDerivation rec {
systemd
upower
glib
(python3.withPackages (ps: with ps; [ ps.pygobject3 ])) # for cli tool
];
mesonFlags = [

7
pkgs/os-specific/linux/raspberrypi-eeprom/default.nix
View File

@@ -3,13 +3,13 @@
}:
stdenvNoCC.mkDerivation {
pname = "raspberrypi-eeprom";
version = "2020-12-11";
version = "2021-03-18";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "rpi-eeprom";
rev = "54a9796abbee59067bff9da6b90c1014178f2c21";
sha256 = "0yp7bn444n6yisp4hiblrm00rrvrf213amzb4sh96mlb5nhxspqk";
rev = "ff27ccf69403b01e337fc4ee6e7ae75244028cce";
sha256 = "1q1vlld0xxh9zinf5g0qa6jw1dggq93br938mvrfx3nb2aviiwcj";
};
buildInputs = [ python3 ];
@@ -28,7 +28,6 @@ stdenvNoCC.mkDerivation {
cp rpi-eeprom-config rpi-eeprom-update $out/bin
cp -r firmware/{beta,critical,old,stable} $out/share/rpi-eeprom
cp -r firmware/vl805 $out/bin
'';
fixupPhase = ''

6
pkgs/os-specific/linux/rdma-core/default.nix
View File

@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, docutils
, pandoc, ethtool, iproute, libnl, udev, python3, perl
}:
, pandoc, ethtool, iproute2, libnl, udev, python3, perl
} :
let
version = "34.0";
@@ -17,7 +17,7 @@ in stdenv.mkDerivation {
};
nativeBuildInputs = [ cmake pkg-config pandoc docutils ];
buildInputs = [ libnl ethtool iproute udev python3 perl ];
buildInputs = [ libnl ethtool iproute2 udev python3 perl ];
cmakeFlags = [
"-DCMAKE_INSTALL_RUNDIR=/run"

4
pkgs/os-specific/linux/sssd/default.nix
View File

@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, fetchpatch, glibc, augeas, dnsutils, c-ares, curl,
cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, nfs-utils, doxygen,
python, python3, pam, popt, talloc, tdb, tevent, pkg-config, ldb, openldap,
pcre, kerberos, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2,
pcre, libkrb5, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2,
libuuid, ldap, systemd, nspr, check, cmocka, uid_wrapper,
nss_wrapper, ncurses, Po4a, http-parser, jansson,
docbook_xsl, docbook_xml_dtd_44,
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss
samba nfs-utils doxygen python python3 popt
talloc tdb tevent pkg-config ldb pam openldap pcre kerberos
talloc tdb tevent pkg-config ldb pam openldap pcre libkrb5
cifs-utils glib keyutils dbus fakeroot libxslt libxml2
libuuid ldap systemd nspr check cmocka uid_wrapper
nss_wrapper ncurses Po4a http-parser jansson ];

10
pkgs/os-specific/linux/trace-cmd/default.nix
View File

@@ -1,9 +1,13 @@
{ lib, stdenv, fetchgit, asciidoc, docbook_xsl, libxslt }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "trace-cmd";
version = "2.9-dev";
version = "2.9.1";
src = fetchgit (import ./src.nix);
src = fetchgit {
url = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";
rev = "trace-cmd-v${version}";
sha256 = "19c63a0qmcppm1456qf4k6a0d1agcvpa6jnbzrdcyc520yax6khw";
};
patches = [ ./fix-Makefiles.patch ];

24
pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
View File

@@ -1,30 +1,30 @@
diff --git a/Makefile b/Makefile
index bbdf15e..deb8ef7 100644
index b034042..b8a06bc 100644
--- a/Makefile
+++ b/Makefile
@@ -288,7 +288,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC)
libtracecmd.a: $(LIBTRACECMD_STATIC)
libtracecmd.so: $(LIBTRACECMD_SHARED)
@@ -338,6 +338,7 @@ libtracefs.a: $(LIBTRACEFS_STATIC)
libtracefs.so: $(LIBTRACEFS_SHARED)
-libs: $(LIBTRACECMD_SHARED) $(LIBTRACEEVENT_SHARED)
+libs: $(LIBTRACECMD_SHARED) $(LIBTRACEEVENT_SHARED) $(LIBTRACECMD_STATIC) $(LIBTRACEEVENT_STATIC)
libs: $(LIBTRACECMD_SHARED) $(LIBTRACEEVENT_SHARED) $(LIBTRACEFS_SHARED)
+libs: $(LIBTRACECMD_STATIC) $(LIBTRACEEVENT_STATIC) $(LIBTRACEFS_STATIC)
plugins: force $(obj)/lib/traceevent/plugins/traceevent_plugin_dir $(obj)/lib/traceevent/plugins/trace_python_dir
$(Q)$(MAKE) -C $(src)/lib/traceevent/plugins
@@ -344,6 +344,8 @@ install_gui: install_cmd gui
install_libs: libs
test: force $(LIBTRACEEVENT_STATIC) $(LIBTRACEFS_STATIC) $(LIBTRACECMD_STATIC)
ifneq ($(CUNIT_INSTALLED),1)
@@ -414,6 +415,9 @@ install_libs: libs
$(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ)/trace-cmd)
$(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ)/traceevent)
$(Q)$(call do_install,$(LIBTRACEFS_SHARED),$(libdir_SQ)/tracefs)
+ $(Q)$(call do_install,$(LIBTRACECMD_STATIC),$(libdir_SQ)/trace-cmd)
+ $(Q)$(call do_install,$(LIBTRACEEVENT_STATIC),$(libdir_SQ)/traceevent)
+ $(Q)$(call do_install,$(LIBTRACEFS_STATIC),$(libdir_SQ)/tracefs)
$(Q)$(call do_install,$(src)/include/traceevent/event-parse.h,$(includedir_SQ)/traceevent)
$(Q)$(call do_install,$(src)/include/traceevent/trace-seq.h,$(includedir_SQ)/traceevent)
$(Q)$(call do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ)/trace-cmd)
diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txt
index e20a030..7fce165 100644
index 457c100..687e150 100644
--- a/kernel-shark/src/CMakeLists.txt
+++ b/kernel-shark/src/CMakeLists.txt
@@ -93,7 +93,7 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND)
@@ -92,7 +92,7 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND)
DESTINATION ${_INSTALL_PREFIX}/share/icons/${KS_APP_NAME})
install(FILES "${KS_DIR}/org.freedesktop.kshark-record.policy"

11
pkgs/os-specific/linux/trace-cmd/kernelshark.nix
View File

@@ -1,9 +1,13 @@
{ lib, mkDerivation, fetchgit, qtbase, cmake, asciidoc, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }:
mkDerivation {
mkDerivation rec {
pname = "kernelshark";
version = "1.1.0";
version = "1.2";
src = fetchgit (import ./src.nix);
src = fetchgit {
url = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";
rev = "kernelshark-v${version}";
sha256 = "0wzzm2imk9n94v96v6sbvbff6j47lz4qj0snhiyv3nj3slg0anvh";
};
patches = [ ./fix-Makefiles.patch ];
@@ -21,6 +25,7 @@ mkDerivation {
"-DTRACECMD_INCLUDE_DIR=${trace-cmd.dev}/include"
"-DTRACECMD_LIBRARY=${trace-cmd.lib}/lib/trace-cmd/libtracecmd.a"
"-DTRACEEVENT_LIBRARY=${trace-cmd.lib}/lib/traceevent/libtraceevent.a"
"-DTRACEFS_LIBRARY=${trace-cmd.lib}/lib/tracefs/libtracefs.a"
];
preInstall = ''

5
pkgs/os-specific/linux/trace-cmd/src.nix
View File

@@ -1,5 +0,0 @@
{
url = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";
rev = "ab370b78b9278fe16657742d46cb95c0a65b47d5"; # branch: kernelshark-v1.1
sha256 = "0qngwc4qgadrkwlwpz73f12prdkx94kl0bg7g9hib95ipvsdmk1c";
}

11
pkgs/os-specific/linux/xpadneo/default.nix
View File

@@ -2,25 +2,19 @@
stdenv.mkDerivation rec {
pname = "xpadneo";
version = "0.8.4";
version = "0.9.1";
src = fetchFromGitHub {
owner = "atar-axis";
repo = pname;
rev = "v${version}";
sha256 = "113xa2mxs2hc4fpjdk3jhhchy81kli6jxdd6vib7zz61n10cjb85";
hash = "sha256-VUcS4OzvPj0o627ZWIOBqEAQJ4JuMCMjgaZoMkL/IHc=";
};
setSourceRoot = ''
export sourceRoot=$(pwd)/source/hid-xpadneo/src
'';
postPatch = ''
# Set kernel module version
substituteInPlace hid-xpadneo.c \
--subst-var-by DO_NOT_CHANGE ${version}
'';
nativeBuildInputs = kernel.moduleBuildDependencies;
buildInputs = [ bluez ];
@@ -28,6 +22,7 @@ stdenv.mkDerivation rec {
"-C"
"${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"M=$(sourceRoot)"
"VERSION=${version}"
];
buildFlags = [ "modules" ];