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: 0cb81acdcc25
Choose a base ref
...
head repository: NixOS/nix
compare: 26aeeb7653fa
Choose a head ref
  • 16 commits
  • 50 files changed
  • 4 contributors

Commits on Mar 30, 2020

  1. Backport 'nix dev-shell' from the flakes branch

    This also adds a '--profile' option to 'nix build' (replacing 'nix-env
    --set').
    edolstra committed Mar 30, 2020
    Copy the full SHA
    e1a94ad View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2020

  1. Copy the full SHA
    12556e5 View commit details
    Browse the repository at this point in the history
  2. nix shell -> nix dev-shell

    edolstra committed Mar 31, 2020
    Copy the full SHA
    3166b97 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #3463 from Ninlives/placeholder-passAsFile

    fix placeholder not substituted in passAsFile
    edolstra committed Mar 31, 2020
    Copy the full SHA
    d4d456c View commit details
    Browse the repository at this point in the history
  4. Merge pull request #3460 from NixOS/dev-shell

    Backport 'nix dev-shell' from the flakes branch
    edolstra committed Mar 31, 2020
    Copy the full SHA
    a754029 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2020

  1. libexpr: remove unused attrError

    The attrError variable is no longer used but still allocated on every
    call to the findAlongAttrPath function.
    andir committed Apr 2, 2020
    Copy the full SHA
    4fc4eb6 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2020

  1. Merge pull request #3470 from andir/remove-unusued-attrError

    libexpr: remove unused attrError
    edolstra committed Apr 3, 2020
    Copy the full SHA
    47c568e View commit details
    Browse the repository at this point in the history
  2. nix-env: Refuse to operate on a new-style profile

    This prevents users from accidentally nuking their profile via
    nix-env.
    
    (cherry picked from commit 021634e)
    edolstra committed Apr 3, 2020
    Copy the full SHA
    63fa926 View commit details
    Browse the repository at this point in the history
  3. Publish a tarball containing the crates we depend on

    This is needed since we no longer produce a source tarball.
    
    (cherry picked from commit bf70a04)
    edolstra committed Apr 3, 2020
    Copy the full SHA
    5e7ccdc View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2020

  1. Don't retry on "unsupported protocol" error

    When encountering an unsupported protocol, there's no need to retry.
    Chances are, it won't suddenly be supported between retry attempts;
    error instead. Otherwise, you see something like the following:
    
        $ nix-env -i -f git://git@github.com/foo/bar
        warning: unable to download 'git://git@github.com/foo/bar': Unsupported protocol (1); retrying in 335 ms
        warning: unable to download 'git://git@github.com/foo/bar': Unsupported protocol (1); retrying in 604 ms
        warning: unable to download 'git://git@github.com/foo/bar': Unsupported protocol (1); retrying in 1340 ms
        warning: unable to download 'git://git@github.com/foo/bar': Unsupported protocol (1); retrying in 2685 ms
    
    With this change, you now see:
    
        $ nix-env -i -f git://git@github.com/foo/bar
        error: unable to download 'git://git@github.com/foo/bar': Unsupported protocol (1)
    cole-h committed Apr 5, 2020
    Copy the full SHA
    c976cb0 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2020

  1. Merge pull request #3474 from cole-h/error-on-unsupported-protocol

    Don't retry on "unsupported protocol" error
    edolstra committed Apr 6, 2020
    Copy the full SHA
    ebb20a5 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2020

  1. Backport libfetchers from the flakes branch

    This provides a pluggable mechanism for defining new fetchers. It adds
    a builtin function 'fetchTree' that generalizes existing fetchers like
    'fetchGit', 'fetchMercurial' and 'fetchTarball'. 'fetchTree' takes a
    set of attributes, e.g.
    
      fetchTree {
        type = "git";
        url = "https://example.org/repo.git";
        ref = "some-branch";
        rev = "abcdef...";
      }
    
    The existing fetchers are just wrappers around this. Note that the
    input attributes to fetchTree are the same as flake input
    specifications and flake lock file entries.
    
    All fetchers share a common cache stored in
    ~/.cache/nix/fetcher-cache-v1.sqlite. This replaces the ad hoc caching
    mechanisms in fetchGit and download.cc (e.g. ~/.cache/nix/{tarballs,git-revs*}).
    
    This also adds support for Git worktrees (c169ea5).
    edolstra committed Apr 7, 2020
    1
    Copy the full SHA
    462421d View commit details
    Browse the repository at this point in the history
  2. Add 'path' fetcher

    This fetchers copies a plain directory (i.e. not a Git/Mercurial
    repository) to the store (or does nothing if the path is already a
    store path).
    
    One use case is to pin the 'nixpkgs' flake used to build the current
    NixOS system, and prevent it from being garbage-collected, via a
    system registry entry like this:
    
      {
          "from": {
              "id": "nixpkgs",
              "type": "indirect"
          },
          "to": {
              "type": "path",
              "path": "/nix/store/rralhl3wj4rdwzjn16g7d93mibvlr521-source",
              "lastModified": 1585388205,
              "rev": "b0c285807d6a9f1b7562ec417c24fa1a30ecc31a"
          },
          "exact": true
      }
    
    Note the fake "lastModified" and "rev" attributes that ensure that the
    flake gives the same evaluation results as the corresponding
    Git/GitHub inputs.
    
    (cherry picked from commit 12f9379)
    edolstra committed Apr 7, 2020
    Copy the full SHA
    670feb0 View commit details
    Browse the repository at this point in the history
  3. Respect the narHash attribute in more input types

    (cherry picked from commit a6ff66b)
    edolstra committed Apr 7, 2020
    Copy the full SHA
    f58a9b0 View commit details
    Browse the repository at this point in the history
  4. PathInput: Add some methods

    (cherry picked from commit 78ad5b3)
    edolstra committed Apr 7, 2020
    Copy the full SHA
    a6dfa3c View commit details
    Browse the repository at this point in the history
  5. Add FIXME

    (cherry picked from commit 2f49453)
    edolstra committed Apr 7, 2020
    Copy the full SHA
    26aeeb7 View commit details
    Browse the repository at this point in the history