rfkill: remove
rfkill was subsumed by util-linux in 2017 [1], and the upstream has not
been updated in over 5 years [2]. This package shadows the rfkill from
util-linux, so it can be completely removed with no breaking changes,
because util-linux is in the base package set in nixos/system-path.
[1] d17fb726b5
[2] https://git.sipsolutions.net/rfkill.git/log/
This commit is contained in:
parent
dd0c15b341
commit
b63b5eda68
6 changed files with 7 additions and 29 deletions
|
@ -1129,7 +1129,6 @@ in
|
|||
++ optionals config.networking.wireless.enable [
|
||||
pkgs.wirelesstools # FIXME: obsolete?
|
||||
pkgs.iw
|
||||
pkgs.rfkill
|
||||
]
|
||||
++ bridgeStp;
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
, librsvg
|
||||
, poppler
|
||||
, pulseaudio
|
||||
, rfkill
|
||||
, utillinux
|
||||
, xcur2png
|
||||
}:
|
||||
|
||||
|
@ -49,7 +49,7 @@ buildGoPackage rec {
|
|||
blur-effect # run (is it really needed?)
|
||||
coreutils # run (is it really needed?)
|
||||
fontconfig # run (is it really needed?)
|
||||
rfkill # run
|
||||
utillinux # run
|
||||
xcur2png # run
|
||||
grub2 # run (is it really needed?)
|
||||
];
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rfkill-0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/software/network/rfkill/${name}.tar.bz2";
|
||||
sha256 = "01zs7p9kd92pxgcgwl5w46h3iyx4acfg6m1j5fgnflsaa350q5iy";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://wireless.kernel.org/en/users/Documentation/rfkill";
|
||||
description = "A tool to query, enable and disable wireless devices";
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.eelco ];
|
||||
license = licenses.isc;
|
||||
};
|
||||
}
|
|
@ -8,7 +8,7 @@
|
|||
, intltool
|
||||
, pavucontrol
|
||||
, python3Packages
|
||||
, rfkill
|
||||
, utillinux
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
cinnamon.xapps
|
||||
gnome3.gnome-bluetooth
|
||||
python3Packages.python
|
||||
rfkill
|
||||
utillinux
|
||||
];
|
||||
|
||||
pythonPath = with python3Packages; [
|
||||
|
@ -68,8 +68,8 @@ stdenv.mkDerivation rec {
|
|||
--replace /usr/lib/blueberry $out/lib/blueberry \
|
||||
--replace /usr/share $out/share
|
||||
substituteInPlace $out/lib/blueberry/rfkillMagic.py \
|
||||
--replace /usr/bin/rfkill ${rfkill}/bin/rfkill \
|
||||
--replace /usr/sbin/rfkill ${rfkill}/bin/rfkill \
|
||||
--replace /usr/bin/rfkill ${utillinux}/bin/rfkill \
|
||||
--replace /usr/sbin/rfkill ${utillinux}/bin/rfkill \
|
||||
--replace /usr/lib/blueberry $out/lib/blueberry
|
||||
substituteInPlace $out/share/applications/blueberry.desktop \
|
||||
--replace Exec=blueberry Exec=$out/bin/blueberry
|
||||
|
|
|
@ -470,6 +470,7 @@ mapAliases ({
|
|||
recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
|
||||
gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
|
||||
qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
|
||||
rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23
|
||||
rkt = throw "rkt was archived by upstream"; # added 2020-05-16
|
||||
ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby";
|
||||
ruby_2_1_0 = throw "deprecated 2018-0213: use a newer version of ruby";
|
||||
|
|
|
@ -18149,8 +18149,6 @@ in
|
|||
|
||||
regionset = callPackage ../os-specific/linux/regionset { };
|
||||
|
||||
rfkill = callPackage ../os-specific/linux/rfkill { };
|
||||
|
||||
rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { };
|
||||
|
||||
riscv-pk = callPackage ../misc/riscv-pk { };
|
||||
|
|
Loading…
Reference in a new issue