diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-22 14:16:15 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-22 14:16:15 +0200 |
| commit | b11049d5626a5b26554b298166c5a338ed3e0af3 (patch) | |
| tree | 9ed773d10e1f7e2b0e675be8447dad2708e88f08 /pkgs/applications/office | |
| parent | 36162c8c999815ef9e929231697845743a5dffde (diff) | |
| parent | db6c38a075fbac96fabcc7759aa6e6ddd5526b0c (diff) | |
| download | nixpkgs-b11049d5626a5b26554b298166c5a338ed3e0af3.tar nixpkgs-b11049d5626a5b26554b298166c5a338ed3e0af3.tar.gz nixpkgs-b11049d5626a5b26554b298166c5a338ed3e0af3.tar.bz2 nixpkgs-b11049d5626a5b26554b298166c5a338ed3e0af3.tar.lz nixpkgs-b11049d5626a5b26554b298166c5a338ed3e0af3.tar.xz nixpkgs-b11049d5626a5b26554b298166c5a338ed3e0af3.tar.zst nixpkgs-b11049d5626a5b26554b298166c5a338ed3e0af3.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/ledger-web/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/office/timetrap/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/office/zotero/default.nix | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/applications/office/ledger-web/default.nix index 13c559cfac1..df8298579e8 100644 --- a/pkgs/applications/office/ledger-web/default.nix +++ b/pkgs/applications/office/ledger-web/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerApp +{ lib, bundlerApp, bundlerUpdateScript , withPostgresql ? true, postgresql , withSqlite ? false, sqlite }: @@ -11,11 +11,13 @@ bundlerApp rec { buildInputs = lib.optional withPostgresql postgresql ++ lib.optional withSqlite sqlite; + passthru.updateScript = bundlerUpdateScript "ledger-web"; + meta = with lib; { description = "A web frontend to the Ledger CLI tool"; homepage = https://github.com/peterkeen/ledger-web; license = licenses.mit; - maintainers = with maintainers; [ peterhoeg manveru ]; + maintainers = with maintainers; [ peterhoeg manveru nicknovitski ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index efeb23b3e83..6d094ecb5dc 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "timetrap"; gemdir = ./.; exes = [ "t" "timetrap" ]; + passthru.updateScript = bundlerUpdateScript "timetrap"; + meta = with lib; { description = "A simple command line time tracker written in ruby"; homepage = https://github.com/samg/timetrap; license = licenses.mit; - maintainers = with maintainers; [ jerith666 manveru ]; + maintainers = with maintainers; [ jerith666 manveru nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 3540fce9173..86eb0ab4c38 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { name = "zotero-${version}"; - version = "5.0.67"; + version = "5.0.71"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "1b06875qr8dy2lhf4h9z7gcc5pcqdyq92c11b3brsbgbq2n48g40"; + sha256 = "070b1ak870jv8h702a9g930p01jsmly93c44igw48ylbgqjyhlwq"; }; buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ]; |