From 076c6b4631ed004a667fb4c5554e79515104783c Mon Sep 17 00:00:00 2001 From: Roman Melnikov Date: Mon, 16 Sep 2024 09:18:18 +0200 Subject: [PATCH] [Chore] Bump xray Problem: Currently used xray version from our nixpkgs fork is somewhat old. Solution: Bump it. --- flake.lock | 22 +++++++++++++++++++--- flake.nix | 4 ++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 22fa1ff..5fe41ff 100644 --- a/flake.lock +++ b/flake.lock @@ -1291,7 +1291,7 @@ "nixpkgs-2111": "nixpkgs-2111_2", "nixpkgs-2205": "nixpkgs-2205_2", "nixpkgs-2211": "nixpkgs-2211_2", - "nixpkgs-unstable": "nixpkgs-unstable_2", + "nixpkgs-unstable": "nixpkgs-unstable_3", "old-ghc-nix": "old-ghc-nix_2", "stackage": "stackage_2", "tullia": "tullia_2" @@ -1341,7 +1341,7 @@ "nixpkgs-2205": "nixpkgs-2205_3", "nixpkgs-2211": "nixpkgs-2211_3", "nixpkgs-2305": "nixpkgs-2305", - "nixpkgs-unstable": "nixpkgs-unstable_3", + "nixpkgs-unstable": "nixpkgs-unstable_4", "old-ghc-nix": "old-ghc-nix_3", "stackage": [ "tzbot", @@ -2502,6 +2502,21 @@ } }, "nixpkgs-unstable_2": { + "locked": { + "lastModified": 1726430219, + "narHash": "sha256-LjRTuUjkvTvmnfSSBmXYMguYQE8JuAYLWyUtFDpR0Lg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d413e712d5340e38102108c49f5989fb86bdb117", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable_3": { "locked": { "lastModified": 1675758091, "narHash": "sha256-7gFSQbSVAFUHtGCNHPF7mPc5CcqDk9M2+inlVPZSneg=", @@ -2517,7 +2532,7 @@ "type": "github" } }, - "nixpkgs-unstable_3": { + "nixpkgs-unstable_4": { "locked": { "lastModified": 1690720142, "narHash": "sha256-GywuiZjBKfFkntQwpNQfL+Ksa2iGjPprBGL0/psgRZM=", @@ -2929,6 +2944,7 @@ "hermetic": "hermetic", "nix": "nix_3", "nixpkgs": "nixpkgs_11", + "nixpkgs-unstable": "nixpkgs-unstable_2", "serokell-nix": "serokell-nix_2", "stevenblack-hosts": "stevenblack-hosts", "subspace": "subspace", diff --git a/flake.nix b/flake.nix index fe6d8e4..2223179 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,7 @@ url = "github:StevenBlack/hosts/3.7.1"; flake = false; }; + nixpkgs-unstable.url = "github:nixos/nixpkgs"; composition-c4.url = "github:fossar/composition-c4"; subspace = { url = "github:serokell/subspace"; @@ -48,6 +49,9 @@ vault-secrets.overlays.default composition-c4.overlays.default terranix-simple.overlay + (self: prev: { + xray = inputs.nixpkgs-unstable.legacyPackages.${self.system}.xray; + }) ]; servers = mapAttrs (path: _: import (./servers + "/${path}"))