summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Solanti <jhs@psonet.com>2022-07-27 03:33:28 +0300
committerJan Solanti <jhs@psonet.com>2022-08-02 00:50:32 +0300
commit34a04025cf342d0336e626dd6c613ae40e560b29 (patch)
tree209b8c1df6a3e3ca8200020c1463d4deff356b36
parent7cc23a097dde208c748bc764a365d347e99bccec (diff)
downloadnixpkgs-34a04025cf342d0336e626dd6c613ae40e560b29.tar
nixpkgs-34a04025cf342d0336e626dd6c613ae40e560b29.tar.gz
nixpkgs-34a04025cf342d0336e626dd6c613ae40e560b29.tar.bz2
nixpkgs-34a04025cf342d0336e626dd6c613ae40e560b29.tar.lz
nixpkgs-34a04025cf342d0336e626dd6c613ae40e560b29.tar.xz
nixpkgs-34a04025cf342d0336e626dd6c613ae40e560b29.tar.zst
nixpkgs-34a04025cf342d0336e626dd6c613ae40e560b29.zip
xow: remove
Upstream project has been deprecated in favour of the 'xone' kernel
mode driver.
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2211.section.xml8
-rw-r--r--nixos/doc/manual/release-notes/rl-2211.section.md2
-rw-r--r--nixos/modules/module-list.nix1
-rw-r--r--nixos/modules/rename.nix4
-rw-r--r--nixos/modules/services/hardware/xow.nix20
-rw-r--r--pkgs/misc/drivers/xow/default.nix45
-rw-r--r--pkgs/top-level/aliases.nix4
-rw-r--r--pkgs/top-level/all-packages.nix2
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 be3adc4d3be..e4154af4c9b 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
@@ -259,6 +259,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 3f9afe13f1d..2bb52113512 100644
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@@ -99,6 +99,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 3010a213705..86b880c3b0d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -474,7 +474,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 22fcb72e9ff..f86aa2fa5c1 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 311181176bd..00000000000
--- 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 c084b45d151..00000000000
--- 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 90cd965a4b1..a0f95d5c741 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1519,6 +1519,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 f1865c8ea9e..8d6d98996ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -35743,8 +35743,6 @@ with pkgs;
 
   xorex = callPackage ../tools/security/xorex { };
 
-  xow = callPackage ../misc/drivers/xow { };
-
   xbps = callPackage ../tools/package-management/xbps { };
 
   xcftools = callPackage ../tools/graphics/xcftools { };