diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2018-01-28 14:43:07 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-28 14:43:07 +0000 |
commit | e305380f0c3f92b765af1f36f42cc6c6ba9e7e14 (patch) | |
tree | 143bd9486fe7549bb2a61b6fc0e5c261e3fa0d13 | |
parent | 2b270c1596f48ffb7ddb5ef88a4374bf1d8331ac (diff) | |
parent | 2f39b19535c7da9ccfc0a7dcc5acfbb97e60afb4 (diff) | |
download | nixlib-e305380f0c3f92b765af1f36f42cc6c6ba9e7e14.tar nixlib-e305380f0c3f92b765af1f36f42cc6c6ba9e7e14.tar.gz nixlib-e305380f0c3f92b765af1f36f42cc6c6ba9e7e14.tar.bz2 nixlib-e305380f0c3f92b765af1f36f42cc6c6ba9e7e14.tar.lz nixlib-e305380f0c3f92b765af1f36f42cc6c6ba9e7e14.tar.xz nixlib-e305380f0c3f92b765af1f36f42cc6c6ba9e7e14.tar.zst nixlib-e305380f0c3f92b765af1f36f42cc6c6ba9e7e14.zip |
Merge pull request #34356 from dezgeg/mdadm4
mdadm: Make 4.0 the default
-rw-r--r-- | pkgs/os-specific/linux/mdadm/4.nix | 43 | ||||
-rw-r--r-- | pkgs/os-specific/linux/mdadm/default.nix | 7 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 4 insertions, 50 deletions
diff --git a/pkgs/os-specific/linux/mdadm/4.nix b/pkgs/os-specific/linux/mdadm/4.nix deleted file mode 100644 index f9c2a5e09af6..000000000000 --- a/pkgs/os-specific/linux/mdadm/4.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv -, fetchurl, groff -, buildPlatform, hostPlatform -}: - -assert stdenv.isLinux; - -stdenv.mkDerivation rec { - name = "mdadm-4.0"; - - src = fetchurl { - url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz"; - sha256 = "1ad3mma641946wn5lsllwf0lifw9lps34fv1nnkhyfpd9krffshx"; - }; - - # This is to avoid self-references, which causes the initrd to explode - # in size and in turn prevents mdraid systems from booting. - allowedReferences = [ stdenv.glibc.out ]; - - patches = [ ./no-self-references.patch ]; - - makeFlags = [ - "NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin" - "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm" - "STRIP=" - ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [ - "CROSS_COMPILE=${stdenv.cc.targetPrefix}" - ]; - - nativeBuildInputs = [ groff ]; - - preConfigure = '' - sed -e 's@/lib/udev@''${out}/lib/udev@' \ - -e 's@ -Werror @ @' \ - -e 's@/usr/sbin/sendmail@/run/wrappers/bin/sendmail@' -i Makefile - ''; - - meta = { - description = "Programs for managing RAID arrays under Linux"; - homepage = http://neil.brown.name/blog/mdadm; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 31dd0cbf18d8..85a65b8f824d 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "mdadm-3.3.4"; + name = "mdadm-4.0"; src = fetchurl { url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz"; - sha256 = "0s6a4bq7v7zxiqzv6wn06fv9f6g502dp047lj471jwxq0r9z9rca"; + sha256 = "1ad3mma641946wn5lsllwf0lifw9lps34fv1nnkhyfpd9krffshx"; }; # This is to avoid self-references, which causes the initrd to explode @@ -29,9 +29,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ groff ]; - # Attempt removing if building with gcc5 when updating - NIX_CFLAGS_COMPILE = "-std=gnu89"; - preConfigure = '' sed -e 's@/lib/udev@''${out}/lib/udev@' \ -e 's@ -Werror @ @' \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 811a456d54a0..7775e5113617 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13200,8 +13200,8 @@ with pkgs; mbpfan = callPackage ../os-specific/linux/mbpfan { }; - mdadm = callPackage ../os-specific/linux/mdadm { }; - mdadm4 = callPackage ../os-specific/linux/mdadm/4.nix { }; + mdadm = mdadm4; + mdadm4 = callPackage ../os-specific/linux/mdadm { }; mingetty = callPackage ../os-specific/linux/mingetty { }; |