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

Commits on Mar 24, 2019

  1. libreoffice: japanese added

    Tomas Hlavaty committed Mar 24, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    nlf nlf
    GPG key ID: 2E00CD5164FF0C07
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fa144d2 View commit details

  2. Merge pull request #58194 from tohl/japanese_libreoffice 

    japanese libreoffice added, tested on nixos x86_64
    @7c6f434c
    7c6f434c authored Mar 24, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    nlf nlf
    GPG key ID: 2E00CD5164FF0C07
    Verified
    Learn about vigilant mode
    Copy the full SHA
    80dd844 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 pkgs/applications/office/libreoffice/default.nix
  2. +1 −1 pkgs/applications/office/libreoffice/still.nix
2 changes: 1 addition & 1 deletion pkgs/applications/office/libreoffice/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
, gnome3, glib, ncurses, epoxy, gpgme
, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ]
, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "ru" "sl" "zh-CN" ]
, withHelp ? true
, kdeIntegration ? false
}:
2 changes: 1 addition & 1 deletion pkgs/applications/office/libreoffice/still.nix
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
, gnome3, glib, ncurses, epoxy, gpgme
, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ]
, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "ru" "sl" "zh-CN" ]
, withHelp ? true
, kdeIntegration ? false
}: