Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 67effde499ff
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bd58bdcf5fd1
Choose a head ref
  • 5 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 13, 2019

  1. lvm2: drop unused patch

    @joachifm
    joachifm committed Oct 13, 2019
    Copy the full SHA
    5c11b11 View commit details

  2. lvm2: enable parallel building

    @joachifm
    joachifm committed Oct 13, 2019
    Copy the full SHA
    494d2de View commit details

  3. lvm2: allow building with systemd = null 

    The closure still picks up systemd via udev, however, overriding with eudev is
necessary to avoid the reference.
    @joachifm
    joachifm committed Oct 13, 2019
    Copy the full SHA
    0489025 View commit details

  4. lvm2: silence warning about unrecognized configure flag 

    --enable-applib has been removed.
    @joachifm
    joachifm committed Oct 13, 2019
    Copy the full SHA
    ecd6931 View commit details

Commits on Oct 14, 2019

  1. Merge pull request #62660 from joachifm/feat/lvm2-nonSystemd 

    lvm2: cleanup & fix eval error when systemd=null
    @joachifm
    joachifm authored Oct 14, 2019
    Copy the full SHA
    bd58bdc View commit details
Showing with 5 additions and 52 deletions.
  1. +5 −8 pkgs/os-specific/linux/lvm2/default.nix
  2. +0 −44 pkgs/os-specific/linux/lvm2/purity.patch
13 changes: 5 additions & 8 deletions pkgs/os-specific/linux/lvm2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,6 @@ stdenv.mkDerivation {
"--enable-udev_rules"
"--enable-udev_sync"
"--enable-pkgconfig"
"--enable-applib"
"--enable-cmdlib"
] ++ stdenv.lib.optional enable_dmeventd " --enable-dmeventd"
++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
@@ -34,17 +33,15 @@ stdenv.mkDerivation {

preConfigure =
''
substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \
--replace /usr/bin/udevadm ${systemd}/bin/udevadm
sed -i /DEFAULT_SYS_DIR/d Makefile.in
sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in
'' + stdenv.lib.optionalString (systemd != null) ''
substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \
--replace /usr/bin/udevadm ${systemd}/bin/udevadm
'';

# gcc: error: ../../device_mapper/libdevice-mapper.a: No such file or directory
enableParallelBuilding = false;
enableParallelBuilding = true;

#patches = [ ./purity.patch ];
patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
(fetchpatch {
name = "fix-stdio-usage.patch";
@@ -75,7 +72,7 @@ stdenv.mkDerivation {
''
substituteInPlace $out/lib/udev/rules.d/13-dm-disk.rules \
--replace $out/sbin/blkid ${utillinux}/sbin/blkid
'' + stdenv.lib.optionalString (systemd != null) ''
# Systemd stuff
mkdir -p $out/etc/systemd/system $out/lib/systemd/system-generators
cp scripts/blk_availability_systemd_red_hat.service $out/etc/systemd/system
44 changes: 0 additions & 44 deletions pkgs/os-specific/linux/lvm2/purity.patch
View file

This file was deleted.