From da74054c816f7e8b542af747601aa997898880dc Mon Sep 17 00:00:00 2001 From: Rongsong Shen Date: Wed, 27 Aug 2025 13:21:27 +0800 Subject: [PATCH 01/10] add XBUILD_SHELL --- pkgs/x/xbuild/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/x/xbuild/package.nix b/pkgs/x/xbuild/package.nix index 215a70f..7d070af 100644 --- a/pkgs/x/xbuild/package.nix +++ b/pkgs/x/xbuild/package.nix @@ -19,7 +19,7 @@ let repo = "xbuild"; rev = "master"; # sha256 = "sha256-DLq7vC+4k2TMy5jKvQkFTy+xZmpvl0+DiWcd7CBVbgw="; - sha256 = "sha256-QuTXftn0LxkSGq5lZFbnGKlTRxIqEsJrfKzT+aa8a5k="; + sha256 = "sha256-V4trb5RhJwdvSMHRafMNJ1h2oDfZ8zabA9Vm2CVJLdg="; }; nativeBuildInputs = [ @@ -67,6 +67,8 @@ let pkgs.ncurses pkgs.capnproto pkgs.postgresql + pkgs.findutils + pkgs.which capnpc cedro ]; From fed52b6fc15526fa7814c76ca47d5a70813071b3 Mon Sep 17 00:00:00 2001 From: Rongsong Shen Date: Wed, 27 Aug 2025 14:36:48 +0800 Subject: [PATCH 02/10] add add gnugrep --- pkgs/x/xbuild/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/x/xbuild/package.nix b/pkgs/x/xbuild/package.nix index 7d070af..1842138 100644 --- a/pkgs/x/xbuild/package.nix +++ b/pkgs/x/xbuild/package.nix @@ -69,6 +69,7 @@ let pkgs.postgresql pkgs.findutils pkgs.which + pkgs.gnugrep capnpc cedro ]; From be4803a0f41a242beb5982246ca7ed55e2080fca Mon Sep 17 00:00:00 2001 From: Rongsong Shen Date: Wed, 27 Aug 2025 14:39:32 +0800 Subject: [PATCH 03/10] add add gawk --- pkgs/x/xbuild/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/x/xbuild/package.nix b/pkgs/x/xbuild/package.nix index 1842138..d8fecc0 100644 --- a/pkgs/x/xbuild/package.nix +++ b/pkgs/x/xbuild/package.nix @@ -70,6 +70,7 @@ let pkgs.findutils pkgs.which pkgs.gnugrep + pkgs.gawk capnpc cedro ]; From da34bc51785969935e76cf74a80dde0c979a4f45 Mon Sep 17 00:00:00 2001 From: Rongsong Shen Date: Wed, 27 Aug 2025 14:48:38 +0800 Subject: [PATCH 04/10] add add gnused --- pkgs/x/xbuild/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/x/xbuild/package.nix b/pkgs/x/xbuild/package.nix index d8fecc0..58bcd58 100644 --- a/pkgs/x/xbuild/package.nix +++ b/pkgs/x/xbuild/package.nix @@ -71,6 +71,7 @@ let pkgs.which pkgs.gnugrep pkgs.gawk + pkgs.gnused capnpc cedro ]; From 460422440e71843da7bbbcbbb12d9de2a585c5af Mon Sep 17 00:00:00 2001 From: Rongsong Shen Date: Thu, 28 Aug 2025 11:08:07 +0800 Subject: [PATCH 05/10] add zig --- pkgs/x/xbuild/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/x/xbuild/package.nix b/pkgs/x/xbuild/package.nix index 58bcd58..cdc12d5 100644 --- a/pkgs/x/xbuild/package.nix +++ b/pkgs/x/xbuild/package.nix @@ -47,6 +47,7 @@ let pkgs.pkg-config pkgs.gnumake pkgs.gcc + pkgs.zig pkgs.coreutils pkgs.bash pkgs.strace From 9c3486dc19fc88952d300744142d11374bdbdb5f Mon Sep 17 00:00:00 2001 From: Rongsong Shen Date: Fri, 5 Sep 2025 14:58:13 +0800 Subject: [PATCH 06/10] use new version of capnpc-c --- pkgs/c/capnpc/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/c/capnpc/package.nix b/pkgs/c/capnpc/package.nix index 11e8158..24504bf 100644 --- a/pkgs/c/capnpc/package.nix +++ b/pkgs/c/capnpc/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { owner = "shen390s"; repo = "c-capnproto"; rev = "master"; - sha256 = "sha256-U+yUYYvfhPjvADtHsjN5LvOUzFEXZrTmmpqfypf/4Ik="; + sha256 = "sha256-nb16c6sq9bx5C5EQS5NE+imvMNcqTjwU9knaCue0C7w="; }; nativeBuildInputs = [ From 59c3a7615b143882a36202cfe3cece96b0aabc23 Mon Sep 17 00:00:00 2001 From: Rongsong Shen Date: Fri, 5 Sep 2025 15:51:42 +0800 Subject: [PATCH 07/10] fix pkg data of capnpc --- pkgs/c/capnpc/package.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/c/capnpc/package.nix b/pkgs/c/capnpc/package.nix index 24504bf..2d718a8 100644 --- a/pkgs/c/capnpc/package.nix +++ b/pkgs/c/capnpc/package.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "shen390s"; repo = "c-capnproto"; - rev = "master"; - sha256 = "sha256-nb16c6sq9bx5C5EQS5NE+imvMNcqTjwU9knaCue0C7w="; + rev = "main"; + sha256 = "sha256-PapM3rCtA8D3uC1YAdzxqR9qvHa15849XmbhBBLuoO0="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; configurePhase = '' - cmake --preset=ci-linux_x86_64 -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF + cmake --preset=ci-linux_x86_64 -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=$out ''; buildPhase = '' @@ -36,11 +36,6 @@ stdenv.mkDerivation { ''; installPhase = '' - mkdir -p $out/bin - mkdir -p $out/include - mkdir -p $out/lib - cp build/capnpc-c $out/bin - cp build/libCapnC_Runtime.a $out/lib - cp lib/capnp_c.h $out/include + cmake --install build ''; } From 23c224c725c2081318e47b282800a09f47c1c711 Mon Sep 17 00:00:00 2001 From: Rongsong Shen Date: Fri, 5 Sep 2025 16:00:13 +0800 Subject: [PATCH 08/10] fix pkg data of capnpc --- pkgs/c/capnpc/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/c/capnpc/package.nix b/pkgs/c/capnpc/package.nix index 2d718a8..3296570 100644 --- a/pkgs/c/capnpc/package.nix +++ b/pkgs/c/capnpc/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { owner = "shen390s"; repo = "c-capnproto"; rev = "main"; - sha256 = "sha256-PapM3rCtA8D3uC1YAdzxqR9qvHa15849XmbhBBLuoO0="; + sha256 = "sha256-oIIOJcNu0iSnrCYGef+GVVblBxwojVaLz7SaVRTFW60="; }; nativeBuildInputs = [ From 2c4eacf5dbd773d81435237ed62ca92c72913da8 Mon Sep 17 00:00:00 2001 From: Rongsong Shen Date: Mon, 22 Sep 2025 17:37:11 +0800 Subject: [PATCH 09/10] use fixed c-capnproto --- pkgs/x/xbuild/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/x/xbuild/package.nix b/pkgs/x/xbuild/package.nix index cdc12d5..3e43709 100644 --- a/pkgs/x/xbuild/package.nix +++ b/pkgs/x/xbuild/package.nix @@ -18,8 +18,8 @@ let owner = "shen390s"; repo = "xbuild"; rev = "master"; - # sha256 = "sha256-DLq7vC+4k2TMy5jKvQkFTy+xZmpvl0+DiWcd7CBVbgw="; - sha256 = "sha256-V4trb5RhJwdvSMHRafMNJ1h2oDfZ8zabA9Vm2CVJLdg="; + # sha256 = "sha256-V4trb5RhJwdvSMHRafMNJ1h2oDfZ8zabA9Vm2CVJLdg="; + sha256 = "sha256-V4trb5RhJwdvSMHRafMNJ1h2oDfZ8zabA9Vm2CVJLdg="; }; nativeBuildInputs = [ From f178a8a6b6885d7321db7c5ebb6bf6b673c8225d Mon Sep 17 00:00:00 2001 From: Rongsong Shen Date: Mon, 22 Sep 2025 17:43:15 +0800 Subject: [PATCH 10/10] use fixed c-capnproto --- pkgs/c/capnpc/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/c/capnpc/package.nix b/pkgs/c/capnpc/package.nix index 3296570..d9faccf 100644 --- a/pkgs/c/capnpc/package.nix +++ b/pkgs/c/capnpc/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { owner = "shen390s"; repo = "c-capnproto"; rev = "main"; - sha256 = "sha256-oIIOJcNu0iSnrCYGef+GVVblBxwojVaLz7SaVRTFW60="; + sha256 = "sha256-QEy1CiXhBPWihvb3K8ZZDAME0OiXf62QHXQdypKfDRg="; }; nativeBuildInputs = [