Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c8e389d512bf
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d447429cc240
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 21, 2020

  1. freeoffice: 976 -> 978 

    Fixes #98385.

(cherry picked from commit ac49c2f)
    @danieldk
    danieldk committed Sep 21, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    picnoir Félix
    GPG key ID: EFD315F31848DBA4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    283adf1 View commit details

Commits on Sep 24, 2020

  1. Merge pull request #98411 from danieldk/freeoffice-2018.978-20.09 

    [20.09] freeoffice: 976 -> 978
    @danieldk
    danieldk authored Sep 24, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    GPG key ID: E432E410B5E48C86
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b91d034 View commit details

  2. gnat: fix build 

    (cherry picked from commit 7ea5b08)
    @Lucus16
    Lucus16 authored and Jon committed Sep 24, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    GPG key ID: E432E410B5E48C86
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d447429 View commit details
Showing with 4 additions and 2 deletions.
  1. +2 −2 pkgs/applications/office/softmaker/freeoffice.nix
  2. +2 −0 pkgs/build-support/cc-wrapper/gnat-wrapper.sh
4 changes: 2 additions & 2 deletions pkgs/applications/office/softmaker/freeoffice.nix
View file
Original file line number Diff line number Diff line change
@@ -5,9 +5,9 @@
# overridable. This is useful when the upstream archive was replaced
# and nixpkgs is not in sync yet.
, officeVersion ? {
version = "976";
version = "978";
edition = "2018";
sha256 = "13yh4lyqakbdqf4r8vw8imy5gwpfva697iqfd85qmp3wimqvzskl";
sha256 = "1c5div1kbyyj48f89wkhc1i1759n70bsbp3w4a42cr0jmllyl60v";
}

, ... } @ args:
2 changes: 2 additions & 0 deletions pkgs/build-support/cc-wrapper/gnat-wrapper.sh
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,8 @@ if [[ -n "@coreutils_bin@" && -n "@gnugrep_bin@" ]]; then
PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin"
fi

cInclude=0

source @out@/nix-support/utils.bash

# Flirting with a layer violation here.