BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

udisks: 2.8.2 -> 2.8.4

Browse source 
https://github.com/storaged-project/udisks/releases/tag/udisks-2.8.3
https://github.com/storaged-project/udisks/releases/tag/udisks-2.8.4
This commit is contained in:
Daniel Schaefer 2019-07-29 23:38:10 +02:00 committed by Frederik Rietdijk
parent 1e07296a7e
commit 05f8fe7ed2
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkgs/os-specific/linux/udisks/2-default.nix
View file

@ -5,16 +5,15 @@
, xfsprogs, f2fs-tools, dosfstools, e2fsprogs, btrfs-progs, exfat, nilfs-utils, ntfs3g , xfsprogs, f2fs-tools, dosfstools, e2fsprogs, btrfs-progs, exfat, nilfs-utils, ntfs3g
}: }:
let stdenv.mkDerivation rec {
version = "2.8.2"; pname = "udisks";
in stdenv.mkDerivation rec { version = "2.8.4";
name = "udisks-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "storaged-project"; owner = "storaged-project";
repo = "udisks"; repo = "udisks";
rev = name; rev = "${pname}-${version}";
sha256 = "000xf99id1f6w8l20jxm3f2g32v9wx68rzv6q2bwrfz6vmy76xwy"; sha256 = "01wx2x8xyal595dhdih7rva2bz7gqzgwdp56gi0ikjdzayx17wcf";
}; };
outputs = [ "out" "man" "dev" "devdoc" ]; outputs = [ "out" "man" "dev" "devdoc" ];
@ -33,7 +32,10 @@ in stdenv.mkDerivation rec {
}) })
(substituteAll { (substituteAll {
src = ./force-path.patch; src = ./force-path.patch;
path = stdenv.lib.makeBinPath [ btrfs-progs coreutils dosfstools e2fsprogs exfat f2fs-tools nilfs-utils xfsprogs ntfs3g parted utillinux ]; path = stdenv.lib.makeBinPath [
btrfs-progs coreutils dosfstools e2fsprogs exfat f2fs-tools nilfs-utils
xfsprogs ntfs3g parted utillinux
];
}) })
]; ];
@ -59,6 +61,7 @@ in stdenv.mkDerivation rec {
"--localstatedir=/var" "--localstatedir=/var"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-udevdir=$(out)/lib/udev" "--with-udevdir=$(out)/lib/udev"
"--with-tmpfilesdir=no"
]; ];
makeFlags = [ makeFlags = [
@ -66,13 +69,15 @@ in stdenv.mkDerivation rec {
"INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
]; ];
doCheck = false; # fails enableParallelBuilding = true;
doCheck = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A daemon, tools and libraries to access and manipulate disks, storage devices and technologies"; description = "A daemon, tools and libraries to access and manipulate disks, storage devices and technologies";
homepage = https://www.freedesktop.org/wiki/Software/udisks/; homepage = "https://www.freedesktop.org/wiki/Software/udisks/";
license = licenses.gpl2Plus; # lgpl2Plus for the library, gpl2Plus for the tools & daemon license = with licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the tools & daemon
maintainers = with maintainers; []; maintainers = with maintainers; [ johnazoidberg ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }