diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2018-09-24 20:08:44 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-24 20:08:44 +0000 |
commit | ce411911e8cf45b4d3e1978047b616c260561eac (patch) | |
tree | da6214144480d43afdc4ea4ff4380a27030afc3a | |
parent | 0a8bbcbac595ee31e2f60ff32d279889025549a3 (diff) | |
parent | 082bf52e31cc0c29aa882cec79f265c7ccda3636 (diff) | |
download | nixlib-ce411911e8cf45b4d3e1978047b616c260561eac.tar nixlib-ce411911e8cf45b4d3e1978047b616c260561eac.tar.gz nixlib-ce411911e8cf45b4d3e1978047b616c260561eac.tar.bz2 nixlib-ce411911e8cf45b4d3e1978047b616c260561eac.tar.lz nixlib-ce411911e8cf45b4d3e1978047b616c260561eac.tar.xz nixlib-ce411911e8cf45b4d3e1978047b616c260561eac.tar.zst nixlib-ce411911e8cf45b4d3e1978047b616c260561eac.zip |
Merge pull request #47289 from 1000101/master
trezord: 2.0.14 -> 2.0.19 and nixos/trezord: revised and updated udev rules
-rw-r--r-- | maintainers/maintainer-list.nix | 5 | ||||
-rw-r--r-- | nixos/modules/services/hardware/trezord.nix | 17 | ||||
-rw-r--r-- | pkgs/servers/trezord/default.nix | 10 |
3 files changed, 18 insertions, 14 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 726cbd74313a..060f770f8f9f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18,6 +18,11 @@ for an example on how to work with this data. */ { + "1000101" = { + email = "jan.hrnko@satoshilabs.com"; + github = "1000101"; + name = "Jan Hrnko"; + }; a1russell = { email = "adamlr6+pub@gmail.com"; github = "a1russell"; diff --git a/nixos/modules/services/hardware/trezord.nix b/nixos/modules/services/hardware/trezord.nix index f2ec00a7d3e1..dfefc1171e62 100644 --- a/nixos/modules/services/hardware/trezord.nix +++ b/nixos/modules/services/hardware/trezord.nix @@ -26,15 +26,14 @@ in { name = "trezord-udev-rules"; destination = "/etc/udev/rules.d/51-trezor.rules"; text = '' - # Trezor 1 - SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0666", GROUP="dialout", SYMLINK+="trezor%n" - KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0666", GROUP="dialout" - - # Trezor 2 (Model-T) - SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c0", MODE="0661", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n" - SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c1", MODE="0660", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n" - KERNEL=="hidraw*", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", MODE="0660", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl" - ]; + # TREZOR v1 (One) + SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n" + KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl" + + # TREZOR v2 (T) + SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c0", MODE="0661", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n" + SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c1", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n" + KERNEL=="hidraw*", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl" ''; }); diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index 2db004d9000f..9869da95a048 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "trezord-go-${version}"; - version = "2.0.14"; + version = "2.0.19"; # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) hardeningDisable = [ "fortify" ]; @@ -13,14 +13,14 @@ buildGoPackage rec { owner = "trezor"; repo = "trezord-go"; rev = "v${version}"; - sha256 = "1bnzib1cbs7cj6vdf015vr60vm5wgfgbqajcpqxcikfckwhjsykv"; + sha256 = "19am5zs2mx36w2f8b5001i1sg6v72y1nq5cagnw6rza8qxyw83qs"; }; meta = with stdenv.lib; { description = "TREZOR Communication Daemon aka TREZOR Bridge"; - homepage = https://mytrezor.com; - license = licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ canndrew jb55 ]; + homepage = https://trezor.io; + license = licenses.lgpl3; + maintainers = with maintainers; [ canndrew jb55 maintainers."1000101"]; platforms = platforms.linux; }; } |