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: 57cf3308bbbf
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: c0dd1e540035
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 20, 2019

  1. softmaker-office: fix product unlock error 

    SoftMaker/FreeOffice collects some system information upon unlocking the
product. But in doing so, it attempts to execute /bin/ls. If the execve
syscall fails, the whole unlock procedure fails. This works around that
by rewriting /bin/ls to the proper path.

SoftMaker Office restarts itself upon some operations, such changing the
theme and unlocking. Unfortunately, we do not have control over its
environment then and it will fail with an error. Starting SoftMaker
Office from scratch will then work.

Fixes #71228
    @danieldk
    danieldk committed Oct 20, 2019
    Copy the full SHA
    6f6331d View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2019

  1. Merge pull request #71460 from danieldk/softmaker-office-fix-unlock 

    softmaker-office: fix product unlock error
    @romildo
    romildo committed Oct 21, 2019
    Copy the full SHA
    c0dd1e5 View commit details
    Browse the repository at this point in the history