From a0d8c5cb7cb4a3a63a32c874e5cc210a21f10fa8 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 4 Dec 2022 18:03:44 +0100 Subject: [PATCH] flake: use latest deploy-rs --- flake.lock | 111 +++++++++++++++++------------------------------------ flake.nix | 2 +- 2 files changed, 37 insertions(+), 76 deletions(-) diff --git a/flake.lock b/flake.lock index dccc5f6..27b6bcc 100644 --- a/flake.lock +++ b/flake.lock @@ -2,47 +2,24 @@ "nodes": { "deploy-rs": { "inputs": { - "fenix": "fenix", "flake-compat": "flake-compat", "nixpkgs": "nixpkgs", "utils": "utils" }, "locked": { - "lastModified": 1661212356, - "narHash": "sha256-+9P849WIb/zhAMWXrW9g0IRd7vFRj5a5acLTtOFyY48=", - "owner": "input-output-hk", + "lastModified": 1668797197, + "narHash": "sha256-0w6iD3GSSQbIeSFVDzAAQZB+hDq670ZTms3d9XI+BtM=", + "owner": "serokell", "repo": "deploy-rs", - "rev": "4da8eb9fc3e611adf4bbe8c8df5b1fc604c4f906", + "rev": "2a3c5f70eee04a465aa534d8bd4fcc9bb3c4a8ce", "type": "github" }, "original": { - "owner": "input-output-hk", + "owner": "serokell", "repo": "deploy-rs", "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "deploy-rs", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1645597478, - "narHash": "sha256-axsWwzGMMMcvHKXyrEC99RHkU/8EecIcmrESGzZMD/k=", - "owner": "nix-community", - "repo": "fenix", - "rev": "6c8d60c1d8deba8c360537c47e2b86aefaea0fd5", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -234,31 +211,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1645433236, - "narHash": "sha256-4va4MvJ076XyPp5h8sm5eMQvCrJ6yZAbBmyw95dGyw4=", + "lastModified": 1670086663, + "narHash": "sha256-hT8C8AQB74tdoCPwz4nlJypLMD7GI2F5q+vn+VE/qQk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7f9b6e2babf232412682c09e57ed666d8f84ac2d", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, - "nixpkgs-22_05": { - "locked": { - "lastModified": 1669513802, - "narHash": "sha256-AmTRNi8bHgJlmaNe3r5k+IMFbbXERM/KarqveMAZmsY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6649e08812f579581bfb4cada3ba01e30485c891", + "rev": "813836d64fa57285d108f0dbf2356457ccd304e3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-22.05", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -349,13 +311,29 @@ "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs-stable_2": { "locked": { - "lastModified": 1669791787, - "narHash": "sha256-KBfoA2fOI5+wCrm7PR+j7jHqXeTkVRPQ0m5fcKchyuU=", + "lastModified": 1670146390, + "narHash": "sha256-XrEoDpuloRHHbUkbPnhF2bQ0uwHllXq3NHxtuVe/QK4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e76c78d20685a043d23f5f9e0ccd2203997f1fb1", + "rev": "86370507cb20c905800527539fc049a2bf09c667", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1670064435, + "narHash": "sha256-+ELoY30UN+Pl3Yn7RWRPabykwebsVK/kYE9JsIsUMxQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "61a8a98e6d557e6dd7ed0cdb54c3a3e3bbc5e25c", "type": "github" }, "original": { @@ -427,11 +405,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1669829516, - "narHash": "sha256-laWMD/TZzyrulu8xLNoSPertXOxjRD7BrcAVwKl+NyQ=", + "lastModified": 1670078914, + "narHash": "sha256-oS3/KHb+S1Hf/PSqHAs8xVmvORRL3G2N+9hvX5uP1rI=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "471c7f1ecace25e39099206431300322632d25c4", + "rev": "2597510df32efafda4d05f5122efe612a7a5da66", "type": "github" }, "original": { @@ -454,36 +432,19 @@ "stunkymonkey": "stunkymonkey" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1645480664, - "narHash": "sha256-1+6YSK1hn6PX5qC3JwjrYktMwtq5GeFgNbyaGzk8Kuo=", - "owner": "rust-analyzer", - "repo": "rust-analyzer", - "rev": "c0ee2f23ff70349704dfe8448027a41b7788eb37", - "type": "github" - }, - "original": { - "owner": "rust-analyzer", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": [ "nixpkgs" ], - "nixpkgs-22_05": "nixpkgs-22_05" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1669714206, - "narHash": "sha256-9aiMbzRL8REsyi9U0eZ+lT4s7HaILA1gh9n2apKzLxU=", + "lastModified": 1670149631, + "narHash": "sha256-rwmtlxx45PvOeZNP51wql/cWjY3rqzIR3Oj2Y+V7jM0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8295b8139ef7baadeb90c5cad7a40c4c9297ebf7", + "rev": "da98a111623101c64474a14983d83dad8f09f93d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 66e368f..64ecc24 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ nixos-hardware.url = "github:NixOS/nixos-hardware"; - deploy-rs.url = "github:input-output-hk/deploy-rs"; + deploy-rs.url = "github:serokell/deploy-rs"; sops-nix = { url = "github:Mic92/sops-nix";