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
base: 32343f11bd68
Choose a base ref
...
head repository: NixOS/infra
compare: 157f5127f279
Choose a head ref
  • 12 commits
  • 5 files changed
  • 2 contributors

Commits on Mar 26, 2020

  1. haumea: pin grahams' public key

    @grahamc
    grahamc committed Mar 26, 2020
    Copy the full SHA
    748ef05 View commit details
    Browse the repository at this point in the history

  2. bastion/flake.lock: Update 

    Flake input changes:

* Updated 'nixos-channel-scripts': 'github:NixOS/nixos-channel-scripts/10188a5679e02334d7f3cccb505f20953065679a' -> 'github:NixOS/nixos-channel-scripts/73cf003eccf1c3a54ff02713ad4cbeb323fb9eee'
    @edolstra
    edolstra committed Mar 26, 2020
    Copy the full SHA
    f23d169 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2020

  1. delft/flake.lock: Update 

    Flake input changes:

* Updated 'hydra': 'github:NixOS/hydra/be8eb9d00d6a3fcac520bc7dfd5740c0b3ade746' -> 'github:NixOS/hydra/a7540b141d085a7e78c21fda8e8c05907c659b34'
    @edolstra
    edolstra committed Mar 27, 2020
    Copy the full SHA
    0ccef70 View commit details
    Browse the repository at this point in the history

  2. Abort unsupported builds after a day

    @edolstra
    edolstra committed Mar 27, 2020
    Copy the full SHA
    b5fe127 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2020

  1. delft/flake.lock: Update 

    Flake input changes:

* Updated 'nix': 'github:NixOS/nix/4ad5826a182f8eeb4cbc61e27d2128b08050b0d4' -> 'github:NixOS/nix/5f75d56c9bb4937b7cc9b7f20b31ef151adf4497'
* Updated 'nix/nixpkgs': 'github:edolstra/nixpkgs/43e283790fbe330b723ac44b584824cf6d85c1ee' -> 'github:NixOS/nixpkgs/81fa5f4501372671b464fe0104fe47f5327b46fe'
    @edolstra
    edolstra committed Mar 28, 2020
    Copy the full SHA
    6fa368e View commit details
    Browse the repository at this point in the history

  2. haumea: update grahams' public key after accidentally deleting the ol… 

    …d one
    @grahamc
    grahamc committed Mar 28, 2020
    Copy the full SHA
    6516986 View commit details
    Browse the repository at this point in the history

  3. delft/flake.lock: Update 

    Flake input changes:

* Updated 'nix': 'github:NixOS/nix/5f75d56c9bb4937b7cc9b7f20b31ef151adf4497' -> 'github:NixOS/nix/2287e2f279ac544a2c11921be51f2f556cb78abc'
    @edolstra
    edolstra committed Mar 28, 2020
    Copy the full SHA
    5860934 View commit details
    Browse the repository at this point in the history

  4. bastion/flake.lock: Update 

    Flake input changes:

* Updated 'nix': 'github:NixOS/nix/cfc38257cfcdabd34151d723906b38873e7ef6d0' -> 'github:NixOS/nix/2287e2f279ac544a2c11921be51f2f556cb78abc'
* Updated 'nix/nixpkgs': 'github:edolstra/nixpkgs/43e283790fbe330b723ac44b584824cf6d85c1ee' -> 'github:NixOS/nixpkgs/81fa5f4501372671b464fe0104fe47f5327b46fe'
    @edolstra
    edolstra committed Mar 28, 2020
    Copy the full SHA
    22a10ac View commit details
    Browse the repository at this point in the history

  5. bastion: Remove nix override

    @edolstra
    edolstra committed Mar 28, 2020
    Copy the full SHA
    b20b421 View commit details
    Browse the repository at this point in the history

  6. bastion/flake.lock: Update 

    Flake input changes:

* Updated 'nix': 'github:NixOS/nix/2287e2f279ac544a2c11921be51f2f556cb78abc' -> 'github:NixOS/nix/2fccef0c59f57ad276a60f6d3ae59dcc36a51027'
    @edolstra
    edolstra committed Mar 28, 2020
    Copy the full SHA
    f9affdc View commit details
    Browse the repository at this point in the history

  7. bastion/flake.lock: Update 

    Flake input changes:

* Updated 'nixops': 'github:NixOS/nixops/893ea3f4cc6760a6baa9d7e899884cccc11e6a4f' -> 'github:NixOS/nixops/5924367f14dbac8596034426f12ec09f18c239bd'
* Updated 'nixops/nixpkgs': 'github:edolstra/nixpkgs/44603b4103dbce2c9c18e6cc0df51a74f5eb8975' -> 'github:edolstra/nixpkgs/54a27fb2fc5fbd8927f9f6dc77fe1de1faa05266'
    @edolstra
    edolstra committed Mar 28, 2020
    Copy the full SHA
    499a545 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of github.com:NixOS/nixos-org-configurations

    @edolstra
    edolstra committed Mar 28, 2020
    Copy the full SHA
    157f512 View commit details
    Browse the repository at this point in the history