alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

libreoffice: cleanup and update

Browse source 
1. For some reason libreoffice-still was still referencing the Fresh
expression.

2. Moved gdb from buildInputs to nativeBuildInputs.

3. Minor update for both branches.
This commit is contained in:
Michael Raskin 2018-06-24 16:08:35 +02:00
parent 5222f36993
commit 7e3db3490e
7 changed files with 43 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/office/libreoffice/default-primary-src.nix
View file

@ -3,7 +3,7 @@
rec { rec {
major = "6"; major = "6";
minor = "0"; minor = "0";
patch = "4"; patch = "5";
tweak = "2"; tweak = "2";
subdir = "${major}.${minor}.${patch}"; subdir = "${major}.${minor}.${patch}";
@ -12,6 +12,6 @@ rec {
src = fetchurl { src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "1xqh4l1nrvgara4ni9zk8pqywz3gbq4a8sw9v0ggxsch409zp0ch"; sha256 = "16h60j7h9z48vfhhj22m64myksnrrgrnh0qc6i4bxgshmm8kkzdn";
}; };
} }

7
pkgs/applications/office/libreoffice/default.nix
View file

@ -42,14 +42,14 @@ let
translations = fetchSrc { translations = fetchSrc {
name = "translations"; name = "translations";
sha256 = "0bjl3hdckd5bcgskh46xqna1hpxjjx0ycgpnilyk7j8l6407hpw6"; sha256 = "1p8gb9jxv4n8ggksbfsqzdw5amxg575grxifsabhgjllpisjzrlr";
}; };
# TODO: dictionaries # TODO: dictionaries
help = fetchSrc { help = fetchSrc {
name = "help"; name = "help";
sha256 = "1z21bk5lwd5gxsyjdwh0fmgkys4lhnx7flbjd6dbn9d99paz1w6f"; sha256 = "1dkzm766zi4msk6w35bvfk5b5bx1xyqg2wx58wklr5375kjv6ba9";
}; };
}; };
@ -264,10 +264,9 @@ in stdenv.mkDerivation rec {
libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
librevenge libe-book libmwaw glm glew ncurses epoxy librevenge libe-book libmwaw glm glew ncurses epoxy
libodfgen CoinMP librdf_rasqal defaultIconTheme gettext libodfgen CoinMP librdf_rasqal defaultIconTheme gettext
gdb
] ]
++ lib.optional kdeIntegration kdelibs4; ++ lib.optional kdeIntegration kdelibs4;
nativeBuildInputs = [ wrapGAppsHook ]; nativeBuildInputs = [ wrapGAppsHook gdb ];
passthru = { passthru = {
inherit srcs jdk; inherit srcs jdk;

10
pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
View file

@ -581,11 +581,11 @@
md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2";
} }
{ {
name = "odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar";
url = "http://dev-www.libreoffice.org/src/../extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar";
sha256 = "a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34"; sha256 = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769";
md5 = "a084cd548b586552cb7d3ee51f1af969"; md5 = "";
md5name = "a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; md5name = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar";
} }
{ {
name = "officeotron-0.7.4-master.jar"; name = "officeotron-0.7.4-master.jar";

24
pkgs/applications/office/libreoffice/libreoffice-srcs.nix
View file

@ -105,11 +105,11 @@
md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
} }
{ {
name = "curl-7.58.0.tar.gz"; name = "curl-7.60.0.tar.gz";
url = "http://dev-www.libreoffice.org/src/curl-7.58.0.tar.gz"; url = "http://dev-www.libreoffice.org/src/curl-7.60.0.tar.gz";
sha256 = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115"; sha256 = "e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5";
md5 = ""; md5 = "";
md5name = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115-curl-7.58.0.tar.gz"; md5name = "e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5-curl-7.60.0.tar.gz";
} }
{ {
name = "libe-book-0.1.3.tar.xz"; name = "libe-book-0.1.3.tar.xz";
@ -455,11 +455,11 @@
md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz"; md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz";
} }
{ {
name = "language-subtag-registry-2017-12-14.tar.bz2"; name = "language-subtag-registry-2018-03-30.tar.bz2";
url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2"; url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-03-30.tar.bz2";
sha256 = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362"; sha256 = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854";
md5 = ""; md5 = "";
md5name = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362-language-subtag-registry-2017-12-14.tar.bz2"; md5name = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854-language-subtag-registry-2018-03-30.tar.bz2";
} }
{ {
name = "JLanguageTool-1.7.0.tar.bz2"; name = "JLanguageTool-1.7.0.tar.bz2";
@ -623,11 +623,11 @@
md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2";
} }
{ {
name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar";
url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar";
sha256 = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf"; sha256 = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769";
md5 = ""; md5 = "";
md5name = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; md5name = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar";
} }
{ {
name = "officeotron-0.7.4-master.jar"; name = "officeotron-0.7.4-master.jar";

4
pkgs/applications/office/libreoffice/still-primary-src.nix
View file

@ -3,7 +3,7 @@
rec { rec {
major = "5"; major = "5";
minor = "4"; minor = "4";
patch = "6"; patch = "7";
tweak = "2"; tweak = "2";
subdir = "${major}.${minor}.${patch}"; subdir = "${major}.${minor}.${patch}";
@ -12,6 +12,6 @@ rec {
src = fetchurl { src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "0icd8h221gp2dsbn6d35flwhqhcfpx66cjc5dg8yifhhvrfam74i"; sha256 = "0s9s4nhp2whwxis54jbxrf1dwpnpl95b9781d1pdj4xk5z9v90fv";
}; };
} }

12
pkgs/applications/office/libreoffice/still.nix
View file

@ -12,7 +12,7 @@
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
, defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme , defaultIconTheme, glib, ncurses, epoxy, gpgme
, langs ? [ "ca" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" ] , langs ? [ "ca" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" ]
, withHelp ? true , withHelp ? true
, kdeIntegration ? false , kdeIntegration ? false
@ -42,14 +42,14 @@ let
translations = fetchSrc { translations = fetchSrc {
name = "translations"; name = "translations";
sha256 = "16g85bn6qkql81a0k9iv3nwrpg2kpvz5nk4r7lab5jzlcl20qplc"; sha256 = "05ixmqbs3pkdpyqcwadz9i3wg797vimsm75rmfby7z71wc3frcyk";
}; };
# TODO: dictionaries # TODO: dictionaries
help = fetchSrc { help = fetchSrc {
name = "help"; name = "help";
sha256 = "02382d09svcgmp5q2xglhbx1na9ycd77f5cbcj9jgs8lpkgwbxxc"; sha256 = "0ifyh4m8mwpkb16g6883ivk2s2qybr4s4s7pdjzp4cpx1nalzibl";
}; };
}; };
@ -238,6 +238,7 @@ in stdenv.mkDerivation rec {
"--without-system-libstaroffice" "--without-system-libstaroffice"
# https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f
"--without-system-orcus" "--without-system-orcus"
"--without-system-xmlsec"
]; ];
checkPhase = '' checkPhase = ''
@ -258,12 +259,11 @@ in stdenv.mkDerivation rec {
python3 sablotron sane-backends unzip vigra which zip zlib python3 sablotron sane-backends unzip vigra which zip zlib
mdds bluez5 glibc libcmis libwps libabw libzmf libtool mdds bluez5 glibc libcmis libwps libabw libzmf libtool
libxshmfence libatomic_ops graphite2 harfbuzz gpgme libxshmfence libatomic_ops graphite2 harfbuzz gpgme
librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy librevenge libe-book libmwaw glm glew ncurses epoxy
libodfgen CoinMP librdf_rasqal defaultIconTheme libodfgen CoinMP librdf_rasqal defaultIconTheme
gdb
] ]
++ lib.optional kdeIntegration kdelibs4; ++ lib.optional kdeIntegration kdelibs4;
nativeBuildInputs = [ wrapGAppsHook ]; nativeBuildInputs = [ wrapGAppsHook gdb ];
passthru = { passthru = {
inherit srcs jdk; inherit srcs jdk;

18
pkgs/top-level/all-packages.nix
View file

@ -16793,7 +16793,7 @@ with pkgs;
libreoffice = hiPrio libreoffice-still; libreoffice = hiPrio libreoffice-still;
libreoffice-unwrapped =callPackage ../applications/office/libreoffice { libreoffice-args = {
inherit (perlPackages) ArchiveZip CompressZlib; inherit (perlPackages) ArchiveZip CompressZlib;
inherit (gnome2) GConf ORBit2 gnome_vfs; inherit (gnome2) GConf ORBit2 gnome_vfs;
inherit (gnome3) defaultIconTheme; inherit (gnome3) defaultIconTheme;
@ -16816,12 +16816,20 @@ with pkgs;
stdenv = overrideCC stdenv gcc5; stdenv = overrideCC stdenv gcc5;
}; };
libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = libreoffice-unwrapped; }); libreoffice-unwrapped =callPackage ../applications/office/libreoffice
(libreoffice-args // {
});
libreoffice-still-unwrapped =callPackage ../applications/office/libreoffice/still.nix
(libreoffice-args // {
poppler = poppler_0_61;
});
libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
libreoffice = libreoffice-unwrapped;
});
libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
libreoffice = libreoffice-unwrapped.override { libreoffice = libreoffice-still-unwrapped;
poppler = poppler_0_61;
};
}); });
liferea = callPackage ../applications/networking/newsreaders/liferea { liferea = callPackage ../applications/networking/newsreaders/liferea {