mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
udisks2: turn into alias
This commit is contained in:
Robert Schütz
parent
772dc221ae
commit
702ded4de3
20 changed files with 36 additions and 37 deletions
|
|
@ -25,7 +25,7 @@ in
|
|||
|
||||
enable = lib.mkEnableOption "udisks2, a DBus service that allows applications to query and manipulate storage devices";
|
||||
|
||||
package = lib.mkPackageOption pkgs "udisks2" { };
|
||||
package = lib.mkPackageOption pkgs "udisks" { };
|
||||
|
||||
mountOnMedia = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ in
|
|||
path = [
|
||||
pkgs.udevil
|
||||
pkgs.procps
|
||||
pkgs.udisks2
|
||||
pkgs.udisks
|
||||
pkgs.which
|
||||
];
|
||||
serviceConfig.ExecStart = "${pkgs.udevil}/bin/devmon";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
udisks2,
|
||||
udisks,
|
||||
qt6,
|
||||
cmake,
|
||||
ninja,
|
||||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
buildInputs = [
|
||||
qt6.qtbase
|
||||
udisks2
|
||||
udisks
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
shared-mime-info,
|
||||
testers,
|
||||
tzdata,
|
||||
udisks2,
|
||||
udisks,
|
||||
upower,
|
||||
webp-pixbuf-loader,
|
||||
wrapGAppsHook3,
|
||||
|
|
@ -145,7 +145,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
networkmanager
|
||||
polkit
|
||||
samba
|
||||
udisks2
|
||||
udisks
|
||||
upower
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
libmtp,
|
||||
withOnlineServices ? true,
|
||||
withDevices ? true,
|
||||
udisks2,
|
||||
udisks,
|
||||
withDynamic ? true,
|
||||
withHttpServer ? true,
|
||||
withLibVlc ? true,
|
||||
|
|
@ -156,7 +156,7 @@ let
|
|||
{
|
||||
names = [ "UDISKS2" ];
|
||||
enable = withUdisks;
|
||||
pkgs = [ udisks2 ];
|
||||
pkgs = [ udisks ];
|
||||
}
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@
|
|||
tinysparql,
|
||||
localsearch,
|
||||
tzdata,
|
||||
udisks2,
|
||||
udisks,
|
||||
upower,
|
||||
wayland-scanner,
|
||||
libepoxy,
|
||||
|
|
@ -147,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
samba
|
||||
tinysparql
|
||||
localsearch # for search locations dialog
|
||||
udisks2
|
||||
udisks
|
||||
upower
|
||||
# For animations in Mouse panel.
|
||||
gst_all_1.gst-plugins-base
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
ninja,
|
||||
pkg-config,
|
||||
systemd,
|
||||
udisks2,
|
||||
udisks,
|
||||
wrapGAppsHook3,
|
||||
xz,
|
||||
}:
|
||||
|
|
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
|
|||
libpwquality
|
||||
libsecret
|
||||
systemd
|
||||
udisks2
|
||||
udisks
|
||||
xz
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
glib,
|
||||
udevSupport ? stdenv.hostPlatform.isLinux,
|
||||
libgudev,
|
||||
udisks2,
|
||||
udisks,
|
||||
libgcrypt,
|
||||
libcap,
|
||||
polkit,
|
||||
|
|
@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
]
|
||||
++ lib.optionals udevSupport [
|
||||
libgudev
|
||||
udisks2
|
||||
udisks
|
||||
fuse3
|
||||
libcdio
|
||||
samba
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
cmake,
|
||||
fetchFromGitHub,
|
||||
qt6,
|
||||
udisks2,
|
||||
udisks,
|
||||
xz,
|
||||
}:
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
qt6.qtbase
|
||||
qt6.qtdeclarative
|
||||
qt6.qtsvg
|
||||
udisks2
|
||||
udisks
|
||||
xz
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
ifuseSupport ? false,
|
||||
ifuse ? null,
|
||||
lsof,
|
||||
udisks2,
|
||||
udisks,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
|
|||
ffmpegthumbnailer
|
||||
jmtpfs
|
||||
lsof
|
||||
udisks2
|
||||
udisks
|
||||
]
|
||||
++ (lib.optionals ifuseSupport [ ifuse ]);
|
||||
# Introduced because ifuse doesn't build due to CVEs in libplist
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
libnotify,
|
||||
librsvg,
|
||||
python3Packages,
|
||||
udisks2,
|
||||
udisks,
|
||||
wrapGAppsHook3,
|
||||
testers,
|
||||
udiskie,
|
||||
|
|
@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec {
|
|||
libappindicator-gtk3
|
||||
libnotify
|
||||
librsvg # SVG icons
|
||||
udisks2
|
||||
udisks
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
pkg-config,
|
||||
dbus,
|
||||
libnotify,
|
||||
udisks2,
|
||||
udisks,
|
||||
gdk-pixbuf,
|
||||
}:
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation {
|
|||
buildInputs = [
|
||||
dbus
|
||||
libnotify
|
||||
udisks2
|
||||
udisks
|
||||
gdk-pixbuf
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
# adds support for handling removable media (vifm-media). Linux only!
|
||||
mediaSupport ? false,
|
||||
python3 ? null,
|
||||
udisks2 ? null,
|
||||
udisks ? null,
|
||||
lib ? null,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
|
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
|||
postFixup =
|
||||
let
|
||||
path = lib.makeBinPath [
|
||||
udisks2
|
||||
udisks
|
||||
(python3.withPackages (p: [ p.dbus-python ]))
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
libexif,
|
||||
pam,
|
||||
xkeyboard_config,
|
||||
udisks2,
|
||||
udisks,
|
||||
waylandSupport ? false,
|
||||
wayland-protocols,
|
||||
xwayland,
|
||||
|
|
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
|||
libexif
|
||||
pam
|
||||
xkeyboard_config
|
||||
udisks2 # for removable storage mounting/unmounting
|
||||
udisks # for removable storage mounting/unmounting
|
||||
]
|
||||
++ lib.optional bluetoothSupport bluez5 # for bluetooth configuration and control
|
||||
++ lib.optional pulseSupport libpulseaudio # for proper audio device control and redirection
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
mate-menus,
|
||||
mate-panel,
|
||||
mate-settings-daemon,
|
||||
udisks2,
|
||||
udisks,
|
||||
systemd,
|
||||
hicolor-icon-theme,
|
||||
wrapGAppsHook3,
|
||||
|
|
@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
|
|||
mate-menus
|
||||
mate-panel # for org.mate.panel schema, see m-c-c#678
|
||||
mate-settings-daemon
|
||||
udisks2
|
||||
udisks
|
||||
systemd
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
libgtop,
|
||||
libcanberra-gtk3,
|
||||
inkscape,
|
||||
udisks2,
|
||||
udisks,
|
||||
mate-desktop,
|
||||
mate-panel,
|
||||
hicolor-icon-theme,
|
||||
|
|
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
|||
libgtop
|
||||
libcanberra-gtk3
|
||||
libxml2
|
||||
udisks2
|
||||
udisks
|
||||
mate-desktop
|
||||
mate-panel
|
||||
hicolor-icon-theme
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
linuxPackages,
|
||||
live-chart,
|
||||
pciutils,
|
||||
udisks2,
|
||||
udisks,
|
||||
wingpanel,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
|
@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
linuxPackages.nvidia_x11.settings.libXNVCtrl
|
||||
live-chart
|
||||
pciutils
|
||||
udisks2
|
||||
udisks
|
||||
wingpanel
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
packagekit,
|
||||
polkit,
|
||||
switchboard,
|
||||
udisks2,
|
||||
udisks,
|
||||
fwupd,
|
||||
appstream,
|
||||
elementary-settings-daemon,
|
||||
|
|
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
|||
packagekit
|
||||
polkit
|
||||
switchboard
|
||||
udisks2
|
||||
udisks
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -1524,6 +1524,7 @@ mapAliases {
|
|||
uade123 = throw "'uade123' has been renamed to/replaced by 'uade'"; # Converted to throw 2025-10-27
|
||||
uae = throw "'uae' has been removed due to lack of upstream maintenance. Consider using 'fsuae' instead."; # Added 2025-06-11
|
||||
ubuntu_font_family = throw "'ubuntu_font_family' has been renamed to/replaced by 'ubuntu-classic'"; # Converted to throw 2025-10-27
|
||||
udisks2 = udisks; # added 2025-10-30
|
||||
unicap = throw "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17
|
||||
unifi-poller = throw "'unifi-poller' has been renamed to/replaced by 'unpoller'"; # Converted to throw 2025-10-27
|
||||
unzoo = throw "'unzoo' has been removed since it is unmaintained upstream and doesn't compile with newer versions of GCC anymore"; # Removed 2025-05-24
|
||||
|
|
|
|||
|
|
@ -1419,7 +1419,7 @@ with pkgs;
|
|||
|
||||
vifm-full = vifm.override {
|
||||
mediaSupport = true;
|
||||
inherit lib udisks2 python3;
|
||||
inherit lib udisks python3;
|
||||
};
|
||||
|
||||
xfe = callPackage ../by-name/xf/xfe/package.nix {
|
||||
|
|
@ -10337,8 +10337,6 @@ with pkgs;
|
|||
util-linux = util-linuxMinimal;
|
||||
};
|
||||
|
||||
udisks2 = udisks;
|
||||
|
||||
usbrelay = callPackage ../os-specific/linux/usbrelay { };
|
||||
usbrelayd = callPackage ../os-specific/linux/usbrelay/daemon.nix { };
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue