Comparing changes
Open a pull request
base repository: NixOS/nix
base: e5ed74ec1e19
head repository: NixOS/nix
compare: 9181b208c973
- 17 commits
- 19 files changed
- 3 contributors
Commits on May 17, 2021
-
Split the parsing of an
App
and its resolvingThat way things (like `nix flake check`) can evaluate the `app` outputs without having to build anything
-
Source bashrc first in nix develop
~/.bashrc should be sourced first in the rc script so that PATH & other env vars give precedence over the bashrc PATH. Also, in my bashrc I alias rm as: alias rm='rm -Iv' To avoid running this alias (which shows ‘removed '/tmp/nix-shell.*'), we can just prefix rm with command.
Commits on May 18, 2021
-
Merge pull request #4825 from NixOS/split-app-parsing-and-resolving
Split the parsing of an `App` and its resolving
-
Merge pull request #4827 from matthewbauer/run-bashrc-first-in-nix-de…
…velop Source bashrc first in nix develop
-
Restore an accidentally suppressed negation
Accidentally removed in ca96f52. This caused `nix run` to systematically fail with ``` error: app program '/nix/store/…' is not in the Nix store ```
-
Merge pull request #4828 from NixOS/ca/fix-nix-run
Restore an accidentally suppressed negation
-
Fix extra slash in canonPath output
When you have a symlink like: /tmp -> ./private/tmp you need to resolve ./private/tmp relative to /tmp’s dir: ‘/’. Unlike any other path output by dirOf, / ends with a slash. We don’t want trailing slashes here since we will append another slash in the next comoponent, so clear s like we would if it was a symlink to an absoute path. This should fix at least part of the issue in #4822, will need confirmation that it actually fixes the problem to close though. Introduced in f3f2287.
Commits on May 19, 2021
-
Merge pull request #4831 from matthewbauer/fix-extra-slash-in-canon-path
Fix extra slash in canonPath output
-
Extract a generic
computeClosure
functionMove the `closure` logic of `computeFSClosure` to its own (templated) function. This doesn’t bring much by itself (except for the ability to properly test the “closure” functionality independently from the rest), but it allows reusing it (in particular for the realisations which will require a very similar closure computation)
-
Always send the realisations as JSON
Align all the worker protocol with `buildDerivation` which inlines the realisations as one opaque json blob. That way we don’t have to bother changing the remote store protocol when the definition of `Realisation` changes, as long as we keep the json backwards-compatible
-
-
Add a dependencies field to DrvOutputInfo
Currently never used, nor set but will be useful shortly
-
-
-
Add a method to compute the closure of a realisation
Only considers the closure in term of `Realisation`, ignores all the opaque inputs. Dunno whether that’s the nicest solution, need to think it through a bit
-
-
Make
copyPaths
copy the whole realisations closureOtherwise registering the realisations on the remote side might fail as it now expects a complete closure
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff e5ed74ec1e19...9181b208c973