From afc4110dac85dbdb1fb503aa956561e88b458054 Mon Sep 17 00:00:00 2001 From: Dima Date: Sat, 14 Sep 2019 02:34:35 +0200 Subject: setools: 4.2.0 -> 4.2.2 and fixing build The build was broken because meanwhile setools requires cython and no bison, swig and flex anymore. Also, bumping version to newest release, which is not directly related to the build breakage. --- pkgs/os-specific/linux/setools/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 1e82c492159..138b54b0224 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bison, flex, python3 , swig +{ stdenv, fetchFromGitHub, python3 , libsepol, libselinux, checkpolicy , withGraphics ? false }: @@ -8,16 +8,16 @@ with python3.pkgs; buildPythonApplication rec { pname = "setools"; - version = "4.2.0"; + version = "4.2.2"; src = fetchFromGitHub { owner = "SELinuxProject"; repo = pname; rev = version; - sha256 = "1bjwcvr6rjx79cdcvaxn68bdrnl4f2a8gnnqsngdxhkhwpddksjy"; + sha256 = "18kklv26dwm2fdjjzfflvxsq83b2svnwf4g18xq7wsfsri121a90"; }; - nativeBuildInputs = [ bison flex swig ]; + nativeBuildInputs = [ cython ]; buildInputs = [ libsepol ]; propagatedBuildInputs = [ enum34 libselinux networkx ] ++ optionals withGraphics [ pyqt5 ]; -- cgit 1.4.1 From 08466b346730c85eb2005ebe3357ff9ac4a97e27 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 14 Sep 2019 22:44:55 -0500 Subject: linuxPackages*.intel-speed-select (5.3+) --- .../os-specific/linux/intel-speed-select/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/os-specific/linux/intel-speed-select/default.nix (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/intel-speed-select/default.nix b/pkgs/os-specific/linux/intel-speed-select/default.nix new file mode 100644 index 00000000000..cf0dd75a8a4 --- /dev/null +++ b/pkgs/os-specific/linux/intel-speed-select/default.nix @@ -0,0 +1,20 @@ +{ stdenv, kernel }: + +stdenv.mkDerivation { + pname = "intel-speed-select"; + inherit (kernel) src version; + + makeFlags = [ "bindir=${placeholder "out"}/bin" ]; + + postPatch = '' + cd tools/power/x86/intel-speed-select + sed -i 's,/usr,,g' Makefile + ''; + + meta = with stdenv.lib; { + description = "Tool to enumerate and control the Intel Speed Select Technology features"; + homepage = https://www.kernel.org/; + license = licenses.gpl2; + platforms = [ "i686-linux" "x86_64-linux" ]; # x86-specific + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7668880edbf..02e4a373d5e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15795,6 +15795,8 @@ in e1000e = if stdenv.lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null; + intel-speed-select = if stdenv.lib.versionAtLeast kernel.version "5.3" then callPackage ../os-specific/linux/intel-speed-select { } else null; + ixgbevf = callPackage ../os-specific/linux/ixgbevf {}; it87 = callPackage ../os-specific/linux/it87 {}; -- cgit 1.4.1 From a5460536647fdb421d89f87a23724893426004f6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 14 Sep 2019 16:54:15 -0500 Subject: cpustat: init at 0.02.09 --- pkgs/os-specific/linux/cpustat/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/os-specific/linux/cpustat/default.nix (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/cpustat/default.nix b/pkgs/os-specific/linux/cpustat/default.nix new file mode 100644 index 00000000000..8c0d206a8d1 --- /dev/null +++ b/pkgs/os-specific/linux/cpustat/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + pname = "cpustat"; + version = "0.02.09"; + src = fetchurl { + url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; + sha256 = "12xahv65yrhs5r830clkl1qnwg3dnrk5qn3zsznzbv1iy2f3cj7y"; + }; + buildInputs = [ ncurses ]; + installFlags = [ + "BINDIR=${placeholder "out"}/bin" + "MANDIR=${placeholder "out"}/share/man/man8" + ]; + meta = with lib; { + description = "CPU usage monitoring tool"; + homepage = "https://kernel.ubuntu.com/~cking/cpustat/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7668880edbf..5782a52f659 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15408,6 +15408,8 @@ in cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; + cpustat = callPackage ../os-specific/linux/cpustat { }; + cockroachdb = callPackage ../servers/sql/cockroachdb { }; conky = callPackage ../os-specific/linux/conky ({ -- cgit 1.4.1 From 57a9aa53f914b54efe524bdcb2630e90dbaec4e1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 16 Sep 2019 08:04:48 -0400 Subject: linux: 4.14.143 -> 4.14.144 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 0a0ccaffa7d..290a17f69f6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.143"; + version = "4.14.144"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${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 = "14rxck0dd0rirj09aj4xsbylcvvfrgqxr1fx0c570dxr7kqg4d15"; + sha256 = "0m6a0ggg6sxhpzmmbczwxpil5s0ndlvf4bd6zx4v4q50bdkq92yb"; }; } // (args.argsOverride or {})) -- cgit 1.4.1 From 572785b869c1ee0e9f69f4c04843f1633c12881a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 16 Sep 2019 08:04:55 -0400 Subject: linux: 4.19.72 -> 4.19.73 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 16277e6c85f..e1c1a260375 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.72"; + version = "4.19.73"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${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 = "0v8zypwyc9bcmm16hbvk092h9qnwqc0f6m61bz2ml499pnrvdz7r"; + sha256 = "1asz4zyfw7iyg68x3h8r5pgbqpk4vpblfzcb295xmn52y9zfgdbx"; }; } // (args.argsOverride or {})) -- cgit 1.4.1 From f282e78e4b93477d959e108ad4ec21847215c29b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 16 Sep 2019 08:04:58 -0400 Subject: linux: 4.4.192 -> 4.4.193 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 9f03e200f1b..a256d406bbf 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.192"; + version = "4.4.193"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0fwak1hrahcky1hdk4h8693rjpx65c2sqzfm1x71nhhysa6r3fig"; + sha256 = "13iy0xyrqqagnrk7msp1qfw6xsc0dlc74dpdzki9rfsxcildxz3a"; }; } // (args.argsOverride or {})) -- cgit 1.4.1 From 9ea89fd6c7b2c059ea46ef483ec2be03f7cb5904 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 16 Sep 2019 08:05:01 -0400 Subject: linux: 4.9.192 -> 4.9.193 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 9b91ced27d0..b43af36bca0 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.192"; + version = "4.9.193"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0m4d6b5sfcx3iv0agia080fbcn9icyqzgzxp946zv93hrq6306ks"; + sha256 = "00gx2sg0zc1xz6gs1kdkkd35gn7kjq1bjp1ydc774szsq0f0ircv"; }; } // (args.argsOverride or {})) -- cgit 1.4.1 From ef13578aacf966f482c48deb7a67cafd5e084b55 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 16 Sep 2019 08:05:04 -0400 Subject: linux: 5.2.14 -> 5.2.15 --- pkgs/os-specific/linux/kernel/linux-5.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix index 47e57b8bb0a..27459e9ac6d 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.2.14"; + version = "5.2.15"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${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 = "136fs0pn5acg40rlq51zl5001rk8fx01gi2ffd58cspfgx3kckf6"; + sha256 = "0jhc70r2rygm91qifjagg1jgbpjwyyq6m8g1n5iv81l1v84i0mpb"; }; } // (args.argsOverride or {})) -- cgit 1.4.1 From 921071da08d673f34b3dcfcd6129cb2c95f54a3b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 16 Sep 2019 09:18:32 -0400 Subject: linux: Add 5.3, linux-libre: 16791 -> 16794 Update linuxPackages_latest to 5.3 --- pkgs/os-specific/linux/kernel/linux-5.3.nix | 18 ++++++++++++++++++ pkgs/os-specific/linux/kernel/linux-libre.nix | 2 +- pkgs/top-level/all-packages.nix | 7 ++++++- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-5.3.nix (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/kernel/linux-5.3.nix b/pkgs/os-specific/linux/kernel/linux-5.3.nix new file mode 100644 index 00000000000..e9cb412d8db --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.3.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "5.3"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "1ck70ns130nqf6xy02bwm67y00yh46lhjzdajq7zzx1wa6bw7wvq"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index ddaceb877f8..d29a2382c2a 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -4,7 +4,7 @@ # Update this if linux_latest-libre fails to build. # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/ | grep -Eo 'Revision [0-9]+' - rev = "16791"; + rev = "16794"; sha256 = "1lpaka4hs7yrpnrzfybd6radjylwvw2p4aly68pypykqs2srvm7j"; } , ... diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02e4a373d5e..f12d5257d92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15717,6 +15717,10 @@ in ]; }; + linux_5_3 = callPackage ../os-specific/linux/kernel/linux-5.3.nix { + kernelPatches = [ kernelPatches.bridge_stp_helper ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -15911,7 +15915,7 @@ in linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_5_2; + linuxPackages_latest = linuxPackages_5_3; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -15922,6 +15926,7 @@ in linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_2); + linuxPackages_5_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_3); # When adding to this list: # - Update linuxPackages_latest to the latest version -- cgit 1.4.1 From d0c6414938ee183e5df0f5136a1e66da5b4b148e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 16 Sep 2019 22:16:37 -0500 Subject: cpustat: newlines between (most) attributes Exception is made for pname/version as is convention. --- pkgs/os-specific/linux/cpustat/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/cpustat/default.nix b/pkgs/os-specific/linux/cpustat/default.nix index 8c0d206a8d1..23ed2b07c96 100644 --- a/pkgs/os-specific/linux/cpustat/default.nix +++ b/pkgs/os-specific/linux/cpustat/default.nix @@ -3,15 +3,19 @@ stdenv.mkDerivation rec { pname = "cpustat"; version = "0.02.09"; + src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; sha256 = "12xahv65yrhs5r830clkl1qnwg3dnrk5qn3zsznzbv1iy2f3cj7y"; }; + buildInputs = [ ncurses ]; + installFlags = [ "BINDIR=${placeholder "out"}/bin" "MANDIR=${placeholder "out"}/share/man/man8" ]; + meta = with lib; { description = "CPU usage monitoring tool"; homepage = "https://kernel.ubuntu.com/~cking/cpustat/"; -- cgit 1.4.1 From 6bbf9dc419c39189520ce5bcc68f2b071e71557d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 17 Sep 2019 23:34:07 +0200 Subject: firmwareLinuxNonfree: 2019-07-17 -> 2019-08-15 --- .../os-specific/linux/firmware/firmware-linux-nonfree/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 380444f0269..a6e3ccad501 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "firmware-linux-nonfree"; - version = "2019-07-17"; + version = "2019-08-15"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - rev = "20190717"; - sha256 = "1dcaqdqyffxiadx420pg20157wqidz0c0ca5mrgyfxgrbh6a4mdj"; + rev = "20190815"; + sha256 = "06p6scpmhdifzi3yhg5n4f2kqp4pl20xhh0k2kw70p10zgxg2l4r"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1q3zqa3xxg4679p893xzwpa43afvdnnkg5xb0qs6mac75sizngid"; + outputHash = "1dgclb44li70z0vkk9qxlbsj2jnqwx97gd7c429i2nv9lhgm14vx"; meta = with stdenv.lib; { description = "Binary firmware collection packaged by kernel.org"; -- cgit 1.4.1 From 101947774c8aea770c650b7d3b78d50c63215742 Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Sat, 14 Sep 2019 12:53:04 +0000 Subject: udisks2: disable docs when cross-compiling --- pkgs/os-specific/linux/udisks/2-default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index e99e9e37d82..1d967b38eb9 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "01wx2x8xyal595dhdih7rva2bz7gqzgwdp56gi0ikjdzayx17wcf"; }; - outputs = [ "out" "man" "dev" "devdoc" ]; + outputs = [ "out" "man" "dev" ] ++ stdenv.lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "devdoc"; patches = [ (substituteAll { @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { preConfigure = "NOCONFIGURE=1 ./autogen.sh"; configureFlags = [ - "--enable-gtk-doc" + (stdenv.lib.enableFeature (stdenv.buildPlatform == stdenv.hostPlatform) "gtk-doc") "--localstatedir=/var" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-udevdir=$(out)/lib/udev" -- cgit 1.4.1 From 3b96c76bef1a2e788558974dc535d3ea788d978a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 18 Sep 2019 12:47:57 -0400 Subject: wxMSW: mark broken MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This hasn’t worked for a while: https://hydra.nixos.org/job/nixpkgs/cross-trunk/crossMingw32.windows.wxMSW.x86_64-linux --- pkgs/os-specific/windows/wxMSW-2.8/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix index 65690af9869..2764c4232c1 100644 --- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix +++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix @@ -31,5 +31,7 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.windows; + + broken = true; }; } -- cgit 1.4.1 From 6b3832a5194feacf4e9708fe94869f3aa7781296 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Wed, 18 Sep 2019 20:12:58 +0200 Subject: mdadm: fix path to sendmail Without this, mdadm won't be able to send email notifications: $ sudo mdadm --monitor --scan --test sh: /nix/store/2v8jn0lxza72grcm6hciak9fpgm7xb3a-system-sendmail-1.0: Is a directory Fixes: b074a40f74c2 ("mdadm: use shared system-sendmail") --- pkgs/os-specific/linux/mdadm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 5aa9e9b43da..8638ac9f798 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -e 's@/lib/udev@''${out}/lib/udev@' \ -e 's@ -Werror @ @' \ - -e 's@/usr/sbin/sendmail@${system-sendmail}@' -i Makefile + -e 's@/usr/sbin/sendmail@${system-sendmail}/bin/sendmail@' -i Makefile sed -i \ -e 's@/usr/bin/basename@${coreutils}/bin/basename@g' \ -e 's@BINDIR/blkid@${utillinux}/bin/blkid@g' \ -- cgit 1.4.1