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: 880375366602
Choose a base ref
...
head repository: NixOS/nix
compare: 406a70159ac0
Choose a head ref
  • 17 commits
  • 12 files changed
  • 10 contributors

Commits on Dec 22, 2020

  1. DerivationGoal: only retry if output closure incomplete is only problem

    (cherry picked from commit bd9eb5c)
    roberth committed Dec 22, 2020
    Copy the full SHA
    c29fffe View commit details
    Browse the repository at this point in the history
  2. Tests for #3964

    (cherry picked from commit ea8d320)
    roberth committed Dec 22, 2020
    Copy the full SHA
    e90530e View commit details
    Browse the repository at this point in the history
  3. Revert "Tests for #3964"

    This reverts commit e90530e.
    
    It appears that this backported test relies on new functionality.
    
    The error is:
    
        + nix copy --to file:///build/nix-test/binary-cache /build/nix-test/store/dckdy2xp7sn8qvyx8axxjq7clnxddri1-multi-output
        warning: you don't have Internet access; disabling some network-dependent features
        error: uploading to 'file:///build/nix-test/binary-cache/nar/0hpfhrig9h6fvbjmiwsb7zkaxr19vr2w048y4xb3nrs36bagf92n.nar.xz' is not supported
    roberth committed Dec 22, 2020
    Copy the full SHA
    8388e2e View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2020

  1. Merge pull request #4389 from hercules-ci/backport-issue-3964-substit…

    …ution-loop
    
    Backport issue 3964 substitution loop
    domenkozar committed Dec 25, 2020
    Copy the full SHA
    0828ace View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2020

  1. Fix compatibility with newer AWS SDKs (#4316)

    Tested against AWS SDK 1.8.99. Fixes #3201.
    
    (cherry picked from commit e20a3ec)
    stephank authored and orivej committed Dec 26, 2020
    Copy the full SHA
    024c0ea View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2020

  1. Merge pull request #4404 from orivej/2.3-aws-sdk-cpp

    Backport compatibility with newer AWS SDKs to 2.3 (#4316)
    edolstra committed Dec 28, 2020
    Copy the full SHA
    3a6a2f8 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2021

  1. Handle missing etag in 304 Not Modified response

    GitHub now omits the etag, but 304 implies it matches the one we
    provided. Just use that one to avoid having an etag-less resource.
    
    Fixes #4469
    
    (cherry picked from commit a766824)
    matthewbauer committed Jan 25, 2021
    Copy the full SHA
    f95c320 View commit details
    Browse the repository at this point in the history
  2. scripts/install-nix-from-closure: only show progress if a terminal is…

    … used
    
    While the progress dots during the copying of the store work fine on a
    normal terminal, those look pretty off if the script is run inside a
    provisioning script of e.g. `vagrant` or `packer` where `stderr` and
    `stdout` are captured:
    
        default: .
        default: ..
        default: .
        default: .
        default: .
    
    To work around this, the script checks with `-t 0` if it's
    running on an actual terminal and doesn't show the progress if that's not
    the case.
    
    (cherry picked from commit d9367a2)
    Ma27 authored and edolstra committed Jan 25, 2021
    Copy the full SHA
    85329ca View commit details
    Browse the repository at this point in the history
  3. Merge pull request #4475 from matthewbauer/fix-4469-backport-2-3

    [backport 2.3] Fix #4469
    edolstra committed Jan 25, 2021
    Copy the full SHA
    3cdd464 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2021

  1. nix-build: set execfail

    When starting a nix-shell with `-i` it was previously possible for it to
    silently fail in the scenario where the specified interpreter didn't
    exist. This happened due to the `exec` call masking the issue.
    
    With this change we enable `execfail`, which causes the script using
    `nix-shell` as interpreter to correctly exit with code 127.
    
    Fixes: #4598
    (cherry picked from commit 6e849e3)
    lovesegfault committed Mar 8, 2021
    Copy the full SHA
    da1629d View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    2a19287 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2021

  1. Copy the full SHA
    2fe57da View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2021

  1. Copy the full SHA
    dac86f8 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2021

  1. fix nixbld user name/uid for macOS

    (cherry picked from commit 0431cf6)
    Signed-off-by: Domen Kožar <domen@dev.si>
    abathur authored and domenkozar committed Mar 26, 2021
    Copy the full SHA
    dd50221 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2021

  1. Fix iterating over $NIX_PROFILES in Zsh

    NIX_PROFILES is space separated list of directories, and passing it into
    for as is is considered to be 1-element list with the whole string. With
    shwordsplit option Zsh emulates other shells in this regard ans
    implicitely splits unquoted strings into words.
    
    Fixes #4167.
    YorikSar committed May 14, 2021
    Copy the full SHA
    4197971 View commit details
    Browse the repository at this point in the history
  2. Bump version

    edolstra committed May 14, 2021
    Copy the full SHA
    2e12b28 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #4805 from YorikSar/zsh-nix-profiles-2.3

    Fix iterating over $NIX_PROFILES in Zsh (backport to 2.3)
    domenkozar committed May 14, 2021
    Copy the full SHA
    406a701 View commit details
    Browse the repository at this point in the history