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: 36c34c3b1fff
Choose a base ref
...
head repository: NixOS/nix
compare: 74024515a306
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Apr 1, 2020

  1. Add a system-wide flake registry /etc/nix/registry.json 

    One application for this is pinning the 'nixpkgs' flake to the exact
revision used to build the NixOS system, e.g.

  {
      "flakes": [
          {
              "from": {
                  "id": "nixpkgs",
                  "type": "indirect"
              },
              "to": {
                  "owner": "NixOS",
                  "repo": "nixpkgs",
                  "type": "github",
                  "rev": "b0c285807d6a9f1b7562ec417c24fa1a30ecc31a"
              }
          }
      ],
      "version": 2
  }
    @edolstra
    edolstra committed Apr 1, 2020
    Copy the full SHA
    77ffaea View commit details
    Browse the repository at this point in the history

  2. Registry: Use a struct instead of a tuple for entries

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

  3. Support registry entries that must match exactly 

    An example use is for pinning the "nixpkgs" entry the system-wide
registry to a particular store path. Inexact matches
(e.g. "nixpkgs/master") should still use the global registry.
    @edolstra
    edolstra committed Apr 1, 2020
    Copy the full SHA
    7402451 View commit details
    Browse the repository at this point in the history