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: 0038bbafdec1
Choose a base ref
...
head repository: NixOS/nix
compare: 941f95284ab5
Choose a head ref
  • 16 commits
  • 9 files changed
  • 7 contributors

Commits on Apr 29, 2020

  1. Only call grantpt on MacOS systems 

    The commit 3cc1125 adds a `grantpt`
call on the builder pseudo terminal fd. This call is actually only
required for MacOS, but it however requires a RW access to /dev/pts
which is only RO bindmounted in the Bazel Linux sandbox. So, Nix can
not be actually run in the Bazel Linux sandbox for unneeded reasons.
    @nlewo
    nlewo committed Apr 29, 2020
    Copy the full SHA
    ca93b26 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3547 from nlewo/grantpt 

    Only call grantpt on MacOS systems
    @edolstra
    edolstra committed Apr 29, 2020
    Copy the full SHA
    aeb406d View commit details
    Browse the repository at this point in the history

  3. Fix displaying error-position in builtins.fetch{Tree,Tarball} 

    Without dereferencing this pointer, you'd get an error like this:

```
error: unsupported argument 'abc' to 'fetchTarball', at 0x13627e8
```
    @Ma27
    Ma27 committed Apr 29, 2020
    Copy the full SHA
    d122985 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2020

  1. Merge pull request #3548 from Ma27/fetchtarball-pos 

    Fix displaying error-position in `builtins.fetch{Tree,Tarball}`
    @domenkozar
    domenkozar committed Apr 30, 2020
    Copy the full SHA
    df8e9d6 View commit details
    Browse the repository at this point in the history

  2. nix dev-shell: Refactor script for getting the environment

    @edolstra
    edolstra committed Apr 30, 2020
    Copy the full SHA
    2fcfc6c View commit details
    Browse the repository at this point in the history

  3. nix dev-shell: Support structured attrs 

    Tested against NixOS/nixpkgs#72074.

Fixes #3540.
    @edolstra
    edolstra committed Apr 30, 2020
    Copy the full SHA
    efe6c18 View commit details
    Browse the repository at this point in the history

  4. nix dev-shell: Unset shellHook 

    This avoids inheriting the caller's shellHook, which can happen when
running a dev-shell inside a dev-shell.
    @edolstra
    edolstra committed Apr 30, 2020
    1
    Copy the full SHA
    0135fd6 View commit details
    Browse the repository at this point in the history

  5. Update issue templates

    @domenkozar
    domenkozar committed Apr 30, 2020
    Copy the full SHA
    a15f918 View commit details
    Browse the repository at this point in the history

  6. Update issue templates

    @domenkozar
    domenkozar committed Apr 30, 2020
    Copy the full SHA
    625868b View commit details
    Browse the repository at this point in the history

  7. Revamp README.md

    @gilligan
    gilligan committed Apr 30, 2020
    Copy the full SHA
    5333436 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2020

  1. Update README.md 

    Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
    @domenkozar @worldofpeace
    domenkozar and worldofpeace committed May 1, 2020
    Copy the full SHA
    536512d View commit details
    Browse the repository at this point in the history

  2. Update README.md 

    Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
    @domenkozar @worldofpeace
    domenkozar and worldofpeace committed May 1, 2020
    Copy the full SHA
    30616d8 View commit details
    Browse the repository at this point in the history

  3. Update README.md

    @domenkozar
    domenkozar committed May 1, 2020
    Copy the full SHA
    2a434fc View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3552 from gilligan/revamp-readme 

    Revamp README.md
    @domenkozar
    domenkozar committed May 1, 2020
    Copy the full SHA
    93874cc View commit details
    Browse the repository at this point in the history

  5. Tweak README.md

    @edolstra
    edolstra committed May 1, 2020
    Copy the full SHA
    404a94a View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/master' into flakes

    @edolstra
    edolstra committed May 1, 2020
    Copy the full SHA
    941f952 View commit details
    Browse the repository at this point in the history