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: 315f1980cadf
Choose a base ref
...
head repository: NixOS/nix
compare: 6636808e9000
Choose a head ref
  • 18 commits
  • 16 files changed
  • 7 contributors

Commits on Apr 17, 2018

  1. nix-lang parser: Add mixed nested attrs tests.

    Part of issue #2077
    picnoir committed Apr 17, 2018
    Copy the full SHA
    10d3345 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2018

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

Commits on May 1, 2018

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

Commits on May 11, 2019

  1. progress-bar: hide expected if expected is 0 (unknown)

    Sometimes, "expected" can be "0", but in fact means "unknown".
    
    This is for example the case when downloading a file while the http
    server doesn't send the `Content-Length` header, like when running `nix
    build` pointing to a nixpkgs checkout streamed from GitHub:
    
    ⇒  nix build -f https://github.com/NixOS/nixpkgs/archive/master.tar.gz hello
    [1.8/0.0 MiB DL] downloading 'https://github.com/NixOS/nixpkgs/archive/master.tar.gz'
    
    In that case, don't show that weird progress bar, but only the (slowly
    increasing) downloaded size ("done").
    
    ⇒  nix build -f https://github.com/NixOS/nixpkgs/archive/master.tar.gz hello
    [1.8 MiB DL] downloading 'https://github.com/NixOS/nixpkgs/archive/master.tar.gz'
    
    This commit also updates fmt calls with three numbers (when something is
    currently 'running' too) - I'm not sure if this can be provoked, but
    showing "0" as expected doesn't make any sense, as we're obviously doing
    more than nothing.
    flokli committed May 11, 2019
    Copy the full SHA
    6ade7ec View commit details
    Browse the repository at this point in the history

Commits on May 16, 2019

  1. Sync NIX_PROFILES between single-user and multi-user modes

    When we are in single user mode, we still want to have access to
    profiles. This way things in Nixpkgs that rely on them getting set
    accurately are done in both cases. The point where I hit this is with
    using aspell which looks in NIX_PROFILES:
    
    https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/aspell/default.nix
    
    Before this patch, NIX_PROFILES was never set in single user mode!
    This corrects that.
    matthewbauer committed May 16, 2019
    Copy the full SHA
    7c20ee4 View commit details
    Browse the repository at this point in the history
  2. Don’t set NIX_REMOTE=daemon in daemon profile

    This is now autodetected. There is no need to put it in the profile.
    matthewbauer committed May 16, 2019
    Copy the full SHA
    92f461e View commit details
    Browse the repository at this point in the history

Commits on May 17, 2019

  1. docs: describe $IN_NIX_SHELL values (#2796)

    See commit 1bffd83
    vcunat committed May 17, 2019
    Copy the full SHA
    c0559a1 View commit details
    Browse the repository at this point in the history
  2. fetchGit -> fetchTarball

    (cherry picked from commit cbfdea6)
    edolstra committed May 17, 2019
    Copy the full SHA
    14c877b View commit details
    Browse the repository at this point in the history

Commits on May 21, 2019

  1. Merge pull request #2812 from matthewbauer/fix-nix-scripts

    Sync NIX_PROFILES between single-user and multi-user modes
    edolstra committed May 21, 2019
    Copy the full SHA
    cdcdf3e View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2800 from flokli/progress-bar-hide-unknown-expected

    progress-bar: hide expected if expected is 0 (unknown)
    edolstra committed May 21, 2019
    Copy the full SHA
    4d82991 View commit details
    Browse the repository at this point in the history
  3. doc: clarify that optional attrs in a function argument will be ignor…

    …ed unless specified
    
    In `args@{ a ? 1 }: /* ... */` the value `a` won't be a part of `args`
    unless it's specified when calling the function, the default value will
    be ignored in this case.
    
    My personal point of view is that this behavior is a matter of taste, at
    least I was pretty sure that unmatched arguments will be a part of
    `args@` while debugging some Nix code last week.
    
    I decided to add a warning to the docs which hopefully reduces the
    confusion of further Nix developers who thought the same about `args@`.
    Ma27 committed May 21, 2019
    Copy the full SHA
    b502b66 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2019

  1. Merge pull request #2880 from Ma27/document-optional-attrs-with-at-pa…

    …ttern
    
    doc: clarify that optional attrs in a function argument will be ignored unless specified
    edolstra committed May 22, 2019
    Copy the full SHA
    bfc6bdf View commit details
    Browse the repository at this point in the history

Commits on May 28, 2019

  1. Copy the full SHA
    9eaebbf View commit details
    Browse the repository at this point in the history
  2. Iterate over references

    edolstra committed May 28, 2019
    Copy the full SHA
    22f2744 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2019

  1. Copy the full SHA
    abdedcd View commit details
    Browse the repository at this point in the history
  2. Fix eval-okay-fromTOML test

    Turns out we were mis-parsing single-quoted attributes, e.g. 'key2'.
    edolstra committed May 29, 2019
    Copy the full SHA
    cfd74ae View commit details
    Browse the repository at this point in the history
  3. Enable more fromTOML tests

    cpptoml now parses almost all examples from the spec.
    edolstra committed May 29, 2019
    Copy the full SHA
    17ef3e6 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    6636808 View commit details
    Browse the repository at this point in the history