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
base: 00738f9a9bac
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 2f74428675e5
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 17, 2020

  1. Revert "softmaker-office: remove /bin/ls intercept" 

    This reverts commit e883c65.
    @danieldk
    danieldk committed Oct 17, 2020
    Copy the full SHA
    e3b407e View commit details
    Browse the repository at this point in the history

  2. softmaker-office: add additional programs to PATH 

    These seem to be needed for the SoftMaker/FreeOffice unlock code. If
they are not added to PATH, startup takes a very long time and reports
many segmentation faults.

Fixes #71228.
    @danieldk
    danieldk committed Oct 17, 2020
    Copy the full SHA
    c342e5a View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2020

  1. Merge pull request #100805 from danieldk/softmaker-unlock-again 

    softmaker-office: fix unlocking again
    @romildo
    romildo committed Oct 18, 2020
    Copy the full SHA
    2f74428 View commit details
    Browse the repository at this point in the history