From b49b6e037525451c1ae0fb9ca0e8597fa6a49c02 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 12 Mar 2019 00:58:43 -0700 Subject: [PATCH 1/2] udisks: 2.8.1 -> 2.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/udisks/versions --- pkgs/os-specific/linux/udisks/2-default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index e0340a0b784..43b694ed876 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -6,7 +6,7 @@ }: let - version = "2.8.1"; + version = "2.8.2"; in stdenv.mkDerivation rec { name = "udisks-${version}"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { owner = "storaged-project"; repo = "udisks"; rev = name; - sha256 = "073iqa0pwa7ab0qw33h3ic89508a78incmg6rq914d6br7s030zy"; + sha256 = "000xf99id1f6w8l20jxm3f2g32v9wx68rzv6q2bwrfz6vmy76xwy"; }; outputs = [ "out" "man" "dev" "devdoc" ]; From d3760f1c7a8de5c4f2c9e268cefc4ca06e834307 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 14 Mar 2019 14:46:22 -0500 Subject: [PATCH 2/2] udisks2: touchup and adjust deps for new version --- pkgs/os-specific/linux/udisks/2-default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 43b694ed876..484697d42ea 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, substituteAll, libtool, pkgconfig, intltool, gnused -, gnome3, gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash +{ stdenv, fetchFromGitHub, substituteAll, libtool, pkgconfig, gettext, gnused +, gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash, which , expat, libxslt, docbook_xsl, utillinux, mdadm, libgudev, libblockdev, parted -, gobject-introspection, docbook_xml_dtd_412, docbook_xml_dtd_43 +, gobject-introspection, docbook_xml_dtd_412, docbook_xml_dtd_43, autoconf, automake , xfsprogs, f2fs-tools, dosfstools, e2fsprogs, btrfs-progs, exfat, nilfs-utils, ntfs3g }: @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig gnome3.gnome-common libtool intltool gobject-introspection + autoconf automake pkgconfig libtool gettext which gobject-introspection gtk-doc libxslt docbook_xml_dtd_412 docbook_xml_dtd_43 docbook_xsl ]; @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { expat libgudev libblockdev acl systemd glib libatasmart polkit ]; - preConfigure = "./autogen.sh"; + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; configureFlags = [ "--enable-gtk-doc"