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/infra
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6a4186f0f519
Choose a base ref
...
head repository: NixOS/infra
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 267186a9c803
Choose a head ref
  • 6 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 12, 2020

  1. 20.03 darwin channel: correct url

    @grahamc
    grahamc committed Apr 12, 2020
    Copy the full SHA
    6bde5e1 View commit details

  2. bastion/flake.lock: Update 

    Flake input changes:

* Updated 'nixos-channel-scripts': 'github:NixOS/nixos-channel-scripts/cd538a428601ea4d4fdfc56878abe3edf18b36cc' -> 'github:NixOS/nixos-channel-scripts/ed29118df9165181ea86add320186fae9873951c'
    @grahamc
    grahamc committed Apr 12, 2020
    Copy the full SHA
    8f7f080 View commit details

  3. bastion/flake.lock: Update 

    Flake input changes:

* Updated 'nixpkgs': 'github:edolstra/nixpkgs/54a27fb2fc5fbd8927f9f6dc77fe1de1faa05266' -> 'github:NixOS/nixpkgs/66d8a2bda511e1fc46725322f94261c8a4083757'
    @edolstra
    edolstra committed Apr 12, 2020
    Copy the full SHA
    e4ffb35 View commit details

  4. bastion/flake.lock: Update 

    Flake input changes:

* Updated 'nixops': 'github:NixOS/nixops/5924367f14dbac8596034426f12ec09f18c239bd' -> 'github:NixOS/nixops/0a636f2d59955a7cc1e6cb5bb132aea325c631cf'
* Updated 'nixops/nixops-aws': 'github:NixOS/nixops-aws/0da38bb5de82d7a118ac32ebefa7a2d5869ba5ab' -> 'github:NixOS/nixops-aws/af97c16f179cd0df94a6fc3ef470092122253f60'
* Updated 'nixops/nixops-hetzner': 'github:NixOS/nixops-hetzner/33256100466e9624af21312d2ae0da8b0b80354a' -> 'github:NixOS/nixops-hetzner/663b02618ece7a92a72da408a552528ee8dd354c'
* Updated 'nixops/nixpkgs': 'github:edolstra/nixpkgs/54a27fb2fc5fbd8927f9f6dc77fe1de1faa05266' -> 'github:NixOS/nixpkgs/29eddfc36d720dcc4822581175217543b387b1e8'
    @edolstra
    edolstra committed Apr 12, 2020
    Copy the full SHA
    2f5e25f View commit details

  5. bastion: Update to 20.03

    @edolstra
    edolstra committed Apr 12, 2020
    Copy the full SHA
    5b740bd View commit details

  6. bastion/flake.lock: Update 

    Flake input changes:

* Updated 'nixops/nixpkgs': 'github:NixOS/nixpkgs/29eddfc36d720dcc4822581175217543b387b1e8' -> 'github:NixOS/nixpkgs/66d8a2bda511e1fc46725322f94261c8a4083757'
    @edolstra
    edolstra committed Apr 12, 2020
    Copy the full SHA
    267186a View commit details
Showing with 23 additions and 37 deletions.
  1. +19 −33 bastion/flake.lock
  2. +2 −2 bastion/flake.nix
  3. +2 −2 channels.nix
52 changes: 19 additions & 33 deletions bastion/flake.lock
View file

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

4 changes: 2 additions & 2 deletions bastion/flake.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
edition = 201909;

inputs.nixpkgs.url = "nixpkgs/release-19.09";
#inputs.nixops.url = "/home/deploy/src/nixops";
inputs.nixpkgs.url = "nixpkgs/nixos-20.03-small";
inputs.nixos-channel-scripts.url = github:NixOS/nixos-channel-scripts;
inputs.nixops.inputs.nixpkgs.follows = "nixpkgs";

outputs = { self, nixpkgs, nix, nixops, nixos-channel-scripts }: {

4 changes: 2 additions & 2 deletions channels.nix
View file
Original file line number Diff line number Diff line change
@@ -27,8 +27,8 @@ rec {
job = "nixos/release-20.03-small/tested";
current = true;
};
"nixos-20.03-darwin" = {
job = "nixos/release-20.03-darwin/darwin-tested";
"nixpkgs-20.03-darwin" = {
job = "nixpkgs/release-20.03-darwin/darwin-tested";
current = true;
};