Merge pull request #180191 from oxalica/bump/solaar

solaar: 1.1.3 -> 1.1.4 and clean up

pkgs/applications/misc/solaar/default.nix

···
 }:
 
 # Although we copy in the udev rules here, you probably just want to use
-# logitech-udev-rules instead of adding this to services.udev.packages on NixOS
+# `logitech-udev-rules`, which is an alias to `udev` output of this derivation,
+# instead of adding this to `services.udev.packages` on NixOS,
 python3Packages.buildPythonApplication rec {
   pname = "solaar";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchFromGitHub {
     owner = "pwr-Solaar";
     repo = "Solaar";
     rev = version;
-    hash = "sha256-6z22MnhUL9Da3G7UDmZsBAi2gHLNpiFEwe+pAtnP91s=";
+    hash = "sha256-nDfVF7g0M54DRpkH1rnZB8o+nCV4A6b1uKMOMRQ3GbI=";
   };
 
+  outputs = [ "out" "udev" ];
+
   nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ];
   buildInputs = [ libappindicator librsvg ];
 
···
   postInstall = ''
     ln -s $out/bin/solaar $out/bin/solaar-cli
 
-    install -Dm444 -t $out/etc/udev/rules.d rules.d/*.rules
+    install -Dm444 -t $udev/etc/udev/rules.d rules.d-uinput/*.rules
   '';
 
-  # No tests
-  doCheck = false;
-
   meta = with lib; {
     description = "Linux devices manager for the Logitech Unifying Receiver";
     longDescription = ''
···
     '';
     homepage = "https://pwr-solaar.github.io/Solaar/";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ spinus ysndr ];
+    maintainers = with maintainers; [ spinus ysndr oxalica ];
     platforms = platforms.linux;
   };
 }

pkgs/os-specific/linux/logitech-udev-rules/default.nix

···
-{ lib, stdenv, solaar }:
-
-# ltunifi and solaar both provide udev rules but solaar's rules are more
-# up-to-date so we simply use that instead of having to maintain our own rules
-
-stdenv.mkDerivation {
-  pname = "logitech-udev-rules";
-  inherit (solaar) version;
-
-  buildCommand = ''
-    install -Dm444 -t $out/etc/udev/rules.d ${solaar.src}/rules.d/*.rules
-  '';
-
-  meta = with lib; {
-    description = "udev rules for Logitech devices";
-    inherit (solaar.meta) homepage license platforms;
-    maintainers = with maintainers; [ peterhoeg ];
-  };
-}

pkgs/top-level/all-packages.nix

···
 
   logiops = callPackage ../misc/drivers/logiops { };
 
-  logitech-udev-rules = callPackage ../os-specific/linux/logitech-udev-rules { };
+  # ltunifi and solaar both provide udev rules but solaar's rules are more
+  # up-to-date so we simply use that instead of having to maintain our own rules
+  logitech-udev-rules = solaar.udev;
 
   # lohit-fonts.assamese lohit-fonts.bengali lohit-fonts.devanagari lohit-fonts.gujarati lohit-fonts.gurmukhi
   # lohit-fonts.kannada lohit-fonts.malayalam lohit-fonts.marathi lohit-fonts.nepali lohit-fonts.odia