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: c3945dc31c09
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b22ec9ca5ec9
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 19, 2020

  1. libreoffice: fix build with poppler 0.86 

    was broken with update in #81955 / 6187d5b
    @ajs124
    ajs124 committed Apr 19, 2020
    Copy the full SHA
    f7c7743 View commit details

  2. libreoffice-fresh: 6.4.1.1 -> 6.4.3.2

    @ajs124
    ajs124 committed Apr 19, 2020
    Copy the full SHA
    cf2ff92 View commit details

Commits on Apr 20, 2020

  1. Merge pull request #85572 from helsinki-systems/libreoffice 

    libreoffice: fix and update
    @7c6f434c
    7c6f434c authored Apr 20, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b22ec9c View commit details
5 changes: 5 additions & 0 deletions pkgs/applications/office/libreoffice/default.nix
View file
Original file line number Diff line number Diff line change
@@ -62,6 +62,11 @@ in (stdenv.mkDerivation rec {

patches = [
./xdg-open-brief.patch
(fetchpatch {
url = "https://git.pld-linux.org/gitweb.cgi?p=packages/libreoffice.git;a=blob_plain;f=poppler-0.86.patch;h=76b8356d5f22ef537a83b0f9b0debab591f152fe;hb=a2737a61353e305a9ee69640fb20d4582c218008";
name = "poppler-0.86.patch";
sha256 = "0q6k4l8imgp8ailcv0qx5l83afyw44hah24fi7gjrm9xgv5sbb8j";
})
];

tarballPath = "external/tarballs";
8 changes: 4 additions & 4 deletions pkgs/applications/office/libreoffice/src-fresh/download.nix
View file
Original file line number Diff line number Diff line change
@@ -728,11 +728,11 @@
md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2";
}
{
name = "Python-3.7.6.tar.xz";
url = "http://dev-www.libreoffice.org/src/Python-3.7.6.tar.xz";
sha256 = "55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f";
name = "Python-3.7.7.tar.xz";
url = "http://dev-www.libreoffice.org/src/Python-3.7.7.tar.xz";
sha256 = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136";
md5 = "";
md5name = "55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f-Python-3.7.6.tar.xz";
md5name = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136-Python-3.7.7.tar.xz";
}
{
name = "QR-Code-generator-1.4.0.tar.gz";
10 changes: 5 additions & 5 deletions pkgs/applications/office/libreoffice/src-fresh/primary.nix
View file
Original file line number Diff line number Diff line change
@@ -8,29 +8,29 @@ rec {

major = "6";
minor = "4";
patch = "1";
tweak = "1";
patch = "3";
tweak = "2";

subdir = "${major}.${minor}.${patch}";

version = "${subdir}${if tweak == "" then "" else "."}${tweak}";

src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "03fqpkilz4yi35l447hb9r8gjwj23l61bpdkwg21jm8blm8kkvyj";
sha256 = "1cmbrhha7mlflnlbpla8fix07cxcgkdb7krnrgs1bylf31y5855w";
};

# FIXME rename
translations = fetchSrc {
name = "translations";
sha256 = "0a7arjlxxy7hjm1brxwd124bf1gkbl92bgygi3sbbhbsv07pjdcr";
sha256 = "06z9hz4m3kdcljjc6y5s18001axjibj9xiyakdndkl9pmnnhn9h3";
};

# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
# it and LibreOffice can use these by pointing DICPATH environment variable at the hunspell directory

help = fetchSrc {
name = "help";
sha256 = "1hfllrdyxrg5mgqry3dcrhjbdrd0d27k5mvv4sfj7nwjlmjh8rqq";
sha256 = "0mpgrwg8z1q38j03l6m1sdpcplyjd5nz1nqaa13vfkryj2lflw45";
};
}