From d0757f69c5ff2f465fc867504fcf21cab5b47654 Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Mon, 10 May 2021 13:05:19 +0300 Subject: [PATCH] chore(deps): update flake deps --- flake.lock | 211 ++++++++++++++++++++++++++++++++++++++++------------- flake.nix | 1 - 2 files changed, 160 insertions(+), 52 deletions(-) diff --git a/flake.lock b/flake.lock index 1b40afb..af7f18a 100644 --- a/flake.lock +++ b/flake.lock @@ -2,9 +2,7 @@ "nodes": { "ci-agent": { "inputs": { - "flake-compat": [ - "flake-compat" - ], + "flake-compat": "flake-compat", "nix-darwin": [ "darwin" ], @@ -12,7 +10,7 @@ "nixos" ], "nixos-unstable": [ - "override" + "latest" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix" }, @@ -33,7 +31,7 @@ "darwin": { "inputs": { "nixpkgs": [ - "override" + "latest" ] }, "locked": { @@ -52,18 +50,10 @@ }, "deploy": { "inputs": { - "flake-compat": [ - "flake-compat" - ], - "naersk": [ - "naersk" - ], - "nixpkgs": [ - "override" - ], - "utils": [ - "utils" - ] + "flake-compat": "flake-compat_2", + "naersk": "naersk", + "nixpkgs": "nixpkgs", + "utils": "utils" }, "locked": { "lastModified": 1616406726, @@ -79,6 +69,29 @@ "type": "github" } }, + "devlib": { + "inputs": { + "deploy": "deploy", + "devshell": "devshell", + "nixpkgs": [ + "nixos" + ], + "utils": "utils_2" + }, + "locked": { + "lastModified": 1620247117, + "narHash": "sha256-6jsMqr4abKYNBp/uMVxtcsM1D6RvLW8KxXbjSAjkTpc=", + "owner": "divnix", + "repo": "devlib", + "rev": "f13ca08de609bc4068ccca679ab9798b7cdf9c77", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "devlib", + "type": "github" + } + }, "devshell": { "locked": { "lastModified": 1618523768, @@ -97,20 +110,65 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1611461076, - "narHash": "sha256-ad++dTtMNeitUIKi1c66aTrVJOSf+mdZTrGrXzjDr6Q=", - "owner": "BBBSnowball", + "lastModified": 1606424373, + "narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=", + "owner": "edolstra", "repo": "flake-compat", - "rev": "a565cb46bee9fa856a6c15bc9c3bb947fbb784ec", + "rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf", "type": "github" }, "original": { - "owner": "BBBSnowball", - "ref": "pr-1", + "owner": "edolstra", "repo": "flake-compat", "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1606424373, + "narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1619345332, + "narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "2ebf2558e5bf978c7fb8ea927dfaed8fefab2e28", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "locked": { + "lastModified": 1618217525, + "narHash": "sha256-WGrhVczjXTiswQaoxQ+0PTfbLNeOQM6M36zvLn78AYg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c6169a2772643c4a93a0b5ac1c61e296cba68544", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home": { "inputs": { "nixpkgs": [ @@ -131,10 +189,45 @@ "type": "github" } }, + "latest": { + "locked": { + "lastModified": 1620639517, + "narHash": "sha256-DvrWL3IK+iKqZ0aQWfdkKSu1WcmBkyxUFOoqB6X6Y0k=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0b973eaa9441f894c65e5008a042b21025f6ff44", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "naersk": { "inputs": { "nixpkgs": [ - "override" + "latest" + ] + }, + "locked": { + "lastModified": 1610392286, + "narHash": "sha256-3wFl5y+4YZO4SgRYK8WE7JIS3p0sxbgrGaQ6RMw+d98=", + "owner": "nmattia", + "repo": "naersk", + "rev": "d7bfbad3304fd768c0f93a4c3b50976275e6d4be", + "type": "github" + }, + "original": { + "owner": "nmattia", + "ref": "master", + "repo": "naersk", + "type": "github" + } + }, + "naersk_2": { + "inputs": { + "nixpkgs": [ + "latest" ] }, "locked": { @@ -153,9 +246,7 @@ }, "nixEvalLsp": { "inputs": { - "flake-utils": [ - "utils" - ], + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixos" ] @@ -219,6 +310,22 @@ "type": "github" } }, + "nixpkgs": { + "locked": { + "lastModified": 1610942247, + "narHash": "sha256-PKo1ATAlC6BmfYSRmX0TVmNoFbrec+A5OKcabGEu2yU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7d71001b796340b219d1bfa8552c81995017544a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "locked": { "lastModified": 1620631260, @@ -233,20 +340,6 @@ "type": "indirect" } }, - "override": { - "locked": { - "lastModified": 1620639517, - "narHash": "sha256-DvrWL3IK+iKqZ0aQWfdkKSu1WcmBkyxUFOoqB6X6Y0k=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0b973eaa9441f894c65e5008a042b21025f6ff44", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "pkgs": { "inputs": { "nixpkgs": [ @@ -283,28 +376,25 @@ "inputs": { "ci-agent": "ci-agent", "darwin": "darwin", - "deploy": "deploy", - "devshell": "devshell", - "flake-compat": "flake-compat", + "devlib": "devlib", "home": "home", - "naersk": "naersk", + "latest": "latest", + "naersk": "naersk_2", "nixEvalLsp": "nixEvalLsp", "nixos": "nixos", "nixos-hardware": "nixos-hardware", "nixosPersistence": "nixosPersistence", "nur": "nur", - "override": "override", - "pkgs": "pkgs", - "utils": "utils" + "pkgs": "pkgs" } }, "utils": { "locked": { - "lastModified": 1619345332, - "narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=", + "lastModified": 1610051610, + "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", "owner": "numtide", "repo": "flake-utils", - "rev": "2ebf2558e5bf978c7fb8ea927dfaed8fefab2e28", + "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc", "type": "github" }, "original": { @@ -312,6 +402,25 @@ "repo": "flake-utils", "type": "github" } + }, + "utils_2": { + "inputs": { + "flake-utils": "flake-utils" + }, + "locked": { + "lastModified": 1619714004, + "narHash": "sha256-xoP81rWAM2cVpEFrQv9sUEIvNxGXAg4UH9kBt83a5u4=", + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "0642ac572a87a0beb78a7c6ddce1267aa5817d05", + "type": "github" + }, + "original": { + "owner": "gytis-ivaskevicius", + "ref": "staging", + "repo": "flake-utils-plus", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index a64ab42..7d479bf 100644 --- a/flake.nix +++ b/flake.nix @@ -25,7 +25,6 @@ nixEvalLsp = { url = "github:aaronjanse/nix-eval-lsp"; inputs.nixpkgs.follows = "nixos"; - inputs.flake-utils.follows = "utils"; }; };