public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #51756 from markuskowa/upd-lvm2

Browse Source 
lvm2: 2.02.177 -> 2.03.01
This commit is contained in:
Michael Raskin 2018-12-10 22:02:02 +00:00 committed by GitHub
commit 654d324230
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/os-specific/linux/lvm2/default.nix
View File

@ -1,16 +1,18 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, udev, utillinux, libuuid { stdenv, fetchgit, fetchpatch, pkgconfig, systemd, udev, utillinux, libuuid
, thin-provisioning-tools, enable_dmeventd ? false }: , thin-provisioning-tools, libaio
, enable_dmeventd ? false }:
let let
version = "2.02.177"; version = "2.03.01";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "lvm2-${version}"; name = "lvm2-${version}";
src = fetchurl { src = fetchgit {
url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz"; url = "git://sourceware.org/git/lvm2.git";
sha256 = "1wl0isn0yz5wvglwylnlqkppafwmvhliq5bd92vjqp5ir4za49a0"; rev = "v${builtins.replaceStrings [ "." ] [ "_" ] version}";
sha256 = "0jlaswf1srdxiqpgpp97j950ddjds8z0kr4pbwmal2za2blrgvbl";
}; };
configureFlags = [ configureFlags = [
@ -27,7 +29,7 @@ stdenv.mkDerivation {
]; ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ udev libuuid thin-provisioning-tools ]; buildInputs = [ udev libuuid thin-provisioning-tools libaio ];
preConfigure = preConfigure =
'' ''

13
pkgs/tools/misc/grub/2.0x.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, flex, bison, python { stdenv, fetchurl, fetchpatch, flex, bison, python
, gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig , gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig
, fuse # only needed for grub-mount , fuse # only needed for grub-mount
, zfs ? null , zfs ? null
@ -82,7 +82,16 @@ stdenv.mkDerivation rec {
unset CPP # setting CPP intereferes with dependency calculation unset CPP # setting CPP intereferes with dependency calculation
''; '';
patches = [ ./fix-bash-completion.patch ]; patches = [
./fix-bash-completion.patch
# This patch makes grub compatible with the XFS sparse inode
# feature introduced by xfsprogs-4.16.
# to be removed in grub-2.03
(fetchpatch {
url = https://git.savannah.gnu.org/cgit/grub.git/patch/?id=cda0a857dd7a27cd5d621747464bfe71e8727fff;
sha256 = "0k9qrkdxwdqk6sz05q9smqwjr6pvgc9adx1mlf0807g4im91xnm0";
})
];
configureFlags = [ "--enable-grub-mount" ] # dep of os-prober configureFlags = [ "--enable-grub-mount" ] # dep of os-prober
++ optional zfsSupport "--enable-libzfs" ++ optional zfsSupport "--enable-libzfs"