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: master
Choose a base ref
...
head repository: NixOS/nixops
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: flake-support
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 19 commits
  • 19 files changed
  • 1 contributor

Commits on Sep 26, 2019

  1. Convert to a flake

    @edolstra
    edolstra committed Sep 26, 2019
    Configuration menu
    Copy the full SHA
    4c7acbb View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2019

  1. Support deploying from a flake 

    Example usage:

  $ nixops create -d hydra-ec2-demo --flake github:edolstra/hydra-ec2-demo
  $ nixops deploy

to get an EC2 instance running Hydra.

Evaluation currently doesn't use pure mode because we need access to
NixOps's NixOS modules, and to physical.nix.
    @edolstra
    edolstra committed Oct 4, 2019
    Configuration menu
    Copy the full SHA
    eb51bda View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2019

  1. Temporary hack

    @edolstra
    edolstra committed Oct 23, 2019
    Configuration menu
    Copy the full SHA
    7fd5576 View commit details
    Browse the repository at this point in the history

  2. Update flake.nix

    @edolstra
    edolstra committed Oct 23, 2019
    Configuration menu
    Copy the full SHA
    a9d9996 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2019

  1. Fix non-flake deployment

    @edolstra
    edolstra committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    1819a44 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2020

  1. Merge remote-tracking branch 'origin/master' into flake-support

    @edolstra
    edolstra committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    c147276 View commit details
    Browse the repository at this point in the history

  2. Update flake.lock

    @edolstra
    edolstra committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    5333e19 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into flake-support

    @edolstra
    edolstra committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    bebc521 View commit details
    Browse the repository at this point in the history

  4. Handle null attributes

    @edolstra
    edolstra committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    741d7b2 View commit details
    Browse the repository at this point in the history

  5. Use nixops-hetzner/zfs branch

    @edolstra
    edolstra committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    0406e2a View commit details
    Browse the repository at this point in the history

  6. Update flake.lock

    @edolstra
    edolstra committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    893ea3f View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2020

  1. flake.lock: Update 

    Flake input changes:

* Updated 'nixpkgs': 'github:edolstra/nixpkgs/44603b4103dbce2c9c18e6cc0df51a74f5eb8975' -> 'github:edolstra/nixpkgs/54a27fb2fc5fbd8927f9f6dc77fe1de1faa05266'
    @edolstra
    edolstra committed Mar 28, 2020
    Configuration menu
    Copy the full SHA
    5924367 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2020

  1. Fix building with latest Nix

    @edolstra
    edolstra committed Apr 12, 2020
    Configuration menu
    Copy the full SHA
    c173c58 View commit details
    Browse the repository at this point in the history

  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
    Configuration menu
    Copy the full SHA
    0a636f2 View commit details
    Browse the repository at this point in the history

  3. Nixpkgs overlay: Don't use 'pkgs' 

    This can cause the package to depend on two different versions of
Nixpkgs, leading to Python module clashes.
    @edolstra
    edolstra committed Apr 12, 2020
    Configuration menu
    Copy the full SHA
    81a952d View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2020

  1. NixOPS -> NixOps

    @edolstra
    edolstra committed Jun 10, 2020
    Configuration menu
    Copy the full SHA
    c781c8f View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2022

  1. Remove edition field

    @edolstra
    edolstra committed Sep 8, 2022
    Configuration menu
    Copy the full SHA
    13dedf0 View commit details
    Browse the repository at this point in the history

  2. Update to NixOS 22.05

    @edolstra
    edolstra committed Sep 8, 2022
    Configuration menu
    Copy the full SHA
    18862a9 View commit details
    Browse the repository at this point in the history

  3. Revert "Update to NixOS 22.05" 

    This reverts commit 18862a9.
    @edolstra
    edolstra committed Sep 8, 2022
    Configuration menu
    Copy the full SHA
    065625a View commit details
    Browse the repository at this point in the history
Loading