diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-31 00:46:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-31 00:46:33 +0000 |
| commit | 81337921f56fd83a795fbcda58f43db555d99fe0 (patch) | |
| tree | 490bf3b9911d7519fa4b95ecb9728788c481c4b9 /pkgs/applications/office | |
| parent | 048e0d3f87850f2d1bec2eb8dbac93fc6a1a2dd2 (diff) | |
| parent | 45aaf5e0c825c45c8bce6a203a5dd711cda350e8 (diff) | |
| download | nixpkgs-81337921f56fd83a795fbcda58f43db555d99fe0.tar nixpkgs-81337921f56fd83a795fbcda58f43db555d99fe0.tar.gz nixpkgs-81337921f56fd83a795fbcda58f43db555d99fe0.tar.bz2 nixpkgs-81337921f56fd83a795fbcda58f43db555d99fe0.tar.lz nixpkgs-81337921f56fd83a795fbcda58f43db555d99fe0.tar.xz nixpkgs-81337921f56fd83a795fbcda58f43db555d99fe0.tar.zst nixpkgs-81337921f56fd83a795fbcda58f43db555d99fe0.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/grisbi/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/office/qnotero/default.nix | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 4bf3081cde1..9fc7a84231b 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "grisbi"; - version = "1.2.2"; + version = "2.0.0"; src = fetchurl { url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2"; - sha256 = "1piiyyxjsjbw9gcqydvknzxmmfgh8kdqal12ywrxyxih2afwnvbw"; + sha256 = "sha256-b3I87tlXhIjM/bFjhsJTNFQvZxIGKsIbsf4zZT5sHXg="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix index 4459e42356a..414312f24e5 100644 --- a/pkgs/applications/office/qnotero/default.nix +++ b/pkgs/applications/office/qnotero/default.nix @@ -26,6 +26,9 @@ python3Packages.buildPythonPackage rec { wrapQtApp "$out"/bin/qnotero ''; + # no tests executed + doCheck = false; + meta = { description = "Quick access to Zotero references"; homepage = "http://www.cogsci.nl/software/qnotero"; |