diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-17 07:58:47 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-17 08:05:24 +0100 |
| commit | f7f1a2f54ef2b744a26e37418dd6354bc46aa20a (patch) | |
| tree | 03b40b737111f3677fbf508dce58a29cfc81fc1b /pkgs/applications/misc | |
| parent | 705167a5dceb53befd22f4e6184bbfba0813b73d (diff) | |
| parent | c904c2ec09cbee8b46bee136e062e611d249cdf2 (diff) | |
| download | nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.gz nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.bz2 nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.lz nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.xz nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.tar.zst nixlib-f7f1a2f54ef2b744a26e37418dd6354bc46aa20a.zip | |
Merge branch 'master' into staging-next
A mass darwin rebuild from master (#55784).
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/gcalcli/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/applications/misc/polar-bookshelf/default.nix | 4 |
2 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index ac8d082513b2..99633c699132 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -4,16 +4,22 @@ with python3.pkgs; buildPythonApplication rec { - version = "4.0.0a4"; - name = "gcalcli-${version}"; + pname = "gcalcli"; + version = "4.0.3"; src = fetchFromGitHub { owner = "insanum"; - repo = "gcalcli"; + repo = pname; rev = "v${version}"; - sha256 = "00giq5cdigidzv5bz4wgzi1yp6xlf2rdcy6ynmsc6bcf0cl5x64d"; + sha256 = "15hpm7b09p5qnha0hpp0mgdl2pgsyq2sjcqihk3fsv7arngdbr5q"; }; + postPatch = lib.optionalString stdenv.isLinux '' + substituteInPlace gcalcli/argparsers.py --replace \ + "command = 'notify-send -u critical" \ + "command = '${libnotify}/bin/notify-send -u critical" + ''; + propagatedBuildInputs = [ dateutil gflags httplib2 parsedatetime six vobject google_api_python_client oauth2client uritemplate diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix index 18bd46a30bd5..82468e1bf9f0 100644 --- a/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { name = "polar-bookshelf-${version}"; - version = "1.9.0"; + version = "1.12.0"; # fetching a .deb because there's no easy way to package this Electron app src = fetchurl { url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-bookshelf-${version}-amd64.deb"; - sha256 = "1kvgmb7kvqc6pzcr0yp8x9mxwymiy85yr0cx3k2sclqlksrc5dzx"; + sha256 = "058pl54mkbvcjyjmdz81r0ibk1qkc3798pkkdw1kp2cbg16qkfyh"; }; buildInputs = [ |