Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e8610d7a41b5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aa3c504e2018
Choose a head ref
  • 3 commits
  • 1 file changed
  • 3 contributors

Commits on Apr 3, 2020

  1. freeoffice: 973 -> 974 

    Cherry picked from PR #82038

Changelog:

https://www.freeoffice.com/en/download/servicepacks
(cherry picked from commit 44085e3)
    @danieldk @romildo
    danieldk authored and romildo committed Apr 3, 2020
    Copy the full SHA
    a1d49d6 View commit details

  2. freeoffice: 974 -> 976 

    Cherry picked from PR #83495

(cherry picked from commit 55b6146)
    @romildo
    romildo committed Apr 3, 2020
    Copy the full SHA
    26df648 View commit details

  3. Merge pull request #84184 from romildo/upd.freeoffice 

    [20.03] freeoffice: 973 -> 976
    @bhipple
    bhipple authored Apr 3, 2020
    Copy the full SHA
    aa3c504 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/applications/office/softmaker/freeoffice.nix
4 changes: 2 additions & 2 deletions pkgs/applications/office/softmaker/freeoffice.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

callPackage ./generic.nix (args // rec {
pname = "freeoffice";
version = "973";
version = "976";
edition = "2018";
suiteName = "FreeOffice";

src = fetchurl {
url = "https://www.softmaker.net/down/softmaker-freeoffice-${version}-amd64.tgz";
sha256 = "0xac4ynf1lfh8qmni5bhp4ybaamdfngva4bqaq21n1m4pgrx1ba5";
sha256 = "13yh4lyqakbdqf4r8vw8imy5gwpfva697iqfd85qmp3wimqvzskl";
};

archive = "freeoffice${edition}.tar.lzma";