diff options
| author | Jonathan Ringer <jonringer@users.noreply.github.com> | 2020-11-20 14:09:26 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-20 14:09:26 -0800 |
| commit | f0aac911871bbcbf9ba55f07aadf4bce3db2ca93 (patch) | |
| tree | 01e9603d5939b7d777a959404b8140b3dc4b0138 /pkgs/applications/office | |
| parent | 4f2880ba128a8f254bea5459d3326edea4d3933d (diff) | |
| parent | 8b0dee1dc67ebbd16aefdaf0015503b1c8de2e84 (diff) | |
| download | nixpkgs-f0aac911871bbcbf9ba55f07aadf4bce3db2ca93.tar nixpkgs-f0aac911871bbcbf9ba55f07aadf4bce3db2ca93.tar.gz nixpkgs-f0aac911871bbcbf9ba55f07aadf4bce3db2ca93.tar.bz2 nixpkgs-f0aac911871bbcbf9ba55f07aadf4bce3db2ca93.tar.lz nixpkgs-f0aac911871bbcbf9ba55f07aadf4bce3db2ca93.tar.xz nixpkgs-f0aac911871bbcbf9ba55f07aadf4bce3db2ca93.tar.zst nixpkgs-f0aac911871bbcbf9ba55f07aadf4bce3db2ca93.zip | |
Merge pull request #102840 from freezeboy/update-fixes
treewide: Qt5.X -> Qt5.15 (when possible)
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/skrooge/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/office/vnote/default.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index e84e8496741..067b06747d7 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -30,6 +30,7 @@ mkDerivation rec { cmakeFlags = [ "-DSKG_DESIGNER=OFF" "-DSKG_WEBENGINE=ON" + "-DBUILD_TESTS=ON" ]; meta = with lib; { diff --git a/pkgs/applications/office/vnote/default.nix b/pkgs/applications/office/vnote/default.nix index 80b6ef6243c..b266ce86e2a 100644 --- a/pkgs/applications/office/vnote/default.nix +++ b/pkgs/applications/office/vnote/default.nix @@ -3,7 +3,7 @@ let description = "A note-taking application that knows programmers and Markdown better"; in mkDerivation rec { - version = "2.8.2"; + version = "2.10"; pname = "vnote"; src = fetchFromGitHub { @@ -11,7 +11,7 @@ in mkDerivation rec { repo = "vnote"; fetchSubmodules = true; rev = "v${version}"; - sha256 = "18qffq5c2plr5rjb5lafhdz1v5kbbb2wiyacgdhh3xni3khni52l"; + sha256 = "EeeVGnKI0irLO1zJQxlVlIUhqG987JIgxNvKpUgLxUQ="; }; nativeBuildInputs = [ qmake ]; |