diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-03-28 21:15:15 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-03-28 21:15:15 +0100 |
| commit | a36be028f5a5dcc55f488a78fc0f58b4b8e4033c (patch) | |
| tree | fee5e8989465811c0472b082260a2d9e91cd334b /pkgs/applications/office | |
| parent | 48a137da7301f3ec5e15f8c32945b64581ef9f70 (diff) | |
| parent | 7f4e4b279e729c05f1b18da867c6d2fd2c2ab2f3 (diff) | |
| download | nixlib-a36be028f5a5dcc55f488a78fc0f58b4b8e4033c.tar nixlib-a36be028f5a5dcc55f488a78fc0f58b4b8e4033c.tar.gz nixlib-a36be028f5a5dcc55f488a78fc0f58b4b8e4033c.tar.bz2 nixlib-a36be028f5a5dcc55f488a78fc0f58b4b8e4033c.tar.lz nixlib-a36be028f5a5dcc55f488a78fc0f58b4b8e4033c.tar.xz nixlib-a36be028f5a5dcc55f488a78fc0f58b4b8e4033c.tar.zst nixlib-a36be028f5a5dcc55f488a78fc0f58b4b8e4033c.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/softmaker/freeoffice.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/office/timetrap/Gemfile.lock | 12 | ||||
| -rw-r--r-- | pkgs/applications/office/timetrap/gemset.nix | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/applications/office/softmaker/freeoffice.nix b/pkgs/applications/office/softmaker/freeoffice.nix index b114194d5633..d9f901ff4635 100644 --- a/pkgs/applications/office/softmaker/freeoffice.nix +++ b/pkgs/applications/office/softmaker/freeoffice.nix @@ -2,13 +2,13 @@ callPackage ./generic.nix (args // rec { pname = "freeoffice"; - version = "974"; + version = "976"; edition = "2018"; suiteName = "FreeOffice"; src = fetchurl { url = "https://www.softmaker.net/down/softmaker-freeoffice-${version}-amd64.tgz"; - sha256 = "0z7131qmqyv1m9phm7wzvb5z7wkh27h59lsa3zc0zjkykikmjrp2"; + sha256 = "13yh4lyqakbdqf4r8vw8imy5gwpfva697iqfd85qmp3wimqvzskl"; }; archive = "freeoffice${edition}.tar.lzma"; diff --git a/pkgs/applications/office/timetrap/Gemfile.lock b/pkgs/applications/office/timetrap/Gemfile.lock index 9f2ea82cee05..c97fb170324a 100644 --- a/pkgs/applications/office/timetrap/Gemfile.lock +++ b/pkgs/applications/office/timetrap/Gemfile.lock @@ -2,12 +2,12 @@ GEM remote: https://rubygems.org/ specs: chronic (0.10.2) - sequel (4.43.0) - sqlite3 (1.3.13) - timetrap (1.15.1) + sequel (5.30.0) + sqlite3 (1.4.2) + timetrap (1.15.2) chronic (~> 0.10.2) - sequel (~> 4.43.0) - sqlite3 (~> 1.3.3) + sequel (~> 5.30.0) + sqlite3 (~> 1.4.2) PLATFORMS ruby @@ -16,4 +16,4 @@ DEPENDENCIES timetrap BUNDLED WITH - 1.17.2 + 1.17.3 diff --git a/pkgs/applications/office/timetrap/gemset.nix b/pkgs/applications/office/timetrap/gemset.nix index 1ea489b92c3f..65ab4ade9e0a 100644 --- a/pkgs/applications/office/timetrap/gemset.nix +++ b/pkgs/applications/office/timetrap/gemset.nix @@ -14,20 +14,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "121z4sq2m4vsgxwy8hs6d12cc1i4xa5rjiv0nbviyj87jldxapw0"; + sha256 = "0gqqnqrfayhwhkp0vy3frv68sgc7klyd6mfisx1j3djjvlyc7hmr"; type = "gem"; }; - version = "4.43.0"; + version = "5.30.0"; }; sqlite3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i"; + sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78"; type = "gem"; }; - version = "1.3.13"; + version = "1.4.2"; }; timetrap = { dependencies = ["chronic" "sequel" "sqlite3"]; @@ -35,9 +35,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ylaz9q99hbxnw6h1df6wphmh68fj847d1l4f9jylcx3nzzp5cyd"; + sha256 = "0pfg5c3kmh1jfaaszw253bi93ixa6cznqmsafrcpccrdg9r8j2k8"; type = "gem"; }; - version = "1.15.1"; + version = "1.15.2"; }; } \ No newline at end of file |