From d1721efc6c07fd752e0626475fc2fe0ad6cdc940 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Sun, 18 Aug 2024 22:23:13 +0000
Subject: [PATCH] fix: vmagent 102 doesn't work, resort to nixpkgs-stable

---
 flake.lock                                 | 17 +++++++++++++++++
 flake.nix                                  |  5 +++++
 hosts/flame/default.nix                    |  1 +
 hosts/swan/default.nix                     |  1 +
 hosts/tempest/default.nix                  |  6 +++++-
 modules/nixos/services/victoriametrics.nix |  2 ++
 6 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/flake.lock b/flake.lock
index 09d417b..355ff32 100644
--- a/flake.lock
+++ b/flake.lock
@@ -461,6 +461,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1723688146,
+        "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nur": {
       "locked": {
         "lastModified": 1723345421,
@@ -596,6 +612,7 @@
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs",
         "nixpkgs-caddy": "nixpkgs-caddy",
+        "nixpkgs-stable": "nixpkgs-stable",
         "nur": "nur",
         "nvim-lint-src": "nvim-lint-src",
         "nvim-lspconfig-src": "nvim-lspconfig-src",
diff --git a/flake.nix b/flake.nix
index 645cf6d..c6feca6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,6 +7,9 @@
     # Used for system packages
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
+    # Used for specific stable packages
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
+
     # Used for caddy plugins
     nixpkgs-caddy.url = "github:jpds/nixpkgs/caddy-external-plugins";
 
@@ -338,6 +341,7 @@
             system = "x86_64-linux";
             format = "iso";
             specialArgs = {
+              pkgs-stable = import inputs.nixpkgs-stable { inherit system; };
               pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
             };
             modules = import ./hosts/arrow/modules.nix { inherit inputs globals overlays; };
@@ -346,6 +350,7 @@
             system = "x86_64-linux";
             format = "amazon";
             specialArgs = {
+              pkgs-stable = import inputs.nixpkgs-stable { inherit system; };
               pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
             };
             modules = import ./hosts/arrow/modules.nix { inherit inputs globals overlays; } ++ [
diff --git a/hosts/flame/default.nix b/hosts/flame/default.nix
index 37cf75f..6ca5eaf 100644
--- a/hosts/flame/default.nix
+++ b/hosts/flame/default.nix
@@ -17,6 +17,7 @@
 inputs.nixpkgs.lib.nixosSystem rec {
   system = "aarch64-linux";
   specialArgs = {
+    pkgs-stable = import inputs.nixpkgs-stable { inherit system; };
     pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
   };
   modules = [
diff --git a/hosts/swan/default.nix b/hosts/swan/default.nix
index 46ff956..b8ed66a 100644
--- a/hosts/swan/default.nix
+++ b/hosts/swan/default.nix
@@ -11,6 +11,7 @@
 inputs.nixpkgs.lib.nixosSystem rec {
   system = "x86_64-linux";
   specialArgs = {
+    pkgs-stable = import inputs.nixpkgs-stable { inherit system; };
     pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
   };
   modules = [
diff --git a/hosts/tempest/default.nix b/hosts/tempest/default.nix
index fd2ce9b..9751d29 100644
--- a/hosts/tempest/default.nix
+++ b/hosts/tempest/default.nix
@@ -8,8 +8,12 @@
   ...
 }:
 
-inputs.nixpkgs.lib.nixosSystem {
+inputs.nixpkgs.lib.nixosSystem rec {
   system = "x86_64-linux";
+  specialArgs = {
+    pkgs-stable = import inputs.nixpkgs-stable { inherit system; };
+    pkgs-caddy = import inputs.nixpkgs-caddy { inherit system; };
+  };
   modules = [
     globals
     inputs.home-manager.nixosModules.home-manager
diff --git a/modules/nixos/services/victoriametrics.nix b/modules/nixos/services/victoriametrics.nix
index e6dcf19..0460649 100644
--- a/modules/nixos/services/victoriametrics.nix
+++ b/modules/nixos/services/victoriametrics.nix
@@ -5,6 +5,7 @@
   config,
   pkgs,
   lib,
+  pkgs-stable,
   ...
 }:
 
@@ -88,6 +89,7 @@ in
     # VMAgent
 
     services.vmagent = {
+      package = pkgs-stable.vmagent;
       prometheusConfig = prometheusConfig;
       remoteWrite = {
         url = "https://${config.hostnames.prometheus}/api/v1/write";