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: e5ed74ec1e19
Choose a base ref
...
head repository: NixOS/nix
compare: 9181b208c973
Choose a head ref
  • 17 commits
  • 19 files changed
  • 3 contributors

Commits on May 17, 2021

  1. Split the parsing of an App and its resolving

    That way things (like `nix flake check`) can evaluate the `app` outputs
    without having to build anything
    thufschmitt committed May 17, 2021
    Copy the full SHA
    ca96f52 View commit details
    Browse the repository at this point in the history
  2. 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.
    matthewbauer committed May 17, 2021
    Copy the full SHA
    5fd8cf7 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2021

  1. Merge pull request #4825 from NixOS/split-app-parsing-and-resolving

    Split the parsing of an `App` and its resolving
    edolstra committed May 18, 2021
    Copy the full SHA
    72356a9 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #4827 from matthewbauer/run-bashrc-first-in-nix-de…

    …velop
    
    Source bashrc first in nix develop
    edolstra committed May 18, 2021
    Copy the full SHA
    de77d1b View commit details
    Browse the repository at this point in the history
  3. 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
    ```
    thufschmitt committed May 18, 2021
    Copy the full SHA
    59d0de6 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #4828 from NixOS/ca/fix-nix-run

    Restore an accidentally suppressed negation
    edolstra committed May 18, 2021
    Copy the full SHA
    57f321f View commit details
    Browse the repository at this point in the history
  5. 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.
    matthewbauer committed May 18, 2021
    Copy the full SHA
    3d90ab9 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2021

  1. Merge pull request #4831 from matthewbauer/fix-extra-slash-in-canon-path

    Fix extra slash in canonPath output
    edolstra committed May 19, 2021
    Copy the full SHA
    7234cf3 View commit details
    Browse the repository at this point in the history
  2. Extract a generic computeClosure function

    Move 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)
    thufschmitt committed May 19, 2021
    Copy the full SHA
    1845588 View commit details
    Browse the repository at this point in the history
  3. 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
    thufschmitt committed May 19, 2021
    Copy the full SHA
    a841686 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    05dde12 View commit details
    Browse the repository at this point in the history
  5. Add a dependencies field to DrvOutputInfo

    Currently never used, nor set but will be useful shortly
    thufschmitt committed May 19, 2021
    Copy the full SHA
    3c72e34 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    cb16dad View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    36ebb2c View commit details
    Browse the repository at this point in the history
  8. 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
    thufschmitt committed May 19, 2021
    Copy the full SHA
    9160c39 View commit details
    Browse the repository at this point in the history
  9. Copy the full SHA
    be29c86 View commit details
    Browse the repository at this point in the history
  10. Make copyPaths copy the whole realisations closure

    Otherwise registering the realisations on the remote side might fail as
    it now expects a complete closure
    thufschmitt committed May 19, 2021
    Copy the full SHA
    9181b20 View commit details
    Browse the repository at this point in the history