Revert cryptsetup update to version 1.4.1.
The patch committed in revision 30839 causes nixos-rebuild to fail: | building Nix... | building the system configuration... | these derivations will be built: | /nix/store/0agbr6bgn6mgy8fy9miyc4p856x33qyg-system.drv | /nix/store/csagx61sw5mzd4hb9lajx65ds5212331-udev-initrd.conf.drv | /nix/store/jgm3l6ylmc8ncsirdi5hjh0mlk3m043g-initrd.drv | /nix/store/k40r1l30amnbxqidbdl480xq46rqr0pa-udev-rules.drv | /nix/store/ndphs01sgzw14aqpzzg3i6s6nlp6bwwc-stage-1-init.sh.drv | /nix/store/wqhdw86v24z0x7fhp8xrqvw6g12lphij-extra-utils.drv | building path(s) `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils' | [pbuilding /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils | `/nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/ld-linux-x86-64.so.2' -> `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/lib/ld-linux-x86-64.so.2' | `/nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libc.so.6' -> `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/lib/libc.so.6' | [...] | `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/sh' -> `bash' | `/nix/store/pmsabjn87gxlmkqlnj3hj502l687hw0f-module-init-tools-3.16/sbin/modprobe' -> `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/modprobe.real' | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/ata_id... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/basename... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/bash... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/blkid... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/cat... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/cdrom_id... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/chmod... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/chroot... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/cryptsetup... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/dmsetup... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/e2fsck... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/edd_id... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/fsck... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/input_id... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/ln... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/lvm... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/mdadm... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/mkdir... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/mknod... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/modprobe.real... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/mount... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/path_id... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/reiserfsck... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/scsi_id... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/sleep... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/switch_root... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/tune2fs... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/udevadm... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/udevd... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/umount... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/usb_id... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/v4l_id... | testing patched programs... | GNU bash, version 4.1.2(1)-release (x86_64-unknown-linux-gnu) | mount from util-linux-ng 2.18 (with libblkid support) | umount (util-linux-ng 2.18) | e2fsck 1.41.14 (22-Dec-2010) | tune2fs 1.41.14 (22-Dec-2010) | 173 | blkid from util-linux-ng 2.18 (libblkid 2.18.0, 30-Jun-2010) | Library version: 1.02.66 (2011-08-12) | LVM version: 2.02.87(2) (2011-08-12) | reiserfsck 3.6.21 (2009 www.namesys.com) | | mdadm - v3.1.2 - 10th March 2010 | basename (GNU coreutils) 8.7 | Copyright (C) 2010 Free Software Foundation, Inc. | License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. | This is free software: you are free to change and redistribute it. | There is NO WARRANTY, to the extent permitted by law. | | Written by David MacKenzie. | module-init-tools version 3.16 | [qoutput is not allowed to refer to path `/nix/store/qccjhn063cfv171rcaxvxh0yk96zf7l2-cryptsetup-1.4.1' | cannot build derivation `/nix/store/ndphs01sgzw14aqpzzg3i6s6nlp6bwwc-stage-1-init.sh.drv': 1 dependencies couldn't be built | cannot build derivation `/nix/store/jgm3l6ylmc8ncsirdi5hjh0mlk3m043g-initrd.drv': 1 dependencies couldn't be built | cannot build derivation `/nix/store/0agbr6bgn6mgy8fy9miyc4p856x33qyg-system.drv': 1 dependencies couldn't be built | error: build of `/nix/store/0agbr6bgn6mgy8fy9miyc4p856x33qyg-system.drv' failed svn path=/nixpkgs/trunk/; revision=30885
This commit is contained in:
Peter Simons
parent
8285e96cb7
commit
8d2d9449f7
@ -1,13 +1,19 @@
|
||||
{stdenv, fetchurl, libuuid, popt, devicemapper, libgcrypt }:
|
||||
{stdenv, fetchurl, libuuid, popt, devicemapper, udev }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "cryptsetup-1.4.1";
|
||||
name = "cryptsetup-1.0.6";
|
||||
src = fetchurl {
|
||||
url = http://cryptsetup.googlecode.com/files/cryptsetup-1.4.1.tar.bz2;
|
||||
sha256 = "82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb";
|
||||
url = http://cryptsetup.googlecode.com/files/cryptsetup-1.0.6.tar.bz2;
|
||||
sha256 = "df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd";
|
||||
};
|
||||
|
||||
buildInputs = [ libuuid popt devicemapper libgcrypt ];
|
||||
configureFlags = [ "--enable-libdevmapper" ];
|
||||
|
||||
patchPhase = ''
|
||||
sed -i -e 's@/sbin/udevsettle@${udev}/sbin/udevadm settle@' lib/libdevmapper.c
|
||||
'';
|
||||
|
||||
buildInputs = [ libuuid popt devicemapper ];
|
||||
|
||||
meta = {
|
||||
homepage = http://code.google.com/p/cryptsetup/;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user