From 011c149ed5e5a336c3039f0b9d4303020cff1d86 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 9 Dec 2015 20:25:40 +0100 Subject: [PATCH] mdadm: Set allowedReferences to only include libc. The updates we had in the past (7719f7f and 1faf610) broke the mdadm installer test and systems in the wild using mdraid because newer mdadm versions contained a self-referenc to its own store path. Instead of putting a big warning about updating in the package expression, let's just add allowedReferences so the build immediately fails if there is a self-reference. Signed-off-by: aszlig --- pkgs/os-specific/linux/mdadm/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index e7ed190c0c5b..dc1697b9e9b2 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -3,20 +3,15 @@ stdenv.mkDerivation rec { name = "mdadm-3.3.4"; - # WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING - # Do NOT update this if you're not ABSOLUTELY certain that it will work. - # Please check the update using the NixOS VM test, BEFORE pushing: - # nix-build nixos/release.nix -A tests.installer.swraid.x86_64-linux - # Discussion: - # https://github.com/NixOS/nixpkgs/commit/7719f7f - # https://github.com/NixOS/nixpkgs/commit/666cf99 - # https://github.com/NixOS/nixpkgs/pull/6006 - # WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING src = fetchurl { url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz"; sha256 = "0s6a4bq7v7zxiqzv6wn06fv9f6g502dp047lj471jwxq0r9z9rca"; }; + # 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 ]; + patches = [ ./no-self-references.patch ]; makeFlags = [