From d9acff1fa13b97e69dddd948ff7d1364049141bf Mon Sep 17 00:00:00 2001 From: xenia Date: Sun, 31 Aug 2025 17:41:36 -0400 Subject: [PATCH] update nixpkgs/lix --- flake.lock | 31 ++++++++----------------------- flake.nix | 11 +++-------- pkgs/lix/lix-plugins/default.nix | 3 ++- 3 files changed, 13 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index d364ac6..0d3a2b5 100644 --- a/flake.lock +++ b/flake.lock @@ -1,40 +1,26 @@ { "nodes": { - "lix": { - "flake": false, - "locked": { - "lastModified": 1751235704, - "narHash": "sha256-J4ycLoXHPsoBoQtEXFCelL4xlq5pT8U9tNWNKm43+YI=", - "rev": "22be6ff62626c8cdbb9cdb59a3e4bd910fedd0d6", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/22be6ff62626c8cdbb9cdb59a3e4bd910fedd0d6.tar.gz?rev=22be6ff62626c8cdbb9cdb59a3e4bd910fedd0d6" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.93.2.tar.gz" - } - }, "lix-module": { "flake": false, "locked": { - "lastModified": 1751240025, - "narHash": "sha256-SXUAlxpjPRkArRMHy5+Hdi+PiC+ND9yzzIjiaHmTvQU=", - "rev": "8b1094356f4723d6e89d3f8a95b333ee16d9ab02", + "lastModified": 1756125859, + "narHash": "sha256-6a+PWILmqHCs9B5eIBLg6HSZ8jYweZpgOWO8FlyVwYI=", + "rev": "d3292125035b04df00d01549a26e948631fabe1e", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/8b1094356f4723d6e89d3f8a95b333ee16d9ab02.tar.gz?rev=8b1094356f4723d6e89d3f8a95b333ee16d9ab02" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/d3292125035b04df00d01549a26e948631fabe1e.tar.gz?rev=d3292125035b04df00d01549a26e948631fabe1e" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.3-2.tar.gz" } }, "nixpkgs": { "locked": { - "lastModified": 1753939845, - "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "94def634a20494ee057c76998843c015909d6311", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { @@ -46,7 +32,6 @@ }, "root": { "inputs": { - "lix": "lix", "lix-module": "lix-module", "nixpkgs": "nixpkgs" } diff --git a/flake.nix b/flake.nix index ec67506..cbe52ce 100644 --- a/flake.nix +++ b/flake.nix @@ -5,21 +5,16 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz"; - flake = false; - }; - - lix = { - url = "https://git.lix.systems/lix-project/lix/archive/2.93.2.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.3-2.tar.gz"; flake = false; }; }; - outputs = { self, nixpkgs, lix, lix-module }: + outputs = { self, nixpkgs, lix-module }: let overlays = [ (import ./overlay.nix) - (import "${lix-module}/overlay.nix" { inherit lix; }) + (import "${lix-module}/overlay.nix" { lix = null; }) ]; forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed; libVersionInfoOverlay = import "${nixpkgs}/lib/flake-version-info.nix" nixpkgs; diff --git a/pkgs/lix/lix-plugins/default.nix b/pkgs/lix/lix-plugins/default.nix index 2125bfa..1e02933 100644 --- a/pkgs/lix/lix-plugins/default.nix +++ b/pkgs/lix/lix-plugins/default.nix @@ -7,6 +7,7 @@ pkg-config, lix, + capnproto, boost182, }: stdenv.mkDerivation { name = "lix-plugins"; @@ -30,7 +31,7 @@ buildInputs = [ lix boost182 - (lix.capnproto-lix) + capnproto ]; meta = {