From 9f49da4d07b19194f8ec0050344b3c39d480ee29 Mon Sep 17 00:00:00 2001 From: Fiscal Velvet Poet Date: Wed, 29 Jun 2022 17:53:26 +1000 Subject: [PATCH] nixos: bumped to HEAD of 22.05 --- nix/sources.json | 8 ++++---- nixops.nix | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index d93c1cf..fb21fd4 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -24,16 +24,16 @@ "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { - "branch": "nixos-21.11", + "branch": "nixos-22.05", "builtin": false, "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to", "homepage": "https://github.com/NixOS/nixpkgs", "owner": "NixOS", "repo": "nixpkgs", - "rev": "891016b5cf1998ea84852adac52c65c5ccd3e802", - "sha256": "0zdgxa68g8d522kq1k39s7zvwxhd9zjxpy4w04nqksp9s7iwlibx", + "rev": "62de360d75419386b69ea4af4a8ce104949a8242", + "sha256": "1iincgcgswg29znpn3whpa04c1waj6ihn38db5v330laa0hdjhxp", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/891016b5cf1998ea84852adac52c65c5ccd3e802.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/62de360d75419386b69ea4af4a8ce104949a8242.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgsUnstable": { diff --git a/nixops.nix b/nixops.nix index eb3832f..4efccda 100644 --- a/nixops.nix +++ b/nixops.nix @@ -6,7 +6,9 @@ enableRollback = true; }; - resources.sshKeyPairs.ssh-key = {}; + network.storage.legacy = { + databasefile = "~/.nixops/deployments.nixops"; + }; defaults = { config, pkgs, lib, ... }: @@ -15,5 +17,5 @@ system.autoUpgrade.enable = false; # Disabled as it conflicts with NixOps }; - toscano = import ../hosts/toscano.nix; + toscano = import ./hosts/toscano.nix; }