From 8a0ffbd41c2deea70dab12a2c2bdcdc987cb7a8b Mon Sep 17 00:00:00 2001 From: Alexander Szczepanski Date: Tue, 1 Oct 2024 12:15:04 +0200 Subject: [PATCH] vps-arm-2024-10-01-12-15-04 --- flake.lock | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) diff --git a/flake.lock b/flake.lock index 10e7a65..af3087e 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,27 @@ "nixpkgs": "nixpkgs" }, "locked": { +<<<<<<< HEAD "lastModified": 1731866540, "narHash": "sha256-wAz/S5GLm+9Vp0kmUPsva3Mxp+VUnbEUZ8aBM1aEhhY=", "owner": "chaotic-cx", "repo": "nyx", "rev": "0857914b69d90ba758e614298452636c6fdc9c7c", +======= +<<<<<<< HEAD + "lastModified": 1728587571, + "narHash": "sha256-vQmYKJ9sLQP6VivCdKNdpisXrB6xpDaaTif5U+IogzQ=", + "owner": "chaotic-cx", + "repo": "nyx", + "rev": "d73c548a001f367048d4f22cf2ae626cd2002503", +======= + "lastModified": 1727734424, + "narHash": "sha256-COHPdJb8goIemave9L8kBKkQKEPHuilXZqR3nIBcQsM=", + "owner": "chaotic-cx", + "repo": "nyx", + "rev": "fed2d39a7c4614311e25a4281d056a7a2d36a6c8", +>>>>>>> f304ed7 (vps-arm-2024-10-01-12-15-04) +>>>>>>> b98a5ab (vps-arm-2024-10-01-12-15-04) "type": "github" }, "original": { @@ -22,6 +38,39 @@ "type": "github" } }, +<<<<<<< HEAD +======= + "fenix": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { +<<<<<<< HEAD + "lastModified": 1728455642, + "narHash": "sha256-abYGwrL6ak5sBRqwPh+V3CPJ6Pa89p378t51b7BO1lE=", + "owner": "nix-community", + "repo": "fenix", + "rev": "3b47535a5c782e4f4ad59cd4bdb23636b6926e03", +======= + "lastModified": 1727591515, + "narHash": "sha256-ar9oGR8kT3S5K3b0EJrcZp1LjfYQdzWl/bBLCp2o50Y=", + "owner": "nix-community", + "repo": "fenix", + "rev": "c31647aab5e8a16087da6283ef9b2e6a9aae6772", +>>>>>>> f304ed7 (vps-arm-2024-10-01-12-15-04) + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, +>>>>>>> b98a5ab (vps-arm-2024-10-01-12-15-04) "flake-compat": { "flake": false, "locked": { @@ -82,11 +131,27 @@ ] }, "locked": { +<<<<<<< HEAD "lastModified": 1731535640, "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=", "owner": "nix-community", "repo": "home-manager", "rev": "35b055009afd0107b69c286fca34d2ad98940d57", +======= +<<<<<<< HEAD + "lastModified": 1728337164, + "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", +======= + "lastModified": 1727383923, + "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "ffe2d07e771580a005e675108212597e5b367d2d", +>>>>>>> f304ed7 (vps-arm-2024-10-01-12-15-04) +>>>>>>> b98a5ab (vps-arm-2024-10-01-12-15-04) "type": "github" }, "original": { @@ -140,11 +205,27 @@ ] }, "locked": { +<<<<<<< HEAD "lastModified": 1731227601, "narHash": "sha256-aGUQ6W/Oxd9xjH9RQbnUtC61sTK2fWlKr+J7kavT/RQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", "rev": "7691d0ac1deb6ac7482c5a22fe1a14a34ca608b0", +======= +<<<<<<< HEAD + "lastModified": 1728410210, + "narHash": "sha256-vn6qupt1U0M6Hf3eXhK3/K4Du0Z7A60qYS1G14QsRY8=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "a25f915ec05196d15e3f7f8555ffb612d4f1045d", +======= + "lastModified": 1727453186, + "narHash": "sha256-nZRCfVEZ9osWXsCD0xCpU66M8JkabMTukBzPRrD/CTA=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "3390ff2632d0d8a14c92473db60fa52bf881f979", +>>>>>>> f304ed7 (vps-arm-2024-10-01-12-15-04) +>>>>>>> b98a5ab (vps-arm-2024-10-01-12-15-04) "type": "github" }, "original": { @@ -199,11 +280,27 @@ }, "nixos-hardware": { "locked": { +<<<<<<< HEAD "lastModified": 1731797098, "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", "owner": "nixos", "repo": "nixos-hardware", "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", +======= +<<<<<<< HEAD + "lastModified": 1728729581, + "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", + "owner": "nixos", + "repo": "nixos-hardware", + "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", +======= + "lastModified": 1727665282, + "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=", + "owner": "nixos", + "repo": "nixos-hardware", + "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5", +>>>>>>> f304ed7 (vps-arm-2024-10-01-12-15-04) +>>>>>>> b98a5ab (vps-arm-2024-10-01-12-15-04) "type": "github" }, "original": { @@ -215,11 +312,27 @@ }, "nixpkgs": { "locked": { +<<<<<<< HEAD "lastModified": 1731676054, "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "NixOS", "repo": "nixpkgs", "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", +======= +<<<<<<< HEAD + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", +======= + "lastModified": 1727634051, + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", +>>>>>>> f304ed7 (vps-arm-2024-10-01-12-15-04) +>>>>>>> b98a5ab (vps-arm-2024-10-01-12-15-04) "type": "github" }, "original": { @@ -231,16 +344,60 @@ }, "nixpkgs-unstable": { "locked": { +<<<<<<< HEAD "lastModified": 1731919951, "narHash": "sha256-vOM6ETpl1yu9KLi/icTmLJIPbbdJCdAVYUXZceO/Ce4=", "owner": "nixos", "repo": "nixpkgs", "rev": "04386ac325a813047fc314d4b4d838a5b1e3c7fe", +======= +<<<<<<< HEAD + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", +======= + "lastModified": 1727634051, + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", +>>>>>>> f304ed7 (vps-arm-2024-10-01-12-15-04) +>>>>>>> b98a5ab (vps-arm-2024-10-01-12-15-04) "type": "github" }, "original": { "owner": "nixos", +<<<<<<< HEAD "ref": "nixos-unstable-small", +======= + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { +<<<<<<< HEAD + "lastModified": 1728627514, + "narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c505ebf777526041d792a49d5f6dd4095ea391a7", +======= + "lastModified": 1727672256, + "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", +>>>>>>> f304ed7 (vps-arm-2024-10-01-12-15-04) + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.05", +>>>>>>> b98a5ab (vps-arm-2024-10-01-12-15-04) "repo": "nixpkgs", "type": "github" } @@ -257,6 +414,34 @@ "sops-nix": "sops-nix" } }, +<<<<<<< HEAD +======= + "rust-analyzer-src": { + "flake": false, + "locked": { +<<<<<<< HEAD + "lastModified": 1728386838, + "narHash": "sha256-Lk64EoJkvp3WMGVJK3CR1TYcNghX0/BqHPLW5zdvmLE=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "efaf8bd5de34e2f47bd57425b83e0c7974902176", +======= + "lastModified": 1727465975, + "narHash": "sha256-jrr8r2CT9jsi6XDTTX+E39/CakTcQ9RYRp6rWGzLkk0=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "546339a7be357b3e95fc4b79a8816dce540d477b", +>>>>>>> f304ed7 (vps-arm-2024-10-01-12-15-04) + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, +>>>>>>> b98a5ab (vps-arm-2024-10-01-12-15-04) "sops-nix": { "inputs": { "nixpkgs": [ @@ -264,11 +449,27 @@ ] }, "locked": { +<<<<<<< HEAD "lastModified": 1731954233, "narHash": "sha256-vvXx1m2Rsw7MkbKJdpcICzz4YPgZPApGKQGhNZfkhOI=", "owner": "mic92", "repo": "sops-nix", "rev": "e39947d0ee8e341fa7108bd02a33cdfa24a1360e", +======= +<<<<<<< HEAD + "lastModified": 1728345710, + "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", + "owner": "mic92", + "repo": "sops-nix", + "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", +======= + "lastModified": 1727734513, + "narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=", + "owner": "mic92", + "repo": "sops-nix", + "rev": "3198a242e547939c5e659353551b0668ec150268", +>>>>>>> f304ed7 (vps-arm-2024-10-01-12-15-04) +>>>>>>> b98a5ab (vps-arm-2024-10-01-12-15-04) "type": "github" }, "original": {