Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 10966f414737
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 96444e62d86e
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Sep 24, 2018

  1. add myself 1000101 as maintainer

    1000101 committed Sep 24, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    infinisil Silvan Mosberger
    GPG key ID: 9424360B4B85C9E7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    493179d View commit details

  2. trezord: 2.0.12 -> 2.0.19

    1000101 committed Sep 24, 2018
    Copy the full SHA
    904f9fa View commit details

  3. nixos/trezord: revised and updated udev rules

    1000101 committed Sep 24, 2018
    Copy the full SHA
    ec88e0c View commit details

  4. Merge pull request #47288 from 1000101/release-18.03 

    trezord: 2.0.12 -> 2.0.19 and nixos/trezord: revised and updated udev rules
    @7c6f434c
    7c6f434c authored Sep 24, 2018
    Copy the full SHA
    96444e6 View commit details
Showing with 18 additions and 14 deletions.
  1. +5 −0 maintainers/maintainer-list.nix
  2. +8 −9 nixos/modules/services/hardware/trezord.nix
  3. +5 −5 pkgs/servers/trezord/default.nix
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
};
Adjective-Object = {
email = "mhuan13@gmail.com";
github = "Adjective-Object";
17 changes: 8 additions & 9 deletions nixos/modules/services/hardware/trezord.nix
View file
Original file line number Diff line number Diff line change
@@ -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"
'';
});

10 changes: 5 additions & 5 deletions pkgs/servers/trezord/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

buildGoPackage rec {
name = "trezord-go-${version}";
version = "2.0.12";
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 = "03pz223jjfbd0g9gkk21q6d27jc8vd1bc1jz00i0f3dzvsyfx5g6";
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;
};
}