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

Merge branch 'staging' into staging-next

Browse Source 
A few conflicts but relatively clear ones (I think).
This commit is contained in:
Vladimír Čunát
2021-04-14 10:08:25 +02:00
parent 3257feac49 25ae1fd29f
commit d2eb7a7887
675 changed files with 5919 additions and 3687 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/anbox/kmod.nix
+1 -1
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
homepage = "https://github.com/anbox/anbox-modules";
license = licenses.gpl2;
platforms = platforms.linux;
broken = (versionOlder kernel.version "4.4") || (kernel.features.grsecurity or false);
broken = (versionOlder kernel.version "4.4");
maintainers = with maintainers; [ edwtjo ];
};
pkgs/os-specific/linux/bluez/default.nix
+2 -12
View File
@@ -1,6 +1,5 @@
{ stdenv
, lib
, fetchpatch
, fetchurl
, alsaLib
, dbus
@@ -20,11 +19,11 @@
];
in stdenv.mkDerivation rec {
pname = "bluez";
version = "5.56";
version = "5.58";
src = fetchurl {
url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz";
sha256 = "sha256-WcTbqfyKripqX48S8ZvBsMLcJzVcfKMSPu0/5r19C50=";
sha256 = "1wgiv8cqya6n1w5fz24cb8q401bhn5aa6s7g95l26rzblmsmw1n8";
};
buildInputs = [
@@ -45,15 +44,6 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "dev" ] ++ lib.optional doCheck "test";
patches = [
# Fixes https://github.com/NixOS/nixpkgs/issues/117663
(fetchpatch {
name = "disconnect-fix.patch";
url = "https://github.com/bluez/bluez/commit/28ddec8d6b829e002fa268c07b71e4c564ba9e16.patch";
sha256 = "sha256-vzMf1i44e4JrpL7cXbn9oDr+3B+Glf7dPW3QDstEnEM=";
})
];
postPatch = ''
substituteInPlace tools/hid2hci.rules \
--replace /sbin/udevadm ${systemd}/bin/udevadm \
pkgs/os-specific/linux/fuse/common.nix
+1 -1
View File
@@ -96,7 +96,7 @@ in stdenv.mkDerivation rec {
inherit (src.meta) homepage;
changelog = "https://github.com/libfuse/libfuse/releases/tag/fuse-${version}";
platforms = platforms.linux;
license = with licenses; [ gpl2 lgpl21 ];
license = with licenses; [ gpl2Only lgpl21Only ];
maintainers = [ maintainers.primeos ];
};
}
pkgs/os-specific/linux/fuse/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@ in {
};
fuse_3 = mkFuse {
version = "3.10.2";
sha256Hash = "0m44hhk6jxkgkvk2jsjcwa3pqgzzqnpm606n3n8wn1ldypkvpsps";
version = "3.10.3";
sha256Hash = "054g3jqy8lhlj8kkwd16wxaxzynmh8h5iv20cryd0psg0hgmhd7v";
};
}
pkgs/os-specific/linux/kernel/common-config.nix
+8 -13
View File
@@ -12,7 +12,7 @@
# Configuration
{ lib, stdenv, version
, features ? { grsecurity = false; xen_dom0 = false; }
, features ? {}
}:
with lib;
@@ -42,7 +42,7 @@ let
TIMER_STATS = whenOlder "4.11" yes;
DEBUG_NX_TEST = whenOlder "4.11" no;
DEBUG_STACK_USAGE = no;
DEBUG_STACKOVERFLOW = mkIf (!features.grsecurity) (option no);
DEBUG_STACKOVERFLOW = option no;
RCU_TORTURE_TEST = no;
SCHEDSTATS = no;
DETECT_HUNG_TASK = yes;
@@ -443,7 +443,7 @@ let
SECURITY_SELINUX_BOOTPARAM_VALUE = whenOlder "5.1" (freeform "0"); # Disable SELinux by default
# Prevent processes from ptracing non-children processes
SECURITY_YAMA = option yes;
DEVKMEM = mkIf (!features.grsecurity) no; # Disable /dev/kmem
DEVKMEM = no; # Disable /dev/kmem
USER_NS = yes; # Support for user namespaces
@@ -523,7 +523,7 @@ let
virtualisation = {
PARAVIRT = option yes;
HYPERVISOR_GUEST = mkIf (!features.grsecurity) yes;
HYPERVISOR_GUEST = yes;
PARAVIRT_SPINLOCKS = option yes;
KVM_APIC_ARCHITECTURE = whenOlder "4.8" yes;
@@ -531,7 +531,7 @@ let
KVM_COMPAT = { optional = true; tristate = whenBetween "4.0" "4.12" "y"; };
KVM_DEVICE_ASSIGNMENT = { optional = true; tristate = whenBetween "3.10" "4.12" "y"; };
KVM_GENERIC_DIRTYLOG_READ_PROTECT = whenAtLeast "4.0" yes;
KVM_GUEST = mkIf (!features.grsecurity) yes;
KVM_GUEST = yes;
KVM_MMIO = yes;
KVM_VFIO = yes;
KSM = yes;
@@ -547,13 +547,8 @@ let
VBOXGUEST = option no;
DRM_VBOXVIDEO = option no;
} // optionalAttrs (stdenv.isx86_64 || stdenv.isi686) ({
XEN = option yes;
# XXX: why isn't this in the xen-dom0 conditional section below?
XEN_DOM0 = option yes;
} // optionalAttrs features.xen_dom0 {
XEN = option yes;
XEN_DOM0 = option yes;
PCI_XEN = option yes;
HVC_XEN = option yes;
HVC_XEN_FRONTEND = option yes;
@@ -572,7 +567,7 @@ let
XEN_SELFBALLOONING = option yes;
XEN_STUB = option yes;
XEN_TMEM = option yes;
});
};
media = {
MEDIA_DIGITAL_TV_SUPPORT = yes;
pkgs/os-specific/linux/kernel/generic.nix
+2 -4
View File
@@ -46,7 +46,6 @@
stdenv.hostPlatform != stdenv.buildPlatform
, extraMeta ? {}
, isXen ? features.xen_dom0 or false
, isZen ? false
, isLibre ? false
, isHardened ? false
@@ -73,8 +72,6 @@ let
efiBootStub = true;
needsCifsUtils = true;
netfilterRPFilter = true;
grsecurity = false;
xen_dom0 = false;
ia32Emulation = true;
} // features) kernelPatches;
@@ -178,7 +175,8 @@ let
passthru = {
features = kernelFeatures;
inherit commonStructuredConfig isXen isZen isHardened isLibre modDirVersion;
inherit commonStructuredConfig isZen isHardened isLibre modDirVersion;
isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true;
kernelOlder = lib.versionOlder version;
kernelAtLeast = lib.versionAtLeast version;
passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]);
pkgs/os-specific/linux/kernel/manual-config.nix
+2 -2
View File
@@ -37,7 +37,6 @@ in {
extraMeta ? {},
# for module compatibility
isXen ? features.xen_dom0 or false,
isZen ? false,
isLibre ? false,
isHardened ? false,
@@ -94,7 +93,8 @@ let
passthru = {
inherit version modDirVersion config kernelPatches configfile
moduleBuildDependencies stdenv;
inherit isXen isZen isHardened isLibre;
inherit isZen isHardened isLibre;
isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true;
kernelOlder = lib.versionOlder version;
kernelAtLeast = lib.versionAtLeast version;
};
pkgs/os-specific/linux/libcap/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, buildPackages, fetchurl, attr, perl
{ stdenv, lib, buildPackages, fetchurl, attr, perl, runtimeShell
, usePam ? !isStatic, pam ? null
, isStatic ? stdenv.hostPlatform.isStatic
}:
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
prePatch = ''
# use full path to bash
substituteInPlace progs/capsh.c --replace "/bin/bash" "${stdenv.shell}"
substituteInPlace progs/capsh.c --replace "/bin/bash" "${runtimeShell}"
# set prefixes
substituteInPlace Make.Rules \
pkgs/os-specific/linux/libfabric/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "libfabric";
version = "1.12.0";
version = "1.12.1";
enableParallelBuilding = true;
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "ofiwg";
repo = pname;
rev = "v${version}";
sha256 = "sha256-OFp6nEW5D8vjglqLRbEgKryb2/KFuJD8Zn6rkpcuPh0=";
sha256 = "sha256-J2PoDwjPWYpagX4M2k9E1xitBzgRUZzwX9Gf00H+Tdc=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ] ;
pkgs/os-specific/linux/libselinux/default.nix
+4 -3
View File
@@ -35,15 +35,16 @@ stdenv.mkDerivation rec {
"MAN3DIR=$(man)/share/man/man3"
"MAN5DIR=$(man)/share/man/man5"
"MAN8DIR=$(man)/share/man/man8"
"PYTHON=${python3.pythonForBuild}/bin/python"
"PYTHONLIBDIR=$(py)/${python3.sitePackages}"
"SBINDIR=$(bin)/sbin"
"SHLIBDIR=$(out)/lib"
"LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a"
] ++ optionals enablePython [
"PYTHON=${python3.pythonForBuild.interpreter}"
"PYTHONLIBDIR=$(py)/${python3.sitePackages}"
];
preInstall = ''
preInstall = optionalString enablePython ''
mkdir -p $py/${python3.sitePackages}/selinux
'';
pkgs/os-specific/linux/shadow/default.nix
+6 -1
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, nixosTests, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt
, libxml2 , docbook_xml_dtd_45, docbook_xsl, itstool, flex, bison
, libxml2 , docbook_xml_dtd_45, docbook_xsl, itstool, flex, bison, runtimeShell
, pam ? null, glibcCross ? null
}:
@@ -38,8 +38,11 @@ stdenv.mkDerivation rec {
# Obtain XML resources from XML catalog (patch adapted from gtk-doc)
./respect-xml-catalog-files-var.patch
dots_in_usernames
./runtime-shell.patch
];
RUNTIME_SHELL = runtimeShell;
# The nix daemon often forbids even creating set[ug]id files.
postPatch =
''sed 's/^\(s[ug]idperms\) = [0-9]755/\1 = 0755/' -i src/Makefile.am
@@ -77,6 +80,8 @@ stdenv.mkDerivation rec {
mv $out/bin/su $su/bin
'';
disallowedReferences = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) stdenv.shellPackage;
meta = with lib; {
homepage = "https://github.com/shadow-maint";
description = "Suite containing authentication-related tools such as passwd and su";
pkgs/os-specific/linux/shadow/runtime-shell.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/configure.ac b/configure.ac
index e4c6aaec..03883ad7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -682,7 +682,7 @@ if test "$enable_utmpx" = "yes"; then
[Define if utmpx should be used])
fi
-AC_DEFINE_UNQUOTED(SHELL, ["$SHELL"], [The default shell.])
+AC_DEFINE_UNQUOTED(SHELL, ["$RUNTIME_SHELL"], [The runtime shell.])
AM_GNU_GETTEXT_VERSION(0.16)
AM_GNU_GETTEXT([external], [need-ngettext])
pkgs/os-specific/linux/util-linux/default.nix
+7 -10
View File
@@ -1,22 +1,17 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, zlib, shadow
{ lib, stdenv, fetchurl, pkg-config, zlib, shadow, libcap_ng
, ncurses ? null, perl ? null, pam, systemd ? null, minimal ? false }:
stdenv.mkDerivation rec {
pname = "util-linux";
version = "2.36.1";
version = "2.36.2";
src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1vbyydl1b13lx73di4bhc4br9ih24hcqv7bky0kyrn1c2x1c5yh9";
sha256 = "0psc0asjp1rmfx1j7468zfnk9nphlphybw2n8dcl74v8v2lnnlgp";
};
patches = [
./rtcwake-search-PATH-for-shutdown.patch
# Remove patch below in 2.36.2, see https://github.com/karelzak/util-linux/issues/1193
(fetchpatch {
url = "https://github.com/karelzak/util-linux/commit/52f730e47869ce630fafb24fd46f755dc7ffc691.patch";
sha256 = "1fz3p9127lfvmrdj1j1s8jds0jjz2dzkvmia66555ihv7hcfajbg";
})
];
outputs = [ "bin" "dev" "out" "man" ];
@@ -57,7 +52,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs =
[ zlib pam ]
[ zlib pam libcap_ng ]
++ lib.filter (p: p != null) [ ncurses systemd perl ];
doCheck = false; # "For development purpose only. Don't execute on production system!"
@@ -71,7 +66,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://www.kernel.org/pub/linux/utils/util-linux/";
description = "A set of system utilities for Linux";
license = licenses.gpl2; # also contains parts under more permissive licenses
changelog = "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v${lib.versions.majorMinor version}/v${version}-ReleaseNotes";
# https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/tree/README.licensing
license = with licenses; [ gpl2Only gpl2Plus gpl3Plus lgpl21Plus bsd3 bsdOriginalUC publicDomain ];
platforms = platforms.linux;
priority = 6; # lower priority than coreutils ("kill") and shadow ("login" etc.) packages
};