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: 5a67b130b9b4
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 21f6cb79a708
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jan 2, 2017

  1. Python: script names now include full path 

    Certain programs, like zim, calibre and now also apparently mercurial,
rely on sys.argv[0] providing not just the script name but the full
path.

The Python docs [1] state the following on the matter:

> argv[0] is the script name (it is operating system dependent whether
this is a full pathname or not).

Therefore, scripts should not expect to receive a full path.
Unfortunately some do. While this can be considered a bug, there doesn't
seem any reason not to provide the full path. Therefore we now provide
the full path.

[1]
https://docs.python.org/3.5/library/sys.html?highlight=sys.argv#sys.argv
    @FRidh
    FRidh committed Jan 2, 2017
    Configuration menu
    Copy the full SHA
    d68aba4 View commit details
    Browse the repository at this point in the history

  2. zim: remove postFixup, include checkPhase, disable tests 

    - wrap-python.nix used to set sys.argv[0] to the name of the script, but
it now sets the path so we won't have to do it here anymore
- tests were not found, so the correct file is now invoked
    @FRidh
    FRidh committed Jan 2, 2017
    Configuration menu
    Copy the full SHA
    21f6cb7 View commit details
    Browse the repository at this point in the history