diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libblockdev')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libblockdev/default.nix | 92 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libblockdev/fix-paths.patch | 47 |
2 files changed, 66 insertions, 73 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libblockdev/default.nix b/nixpkgs/pkgs/development/libraries/libblockdev/default.nix index c64fd87e6c28..985151494364 100644 --- a/nixpkgs/pkgs/development/libraries/libblockdev/default.nix +++ b/nixpkgs/pkgs/development/libraries/libblockdev/default.nix @@ -1,41 +1,81 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkg-config, gtk-doc -, docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted -, cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key -, libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive -, thin-provisioning-tools, makeWrapper +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, gtk-doc +, docbook_xml_dtd_43 +, python3 +, gobject-introspection +, glib +, udev +, kmod +, parted +, cryptsetup +, lvm2 +, util-linux +, libbytesize +, libndctl +, nss +, volume_key +, libxslt +, docbook_xsl +, gptfdisk +, libyaml +, autoconf-archive +, thin-provisioning-tools +, makeBinaryWrapper +, e2fsprogs +, libnvme +, keyutils }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libblockdev"; - version = "2.28"; + version = "3.0.2"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libblockdev"; - rev = "${version}-1"; - sha256 = "sha256-6MrM3psLqMcpf4haaEHg3FwrhUDz5h/DeY1w96T0UlE="; + rev = "${finalAttrs.version}-1"; + hash = "sha256-tqF96yeBPilF0zQ53RNN7IZ2wVgWQOwbGkvoywN/i+0="; }; outputs = [ "out" "dev" "devdoc" ]; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - sgdisk = "${gptfdisk}/bin/sgdisk"; - }) - ]; - postPatch = '' patchShebangs scripts ''; nativeBuildInputs = [ - autoreconfHook pkg-config gtk-doc libxslt docbook_xsl docbook_xml_dtd_43 - python3 gobject-introspection autoconf-archive makeWrapper + autoconf-archive + autoreconfHook + docbook_xsl + docbook_xml_dtd_43 + gobject-introspection + gtk-doc + libxslt + makeBinaryWrapper + pkg-config + python3 ]; buildInputs = [ - glib udev kmod parted gptfdisk cryptsetup lvm2 dmraid util-linux libbytesize - libndctl nss volume_key libyaml + cryptsetup + e2fsprogs + glib + gptfdisk + keyutils + kmod + libbytesize + libndctl + libnvme + libyaml + lvm2 + nss + parted + udev + util-linux + volume_key ]; postInstall = '' @@ -43,12 +83,12 @@ stdenv.mkDerivation rec { ${lib.makeBinPath [ thin-provisioning-tools ]} ''; - meta = with lib; { + meta = { + changelog = "https://github.com/storaged-project/libblockdev/raw/${finalAttrs.src.rev}/NEWS.rst"; description = "A library for manipulating block devices"; homepage = "http://storaged.org/libblockdev/"; - changelog = "https://github.com/storaged-project/libblockdev/raw/${src.rev}/NEWS.rst"; - license = with licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the utils - maintainers = with maintainers; [ johnazoidberg ]; - platforms = platforms.linux; + license = with lib.licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the utils + maintainers = with lib.maintainers; [ johnazoidberg ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/libblockdev/fix-paths.patch b/nixpkgs/pkgs/development/libraries/libblockdev/fix-paths.patch deleted file mode 100644 index 85822165d8c5..000000000000 --- a/nixpkgs/pkgs/development/libraries/libblockdev/fix-paths.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/src/plugins/part.c -+++ b/src/plugins/part.c -@@ -146,7 +146,7 @@ static GMutex deps_check_lock; - #define DEPS_LAST 2 - - static const UtilDep deps[DEPS_LAST] = { -- {"sgdisk", "0.8.6", NULL, "GPT fdisk \\(sgdisk\\) version ([\\d\\.]+)"}, -+ {"@sgdisk@", "0.8.6", NULL, "GPT fdisk \\(sgdisk\\) version ([\\d\\.]+)"}, - {"sfdisk", NULL, NULL, NULL}, - }; - -@@ -355,7 +355,7 @@ gboolean bd_part_create_table (const gchar *disk, BDPartTableType type, gboolean - } - - static gchar* get_part_type_guid_and_gpt_flags (const gchar *device, int part_num, guint64 *flags, GError **error) { -- const gchar *args[4] = {"sgdisk", NULL, device, NULL}; -+ const gchar *args[4] = {"@sgdisk@", NULL, device, NULL}; - gchar *output = NULL; - gchar **lines = NULL; - gchar **line_p = NULL; -@@ -1325,7 +1325,7 @@ gboolean bd_part_resize_part (const gchar *disk, const gchar *part, guint64 size - - - static gboolean set_gpt_flag (const gchar *device, int part_num, BDPartFlag flag, gboolean state, GError **error) { -- const gchar *args[5] = {"sgdisk", "--attributes", NULL, device, NULL}; -+ const gchar *args[5] = {"@sgdisk@", "--attributes", NULL, device, NULL}; - int bit_num = 0; - gboolean success = FALSE; - -@@ -1351,7 +1351,7 @@ static gboolean set_gpt_flag (const gchar *device, int part_num, BDPartFlag flag - } - - static gboolean set_gpt_flags (const gchar *device, int part_num, guint64 flags, GError **error) { -- const gchar *args[5] = {"sgdisk", "--attributes", NULL, device, NULL}; -+ const gchar *args[5] = {"@sgdisk@", "--attributes", NULL, device, NULL}; - guint64 real_flags = 0; - gchar *mask_str = NULL; - gboolean success = FALSE; -@@ -1791,7 +1791,7 @@ gboolean bd_part_set_part_name (const gchar *disk, const gchar *part, const gcha - * Tech category: %BD_PART_TECH_GPT-%BD_PART_TECH_MODE_MODIFY_PART - */ - gboolean bd_part_set_part_type (const gchar *disk, const gchar *part, const gchar *type_guid, GError **error) { -- const gchar *args[5] = {"sgdisk", "--typecode", NULL, disk, NULL}; -+ const gchar *args[5] = {"@sgdisk@", "--typecode", NULL, disk, NULL}; - const gchar *part_num_str = NULL; - gboolean success = FALSE; - guint64 progress_id = 0; |