summary refs log tree commit diff
diff options
context:
space:
mode:
authorKai Harries <kai.harries@posteo.de>2021-01-03 13:03:19 +0100
committerKai Harries <kai.harries@posteo.de>2021-01-18 07:36:44 +0100
commitd27be236f11c05da21322cb0d00a97f56c6be450 (patch)
treec46197a7de6526c84b1a353a37a1f44cc74b0409
parentf9ced01f4ac5c269e2ce73ec629cad115b0c725d (diff)
downloadnixpkgs-d27be236f11c05da21322cb0d00a97f56c6be450.tar
nixpkgs-d27be236f11c05da21322cb0d00a97f56c6be450.tar.gz
nixpkgs-d27be236f11c05da21322cb0d00a97f56c6be450.tar.bz2
nixpkgs-d27be236f11c05da21322cb0d00a97f56c6be450.tar.lz
nixpkgs-d27be236f11c05da21322cb0d00a97f56c6be450.tar.xz
nixpkgs-d27be236f11c05da21322cb0d00a97f56c6be450.tar.zst
nixpkgs-d27be236f11c05da21322cb0d00a97f56c6be450.zip
nitrokey-app: 1.3.2 -> 1.4.2
The optional argument group was removed because it is no longer used
in the udev-rules that come with the libnitrokey.
-rw-r--r--pkgs/tools/security/nitrokey-app/default.nix9
-rw-r--r--pkgs/tools/security/nitrokey-app/udev-rules.nix9
2 files changed, 4 insertions, 14 deletions
diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix
index c3aebc782d8..bc7731a0a7a 100644
--- a/pkgs/tools/security/nitrokey-app/default.nix
+++ b/pkgs/tools/security/nitrokey-app/default.nix
@@ -3,21 +3,16 @@
 
 stdenv.mkDerivation rec {
   pname = "nitrokey-app";
-  version = "1.3.2";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "Nitrokey";
     repo = "nitrokey-app";
     rev = "v${version}";
-    sha256 = "193kzlz3qn9il56h78faiqkgv749hdils1nn1iw6g3wphgx5fjs2";
+    sha256 = "1k0w921hfrya4q2r7bqn7kgmwvwb7c15k9ymlbnksmfc9yyjyfcv";
     fetchSubmodules = true;
   };
 
-  postPatch = ''
-    substituteInPlace libnitrokey/CMakeLists.txt \
-      --replace '/data/41-nitrokey.rules' '/libnitrokey/data/41-nitrokey.rules'
-  '';
-
   buildInputs = [
     bash-completion
     hidapi
diff --git a/pkgs/tools/security/nitrokey-app/udev-rules.nix b/pkgs/tools/security/nitrokey-app/udev-rules.nix
index a8143ae6925..11dcd63d776 100644
--- a/pkgs/tools/security/nitrokey-app/udev-rules.nix
+++ b/pkgs/tools/security/nitrokey-app/udev-rules.nix
@@ -1,6 +1,5 @@
-{ lib, stdenv, nitrokey-app
-, group ? "nitrokey"
-}:
+{ lib, stdenv, nitrokey-app }:
+
 
 stdenv.mkDerivation {
   name = "nitrokey-udev-rules-${lib.getVersion nitrokey-app}";
@@ -9,10 +8,6 @@ stdenv.mkDerivation {
 
   dontBuild = true;
 
-  patchPhase = ''
-    substituteInPlace libnitrokey/data/41-nitrokey.rules --replace plugdev "${group}"
-  '';
-
   installPhase = ''
     mkdir -p $out/etc/udev/rules.d
     cp libnitrokey/data/41-nitrokey.rules $out/etc/udev/rules.d