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: 9b63bb88c887
Choose a base ref
...
head repository: NixOS/nix
compare: c30330df6f67
Choose a head ref
  • 9 commits
  • 13 files changed
  • 1 contributor

Commits on Apr 24, 2017

  1. Factor out --json

    edolstra committed Apr 24, 2017
    Configuration menu
    Copy the full SHA
    66577a1 View commit details
    Browse the repository at this point in the history
  2. Remove debug statement

    edolstra committed Apr 24, 2017
    Configuration menu
    Copy the full SHA
    1bb87c0 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2017

  1. Configuration menu
    Copy the full SHA
    bcecc99 View commit details
    Browse the repository at this point in the history
  2. Add "nix eval" command

    This replaces "nix-instantiate --eval". The result is evaluated
    strictly since this seems more useful.
    edolstra committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    6267d74 View commit details
    Browse the repository at this point in the history
  3. Move code around

    edolstra committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    c769841 View commit details
    Browse the repository at this point in the history
  4. Make StorePathsCommand a subclass of InstallablesCommand

    This allows commands like 'nix path-info', 'nix copy', 'nix verify'
    etc. to work on arbitrary installables. E.g. to copy geeqie to a
    binary cache:
    
      $ nix copy -r --to file:///tmp/binary-cache nixpkgs.geeqie
    
    Or to get the closure size of thunderbird:
    
      $ nix path-info -S nixpkgs.thunderbird
    edolstra committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    7ee81f3 View commit details
    Browse the repository at this point in the history
  5. Interpret any installable containing a slash as a path

    So "nix path-info ./result" now works.
    edolstra committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    0b6220f View commit details
    Browse the repository at this point in the history
  6. Set default installable

    Thus
    
      $ nix build -f foo.nix
    
    will build foo.nix.
    
    And
    
      $ nix build
    
    will build default.nix. However, this may not be a good idea because
    it's kind of inconsistent, given that "nix build foo" will build the
    "foo" attribute from the default installation source (i.e. the
    synthesis of $NIX_PATH), rather than ./default.nix. So I may revert
    this.
    edolstra committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    d48c973 View commit details
    Browse the repository at this point in the history
  7. StorePathCommands: Build installables

    So for instance "nix copy --to ... nixpkgs.hello" will build
    nixpkgs.hello first. It's debatable whether this is a good idea. It
    seems desirable for commands like "nix copy" but maybe not for
    commands like "nix path-info".
    edolstra committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    c30330d View commit details
    Browse the repository at this point in the history