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

Commits on Apr 12, 2020

  1. Fix building with latest Nix

    @edolstra
    edolstra committed Apr 12, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rnhmjoj Michele Guerini Rocco
    GPG key ID: BFBAF4C975F76450
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c173c58 View commit details

  2. flake.lock: Update 

    Flake input changes:

* Updated 'nixops-aws': 'github:NixOS/nixops-aws/0da38bb5de82d7a118ac32ebefa7a2d5869ba5ab' -> 'github:NixOS/nixops-aws/af97c16f179cd0df94a6fc3ef470092122253f60'
* Updated 'nixops-hetzner': 'github:NixOS/nixops-hetzner/33256100466e9624af21312d2ae0da8b0b80354a' -> 'github:NixOS/nixops-hetzner/663b02618ece7a92a72da408a552528ee8dd354c'
    @edolstra
    edolstra committed Apr 12, 2020
    Copy the full SHA
    0a636f2 View commit details
Showing with 16 additions and 13 deletions.
  1. +12 −9 flake.lock
  2. +4 −4 flake.nix
21 changes: 12 additions & 9 deletions flake.lock
View file

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

8 changes: 4 additions & 4 deletions flake.nix
View file
Original file line number Diff line number Diff line change
@@ -3,15 +3,15 @@

edition = 201909;

inputs.nixpkgs.uri = "nixpkgs/release-19.09";
inputs.nixpkgs.url = "nixpkgs/nixos-20.03";

inputs.nixops-aws = {
uri = github:NixOS/nixops-aws;
url = github:NixOS/nixops-aws/flake;
flake = false;
};

inputs.nixops-hetzner = {
uri = github:NixOS/nixops-hetzner/zfs;
url = github:NixOS/nixops-hetzner/zfs;
flake = false;
};

@@ -20,7 +20,7 @@

officialRelease = false;

version = "1.8" + (if officialRelease then "" else "pre${builtins.substring 0 8 self.lastModified}.${self.shortRev}");
version = "1.8" + (if officialRelease then "" else "pre${builtins.substring 0 8 self.lastModifiedDate}.${self.shortRev}");

pkgs = import nixpkgs {
system = "x86_64-linux";