From 3a395ccb57f3d918a361c646f0d7765be63f90a6 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Wed, 9 May 2018 22:34:04 +0200 Subject: systemd: suppress certain warnings to compile under gcc8 --- pkgs/os-specific/linux/systemd/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 58a1c7ca7147..593dbfe181e1 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -17,6 +17,7 @@ let pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); in stdenv.mkDerivation rec { + # To whoever updates this to 239: check the todo on line 173. version = "238"; name = "systemd-${version}"; @@ -166,6 +167,12 @@ in stdenv.mkDerivation rec { "-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\"" "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" + + + # Temporary flags to get this to compile under GCC8. + # TODO when updating (to systemd 239): remove this. + "-Wno-maybe-uninitialized" + "-Wno-error=format-truncation" ]; postInstall = '' -- cgit v1.2.3 From 22a8f081aed5fca30522a36b4eadd9f3ec3ef28e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 04:35:24 +0100 Subject: libsepol: 2.7 -> 2.8 --- pkgs/os-specific/linux/libsepol/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index f16c241a0a1f..a1dbc8efd5c9 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "libsepol-${version}"; - version = "2.7"; - se_release = "20170804"; + version = "2.8"; + se_release = "20180524"; se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { url = "${se_url}/${se_release}/libsepol-${version}.tar.gz"; - sha256 = "1rzr90d3f1g5wy1b8sh6fgnqb9migys2zgpjmpakn6lhxkc3p7fn"; + sha256 = "1mi4kpx7b94wjphv8k2fz5b8rd7mllvq1k4ssjxg1gjjhdm93mis"; }; nativeBuildInputs = [ flex ]; -- cgit v1.2.3 From 8cfc850510ae9055e8055d786b975a12b82ade34 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 04:35:40 +0100 Subject: libselinux: 2.7 -> 2.8 --- pkgs/os-specific/linux/libselinux/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 51e1a3220941..9a19fcb067ad 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -9,14 +9,14 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libselinux-${version}"; - version = "2.7"; + version = "2.8"; inherit (libsepol) se_release se_url; outputs = [ "bin" "out" "dev" "man" "py" ]; src = fetchurl { url = "${se_url}/${se_release}/libselinux-${version}.tar.gz"; - sha256 = "0mwcq78v6ngbq06xmb9dvilpg0jnl2vs9fgrpakhmmiskdvc1znh"; + sha256 = "1qc7c6lzvhs9sdgqalg1rxni3a88d989hgrw5f8i1kj3fvn9dnri"; }; nativeBuildInputs = [ pkgconfig ] ++ optionals enablePython [ swig python ]; @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { "MAN3DIR=$(man)/share/man/man3" "MAN5DIR=$(man)/share/man/man5" "MAN8DIR=$(man)/share/man/man8" - "PYSITEDIR=$(py)/${python.sitePackages}" "SBINDIR=$(bin)/sbin" "SHLIBDIR=$(out)/lib" @@ -44,6 +43,10 @@ stdenv.mkDerivation rec { installTargets = [ "install" ] ++ optional enablePython "install-pywrap"; + postInstall = '' + moveToOutput "${python.sitePackages}" "$py" + ''; + meta = removeAttrs libsepol.meta ["outputsToInstall"] // { description = "SELinux core library"; }; -- cgit v1.2.3 From 3020da11bb037d05624d3cbbbd57e35ea5123df3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jan 2019 04:35:51 +0100 Subject: setools: 2017-11-10 -> 4.2.0, fix build with gcc8 --- pkgs/os-specific/linux/setools/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/os-specific') 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; }; -- cgit v1.2.3 From 5acbd2f6d88bb30e2108b27df8459695d4188d44 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Jan 2019 10:14:50 +0100 Subject: mmc-utils: 2018-03-27 -> 2018-12-14 --- pkgs/os-specific/linux/mmc-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index 533cd90a2d3c..772f04b27f54 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 rec { name = "mmc-utils-${version}"; - 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"; -- cgit v1.2.3 From d5cd7dd29c7980b26177ba0d63e9d8a98f52c72d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 17 Jan 2019 10:07:41 +0100 Subject: libselinux: use PYTHONLIBDIR instead of manual copy --- pkgs/os-specific/linux/libselinux/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 9a19fcb067ad..a836d6baec11 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { "MAN3DIR=$(man)/share/man/man3" "MAN5DIR=$(man)/share/man/man5" "MAN8DIR=$(man)/share/man/man8" + "PYTHONLIBDIR=$(py)/${python.sitePackages}" "SBINDIR=$(bin)/sbin" "SHLIBDIR=$(out)/lib" @@ -43,10 +44,6 @@ stdenv.mkDerivation rec { installTargets = [ "install" ] ++ optional enablePython "install-pywrap"; - postInstall = '' - moveToOutput "${python.sitePackages}" "$py" - ''; - meta = removeAttrs libsepol.meta ["outputsToInstall"] // { description = "SELinux core library"; }; -- cgit v1.2.3 From 45d6ccea3357c65135b985f2eebf88020ca6461e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 17 Jun 2019 11:23:19 +0200 Subject: linuxPackages.usbip: fix build with gcc8 --- pkgs/os-specific/linux/usbip/default.nix | 5 +++++ pkgs/os-specific/linux/usbip/fix-snprintf-truncation.patch | 13 +++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/os-specific/linux/usbip/fix-snprintf-truncation.patch (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix index 497b5c191669..9f8b02c7537d 100644 --- a/pkgs/os-specific/linux/usbip/default.nix +++ b/pkgs/os-specific/linux/usbip/default.nix @@ -5,6 +5,11 @@ stdenv.mkDerivation rec { 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++) { -- cgit v1.2.3 From 2207378c9e67dead15040e53d17888af7881ac28 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 21 Aug 2019 22:14:31 +0900 Subject: linux: clearer origin for settings configuration adds _file so that nix may have a chance to display what file the conflictings settings come from. --- pkgs/os-specific/linux/kernel/generic.nix | 4 ++-- pkgs/os-specific/linux/kernel/manual-config.nix | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific') 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; -- cgit v1.2.3 From 289579b09e49d00e6c976ef943fb736979aaf7da Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 2 Sep 2019 18:15:05 -0500 Subject: numactl: 2.0.12 -> 2.0.13 https://github.com/numactl/numactl/releases/tag/v2.0.13 --- pkgs/os-specific/linux/numactl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/os-specific') 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 ]; -- cgit v1.2.3 From 5abfb98d50f7ea6a5a15ed0373320e10d2d1c41b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Aug 2019 08:28:22 -0700 Subject: kexectools: 2.0.19 -> 2.0.20 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/kexec-tools/versions --- pkgs/os-specific/linux/kexectools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific') 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" ]; -- cgit v1.2.3