update nixpkgs and lix

flake.lock

@@ -3,38 +3,38 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1750762236,
+        "lastModified": 1751235704,
-        "narHash": "sha256-D7YepvFkGE4K1rOkEYA1P6wGj/eFbQXb03nLdBRjjwA=",
+        "narHash": "sha256-J4ycLoXHPsoBoQtEXFCelL4xlq5pT8U9tNWNKm43+YI=",
-        "rev": "9271961fe6a7130e71b3266508ad0bf2b2f1dea3",
+        "rev": "22be6ff62626c8cdbb9cdb59a3e4bd910fedd0d6",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/9271961fe6a7130e71b3266508ad0bf2b2f1dea3.tar.gz?rev=9271961fe6a7130e71b3266508ad0bf2b2f1dea3"
+        "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.92.2.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.93.2.tar.gz"
       }
     },
     "lix-module": {
       "flake": false,
       "locked": {
-        "lastModified": 1750776709,
+        "lastModified": 1751240025,
-        "narHash": "sha256-h9vRkc/RIIuo1fDisx8WX1mGYfryWUOhrOvnI8DGYeI=",
+        "narHash": "sha256-SXUAlxpjPRkArRMHy5+Hdi+PiC+ND9yzzIjiaHmTvQU=",
-        "rev": "f84e0257d1125715e3eb4800a6f36376583984a3",
+        "rev": "8b1094356f4723d6e89d3f8a95b333ee16d9ab02",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/f84e0257d1125715e3eb4800a6f36376583984a3.tar.gz?rev=f84e0257d1125715e3eb4800a6f36376583984a3"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/8b1094356f4723d6e89d3f8a95b333ee16d9ab02.tar.gz?rev=8b1094356f4723d6e89d3f8a95b333ee16d9ab02"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.2-1.tar.gz"
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1750506804,
+        "lastModified": 1751792365,
-        "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
+        "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4206c4cb56751df534751b058295ea61357bbbaa",
+        "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb",
         "type": "github"
       },
       "original": {

flake.nix

@@ -5,12 +5,12 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.2-1.tar.gz";
+      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.92.2.tar.gz";
+      url = "https://git.lix.systems/lix-project/lix/archive/2.93.2.tar.gz";
       flake = false;
     };
   };

pkgs/lix/lix-plugins/0001-implement-lix-support.patch

@@ -1,14 +1,14 @@
-From 10a24d7831f51549d8c05193a0fbc329cc327fbe Mon Sep 17 00:00:00 2001
+From d9e022548aff94e90914baa921ddb4cd939c0e5c Mon Sep 17 00:00:00 2001
 From: xenia <xenia@awoo.systems>
 Date: Sat, 21 Dec 2024 15:33:10 -0500
 Subject: [PATCH] implement lix support
 
 ---
- CMakeLists.txt          | 27 -------------
+ CMakeLists.txt          | 27 ------------
- extra-builtins.cc       | 87 ++++++++++++++++-------------------------
+ extra-builtins.cc       | 91 ++++++++++++++++-------------------------
- meson.build             | 18 +++++++++
+ meson.build             | 18 ++++++++
  nix-plugins-config.h.in |  3 --
- 4 files changed, 51 insertions(+), 84 deletions(-)
+ 4 files changed, 53 insertions(+), 86 deletions(-)
  delete mode 100644 CMakeLists.txt
  create mode 100644 meson.build
  delete mode 100644 nix-plugins-config.h.in
@@ -47,7 +47,7 @@ index 9674fe8..0000000
 -
 -install(TARGETS nix-extra-builtins DESTINATION lib/nix/plugins)
 diff --git a/extra-builtins.cc b/extra-builtins.cc
-index 3a0f90e..f2978f8 100644
+index 3a0f90e..95aef5e 100644
 --- a/extra-builtins.cc
 +++ b/extra-builtins.cc
 @@ -1,12 +1,8 @@
@@ -68,8 +68,12 @@ index 3a0f90e..f2978f8 100644
  
  using namespace nix;
  
-@@ -24,39 +20,38 @@ static GlobalConfig::Register rp(&extraBuiltinsSettings);
+@@ -21,42 +17,41 @@ static ExtraBuiltinsSettings extraBuiltinsSettings;
- static void extraBuiltins(EvalState & state, const PosIdx pos,
+ 
+ static GlobalConfig::Register rp(&extraBuiltinsSettings);
+ 
+-static void extraBuiltins(EvalState & state, const PosIdx pos,
++static void extraBuiltins(EvalState & state,
      Value ** _args, Value & v)
  {
 -    static auto extraBuiltinsFile = state.rootPath(CanonPath(extraBuiltinsSettings.extraBuiltinsFile.to_string()));
@@ -130,8 +134,9 @@ index 3a0f90e..f2978f8 100644
 +        Value* arg = state.ctx.mem.allocValue();
 +        arg->mkAttrs(attrs);
          v.mkApp(fun, arg);
-         state.forceValue(v, pos);
+-        state.forceValue(v, pos);
 -    } catch (FileNotFound &) {
++        state.forceValue(v, noPos);
 +    } catch (SysError &) {
          v.mkNull();
      }
@@ -190,5 +195,5 @@ index 459fea8..0000000
 -#define NIX_CFLAGS_OTHER "@NIX_CFLAGS_OTHER@"
 -#define BOOST_INCLUDE_DIR "@BOOST_INCLUDE_DIR@"
 -- 
-2.47.2
+2.49.0
 

pkgs/lix/lix-plugins/default.nix

@@ -30,6 +30,7 @@
   buildInputs = [
     lix
     boost182
+    (lix.capnproto-lix)
   ];
 
   meta = {