3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

89 commits

Author SHA1 Message Date
Alyssa Ross ad3ed16929 lvm2: fix musl patches; apply unconditionally
Alpine's version of the first patch no longer applied, because we're
on a newer lvm2 version.

The fixes in both of these patches are either Musl-specific, or
shouldn't negatively affect Glibc, so change to applying them
unconditionally so they don't bitrot in future.
2021-08-12 09:19:21 +00:00
Alyssa Ross 3bc7ad5378 lvm2: remove probably-unnecessary Musl patch
e606e4d6a9 ("lvm2: musl patches from alpine") added all these patches
from Alpine to fix Musl builds, but one doesn't actually seem related
to Musl.  The Alpine issue[1] that led to its introduction links to a
Gentoo issue[2] about the same thing on Glibc.

We shouldn't be applying a fix for a non-libc-specific bug only to
Musl builds, and if this was going to be an issue for us we'd expect
to have seen it on Glibc by now.  It's more likely that it's been
fixed in the meantime.

[1]: https://gitlab.alpinelinux.org/alpine/aports/-/issues/3107
[2]: https://bugs.gentoo.org/335492
2021-08-12 09:19:21 +00:00
Arian van Putten d5fde7feb6 lvm2: Remove dependency on thin-provisioning-tools
thin-provisioning-tools has a _huge_ closure size (hundreds of
megabytes) and the only reference in the output of the lvm2 package is a
_comment_ in the etc/lvm.conf

The lvm2 package thus does not seem to depend on thin-provisoning-tools
in any way.

Reverts 9326a89910

thin provisoning is broken with or without this change:
https://github.com/NixOS/nixpkgs/issues/15516

A proper fix is here:
https://github.com/NixOS/nixpkgs/pull/46541

References:

$ nix why-depends nixpkgs#lvm2 nixpkgs#thin-provisioning-tools
/nix/store/n7zwwxi0ihjks7qk9bq5lbkniligfcqc-lvm2-2.03.11
└───etc/lvm.conf: …_check_executable = "/nix/store/w5an38q6byfr1sihks66srbqdii9hnsd-thin-prov>
    → /nix/store/w5an38q6byfr1sihks66srbqdii9hnsd-thin-provisioning-tools-0.9.0

$ ag thin-provisioning-tools --search-binary
etc/lvm.conf
1093:	# (See package device-mapper-persistent-data or thin-provisioning-tools)
1095:	# thin_check_executable = "/nix/store/w5an38q6byfr1sihks66srbqdii9hnsd-thin-provisioning-tools-0.9.0/bin/thin_check"
1100:	# (See package device-mapper-persistent-data or thin-provisioning-tools)
1102:	# thin_dump_executable = "/nix/store/w5an38q6byfr1sihks66srbqdii9hnsd-thin-provisioning-tools-0.9.0/bin/thin_dump"
1108:	# (See package device-mapper-persistent-data or thin-provisioning-tools)
1110:	# thin_repair_executable = "/nix/store/w5an38q6byfr1sihks66srbqdii9hnsd-thin-provisioning-tools-0.9.0/bin/thin_repair"
1155:	# (See package device-mapper-persistent-data or thin-provisioning-tools)
1157:	# cache_check_executable = "/nix/store/w5an38q6byfr1sihks66srbqdii9hnsd-thin-provisioning-tools-0.9.0/bin/cache_check"
1162:	# (See package device-mapper-persistent-data or thin-provisioning-tools)
1164:	# cache_dump_executable = "/nix/store/w5an38q6byfr1sihks66srbqdii9hnsd-thin-provisioning-tools-0.9.0/bin/cache_dump"
1170:	# (See package device-mapper-persistent-data or thin-provisioning-tools)
1172:	# cache_repair_executable = "/nix/store/w5an38q6byfr1sihks66srbqdii9hnsd-thin-provisioning-tools-0.9.0/bin/cache_repair"
2021-07-29 10:57:40 +02:00
ajs124 d151b2fb41 lvm2: 2.03.11 -> 2.03.12 2021-05-15 08:55:27 -07:00
Jan Tojnar fc7bd322df
Merge branch 'staging-next' into staging 2021-01-19 13:50:04 +01:00
Jonathan Ringer 9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
zowoq d93966200c Merge staging-next into staging 2021-01-18 13:03:13 +10:00
Ben Siraphob 16d91ee628 pkgs/os-specific: stdenv.lib -> lib 2021-01-17 23:26:08 +07:00
ajs124 2982fa466e lvm2: 2.03.10 -> 2.03.11
https://github.com/lvmteam/lvm2/blob/v2_03_11/WHATS_NEW

[VDO](https://github.com/dm-vdo/vdo) support is built by default now,
but is disabled in nixpkgs, because it can't find `vdoformat`.
AFAICT the kernel support for that still isn't upstream and it still
seems kind of experimental, so I'd just ignore that for now and add it
once it's either upstream of if anyone actually wants to use it.
2021-01-16 09:07:59 -08:00
Profpatsch 4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Graham Christensen bc49a0815a
utillinux: rename to util-linux 2020-11-24 12:42:06 -05:00
Arthur Gautier 0bd5a7d3ba lvm2: 2.03.09 -> 2.03.10 2020-08-22 10:23:00 -07:00
Florian Klink 9583669422 lvm2: passthru tests 2020-07-14 12:56:35 +02:00
Florian Klink 12d32eefed lvm2: rename enable_{cmdlib,dmeventd} to enable{Cmdlib,Dmeventd}
Make this more consistent with how these flags look like in the rest of
nixpkgs.
2020-07-14 12:00:33 +02:00
Florian Klink 9f83907013 lvm2: only split bin and lib out from out if cmdlib isn't enabled 2020-07-12 23:04:33 +02:00
Florian Klink b8129312bd lvm2: fix location to systemd-run invocation 2020-07-12 23:04:33 +02:00
ajs124 e6a6846d4f lvm2: fix paths to use /run instead of /var/run.
This shuts up some warnings.
2020-07-12 23:04:33 +02:00
Florian Klink d3a991d410 lvm2: add multiple output support 2020-07-12 23:04:33 +02:00
Florian Klink df67459b89 lvm2: don't embed ./configure line in lvm2 binary 2020-07-12 23:04:33 +02:00
Florian Klink 198d1e6f5c lvm2: make --enable-cmdlib optional
This seems to be mostly used to simplify LV management tasks from a web
interface
(https://www.redhat.com/archives/linux-lvm/2008-September/msg00029.html),
and is as fat as the `lvm` binary itself
2020-07-12 23:04:33 +02:00
ajs124 3ca74a976a lvm2: 2.03.01 -> 2.03.09 2020-07-12 23:04:33 +02:00
Florian Klink fbe7027251 lvm2: fetch sources from http instead of git
Otherwise, we end up in a dependency cycle:

systemd -> cryptsetup -> lvm -> fetchgit -> git -> openssh -> libfido2 -> hidapi -> libusb -> udev=systemd
2020-07-12 23:04:33 +02:00
ajs124 33030f1bd2 lvm2: add myself as maintainer 2020-07-12 23:04:33 +02:00
Florian Klink 5e1eb7bd59 lvm2: cleanups, make udev optional
- use installTargets again ("install", and
   "install_systemd_{generators,units,configuration}" when udev is not
   null)
 - The call to the blkid binary in lvm2's 13-dm-disk.rules file
   disappeared (so we don't need to patch in blkid anymore).
   lvm seems to rely on udev's internal blkid functionality.
 - Call /run/current-system/systemd/bin/udevadm instead
   of ${systemd}/bin/udevadm in the lvm activation generator.
   This is not necessary to break the dependency cycle (as we don't use
   that file when building without udev), but a good idea anyways -
   We want to trigger the udevadm of the current system, not the one
   that lvm was built with.
2020-07-12 23:04:33 +02:00
Lila 7517299146
treewide: fix broken AlpineLinux repo links (#87892) 2020-05-15 16:58:27 +01:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Maximilian Bosch a534e750a8
lvm2: fix build 2019-12-31 01:32:18 +01:00
Kirill Elagin 2e8ed0f443 Revert "lvm2: enable parallel building" (#72823)
* Revert "lvm2: enable parallel building"

This reverts commit 494d2deebf.

I am getting

```
gcc: error: ../../device_mapper/libdevice-mapper.a: No such file or directory
```
2019-11-05 11:29:14 +01:00
Joachim Fasting ecd693153f
lvm2: silence warning about unrecognized configure flag
--enable-applib has been removed.
2019-10-13 13:11:57 +02:00
Joachim Fasting 0489025cab
lvm2: allow building with systemd = null
The closure still picks up systemd via udev, however, overriding with eudev is
necessary to avoid the reference.
2019-10-13 13:11:55 +02:00
Joachim Fasting 494d2deebf
lvm2: enable parallel building 2019-10-13 13:11:54 +02:00
Joachim Fasting 5c11b11b58
lvm2: drop unused patch 2019-10-13 13:11:53 +02:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Ben Wolsieffer 369af2f5b2 lvm2: disable parallel building 2018-12-24 15:10:48 -05:00
Markus Kowalewski c047c26791
lvm2: 2.02.177 -> 2.03.01
* switch to sources to git
* add libaio to buildInputs
2018-12-09 11:43:08 +01:00
Markus Kowalewski 03a41ab5ec
lvm2: add license 2018-08-17 22:30:55 +02:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Matthew Bauer 76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
Jan Malakhovski 7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Will Dietz e606e4d6a9 lvm2: musl patches from alpine 2018-02-13 09:44:55 -06:00
Tuomas Tynkkynen 45e47c14be devicemapper: 2.02.176 -> 2.02.177 2018-01-20 23:19:35 +02:00
Ben Gamari dc10c551eb lvm2: Enable cross-compilation 2017-12-03 01:50:42 +02:00
Tuomas Tynkkynen d1f7d794cf devicemapper: 2.02.175 -> 2.02.176 2017-11-19 19:14:19 +02:00
Frederik Rietdijk 97c7b69e25 systemd: remove udev attributes 2017-10-27 22:20:20 +02:00
Tuomas Tynkkynen 89e5c3b700 devicemapper: 2.02.173 -> 2.02.175 2017-10-22 01:40:58 +03:00
Robert Hensing fbd3f8698a lvm2: 2.02.140 -> 2.02.173 2017-07-21 16:25:34 +02:00
Dan Peebles 90b9719f4f treewide: fix the remaining issues with meta attributes 2017-04-29 04:24:34 +00:00
Robin Gloster 9326a89910
lvm: add missing dependency
fixes #14394
2017-02-18 23:17:14 +01:00
Lluís Batlle i Rossell 2f35e223b1 Adding libuuid (libblkid) to lvm2.
It wants it to detect if there are filesystems present in block devices, in
case of pvcreate. Otherwise it complaints "lvm built without blkid support" and
lacks the feature of detecting/wiping.
2016-05-06 15:09:49 +02:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00