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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 04f38d1b4d2f
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 736639c8f826
Choose a head ref
6 contributors

Commits on Nov 9, 2020

  1. nix develop: Preserve stdin with -c

    @Kha
    Kha committed Nov 9, 2020
    Copy the full SHA
    fb7735e View commit details

  2. Make test case more precise 

    Co-authored-by: Théophane Hufschmitt <regnat@users.noreply.github.com>
    @Kha
    Kha and Théophane Hufschmitt committed Nov 9, 2020
    Copy the full SHA
    579b953 View commit details

  3. Add test case for incidentally fixed #4228

    @Kha
    Kha committed Nov 9, 2020
    Copy the full SHA
    3f24a41 View commit details

  4. Bump cachix/install-nix-action from v11 to v12 (#4237) 

    Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from v11 to v12.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](cachix/install-nix-action@v11...07da252)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot
    dependabot[bot] authored Nov 9, 2020
    Copy the full SHA
    0ed7c95 View commit details

Commits on Nov 10, 2020

  1. Fix stack overflow introduced in #4206

    @wizeman
    wizeman committed Nov 10, 2020
    Copy the full SHA
    108a2da View commit details

  2. Merge pull request #4233 from Kha/master 

    nix develop: Preserve stdin with `-c`
    @edolstra
    edolstra authored Nov 10, 2020
    Copy the full SHA
    3f680c1 View commit details

  3. Merge pull request #4242 from wizeman/fix-stack-overflow 

    Fix stack overflow introduced in #4206
    @edolstra
    edolstra authored Nov 10, 2020
    Copy the full SHA
    cdc840d View commit details

  4. enable Darwin.arm64 to install x86_64 binary 

    Throwing @thefloweringash under the bus if this doesn't work, but it
sounds like Apple Silicon devices can use the x86_64 binary for now.

Fixes #4058
    @abathur
    abathur committed Nov 10, 2020
    1
    Copy the full SHA
    4864df6 View commit details

  5. Fix use of dirty Git/Mercurial inputs with chroot stores 

    Fixes:

  $ nix build --store /tmp/nix /home/eelco/Dev/patchelf#hydraJobs.build.x86_64-linux
  warning: Git tree '/home/eelco/Dev/patchelf' is dirty
  error: --- RestrictedPathError ------------------------------------------------------------------------------------------- nix
  access to path '/tmp/nix/nix/store/xmkvfmffk7xfnazykb5kx999aika8an4-source/flake.nix' is forbidden in restricted mode
  (use '--show-trace' to show detailed location information)
    @edolstra
    edolstra committed Nov 10, 2020
    Copy the full SHA
    4badb69 View commit details

  6. Merge pull request #4243 from abathur/fix_4058 

    enable Darwin.arm64 to install x86_64 binary
    @edolstra
    edolstra authored Nov 10, 2020
    Copy the full SHA
    905f667 View commit details

Commits on Nov 11, 2020

  1. Macro hygiene

    @edolstra
    edolstra committed Nov 11, 2020
    Copy the full SHA
    b0ca9c7 View commit details

  2. Lower verbosity for 'Failed to find a machine' message

    @edolstra
    edolstra committed Nov 11, 2020
    Copy the full SHA
    27d4d1c View commit details

  3. Interactive progress bar 

    During a build you can hit 'L' to enable/disable printing of build
logs, 'v' or '+' to increase verbosity, and '-' to decrease verbosity.
    @edolstra
    edolstra committed Nov 11, 2020
    Copy the full SHA
    30115b4 View commit details

  4. replaceStrings(): Use std::string_view

    @edolstra
    edolstra committed Nov 11, 2020
    Copy the full SHA
    15c6395 View commit details

  5. Support multi-line status

    @edolstra
    edolstra committed Nov 11, 2020
    Copy the full SHA
    bf9de2f View commit details

  6. Add separate progress bars for substituting and building

    @edolstra
    edolstra committed Nov 11, 2020
    Copy the full SHA
    ee8c622 View commit details

  7. Doh

    @edolstra
    edolstra committed Nov 11, 2020
    Copy the full SHA
    3af3b9a View commit details

  8. Cleanup

    @edolstra
    edolstra committed Nov 11, 2020
    Copy the full SHA
    4cee272 View commit details

  9. Style change

    @edolstra
    edolstra committed Nov 11, 2020
    Copy the full SHA
    c205a21 View commit details

  10. Add activity for evaluation

    @edolstra
    edolstra committed Nov 11, 2020
    Copy the full SHA
    3386b1f View commit details

  11. Show failure / evaluation

    @edolstra
    edolstra committed Nov 11, 2020
    Copy the full SHA
    736639c View commit details
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,6 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: cachix/install-nix-action@v11
- uses: cachix/install-nix-action@v12
#- run: nix flake check
- run: nix-build -A checks.$(if [[ `uname` = Linux ]]; then echo x86_64-linux; else echo x86_64-darwin; fi)
2 changes: 2 additions & 0 deletions scripts/install.in
View file
Original file line number Diff line number Diff line change
@@ -29,6 +29,8 @@ case "$(uname -s).$(uname -m)" in
Linux.i?86) system=i686-linux; hash=@binaryTarball_i686-linux@;;
Linux.aarch64) system=aarch64-linux; hash=@binaryTarball_aarch64-linux@;;
Darwin.x86_64) system=x86_64-darwin; hash=@binaryTarball_x86_64-darwin@;;
# eventually maybe: system=arm64-darwin; hash=@binaryTarball_arm64-darwin@;;
Darwin.arm64) system=x86_64-darwin; hash=@binaryTarball_x86_64-darwin@;;
*) oops "sorry, there is no binary distribution of Nix for your platform";;
esac

2 changes: 1 addition & 1 deletion src/build-remote/build-remote.cc
View file
Original file line number Diff line number Diff line change
@@ -201,7 +201,7 @@ static int main_build_remote(int argc, char * * argv)
% concatStringsSep<StringSet>(", ", m.mandatoryFeatures);
}

logErrorInfo(lvlInfo, {
logErrorInfo(canBuildLocally ? lvlChatty : lvlWarn, {
.name = "Remote build",
.description = "Failed to find a machine for remote build!",
.hint = hint
2 changes: 1 addition & 1 deletion src/libfetchers/git.cc
View file
Original file line number Diff line number Diff line change
@@ -273,7 +273,7 @@ struct GitInputScheme : InputScheme
haveCommits ? std::stoull(runProgram("git", true, { "-C", actualUrl, "log", "-1", "--format=%ct", "--no-show-signature", "HEAD" })) : 0);

return {
Tree(store->printStorePath(storePath), std::move(storePath)),
Tree(store->toRealPath(storePath), std::move(storePath)),
input
};
}
2 changes: 1 addition & 1 deletion src/libfetchers/mercurial.cc
View file
Original file line number Diff line number Diff line change
@@ -166,7 +166,7 @@ struct MercurialInputScheme : InputScheme
auto storePath = store->addToStore("source", actualUrl, FileIngestionMethod::Recursive, htSHA256, filter);

return {
Tree(store->printStorePath(storePath), std::move(storePath)),
Tree(store->toRealPath(storePath), std::move(storePath)),
input
};
}
Loading