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/nixops
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8aa43c153bc2
Choose a base ref
...
head repository: NixOS/nixops
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d5ad09cd3db5
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 16, 2018

  1. nix/eval-machine-info.nix: fix evaluation with nixpkgs master 

    The evaluation broken with NixOS/nixpkgs@6c68fbd

I have no idea why this file was imported in the first place:

bac59ad#diff-6f15e27c3e048b98302b636c2b8f983bR7

I just removed it and it is still working for my `none` backend.
However since this is file is sufficiently complex I cannot
tell what the general consequence of removing is.
    @Mic92
    Mic92 committed Nov 16, 2018
    1
    Copy the full SHA
    daf7873 View commit details

  2. Merge pull request #1047 from Mic92/eval-fix 

    nix/eval-machine-info.nix: fix evaluation with nixpkgs master
    @domenkozar
    domenkozar authored Nov 16, 2018
    Copy the full SHA
    d5ad09c View commit details
Showing with 1 addition and 2 deletions.
  1. +1 −2 nix/eval-machine-info.nix
3 changes: 1 addition & 2 deletions nix/eval-machine-info.nix
View file
Original file line number Diff line number Diff line change
@@ -6,8 +6,7 @@
, args
}:

with import <nixpkgs/nixos/lib/testing.nix> { inherit system; };
with pkgs;
with import <nixpkgs> { inherit system; };
with lib;