diff options
| author | Florian Klink <flokli@flokli.de> | 2020-09-04 19:12:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 19:12:53 +0200 |
| commit | 176d5e090a42961e5c6df3e20e483606f78042e1 (patch) | |
| tree | f6f4889d46eb69c1a17bb20450fd3ac595f076ba /pkgs | |
| parent | 7ecabdc22ba3fed533067292bcabbd7ebb07e5d8 (diff) | |
| parent | f4b2c9dfe7cb63edc8059c6caeaa9de015068628 (diff) | |
Merge pull request #97008 from andersk/cryptception-1
cryptsetup, lvm2, systemd: Break cyclic dependency at a different point
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1fe345de20ef0..bf9973ec27f41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17246,11 +17246,7 @@ in criu = callPackage ../os-specific/linux/criu { }; - cryptsetup = callPackage ../os-specific/linux/cryptsetup { - # cryptsetup only really needs the devmapper component of cryptsetup - # but itself is used as a library in systemd (=udev) - lvm2 = lvm2.override { udev = null; }; - }; + cryptsetup = callPackage ../os-specific/linux/cryptsetup { }; cramfsprogs = callPackage ../os-specific/linux/cramfsprogs { }; @@ -18032,7 +18028,12 @@ in lsscsi = callPackage ../os-specific/linux/lsscsi { }; - lvm2 = callPackage ../os-specific/linux/lvm2 { }; + lvm2 = callPackage ../os-specific/linux/lvm2 { + # udev is the same package as systemd which depends on cryptsetup + # which depends on lvm2 again. But we only need the libudev part + # which does not depend on cryptsetup. + udev = udev.override { cryptsetup = null; }; + }; lvm2_dmeventd = callPackage ../os-specific/linux/lvm2 { enableDmeventd = true; enableCmdlib = true; |