Merge pull request #47259 from AveryLychee/fix/treesheets

treesheets: 2017-03-27 -> 2018-08-18
This commit is contained in:
Michael Raskin 2018-09-24 05:27:46 +00:00 committed by GitHub
commit 610203c126
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions

View File

@ -376,6 +376,11 @@
github = "auntie";
name = "Jonathan Glines";
};
avery = {
email = "averyl+nixos@protonmail.com";
github = "AveryLychee";
name = "Avery Lychee";
};
avnik = {
email = "avn@avnik.info";
github = "avnik";

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "treesheets-${version}";
version = "2017-03-27";
version = "2018-08-18";
src = fetchFromGitHub {
owner = "aardappel";
repo = "treesheets";
rev = "1d1d6b214e3ae88445eb1ec0032d5fef14160f32";
sha256 = "0np91c4skq3yxq76c4zi33w73qb1w2nrcin490kkvrxk53jspklb";
rev = "3af41d99c8f9f32603a36ab64af3560b6d61dd73";
sha256 = "147y8ggh3clwjgsi15z8i4jnzlkh8p17mmlg532jym53zzbcva65";
};
buildInputs = [ wxGTK makeWrapper ];
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
'';
homepage = http://strlen.com/treesheets/;
maintainers = with maintainers; [ obadz ];
maintainers = with maintainers; [ obadz avery ];
platforms = platforms.linux;
license = licenses.zlib;
};

View File

@ -19008,7 +19008,7 @@ with pkgs;
tree = callPackage ../tools/system/tree {};
treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK30; };
treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK31; };
trezor-bridge = callPackage ../applications/networking/browsers/mozilla-plugins/trezor { };