From ebf1159fe79d3e52d454961e14fc21cc7bc91caf Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 13 Mar 2019 12:50:51 -0400
Subject: [PATCH 1/3] solaar: Copies udev rules in the package

---
 pkgs/applications/misc/solaar/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix
index cb64365a944..480c8ea325c 100644
--- a/pkgs/applications/misc/solaar/default.nix
+++ b/pkgs/applications/misc/solaar/default.nix
@@ -18,6 +18,9 @@ pythonPackages.buildPythonApplication rec {
     wrapProgram "$out/bin/solaar-cli" \
       --prefix PYTHONPATH : "$PYTHONPATH" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
+
+    mkdir -p $out/lib/udev/rules.d
+    cp rules.d/*.rules $out/lib/udev/rules.d/
   '';
 
   enableParallelBuilding = true;

From ccc8ec874ded2118fc32094e0afeac8ca8b86934 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 13 Mar 2019 12:52:10 -0400
Subject: [PATCH 2/3] solaar: 2018-02-02 -> 2019-01-30

---
 pkgs/applications/misc/solaar/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix
index 480c8ea325c..5877ac76829 100644
--- a/pkgs/applications/misc/solaar/default.nix
+++ b/pkgs/applications/misc/solaar/default.nix
@@ -1,13 +1,13 @@
 {fetchFromGitHub, stdenv, gtk3, pythonPackages, gobject-introspection}:
 pythonPackages.buildPythonApplication rec {
   name = "solaar-unstable-${version}";
-  version = "2018-02-02";
+  version = "2019-01-30";
   namePrefix = "";
   src = fetchFromGitHub {
     owner = "pwr";
     repo = "Solaar";
-    rev = "59b7285fdfc875119f0c92cfd5f5909e8a8e578c";
-    sha256 = "0zy5vmjzdybnjf0mpp8rny11sc43gmm8172svsm9s51h7x0v83y3";
+    rev = "c07c115ee379e82db84283aaa29dc53df033a8c8";
+    sha256 = "0xg181xcwzzs8pdqvjrkjyaaga7ir93hzjvd17j9g3ns8xfj2mvr";
   };
 
   propagatedBuildInputs = [pythonPackages.pygobject3 pythonPackages.pyudev gobject-introspection gtk3];

From 1cfdbe99402c33613d5d885b983557fe55e12a72 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 13 Mar 2019 13:06:24 -0400
Subject: [PATCH 3/3] solaar: Modernizes build

Drops unused namePrefix, uses pname/version.
---
 pkgs/applications/misc/solaar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix
index 5877ac76829..1928da18681 100644
--- a/pkgs/applications/misc/solaar/default.nix
+++ b/pkgs/applications/misc/solaar/default.nix
@@ -1,8 +1,8 @@
 {fetchFromGitHub, stdenv, gtk3, pythonPackages, gobject-introspection}:
 pythonPackages.buildPythonApplication rec {
-  name = "solaar-unstable-${version}";
+  pname = "solaar-unstable";
   version = "2019-01-30";
-  namePrefix = "";
+
   src = fetchFromGitHub {
     owner = "pwr";
     repo = "Solaar";