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: eb51bdabb374
Choose a base ref
...
head repository: NixOS/nixops
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a9d9996c3564
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Oct 23, 2019

  1. Temporary hack

    @edolstra
    edolstra committed Oct 23, 2019
    Copy the full SHA
    7fd5576 View commit details

  2. Update flake.nix

    @edolstra
    edolstra committed Oct 23, 2019
    Copy the full SHA
    a9d9996 View commit details
Showing with 12 additions and 12 deletions.
  1. +8 −8 flake.lock
  2. +3 −3 flake.nix
  3. +1 −1 nixops/deployment.py
16 changes: 8 additions & 8 deletions flake.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions flake.nix
View file
Original file line number Diff line number Diff line change
@@ -145,10 +145,10 @@
}).test;
};

checks.build = self.hydraJobs.build.x86_64-linux;
checks.x86_64-linux.build = self.hydraJobs.build.x86_64-linux;

packages.nixops = pkgs.nixops;
defaultPackage = pkgs.nixops;
packages.x86_64-linux.nixops = pkgs.nixops;
defaultPackage.x86_64-linux = pkgs.nixops;

};
}
2 changes: 1 addition & 1 deletion nixops/deployment.py
View file
Original file line number Diff line number Diff line change
@@ -270,7 +270,7 @@ def _get_cur_flake_uri(self):
out = json.loads(subprocess.check_output(
["nix", "flake", "info", "--json", "--", self.flake_uri],
stderr=self.logger.log_file))
self._cur_flake_uri = out['uri']
self._cur_flake_uri = out['url'].replace("ref=HEAD&rev=0000000000000000000000000000000000000000&", "") # FIXME
return self._cur_flake_uri