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: 807d73c391d0
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 4e18bc855dde
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 3, 2018

  1. makeself: backport megastep/makeself#142 

    Currently, a self-extracting archive created by makeself will fail to
properly execute on NixOS because the boilerplate Bash code it uses to
clean up the temporary directory it extracted its contents into
assumes that the `rm` command is installed at `/bin/rm`, which is not
the case on NixOS.

This commit, a backport of a pull request I made to the upstream
repository at megastep/makeself#142, fixes the issue by causing the
boilerplate code to call `rm` without specifying an absolute path,
which allows the version of `rm` from one's current Nix environment to
be used instead.
    @kini
    kini committed Oct 3, 2018
    Copy the full SHA
    eb84586 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #45285 from kini/makeself 

    makeself: backport megastep/makeself#142
    @Mic92
    Mic92 committed Oct 3, 2018
    Copy the full SHA
    4e18bc8 View commit details
    Browse the repository at this point in the history