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: ebc4dae51761
Choose a base ref
...
head repository: NixOS/nix
compare: 80c36d4562af
Choose a head ref
  • 6 commits
  • 12 files changed
  • 1 contributor

Commits on Aug 30, 2019

  1. Extract flake dependencies from the 'outputs' arguments 

    That is, instead of

  inputs = [ "nixpkgs" ];

  outputs = inputs: ... inputs.nixpkgs ...;

you can write

  outputs = { nixpkgs }: ... inputs.nixpkgs ...;
    @edolstra
    edolstra committed Aug 30, 2019
    Copy the full SHA
    8946841 View commit details
    Browse the repository at this point in the history

  2. Clean up the 'outputs' interface

    @edolstra
    edolstra committed Aug 30, 2019
    Copy the full SHA
    2341f30 View commit details
    Browse the repository at this point in the history

  3. Update flake.{nix,lock}

    @edolstra
    edolstra committed Aug 30, 2019
    Copy the full SHA
    d749f51 View commit details
    Browse the repository at this point in the history

  4. Update tests

    @edolstra
    edolstra committed Aug 30, 2019
    Copy the full SHA
    0588d72 View commit details
    Browse the repository at this point in the history

  5. Turn flake inputs into an attrset 

    Instead of a list, inputs are now an attrset like

  inputs = {
    nixpkgs.uri = github:NixOS/nixpkgs;
  };

If 'uri' is omitted, than the flake is a lookup in the flake registry, e.g.

  inputs = {
    nixpkgs = {};
  };

but in that case, you can also just omit the input altogether and
specify it as an argument to the 'outputs' function, as in

  outputs = { self, nixpkgs }: ...

This also gets rid of 'nonFlakeInputs', which are now just a special
kind of input that have a 'flake = false' attribute, e.g.

  inputs = {
    someRepo = {
      uri = github:example/repo;
      flake = false;
    };
  };
    @edolstra
    edolstra committed Aug 30, 2019
    Copy the full SHA
    30ccf4e View commit details
    Browse the repository at this point in the history

  6. Remove 'name' attribute from flakes 

    This is no longer needed since flakes are given an identity in the
'inputs' attribute.
    @edolstra
    edolstra committed Aug 30, 2019
    Copy the full SHA
    80c36d4 View commit details
    Browse the repository at this point in the history