diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-09-09 08:09:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-09 08:09:36 +0200 |
commit | 731c82a447d916e78f31642ad757a3ce8911f1ea (patch) | |
tree | 8630c820679c3d3245267a4f701ae9a4a9cd3e3e /pkgs/os-specific | |
parent | 21f61dde0dcf436660224acdb7ee5bd6d72ee192 (diff) | |
parent | b5284a56d9b2c0bace0e7d9acdb2003b47fe581e (diff) |
Merge pull request #68244 from NixOS/staging-next
Staging next that includes gcc8
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 3 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kexectools/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/mmc-utils/default.nix | 6 | ||||
-rw-r--r-- | pkgs/os-specific/linux/numactl/default.nix | 8 | ||||
-rw-r--r-- | pkgs/os-specific/linux/setools/default.nix | 12 | ||||
-rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 8 | ||||
-rw-r--r-- | pkgs/os-specific/linux/usbip/default.nix | 5 | ||||
-rw-r--r-- | pkgs/os-specific/linux/usbip/fix-snprintf-truncation.patch | 13 |
9 files changed, 43 insertions, 20 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 2c01dcb97312..e6e1bd842363 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -151,8 +151,8 @@ let moduleStructuredConfig = (lib.evalModules { modules = [ module - { settings = commonStructuredConfig; } - { settings = structuredExtraConfig; } + { settings = commonStructuredConfig; _file = "pkgs/os-specific/linux/kernel/common-config.nix"; } + { settings = structuredExtraConfig; _file = "structuredExtraConfig"; } ] ++ structuredConfigFromPatches ; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 7a663fca6948..257aec751429 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -278,7 +278,8 @@ in assert stdenv.lib.versionAtLeast version "4.14" -> libelf != null; assert stdenv.lib.versionAtLeast version "4.15" -> utillinux != null; stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches configfile) // { - name = "linux-${version}"; + pname = "linux"; + inherit version; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index 326afdfff464..3d3215e6b4bf 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "kexec-tools"; - version = "2.0.19"; + version = "2.0.20"; src = fetchurl { urls = [ "mirror://kernel/linux/utils/kernel/kexec/${pname}-${version}.tar.xz" "http://horms.net/projects/kexec/kexec-tools/${pname}-${version}.tar.xz" ]; - sha256 = "03jyi4c47ywclycf3a253xpqs7p6ys8inz9q66b8m3xc6nrh307d"; + sha256 = "1j7qlhxk1rbv9jbj8wd6hb7zl8p2mp29ymrmccgmsi0m0dzhgn6s"; }; hardeningDisable = [ "format" "pic" "relro" "pie" ]; diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index e0b87f2010ac..297faa2a6042 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "mmc-utils"; - version = "2018-03-27"; + version = "2018-12-14"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git"; - rev = "b4fe0c8c0e57a74c01755fa9362703b60d7ee49d"; - sha256 = "01llwan5j40mv5p867f31lm87qh0hcyhy892say60y5pxc0mzpyn"; + rev = "aef913e31b659462fe6b9320d241676cba97f67b"; + sha256 = "1mak9rqjp6yvqk2h5hfil5a9gfx138h62n3cryckfbhr6fmaylm7"; }; makeFlags = "CC=${stdenv.cc.targetPrefix}cc"; diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index 4417ffb569bf..f2188ee37cb4 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numactl"; - version = "2.0.12"; + version = "2.0.13"; src = fetchFromGitHub { - owner = "numactl"; - repo = "numactl"; + owner = pname; + repo = pname; rev = "v${version}"; - sha256 = "0crhpxwakp0gvd7wwpbkfd3brnrdf89lkbf03axnbrs0b6kaygg2"; + sha256 = "08xj0n27qh0ly8hjallnx774gicz15nfq0yyxz8zhgy6pq8l33vv"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index 039d875060a2..1e82c4921595 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -8,13 +8,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "setools"; - version = "2017-11-10"; + version = "4.2.0"; src = fetchFromGitHub { - owner = "TresysTechnology"; + owner = "SELinuxProject"; repo = pname; - rev = "a1aa0f33f5c428d3f9fe82960ed5de36f38047f7"; - sha256 = "0iyj35fff93cprjkzbkg9dn5xz8dg5h2kjx3476fl625nxxskndn"; + rev = version; + sha256 = "1bjwcvr6rjx79cdcvaxn68bdrnl4f2a8gnnqsngdxhkhwpddksjy"; }; nativeBuildInputs = [ bison flex swig ]; @@ -34,8 +34,8 @@ buildPythonApplication rec { ''; meta = { - description = "SELinux Tools"; - homepage = https://github.com/TresysTechnology/setools/wiki; + description = "SELinux Policy Analysis Tools"; + homepage = https://github.com/SELinuxProject/setools; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 4117df8cf13c..48f915214188 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -15,9 +15,13 @@ , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools }: -stdenv.mkDerivation { - version = "242"; +let + pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); + +in stdenv.mkDerivation rec { pname = "systemd"; + # To whoever updates this to 239: check the todo on line 173. + version = "242"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! # Also fresh patches should be cherry-picked from that tree to our current one. diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix index 1bb92d7dce1b..61f2c4540465 100644 --- a/pkgs/os-specific/linux/usbip/default.nix +++ b/pkgs/os-specific/linux/usbip/default.nix @@ -5,6 +5,11 @@ stdenv.mkDerivation { src = kernel.src; + patches = [ + # fixes build with gcc8 + ./fix-snprintf-truncation.patch + ]; + nativeBuildInputs = [ autoconf automake libtool ]; buildInputs = [ udev ]; diff --git a/pkgs/os-specific/linux/usbip/fix-snprintf-truncation.patch b/pkgs/os-specific/linux/usbip/fix-snprintf-truncation.patch new file mode 100644 index 000000000000..63fca9ddbfe5 --- /dev/null +++ b/pkgs/os-specific/linux/usbip/fix-snprintf-truncation.patch @@ -0,0 +1,13 @@ +diff --git a/tools/usb/usbip/libsrc/vhci_driver.c b/tools/usb/usbip/libsrc/vhci_driver.c +index 8159fd98680b..7d6eb3e3fe1e 100644 +--- a/tools/usb/usbip/libsrc/vhci_driver.c ++++ b/tools/usb/usbip/libsrc/vhci_driver.c +@@ -111,7 +111,7 @@ static int parse_status(const char *value) + static int refresh_imported_device_list(void) + { + const char *attr_status; +- char status[MAX_STATUS_NAME+1] = "status"; ++ char status[MAX_STATUS_NAME+2] = "status"; + int i, ret; + + for (i = 0; i < vhci_driver->ncontrollers; i++) { |