mdadm: Make 4.0 the default

4.0 has been out for a year without another upstream release, so
presumably 4.x's quite stable enough (and already in Arch & Debian
Buster for instance).

+4 -50
-43
pkgs/os-specific/linux/mdadm/4.nix
··· 1 - { stdenv 2 - , fetchurl, groff 3 - , buildPlatform, hostPlatform 4 - }: 5 - 6 - assert stdenv.isLinux; 7 - 8 - stdenv.mkDerivation rec { 9 - name = "mdadm-4.0"; 10 - 11 - src = fetchurl { 12 - url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz"; 13 - sha256 = "1ad3mma641946wn5lsllwf0lifw9lps34fv1nnkhyfpd9krffshx"; 14 - }; 15 - 16 - # This is to avoid self-references, which causes the initrd to explode 17 - # in size and in turn prevents mdraid systems from booting. 18 - allowedReferences = [ stdenv.glibc.out ]; 19 - 20 - patches = [ ./no-self-references.patch ]; 21 - 22 - makeFlags = [ 23 - "NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin" 24 - "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm" 25 - "STRIP=" 26 - ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [ 27 - "CROSS_COMPILE=${stdenv.cc.targetPrefix}" 28 - ]; 29 - 30 - nativeBuildInputs = [ groff ]; 31 - 32 - preConfigure = '' 33 - sed -e 's@/lib/udev@''${out}/lib/udev@' \ 34 - -e 's@ -Werror @ @' \ 35 - -e 's@/usr/sbin/sendmail@/run/wrappers/bin/sendmail@' -i Makefile 36 - ''; 37 - 38 - meta = { 39 - description = "Programs for managing RAID arrays under Linux"; 40 - homepage = http://neil.brown.name/blog/mdadm; 41 - platforms = stdenv.lib.platforms.linux; 42 - }; 43 - }
+2 -5
pkgs/os-specific/linux/mdadm/default.nix
··· 6 6 assert stdenv.isLinux; 7 7 8 8 stdenv.mkDerivation rec { 9 - name = "mdadm-3.3.4"; 9 + name = "mdadm-4.0"; 10 10 11 11 src = fetchurl { 12 12 url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz"; 13 - sha256 = "0s6a4bq7v7zxiqzv6wn06fv9f6g502dp047lj471jwxq0r9z9rca"; 13 + sha256 = "1ad3mma641946wn5lsllwf0lifw9lps34fv1nnkhyfpd9krffshx"; 14 14 }; 15 15 16 16 # This is to avoid self-references, which causes the initrd to explode ··· 28 28 ]; 29 29 30 30 nativeBuildInputs = [ groff ]; 31 - 32 - # Attempt removing if building with gcc5 when updating 33 - NIX_CFLAGS_COMPILE = "-std=gnu89"; 34 31 35 32 preConfigure = '' 36 33 sed -e 's@/lib/udev@''${out}/lib/udev@' \
+2 -2
pkgs/top-level/all-packages.nix
··· 13200 13200 13201 13201 mbpfan = callPackage ../os-specific/linux/mbpfan { }; 13202 13202 13203 - mdadm = callPackage ../os-specific/linux/mdadm { }; 13204 - mdadm4 = callPackage ../os-specific/linux/mdadm/4.nix { }; 13203 + mdadm = mdadm4; 13204 + mdadm4 = callPackage ../os-specific/linux/mdadm { }; 13205 13205 13206 13206 mingetty = callPackage ../os-specific/linux/mingetty { }; 13207 13207