diff options
author | Winter <winter@winter.cafe> | 2022-08-01 18:17:39 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-01 18:17:39 -0400 |
commit | 468c10d8e058934b7e8c36984c6544d8c92a1863 (patch) | |
tree | 82caa791bf5a47fff3a662f69e692bf5a6a57f15 | |
parent | c13ca4324c54a63c3bc73eebe6dfe72d6b6b097d (diff) | |
parent | 34a04025cf342d0336e626dd6c613ae40e560b29 (diff) | |
download | nixlib-468c10d8e058934b7e8c36984c6544d8c92a1863.tar nixlib-468c10d8e058934b7e8c36984c6544d8c92a1863.tar.gz nixlib-468c10d8e058934b7e8c36984c6544d8c92a1863.tar.bz2 nixlib-468c10d8e058934b7e8c36984c6544d8c92a1863.tar.lz nixlib-468c10d8e058934b7e8c36984c6544d8c92a1863.tar.xz nixlib-468c10d8e058934b7e8c36984c6544d8c92a1863.tar.zst nixlib-468c10d8e058934b7e8c36984c6544d8c92a1863.zip |
Merge pull request #183039 from jansol/master
-rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 8 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2211.section.md | 2 | ||||
-rw-r--r-- | nixos/modules/module-list.nix | 1 | ||||
-rw-r--r-- | nixos/modules/rename.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/hardware/xow.nix | 20 | ||||
-rw-r--r-- | pkgs/misc/drivers/xow/default.nix | 45 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
8 files changed, 18 insertions, 68 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 19949b932f15..882eea3c4a4a 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -273,6 +273,14 @@ </listitem> <listitem> <para> + xow package removed along with the + <literal>hardware.xow</literal> module, due to the project + being deprecated in favor of <literal>xone</literal>, which is + available via the <literal>hardware.xone</literal> module. + </para> + </listitem> + <listitem> + <para> The <literal>services.graphite.api</literal> and <literal>services.graphite.beacon</literal> NixOS options, and the <literal>python3.pkgs.graphite_api</literal>, diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 4d9da9f09969..a2757d67e89c 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -105,6 +105,8 @@ In addition to numerous new and upgraded packages, this release has the followin - riak package removed along with `services.riak` module, due to lack of maintainer to update the package. +- xow package removed along with the `hardware.xow` module, due to the project being deprecated in favor of `xone`, which is available via the `hardware.xone` module. + - The `services.graphite.api` and `services.graphite.beacon` NixOS options, and the `python3.pkgs.graphite_api`, `python3.pkgs.graphite_beacon` and `python3.pkgs.influxgraph` packages, have been removed due to lack of upstream diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d961e2f683bd..616f357663ca 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -475,7 +475,6 @@ ./services/hardware/thermald.nix ./services/hardware/undervolt.nix ./services/hardware/vdr.nix - ./services/hardware/xow.nix ./services/home-automation/home-assistant.nix ./services/home-automation/zigbee2mqtt.nix ./services/logging/SystemdJournal2Gelf.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 22fcb72e9ff4..f86aa2fa5c1b 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -30,6 +30,10 @@ with lib; udev rules from libu2f-host to the system. Udev gained native support to handle FIDO security tokens, so this isn't necessary anymore. '') + (mkRemovedOptionModule [ "hardware" "xow" ] '' + The xow package was removed from nixpkgs. Upstream has deprecated + the project and users are urged to switch to xone. + '') (mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.") (mkRemovedOptionModule [ "networking" "wicd" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "programs" "tilp2" ] "The corresponding package was removed from nixpkgs.") diff --git a/nixos/modules/services/hardware/xow.nix b/nixos/modules/services/hardware/xow.nix deleted file mode 100644 index 311181176bd8..000000000000 --- a/nixos/modules/services/hardware/xow.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ config, pkgs, lib, ... }: - -let - cfg = config.services.hardware.xow; -in { - options.services.hardware.xow = { - enable = lib.mkEnableOption "xow as a systemd service"; - }; - - config = lib.mkIf cfg.enable { - hardware.uinput.enable = true; - - boot.extraModprobeConfig = lib.readFile "${pkgs.xow}/lib/modprobe.d/xow-blacklist.conf"; - - systemd.packages = [ pkgs.xow ]; - systemd.services.xow.wantedBy = [ "multi-user.target" ]; - - services.udev.packages = [ pkgs.xow ]; - }; -} diff --git a/pkgs/misc/drivers/xow/default.nix b/pkgs/misc/drivers/xow/default.nix deleted file mode 100644 index c084b45d151c..000000000000 --- a/pkgs/misc/drivers/xow/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, cabextract, fetchurl, fetchFromGitHub, libusb1 }: - -stdenv.mkDerivation rec { - pname = "xow"; - version = "unstable-2022-04-24"; - - src = fetchFromGitHub { - owner = "medusalix"; - repo = "xow"; - rev = "d335d6024f8380f52767a7de67727d9b2f867871"; - sha256 = "0q5nr21p4dlx2a99hiivwz6qj9anrqqsdhiz6xi375yqkxis4251"; - }; - - firmware = fetchurl { - url = "http://download.windowsupdate.com/c/msdownload/update/driver/drvs/2017/07/1cd6a87c-623f-4407-a52d-c31be49e925c_e19f60808bdcbfbd3c3df6be3e71ffc52e43261e.cab"; - sha256 = "013g1zngxffavqrk5jy934q3bdhsv6z05ilfixdn8dj0zy26lwv5"; - }; - - makeFlags = [ - "BUILD=RELEASE" - "VERSION=${version}-${src.rev}" - "BINDIR=${placeholder "out"}/bin" - "UDEVDIR=${placeholder "out"}/lib/udev/rules.d" - "MODLDIR=${placeholder "out"}/lib/modules-load.d" - "MODPDIR=${placeholder "out"}/lib/modprobe.d" - "SYSDDIR=${placeholder "out"}/lib/systemd/system" - ]; - - postUnpack = '' - cabextract -F FW_ACC_00U.bin ${firmware} - mv FW_ACC_00U.bin source/firmware.bin - ''; - - enableParallelBuilding = true; - nativeBuildInputs = [ cabextract ]; - buildInputs = [ libusb1 ]; - - meta = with lib; { - homepage = "https://github.com/medusalix/xow"; - description = "Linux driver for the Xbox One wireless dongle"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.jansol ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 767e6a88c34d..3c28d18108c1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1524,6 +1524,10 @@ mapAliases ({ ''; xf86_input_multitouch = throw "xf86_input_multitouch has been removed from nixpkgs"; # Added 2020-01-20 xlibs = throw "'xlibs' has been renamed to/replaced by 'xorg'"; # Converted to throw 2022-02-22 + xow = throw ( + "Upstream has ended support for 'xow' and the package has been removed" + + "from nixpkgs. Users are urged to switch to 'xone'." + ); # Added 2022-08-02 xpraGtk3 = throw "'xpraGtk3' has been renamed to/replaced by 'xpra'"; # Converted to throw 2022-02-22 xv = xxv; # Added 2020-02-22 xvfb_run = xvfb-run; # Added 2021-05-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25948a8b01c8..3b86d2dc01de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35793,8 +35793,6 @@ with pkgs; xorex = callPackage ../tools/security/xorex { }; - xow = callPackage ../misc/drivers/xow { }; - xbps = callPackage ../tools/package-management/xbps { }; xcftools = callPackage ../tools/graphics/xcftools { }; |