Commit Graph

28 Commits

Author SHA1 Message Date
Sergei Trofimovich
d32fcc684c multipath-tools: pull upstream fix for -fno-cmmon toolchains
Without the change build on clang-12 (and upstream gcc-10+) fails as:

    $ nix build -L --impure --expr 'with import ./. {}; multipath-tools.override { stdenv = clang12Stdenv; }'
    ...
    multipath-tools> ld: callout.o:libmultipath/./structs.h:109:
      multiple definition of `___error1___'; devmapper.o:structs.h:109: first defined here
2021-12-25 22:38:47 +00:00
Michael Brantley
c344317f18 multipath-tools: deprecate systemd-udev-settle.service
The systemd service manifest provided with the multipath-tools source
makes reference to the systemd-udev-settle.service, and this in turn
triggers deprecation warnings on startup. This patch removes these
references to silence these warnings.
2021-10-08 09:47:01 -04:00
Graham Christensen
94a291a5b7
multipath-tools: fix the service path to multipathd 2021-03-11 10:31:42 -05: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
Ben Siraphob
16d91ee628 pkgs/os-specific: stdenv.lib -> lib 2021-01-17 23:26:08 +07: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
Anders Kaseorg
a3a1e27135 multipath-tools: Fix build with multi-output lvm2
It was broken by commit d3a991d410
(#93024).

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2020-07-26 22:58:02 -07:00
Martin Milata
542c8ff893 multipath-tools: support json_c-0.14 2020-07-02 18:30:23 +02:00
Neil Mayhew
367b3a99e4 multipath-tools: Fix build failure due to GZIP make var
The multipath-tools makefiles use GZIP as a variable name but this is
also the name of the environment variable gzip uses to get its default
options.

Normally, this wouldn't get into the environment but nixpkgs exports
GZIP=-n in a setup hook. This in turn causes make to export its own
value for this variable. gzip objects to having -c in the environment
variable and aborts, causing the build to fail.
2020-06-02 09:38:29 -06:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Daniel Schaefer
27aa4bf49b multipath-tools: Fix prefix
udev rules and manpages in section 8 were installed into $out/usr

Results in the following derivation output diff:

 lib/systemd/system
 lib/systemd/system/multipathd.service
 lib/systemd/system/multipathd.socket
+lib/udev
+lib/udev/kpartx_id
+lib/udev/rules.d
+lib/udev/rules.d/11-dm-mpath.rules
+lib/udev/rules.d/11-dm-parts.rules
+lib/udev/rules.d/56-multipath.rules
+lib/udev/rules.d/66-kpartx.rules
+lib/udev/rules.d/68-del-part-nodes.rules
 sbin
 share
 share/man
@@ -79,25 +87,14 @@
 share/man/man3/mpath_persistent_reserve_out.3.gz
 share/man/man5
 share/man/man5/multipath.conf.5.gz
+share/man/man8
+share/man/man8/kpartx.8.gz
+share/man/man8/mpathpersist.8.gz
+share/man/man8/multipath.8.gz
+share/man/man8/multipathd.8.gz
 usr
 usr/include
 usr/include/libdmmp
 usr/include/libdmmp/libdmmp.h
 usr/include/mpath_cmd.h
 usr/include/mpath_persist.h
-usr/lib
-usr/lib/udev
-usr/lib/udev/kpartx_id
-usr/lib/udev/rules.d
-usr/lib/udev/rules.d/11-dm-mpath.rules
-usr/lib/udev/rules.d/11-dm-parts.rules
-usr/lib/udev/rules.d/56-multipath.rules
-usr/lib/udev/rules.d/66-kpartx.rules
-usr/lib/udev/rules.d/68-del-part-nodes.rules
-usr/share
-usr/share/man
-usr/share/man/man8
-usr/share/man/man8/kpartx.8.gz
-usr/share/man/man8/mpathpersist.8.gz
-usr/share/man/man8/multipath.8.gz
-usr/share/man/man8/multipathd.8.gz
2019-11-06 19:12:52 +01:00
R. RyanTM
ff2a877712 multipath-tools: 0.8.2 -> 0.8.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/multipath-tools/versions
2019-10-07 12:11:55 -07:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
R. RyanTM
b8a4f1eb97 multipath-tools: 0.8.1 -> 0.8.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/multipath-tools/versions
2019-07-15 18:27:29 -07:00
Franz Pletz
d436ab0718
multipath-tools: 0.6.2 -> 0.8.1 2019-06-03 15:05:20 +02:00
László Vaskó
c3b6b00bcf multipath-tools: download URL points to tag for easier package updates 2019-05-21 20:18:43 +02:00
László Vaskó
3c66a05a7b multipath-tools: fix download URL
The URL was mistakenly truncated in the following commit:
    57bccb3cb8 treewide: http -> https sources (#42676)
2019-05-21 20:18:43 +02:00
Markus Kowalewski
c6eff80696
multipath-tools: add license 2018-08-30 21:37:57 +02:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Joachim Fasting
6758d157d2
multipath-tools: ensure gzip does not capture timestamp
gzip is originally called as 'gzip -9 -c'

This is a port of
a8e7ddd1df

Note that it does not seem to make a difference to `nix-build --check`.
2016-12-20 15:31:55 +01:00
Franz Pletz
c513e2ab39
multipath-tools: 0.5.0 -> 0.6.2, fixes build
Was broken due to 78178d5854.
2016-09-09 23:14:16 +02:00
Eelco Dolstra
78178d5854 systemd: Separate lib output
This moves libsystemd.so and libudev.so into systemd.lib, and gets rid
of libudev (which just contained a copy of libudev.so and the udev
headers). It thus reduces the closure size of all packages that
(indirectly) depend on libsystemd, of which there are quite a few (for
instance, PulseAudio and dbus). For example, it reduces the closure of
Blender from 430.8 to 400.8 MiB.
2016-09-05 19:17:14 +02:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster
1581f25a07 multipath-tools: no format hardening 2016-01-30 16:36:57 +00:00
aszlig
05fed13de3
multipath_tools: Cleanup and update to v0.5.0
Previously, version 0.4.9 was a tarbomb and in version 0.5.0 this
fortunately isn't the case anymore so we don't need to set sourceRoot by
ourselves.

I've also moved the definition of makeFlagsArray to the attribute
makeFlags, because we can use $(var) to substitute shell variables
within make.

The references to /lib/udev/scsi_id no longer exist in version 0.5.0 and
it seems that libudev is used directly.

Nevertheless, there are still references to FHS paths such as /var/run,
/etc/multipath.conf and /etc/multipath but these are only relevant at
runtime and can be configured to point to a different path elsewhere.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-21 16:18:13 +01:00
Alexander Kjeldaas
da1f8578b0 Eradicate gzip -9 without -n 2014-12-28 13:45:27 +01:00
Yury G. Kudryashov
69f13c4922 udev-173, patch
svn path=/nixpkgs/branches/udev-173/; revision=28660
2011-08-18 13:04:55 +00:00
Eelco Dolstra
ee6e9046b8 * Add the Linux multipath-tools.
svn path=/nixpkgs/trunk/; revision=26719
2011-04-06 14:57:31 +00:00