diff options
author | Daniel Schaefer <git@danielschaefer.me> | 2019-07-29 23:00:09 +0200 |
---|---|---|
committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-07-30 13:00:40 +0200 |
commit | 1e07296a7e456a5f5a6a4cd27fcad061a6aa2f0c (patch) | |
tree | 32544aac7d8b393ae9d0d7a9447d19d2530f52fe /pkgs/development/libraries/libblockdev | |
parent | f744758a74161b2a5ade4f27af6d839e91609d21 (diff) |
libblockdev: 2.20 -> 2.22
https://github.com/storaged-project/libblockdev/releases/tag/2.22-1 https://github.com/storaged-project/libblockdev/releases/tag/2.21-1
Diffstat (limited to 'pkgs/development/libraries/libblockdev')
-rw-r--r-- | pkgs/development/libraries/libblockdev/default.nix | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index a807e39982739..6deb89a80ea2d 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, gtk-doc, libxslt, docbook_xsl -, docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted, gptfdisk, libyaml +{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, gtk-doc +, docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted , cryptsetup, lvm2, dmraid, utillinux, libbytesize, libndctl, nss, volume_key +, libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive +, thin-provisioning-tools, makeWrapper }: - -let - version = "2.20"; -in stdenv.mkDerivation rec { - name = "libblockdev-${version}"; +stdenv.mkDerivation rec { + pname = "libblockdev"; + version = "2.22"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libblockdev"; rev = "${version}-1"; - sha256 = "13xy8vx2dnnxczpnwapchc5ncigcxb2fhpmrmglbpkjqmhn2zbdj"; + sha256 = "03y4ps37wbi9p1136q0xzgshfnrjg4lgy8pgm1a3ihfcjnbwrbnq"; }; outputs = [ "out" "dev" "devdoc" ]; @@ -29,18 +29,25 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - autoreconfHook pkgconfig gtk-doc libxslt docbook_xsl docbook_xml_dtd_43 python3 gobject-introspection + autoreconfHook pkgconfig gtk-doc libxslt docbook_xsl docbook_xml_dtd_43 + python3 gobject-introspection autoconf-archive makeWrapper ]; buildInputs = [ - glib udev kmod parted gptfdisk cryptsetup lvm2 dmraid utillinux libbytesize libndctl nss volume_key libyaml + glib udev kmod parted gptfdisk cryptsetup lvm2 dmraid utillinux libbytesize + libndctl nss volume_key libyaml ]; + postInstall = '' + wrapProgram $out/bin/lvm-cache-stats --prefix PATH : \ + ${stdenv.lib.makeBinPath [ thin-provisioning-tools ]} + ''; + meta = with stdenv.lib; { description = "A library for manipulating block devices"; - homepage = http://storaged.org/libblockdev/; - license = licenses.lgpl2Plus; # lgpl2Plus for the library, gpl2Plus for the utils - maintainers = with maintainers; []; + homepage = "http://storaged.org/libblockdev/"; + license = with licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the utils + maintainers = with maintainers; [ johnazoidberg ]; platforms = platforms.linux; }; } |