From 1f0f4169fc8624a30e3686f62cd68bfd954d9112 Mon Sep 17 00:00:00 2001 From: asonix Date: Fri, 27 Jan 2023 18:32:14 -0600 Subject: [PATCH] Bump nixpkgs --- flake.lock | 28 +++++++--------------------- flake.nix | 5 ++++- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 8d0ef59..5edffce 100644 --- a/flake.lock +++ b/flake.lock @@ -40,7 +40,9 @@ }, "image-builder": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1674710518, @@ -58,11 +60,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1674521756, - "narHash": "sha256-cRrkhBGPO2rKvvEM2FzDBQDsh4DPuR17I+7P4MqxQoM=", + "lastModified": 1674864544, + "narHash": "sha256-JpxzpAFWmSsqzqjFOKQdS2Zkg4MnGaNQoKztClIoJgo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "71bcd827fbad46a0d5c2d5e9a4a2e291eaed2c3e", + "rev": "35b2d417c3e02178a52f9c7bad26ca7f51062533", "type": "github" }, "original": { @@ -88,27 +90,11 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1674709693, - "narHash": "sha256-UbbaTzVGAYQmTx4Z4kiAgL3HXI+P0nlV3x08H74k0mo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b5889f3dceedefb854e2d80f4cd6792c90ef55dd", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "deploy-rs": "deploy-rs", "image-builder": "image-builder", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "sops-nix": "sops-nix" } }, diff --git a/flake.nix b/flake.nix index 00aa225..61ca1b6 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,10 @@ url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; }; - image-builder.url = "git+https://git.asonix.dog/asonix/nixos-aarch64-images"; + image-builder = { + url = "git+https://git.asonix.dog/asonix/nixos-aarch64-images"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nixpkgs.url = "github:nixos/nixpkgs/master"; sops-nix = { url = "github:Mic92/sops-nix";