From d8d46a4c2832e76c4e86009719fcce4e9470f13c Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sat, 15 Apr 2023 21:13:27 +0200 Subject: [PATCH] flake: remove nix-autobahn, bump flake.lock --- flake.lock | 130 ++++++++-------------------------------- flake.nix | 4 -- users/teutat3s/home.nix | 2 - 3 files changed, 24 insertions(+), 112 deletions(-) diff --git a/flake.lock b/flake.lock index dc9e160c..e7406a3a 100644 --- a/flake.lock +++ b/flake.lock @@ -148,29 +148,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "nix-autobahn", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1655188051, - "narHash": "sha256-Cf/qNGb7Xw84TPPep0iIZLLhSXiFq9h+tt6TnfaQMrE=", - "ref": "main", - "rev": "522a4e99be1f8fcc94b94666c3a44677d668f539", - "revCount": 1067, - "type": "git", - "url": "https://github.com/nix-community/fenix" - }, - "original": { - "ref": "main", - "type": "git", - "url": "https://github.com/nix-community/fenix" - } - }, "flake-compat": { "flake": false, "locked": { @@ -270,12 +247,15 @@ } }, "flake-utils_5": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -324,11 +304,11 @@ }, "master": { "locked": { - "lastModified": 1681329348, - "narHash": "sha256-Cl2uaO7FdsRm3Z5K37l2Fegz1OjpWeKtxVcRYz+0NHI=", + "lastModified": 1681583755, + "narHash": "sha256-sbTea6Mf5Oc1wvkA8a/FbQG+F/wISUiWqyWQzoc+T4o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e473a343651e8d95b803248a7c57ad08fb67b38e", + "rev": "2fee028681cd0caa48a2aeb75f5c42fd50e4f298", "type": "github" }, "original": { @@ -338,57 +318,13 @@ "type": "github" } }, - "naersk": { - "inputs": { - "nixpkgs": [ - "nix-autobahn", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1655042882, - "narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=", - "ref": "master", - "rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f", - "revCount": 302, - "type": "git", - "url": "https://github.com/nix-community/naersk" - }, - "original": { - "type": "git", - "url": "https://github.com/nix-community/naersk" - } - }, - "nix-autobahn": { - "inputs": { - "fenix": "fenix", - "naersk": "naersk", - "nixpkgs": [ - "latest" - ], - "utils": "utils_3" - }, - "locked": { - "lastModified": 1655761558, - "narHash": "sha256-BGKT0RQGJ1CtTssfPhI4PABV1Gh6Wyq/cf6GN30TUAY=", - "owner": "wucke13", - "repo": "nix-autobahn", - "rev": "85861fdd5cc32b65e75db4e6be478fe2da455dba", - "type": "github" - }, - "original": { - "owner": "wucke13", - "repo": "nix-autobahn", - "type": "github" - } - }, "nixos": { "locked": { - "lastModified": 1681349002, - "narHash": "sha256-9Ckc2WvSwuYrPfk3ZXgPasM1ir/cgs6UV0EpIWyPGZE=", + "lastModified": 1681482634, + "narHash": "sha256-cT/nr3L8khEYZSGp8qqwxFH+/q4/547MfyOdSj6MhBk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2b1bba76a13ed39c7abc0a6e8f74f9e168cf3c7c", + "rev": "fda0d99c2cbbb5c89d8855d258cb0821bd9113ad", "type": "github" }, "original": { @@ -471,7 +407,6 @@ "home": "home", "latest": "latest", "master": "master", - "nix-autobahn": "nix-autobahn", "nixos": "nixos", "nixos-22-05": "nixos-22-05", "nixos-hardware": "nixos-hardware", @@ -479,20 +414,18 @@ "tritonshell": "tritonshell" } }, - "rust-analyzer-src": { - "flake": false, + "systems": { "locked": { - "lastModified": 1655114284, - "narHash": "sha256-2yz3TexDtxXMMjYKn1SImavH3Zflkxte6/5ESncu5E4=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "7db73875ac0d9280ae93b14232249d9c1496583a", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", + "owner": "nix-systems", + "repo": "default", "type": "github" } }, @@ -529,11 +462,11 @@ ] }, "locked": { - "lastModified": 1680111007, - "narHash": "sha256-iDq/ImLoysZS2fO6XQpzp2HFy7+ysFN3ztgXYlEHzXw=", + "lastModified": 1681583564, + "narHash": "sha256-6OyvmG7IC6Nump2CHg6Kgjg9HaLVBGtN8PI0gnTHTQI=", "ref": "main", - "rev": "ec9b4b3335515d45696c7b60b9560ed4f597f5a4", - "revCount": 58, + "rev": "054140b3a7b79663b9831923832d43ac0b829be4", + "revCount": 59, "type": "git", "url": "https://git.greenbaum.cloud/dev/tritonshell" }, @@ -572,21 +505,6 @@ "repo": "flake-utils", "type": "github" } - }, - "utils_3": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "ref": "master", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "revCount": 58, - "type": "git", - "url": "https://github.com/numtide/flake-utils" - }, - "original": { - "type": "git", - "url": "https://github.com/numtide/flake-utils" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 8d990ef3..0c06c1a2 100644 --- a/flake.nix +++ b/flake.nix @@ -43,9 +43,6 @@ tritonshell.url = "git+https://git.greenbaum.cloud/dev/tritonshell?ref=main"; tritonshell.inputs.nixpkgs.follows = "latest"; - - nix-autobahn.url = "github:wucke13/nix-autobahn"; - nix-autobahn.inputs.nixpkgs.follows = "latest"; }; outputs = { @@ -57,7 +54,6 @@ agenix, deploy, tritonshell, - nix-autobahn, ... } @ inputs: digga.lib.mkFlake diff --git a/users/teutat3s/home.nix b/users/teutat3s/home.nix index e7142c23..53a25307 100644 --- a/users/teutat3s/home.nix +++ b/users/teutat3s/home.nix @@ -10,7 +10,6 @@ with lib; let psCfg = config.pub-solar; xdg = config.home-manager.users."${psCfg.user.name}".xdg; tritonshell = inputs.tritonshell; - nix-autobahn = inputs.nix-autobahn; in { imports = [ ./session-variables.nix @@ -70,7 +69,6 @@ in { age-plugin-yubikey cockroach-bin zoom-us - nix-autobahn.packages.${pkgs.system}.default ]; programs.bash.initExtra = '' source ${config.age.secrets.environment-secrets.path}