public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #47289 from 1000101/master 

trezord: 2.0.14 -> 2.0.19 and nixos/trezord: revised and updated udev rules
This commit is contained in:
Michael Raskin 2018-09-24 20:08:44 +00:00 committed by GitHub
parent 0a8bbcbac5 082bf52e31
commit ce411911e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maintainers/maintainer-list.nix
View File

@ -18,6 +18,11 @@
for an example on how to work with this data. for an example on how to work with this data.
*/ */
{ {
"1000101" = {
email = "jan.hrnko@satoshilabs.com";
github = "1000101";
name = "Jan Hrnko";
};
a1russell = { a1russell = {
email = "adamlr6+pub@gmail.com"; email = "adamlr6+pub@gmail.com";
github = "a1russell"; github = "a1russell";

15
nixos/modules/services/hardware/trezord.nix
View File

@ -26,15 +26,14 @@ in {
name = "trezord-udev-rules"; name = "trezord-udev-rules";
destination = "/etc/udev/rules.d/51-trezor.rules"; destination = "/etc/udev/rules.d/51-trezor.rules";
text = '' text = ''
# Trezor 1 # TREZOR v1 (One)
SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0666", GROUP="dialout", SYMLINK+="trezor%n" 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" KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl"
# Trezor 2 (Model-T) # 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}=="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" 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="0660", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl" KERNEL=="hidraw*", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl"
];
''; '';
}); });

10
pkgs/servers/trezord/default.nix
View File

@ -2,7 +2,7 @@
buildGoPackage rec { buildGoPackage rec {
name = "trezord-go-${version}"; 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 ) # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
hardeningDisable = [ "fortify" ]; hardeningDisable = [ "fortify" ];
@ -13,14 +13,14 @@ buildGoPackage rec {
owner = "trezor"; owner = "trezor";
repo = "trezord-go"; repo = "trezord-go";
rev = "v${version}"; rev = "v${version}";
sha256 = "1bnzib1cbs7cj6vdf015vr60vm5wgfgbqajcpqxcikfckwhjsykv"; sha256 = "19am5zs2mx36w2f8b5001i1sg6v72y1nq5cagnw6rza8qxyw83qs";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "TREZOR Communication Daemon aka TREZOR Bridge"; description = "TREZOR Communication Daemon aka TREZOR Bridge";
homepage = https://mytrezor.com; homepage = https://trezor.io;
license = licenses.gpl3; license = licenses.lgpl3;
maintainers = with stdenv.lib.maintainers; [ canndrew jb55 ]; maintainers = with maintainers; [ canndrew jb55 maintainers."1000101"];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }