From 704f745f5ef9499d18bb37916ca65043f442ba46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Wed, 16 Feb 2022 09:11:10 +0100 Subject: [PATCH] try out whether new krops fixes the nixpkgs rebuilding issue --- flake.lock | 6 +++--- flake.nix | 12 +----------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index e5e17af..7ae48ce 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1632420452, - "narHash": "sha256-ncK6vABW/Ku9XI0kqj1otarUfblryoQzSaOCnaZ0oSs=", + "lastModified": 1644957911, + "narHash": "sha256-ggie/j7pdBqzDs4W7OiPmhqH9IGbXAbJxGqBdVxA8jA=", "owner": "Mic92", "repo": "krops", - "rev": "0388970c568905fedcbf429e5745aacd4f7a6633", + "rev": "86fb3d2ee94fd8306231853b323ed8804edf26ec", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 74cce3b..36cc1d0 100644 --- a/flake.nix +++ b/flake.nix @@ -62,20 +62,10 @@ dir = toString ~/.password-store; name = "shared"; }; - nixpkgs.git = { - url = "https://github.com/NixOS/nixpkgs"; - ref = nixpkgs.rev; - shallow = true; - }; - nixpkgs-unstable.git = { - url = "https://github.com/NixOS/nixpkgs"; - ref = nixpkgs-unstable.rev; - shallow = true; - }; } // nixpkgs.lib.mapAttrs' (name: value: { inherit name; value.file = toString value; - }) (nixpkgs.lib.filterAttrs (name: _: !builtins.elem name [ "nixpkgs" "nixpkgs-unstable" "flake-utils" "krops" "self" ]) inputs); + }) (nixpkgs.lib.filterAttrs (name: _: !builtins.elem name [ "flake-utils" "krops" "self" ]) inputs); deployScriptFor = {name, host}: let inherit (import ./lib/default.nix) sshPort; in toString (krops.packages.${system}.writeDeploy "deploy-${name}" { source = krops.lib.evalSource [ (source name) ]; target = "root@${host}:${toString sshPort}";