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

udisks1: remove after being marked broken for over 18 months

Browse source 
It was marked in commit 404c2e5b24 by Joachim Fasting on 2019-06-10 (commited on 2019-06-10)
This commit is contained in:
ajs124 2022-06-02 17:52:08 +02:00
parent d93dec5b84
commit b6650a4438
6 changed files with 0 additions and 202 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/os-specific/linux/udisks-glue/default.nix
View file

@ -1,26 +0,0 @@
{ lib, stdenv, fetchurl, pkg-config, automake, autoconf, udisks1, dbus-glib, glib, libconfuse }:
stdenv.mkDerivation rec {
pname = "udisks-glue";
version = "1.3.5";
src = fetchurl {
url = "https://github.com/fernandotcl/udisks-glue/archive/release-${version}.tar.gz";
sha256 = "317d25bf249278dc8f6a5dcf18f760512427c772b9afe3cfe34e6e1baa258176";
};
nativeBuildInputs = [ pkg-config automake autoconf ];
buildInputs = [ udisks1 dbus-glib glib libconfuse ];
preConfigure = "sh autogen.sh";
meta = {
homepage = "https://github.com/fernandotcl/udisks-glue";
description = "A tool to associate udisks events to user-defined actions";
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ pSub ];
license = lib.licenses.bsd2;
broken = true;
hydraPlatforms = [ ];
};
}

78
pkgs/os-specific/linux/udisks/1-default.nix
View file

@ -1,78 +0,0 @@
{ lib
, stdenv
, fetchurl
, pkg-config
, sg3_utils
, udev
, glib
, dbus
, dbus-glib
, polkit
, parted
, lvm2
, libatasmart
, intltool
, libuuid
, mdadm
, libxslt
, docbook_xsl
, util-linux
, libgudev
}:
stdenv.mkDerivation rec {
pname = "udisks";
version = "1.0.5";
src = fetchurl {
url = "https://hal.freedesktop.org/releases/udisks-${version}.tar.gz";
sha256 = "0wbg3jrv8limdgvcygf4dqin3y6d30y9pcmmk711vq571vmq5v7j";
};
patches = [ ./purity.patch ./no-pci-db.patch ./glibc.patch ];
preConfigure =
''
configureFlagsArray+=(--with-systemdsystemunitdir=$out/lib/systemd/system)
'';
postPatch =
''
sed -e 's,/sbin/mdadm,${mdadm}&,g' -e "s,@slashlibdir@,$out/lib,g" -i data/80-udisks.rules
substituteInPlace src/main.c --replace \
"/sbin:/bin:/usr/sbin:/usr/bin" \
"${util-linux}/bin:${mdadm}/sbin:/run/current-system/sw/bin:/run/current-system/sw/bin"
'';
buildInputs =
[
sg3_utils
udev
glib
dbus
dbus-glib
polkit
parted
libgudev
lvm2
libatasmart
intltool
libuuid
libxslt
docbook_xsl
];
nativeBuildInputs = [ pkg-config ];
configureFlags = [ "--localstatedir=/var" "--enable-lvm2" ];
meta = with lib; {
homepage = "http://www.freedesktop.org/wiki/Software/udisks";
description = "A daemon and command-line utility for querying and manipulating storage devices";
platforms = platforms.linux;
license = with licenses; [ gpl2 lgpl2Plus ];
broken = true;
hydraPlatforms = [ ];
};
}

25
pkgs/os-specific/linux/udisks/glibc.patch
View file

@ -1,25 +0,0 @@
From 0aa652a7b257f98f9e8e7dc7b0ddc9bc62377d09 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Fri, 29 May 2015 21:09:39 -0400
Subject: [PATCH] Bug 90778 - fix build with newer glibc versions
https://bugs.freedesktop.org/show_bug.cgi?id=90778
---
src/helpers/job-drive-detach.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/helpers/job-drive-detach.c b/src/helpers/job-drive-detach.c
index eeafcab..d122a1f 100644
--- a/src/helpers/job-drive-detach.c
+++ b/src/helpers/job-drive-detach.c
@@ -18,6 +18,7 @@
*
*/
+#include <sys/stat.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
--
2.4.2

13
pkgs/os-specific/linux/udisks/no-pci-db.patch
View file

@ -1,13 +0,0 @@
Systemd no longer has the pci-db program.
diff -ru -x '*~' udisks-1.0.4-orig/data/80-udisks.rules udisks-1.0.4/data/80-udisks.rules
--- udisks-1.0.4-orig/data/80-udisks.rules 2011-08-25 23:31:20.000000000 +0200
+++ udisks-1.0.4/data/80-udisks.rules 2012-12-13 13:06:52.189650854 +0100
@@ -3,7 +3,6 @@
# import names for PCI storage controllers
#
-SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p"
# Set eSATA port type for known eSATA CardBus adapters - first we want to ensure
# the device is on a cardbus controller (upper PCI device) - then we check

57
pkgs/os-specific/linux/udisks/purity.patch
View file

@ -1,57 +0,0 @@
diff --git a/data/80-udisks.rules b/data/80-udisks.rules
index 6720394..60b67ed 100644
--- a/data/80-udisks.rules
+++ b/data/80-udisks.rules
@@ -23,7 +23,7 @@ LABEL="ata_port_cardbus_end"
# this is the case we can trigger a 'change' on the sas_expander device
# when the bsg device appears)
#
-SUBSYSTEM=="sas_expander", ACTION=="add|change", IMPORT{program}="udisks-probe-sas-expander /sys/%p"
+SUBSYSTEM=="sas_expander", ACTION=="add|change", IMPORT{program}="@slashlibdir@/udev/udisks-probe-sas-expander /sys/%p"
##############################################################################################################
@@ -54,7 +54,7 @@ ENV{DM_UDEV_DISABLE_DISK_RULES_FLAG}=="1", GOTO="udisks_end"
# import UDISKS_DM_* and UDISKS_LVM2_* properties - the long-term plan is to make the lvm2 and
# device-mapper packages provide this information
#
-KERNEL=="dm-*", IMPORT{program}="udisks-dm-export %M %m"
+KERNEL=="dm-*", IMPORT{program}="@slashlibdir@/udev/udisks-dm-export %M %m"
# Make udevd synthesize a 'change' uevent when last opener of a rw-fd closes the fd - this
# should be part of the device-mapper rules
@@ -63,7 +63,7 @@ KERNEL=="dm-*", OPTIONS+="watch"
##############################################################################################################
# Probe LVM2 Physical Volumes - this will eventually be part of the LVM2 package
-ENV{ID_FS_TYPE}=="LVM2_member", TEST=="/lib/udev/udisks-lvm-pv-export", IMPORT{program}="udisks-lvm-pv-export $env{ID_FS_UUID}"
+ENV{ID_FS_TYPE}=="LVM2_member", TEST=="@slashlibdir@/udev/udisks-lvm-pv-export", IMPORT{program}="@slashlibdir@/udev/udisks-lvm-pv-export $env{ID_FS_UUID}"
##############################################################################################################
@@ -85,7 +85,7 @@ KERNEL=="sr*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="", GOTO="probe_parttable_e
# scan for partition tables both on whole-disk and partitions
#
-IMPORT{program}="udisks-part-id $tempnode"
+IMPORT{program}="@slashlibdir@/udev/udisks-part-id $tempnode"
LABEL="probe_parttable_end"
@@ -109,13 +109,13 @@ LABEL="md_end"
#
# USB ATA enclosures with a SAT layer
-KERNEL=="sd*[!0-9]", ATTR{removable}=="0", ENV{ID_BUS}=="usb", ENV{DEVTYPE}=="disk", IMPORT{program}="udisks-probe-ata-smart $tempnode"
+KERNEL=="sd*[!0-9]", ATTR{removable}=="0", ENV{ID_BUS}=="usb", ENV{DEVTYPE}=="disk", IMPORT{program}="@slashlibdir@/udev/udisks-probe-ata-smart $tempnode"
# ATA disks driven by libata
-KERNEL=="sd*[!0-9]", ATTR{removable}=="0", ENV{ID_BUS}=="ata", ENV{DEVTYPE}=="disk", IMPORT{program}="udisks-probe-ata-smart $tempnode"
+KERNEL=="sd*[!0-9]", ATTR{removable}=="0", ENV{ID_BUS}=="ata", ENV{DEVTYPE}=="disk", IMPORT{program}="@slashlibdir@/udev/udisks-probe-ata-smart $tempnode"
# ATA disks connected via SAS (not driven by libata)
-KERNEL=="sd*[!0-9]", ATTR{removable}=="0", ENV{ID_BUS}=="scsi", ENV{DEVTYPE}=="disk", ENV{ID_VENDOR}=="ATA", IMPORT{program}="udisks-probe-ata-smart $tempnode"
+KERNEL=="sd*[!0-9]", ATTR{removable}=="0", ENV{ID_BUS}=="scsi", ENV{DEVTYPE}=="disk", ENV{ID_VENDOR}=="ATA", IMPORT{program}="@slashlibdir@/udev/udisks-probe-ata-smart $tempnode"
# Example rule for tagging a device with a specific media type. Where and

3
pkgs/top-level/all-packages.nix
View file

@ -23941,12 +23941,9 @@ with pkgs;
libudev0-shim = callPackage ../os-specific/linux/libudev0-shim { };
udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { };
udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { };
udisks = udisks2;
udisks_glue = callPackage ../os-specific/linux/udisks-glue { };
ugtrain = callPackage ../tools/misc/ugtrain { };
unscd = callPackage ../os-specific/linux/unscd { };