public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libreoffice-*: changes attributes structure for *-unwrapped 

libreoffice-unwrapped points to the same libreoffice than libreoffice.
libreoffice-*-unwrapped exists for all versions

This bring an incompatible change where a user using
`libreoffice-unwrapped` hoping to use `fresh` would now be inadvertently
be using `still`.
This commit is contained in:
Samuel Dionne-Riel 2018-11-09 13:53:37 -05:00
parent 4a58f744f1
commit 1430f1c0d0
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/top-level/all-packages.nix
View File

@ -17652,6 +17652,7 @@ with pkgs;
librecad = callPackage ../applications/misc/librecad { };
libreoffice = hiPrio libreoffice-still;
libreoffice-unwrapped = libreoffice.libreoffice;
libreoffice-args = {
inherit (perlPackages) ArchiveZip IOCompress;
@ -17673,21 +17674,20 @@ with pkgs;
};
};
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 = callPackage ../applications/office/libreoffice
(libreoffice-args // {
});
});
libreoffice-fresh-unwrapped = libreoffice-fresh.libreoffice;
libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
libreoffice = libreoffice-still-unwrapped;
libreoffice = callPackage ../applications/office/libreoffice/still.nix
(libreoffice-args // {
poppler = poppler_0_61;
});
});
libreoffice-still-unwrapped = libreoffice-still.libreoffice;
libvmi = callPackage ../development/libraries/libvmi { };