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/nix
base: 22d4ea7a989d
Choose a base ref
...
head repository: NixOS/nix
compare: e232bf2b6993
Choose a head ref
  • 16 commits
  • 20 files changed
  • 9 contributors

Commits on Oct 9, 2019

  1. getSourceExpr(): Handle channels

    Fixes #1892.
    Fixes #1865.
    Fixes #3119.
    
    (cherry picked from commit e6e61f0)
    edolstra committed Oct 9, 2019
    1
    Copy the full SHA
    1d5cb6a View commit details
    Browse the repository at this point in the history
  2. nix search: Don't quietly ignore errors

    (cherry picked from commit 7c74f07)
    edolstra committed Oct 9, 2019
    Copy the full SHA
    1b78bbb View commit details
    Browse the repository at this point in the history
  3. Handle empty sandbox_shell

    Previously, SANDBOX_SHELL was set to empty when unavailable. This
    caused issues when actually generating the sandbox. Instead, just set
    SANDBOX_SHELL when --with-sandbox-shell= is non-empty. Alternative
    implementation to #3038.
    
    (cherry picked from commit 199e888)
    matthewbauer authored and edolstra committed Oct 9, 2019
    Copy the full SHA
    9f698c4 View commit details
    Browse the repository at this point in the history
  4. Fix typos in the Nix Manual.

    (cherry picked from commit 00a5675)
    PyroLagus authored and edolstra committed Oct 9, 2019
    Copy the full SHA
    3c5788d View commit details
    Browse the repository at this point in the history
  5. nix search: remove verbose example

    (cherry picked from commit 6f6cb5e)
    samdoshi authored and edolstra committed Oct 9, 2019
    Copy the full SHA
    b0ae8fe View commit details
    Browse the repository at this point in the history
  6. Fix fetchTarball with chroot stores

    Fixes #2405.
    
    (cherry picked from commit 168a887)
    edolstra committed Oct 9, 2019
    Copy the full SHA
    3919093 View commit details
    Browse the repository at this point in the history
  7. Update garbage-collection.xml readability

    1. remove a typo space
    2. Simplify negative style by using affirmative style
    
    (cherry picked from commit 10bfc5c)
    JosephLucas authored and edolstra committed Oct 9, 2019
    Copy the full SHA
    4d83eb6 View commit details
    Browse the repository at this point in the history
  8. Shut up some warnings

    (cherry picked from commit 99e8e58)
    (cherry picked from commit 3a022d4)
    edolstra committed Oct 9, 2019
    Copy the full SHA
    9f53bc3 View commit details
    Browse the repository at this point in the history
  9. Don't catch exceptions by value

    (cherry picked from commit 893be6f)
    (cherry picked from commit bd79c1f)
    edolstra committed Oct 9, 2019
    Copy the full SHA
    f3ce445 View commit details
    Browse the repository at this point in the history
  10. libstore: don't forward --show-trace

    (cherry picked from commit e63c9e7)
    zimbatm authored and edolstra committed Oct 9, 2019
    Copy the full SHA
    f4106e7 View commit details
    Browse the repository at this point in the history
  11. Move 'builtins.splitVersion' to position respecting alphabetical order

    (cherry picked from commit 9533d85)
    alexfmpe authored and edolstra committed Oct 9, 2019
    Copy the full SHA
    62d1c60 View commit details
    Browse the repository at this point in the history
  12. docs: Use the explicit ref for fetchGit with a tag

    With the merge of #2582, the syntax "tags/1.9" for refs does not work
    anymore.
    However, the new syntax "refs/tags/1.9" seems to support annotated tags,
    such as "refs/tags/2.0".
    
    Closes #2385.
    
    (cherry picked from commit ae244af)
    jtanguy authored and edolstra committed Oct 9, 2019
    Copy the full SHA
    ceddbc9 View commit details
    Browse the repository at this point in the history
  13. docs: Fix a typo in github in an example

    (cherry picked from commit 92ede15)
    jtanguy authored and edolstra committed Oct 9, 2019
    Copy the full SHA
    ff7fcd3 View commit details
    Browse the repository at this point in the history
  14. Disable OpenSSL lock callback on OpenSSL >= 1.1.1

    (cherry picked from commit a56b51a)
    edolstra committed Oct 9, 2019
    Copy the full SHA
    fa02819 View commit details
    Browse the repository at this point in the history
  15. docs: Note that tryEval doesn't do deep evaluation

    (cherry picked from commit e4ea3e0)
    infinisil authored and edolstra committed Oct 9, 2019
    Copy the full SHA
    7c9ad4d View commit details
    Browse the repository at this point in the history
  16. Bump version number

    edolstra committed Oct 9, 2019
    Copy the full SHA
    e232bf2 View commit details
    Browse the repository at this point in the history