From ddfe25e9fe0627a0ac09156aa2078f25d4f43c0d Mon Sep 17 00:00:00 2001 From: Gabriel Simmer Date: Fri, 27 Oct 2023 14:53:37 +0100 Subject: [PATCH] Update flake.lock, kube diff command --- flake.lock | 178 ++++++++++++++++++++++++++++++++++++++++++++++------- flake.nix | 6 ++ 2 files changed, 162 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 0d01f7f..ece13cc 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "advisory-db": { + "flake": false, + "locked": { + "lastModified": 1697318478, + "narHash": "sha256-ZEDgHfurZiv9lBGTmHnQ0YECoi6H2NYs3pTo1VU1koQ=", + "owner": "rustsec", + "repo": "advisory-db", + "rev": "71d80e811f2e29a4b82d3e545ad6591e35227e03", + "type": "github" + }, + "original": { + "owner": "rustsec", + "repo": "advisory-db", + "type": "github" + } + }, "agenix": { "inputs": { "darwin": "darwin", @@ -72,6 +88,27 @@ "type": "github" } }, + "crane": { + "inputs": { + "nixpkgs": [ + "vrchat-prometheus-adapter", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1697811061, + "narHash": "sha256-NhSq9+Ya8vTqsKzHpSWNGYxto71VZ4THAx3hn6maoTs=", + "owner": "ipetkov", + "repo": "crane", + "rev": "6b229eec8adc685e2cb95f27ad59c22e82992f70", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -94,6 +131,30 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "vrchat-prometheus-adapter", + "nixpkgs" + ], + "rust-analyzer-src": [ + "vrchat-prometheus-adapter" + ] + }, + "locked": { + "lastModified": 1697782927, + "narHash": "sha256-OikLtn3e0kR5ztHJbLzS/5mUMadXfgRGKA1BDgcTa60=", + "owner": "nix-community", + "repo": "fenix", + "rev": "e5f13bd304140705f6aba0f121cee7775d861897", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -195,6 +256,24 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -223,11 +302,11 @@ ] }, "locked": { - "lastModified": 1697611555, - "narHash": "sha256-8nYMduRQfGSQJr2cDMyodsuGlRcJAy0Ko8K4KkjurP8=", + "lastModified": 1698392685, + "narHash": "sha256-yx/sbRneR2AfSAeAMqUu0hoVJdjh+qhl/7dkirp8yo8=", "owner": "nix-community", "repo": "home-manager", - "rev": "05649393ac1f34980a5cf6a6e89de77626c9182b", + "rev": "1369d2cefb6f128c30e42fabcdebbacc07e18b3f", "type": "github" }, "original": { @@ -263,11 +342,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1697371715, - "narHash": "sha256-1ZV4qoL1B35DsciS/inC+z6vAwjxjWHL3+4G4QQhT0A=", + "lastModified": 1697976504, + "narHash": "sha256-sU8q83TEaafIe5d7L6Dc2alRhWT898aB0+6EXcfao1I=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "af42578368ca0c97d5836ba55b146745911aaecc", + "rev": "2e96d2f9d80f80bd22cd7c603985f2b03cf186fc", "type": "github" }, "original": { @@ -283,11 +362,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1697418520, - "narHash": "sha256-UIwdw9Lw36GFgm7TFjOBdPHFKhbTSfLLT+4XxB39rh8=", + "lastModified": 1697679370, + "narHash": "sha256-E4iEs004owoShYK0MBDD6uRXCgZdxl//hYijvSakg0k=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "bdf17c44b19325b5476703400cbafe64f7553fa6", + "rev": "01a606e119963957eefaf1b22ef92b69b90f5b85", "type": "github" }, "original": { @@ -368,11 +447,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1697331025, - "narHash": "sha256-a5LJWWHfEvnq9tBd9UyNVdtzLXc2ehu5MCp//Bex/0E=", + "lastModified": 1697935651, + "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "05c07c73de74725ec7efa6609011687035a92c0f", + "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902", "type": "github" }, "original": { @@ -391,11 +470,11 @@ ] }, "locked": { - "lastModified": 1697624213, - "narHash": "sha256-EmIp5EbuUlEgGxo0WMBIhzroNrKbnBSXshAcnfpOD2c=", + "lastModified": 1698354843, + "narHash": "sha256-eTsga6QxX9gVwC6zsUNs0UPyQX9hToVi5jSE0XUH42Y=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "e3b66242214443547b55727617c8fdb9ca68214c", + "rev": "50c2725465ab035b232ef8ae9b976f4ac25c772b", "type": "github" }, "original": { @@ -454,11 +533,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1697379843, - "narHash": "sha256-RcnGuJgC2K/UpTy+d32piEoBXq2M+nVFzM3ah/ZdJzg=", + "lastModified": 1698266953, + "narHash": "sha256-jf72t7pC8+8h8fUslUYbWTX5rKsRwOzRMX8jJsGqDXA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12bdeb01ff9e2d3917e6a44037ed7df6e6c3df9d", + "rev": "75a52265bda7fd25e06e3a67dee3f0354e73243c", "type": "github" }, "original": { @@ -470,11 +549,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1697417052, - "narHash": "sha256-QyFpNZ28H0IoWhbGxD4j2h3aYwap2l2rSWyoFue95sM=", + "lastModified": 1697677194, + "narHash": "sha256-lN2eJCsOzjhxrvTQsNcW7r0E9hMJ7ABrKDQWpmYFRkM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "21f56f3209c0272852be7a704d9b21f2601c72e3", + "rev": "18e505d654892d057f308c817d220faf962dbf23", "type": "github" }, "original": { @@ -499,6 +578,22 @@ "type": "github" } }, + "nixpkgs_8": { + "locked": { + "lastModified": 1697730408, + "narHash": "sha256-Ww//zzukdTrwTrCUkaJA/NsaLEfUfQpWZXBdXBYfhak=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ff0a5a776b56e0ca32d47a4a47695452ec7f7d80", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -509,7 +604,8 @@ "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_5", "nixpkgs-wayland": "nixpkgs-wayland", - "terranix": "terranix" + "terranix": "terranix", + "vrchat-prometheus-adapter": "vrchat-prometheus-adapter" } }, "systems": { @@ -541,6 +637,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "terranix": { "inputs": { "bats-assert": "bats-assert", @@ -620,6 +731,29 @@ "repo": "treefmt-nix", "type": "github" } + }, + "vrchat-prometheus-adapter": { + "inputs": { + "advisory-db": "advisory-db", + "crane": "crane", + "fenix": "fenix", + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_8" + }, + "locked": { + "lastModified": 1698265247, + "narHash": "sha256-e8MyvjIUt8Yatqt93rlmQIuMSTJcsqFdfXZ/AwF7lCg=", + "ref": "master", + "rev": "012771f2fbb026dffac8b60a54d28a68ea82b83a", + "revCount": 13, + "type": "git", + "url": "https://git.gmem.ca/arch/vrchat-prometheus-adapter" + }, + "original": { + "ref": "master", + "type": "git", + "url": "https://git.gmem.ca/arch/vrchat-prometheus-adapter" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index a8e22f2..f8e8385 100644 --- a/flake.nix +++ b/flake.nix @@ -64,6 +64,12 @@ }; apps = nixinate.nixinate.x86_64-linux self // { x86_64-linux = { + kube-diff = { + type = "app"; + program = toString (pkgs.writers.writeBash "diff" '' + ${pkgs.kubectl}/bin/kubectl diff -f ${self.packages.x86_64-linux.kubernetes} + ''); + }; tf-plan = { type = "app"; program = toString (pkgs.writers.writeBash "plan" ''