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: eacc51057278
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 95be8d3b1204
Choose a head ref
  • 14 commits
  • 15 files changed
  • 11 contributors

Commits on Jan 4, 2020

  1. Copy instead of linking launch agent 

    On Catalina, the /nix filesystem might not be mounted at start time.
To avoid this service not starting, we need to keep the launch agent
outside of the Nix store. A wait4pid will hold for our /nix dir to be
mounted.

Fixes #3125.

(cherry picked from commit 0847f2f)
    @matthewbauer @edolstra
    matthewbauer authored and edolstra committed Jan 4, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    dywedir Vlad M.
    GPG key ID: BE743C5DD7703515
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7a011de View commit details

  2. Make nix-daemon.plist less fragile on macOS 

    We're calling `wait4path` on the full, resolved `@bindir@/nix-daemon` path.

That means we're hardcoding something like:

    /bin/wait4path /nix/store/zs9c5xhp3zv9p23qnjxp87nl5injsi1i-nix-2.3/bin/nix-daemon && /nix/var/nix/profiles/default/bin/nix-daemon

That seems unnecessarily fragile.

It might be better to wait4path on the path we intend to call.

(cherry picked from commit 8c4a5e7)
    @callahad @edolstra
    callahad authored and edolstra committed Jan 4, 2020
    Copy the full SHA
    34bf1a8 View commit details

  3. Fix unset variable in installer 

    (cherry picked from commit f0ec4b4)
    @steshaw @edolstra
    steshaw authored and edolstra committed Jan 4, 2020
    Copy the full SHA
    e1fb586 View commit details

  4. Revert "Document import <path> syntax" 

    This reverts commit d8730fb.

(cherry picked from commit 9be7787)
    @ersinakinci @edolstra
    ersinakinci authored and edolstra committed Jan 4, 2020
    Copy the full SHA
    1ea63a5 View commit details

  5. Add hint about path in builtins.import 

    (cherry picked from commit b7a9362)
    @ersinakinci @edolstra
    ersinakinci authored and edolstra committed Jan 4, 2020
    Copy the full SHA
    e9c0c77 View commit details

  6. Tweak path hint 

    (cherry picked from commit f107a27)
    @ersinakinci @edolstra
    ersinakinci authored and edolstra committed Jan 4, 2020
    Copy the full SHA
    93d6814 View commit details

  7. Remove superfluous IAM action for S3 cache 

    `s3:ListObjects` isn't a real IAM action, but _is_ the name of an S3 API method. `s3:ListBucket` is the relevant action for that method.

https://docs.aws.amazon.com/IAM/latest/UserGuide/list_amazons3.html
(cherry picked from commit c92ea92)
    @schlarpc @edolstra
    schlarpc authored and edolstra committed Jan 4, 2020
    Copy the full SHA
    9f524d9 View commit details

  8. install-multi-user.sh: Remove unused variables 

    https://hydra.nixos.org/build/104119659
(cherry picked from commit 2f96a89)
    @edolstra
    edolstra committed Jan 4, 2020
    Copy the full SHA
    6c90e3b View commit details

  9. builtins.toJSON: fix __toString usage 

    (cherry picked from commit e583df5)
    @globin @edolstra
    globin authored and edolstra committed Jan 4, 2020
    Copy the full SHA
    3130aaf View commit details

  10. docs: correct default location of log directory 

    (cherry picked from commit cea05e5)
    @kevinastock @edolstra
    kevinastock authored and edolstra committed Jan 4, 2020
    Copy the full SHA
    a118444 View commit details

  11. doc: Document --dry-run option for nix-build 

    (cherry picked from commit 52ffe27)
    @Ma27 @edolstra
    Ma27 authored and edolstra committed Jan 4, 2020
    Copy the full SHA
    195cc3f View commit details

  12. Ensure enough space in attrset bindings when using both __overrides a… 

    …nd dynamic attributes

(cherry picked from commit cd55f91)
    @puckipedia @edolstra
    puckipedia authored and edolstra committed Jan 4, 2020
    Copy the full SHA
    59bbc31 View commit details

  13. Add testcase for attrset using __overrides and dynamic attrs 

    (cherry picked from commit cdadbf7)
    @puckipedia @edolstra
    puckipedia authored and edolstra committed Jan 4, 2020
    Copy the full SHA
    9879e25 View commit details

  14. Document builtins.placeholder 

    (cherry picked from commit 4e70652)
    @raboof @edolstra
    raboof authored and edolstra committed Jan 4, 2020
    Copy the full SHA
    95be8d3 View commit details
Loading