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: 8426d99b0efc
Choose a base ref
...
head repository: NixOS/nix
compare: 4a1cd104952e
Choose a head ref
  • 11 commits
  • 6 files changed
  • 4 contributors

Commits on Jul 16, 2018

  1. nix-channel documentation: don't suggest deprecated function 

    Running `nix-instantiate --eval -E '(import <nixpkgs> {}).lib.nixpkgsVersion` emits a warning
```
trace: `lib.nixpkgsVersion` is deprecated, use `lib.version` instead!
```
    @Taneb
    Taneb committed Jul 16, 2018
    Copy the full SHA
    41f38fb View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2019

  1. Add libatomic for 32-bit ARM 

    Fixes #3113
    @matthewbauer
    matthewbauer committed Oct 2, 2019
    Copy the full SHA
    74b4737 View commit details
    Browse the repository at this point in the history

  2. Use more robust test for libatomics 

    Taken from Mesa configure script:

https://github.com/mesa3d/mesa/blob/17.2/configure.ac#L405-L427
    @matthewbauer
    matthewbauer committed Oct 2, 2019
    Copy the full SHA
    b1c3415 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2019

  1. Merge pull request #3114 from matthewbauer/add-libatomic 

    Add libatomic for 32-bit ARM
    @edolstra
    edolstra committed Oct 11, 2019
    Copy the full SHA
    7d8c99e View commit details
    Browse the repository at this point in the history

  2. ssh-ng: Don't set CPU affinity on the remote 

    Fixes #3138.
    @edolstra
    edolstra committed Oct 11, 2019
    Copy the full SHA
    906d56a View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2019

  1. Merge pull request #2291 from Taneb/master 

    nix-channel documentation: don't suggest deprecated function
    @edolstra
    edolstra committed Oct 17, 2019
    Copy the full SHA
    ab4dd1d View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2019

  1. Fix unset variable in installer

    @steshaw
    steshaw committed Oct 19, 2019
    Copy the full SHA
    f0ec4b4 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2019

  1. Merge pull request #3158 from steshaw/master 

    Fix unset variable in installer
    @edolstra
    edolstra committed Oct 21, 2019
    Copy the full SHA
    37e45da View commit details
    Browse the repository at this point in the history

  2. SourceExprCommand::getSourceExpr(): Allocate more space 

    Fixes #3140.
    @edolstra
    edolstra committed Oct 21, 2019
    Copy the full SHA
    389a2ce View commit details
    Browse the repository at this point in the history

  3. Add experimental-features setting 

    Experimental features are now opt-in. There is currently one
experimental feature: "nix-command" (which enables the "nix"
command. This will allow us to merge experimental features more
quickly, without committing to supporting them indefinitely.

Typical usage:

$ nix build --experimental-features 'nix-command flakes' nixpkgs#hello

(cherry picked from commit 8e478c2,
without the "flakes" feature)
    @edolstra
    edolstra committed Oct 21, 2019
    2
    Copy the full SHA
    aabf5c8 View commit details
    Browse the repository at this point in the history

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

    @edolstra
    edolstra committed Oct 21, 2019
    Copy the full SHA
    4a1cd10 View commit details
    Browse the repository at this point in the history