From c945291fad721321438874fa1c07315d4c64dcb1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Oct 2024 04:42:48 +0000 Subject: [PATCH 01/18] renovate: 38.93.1 -> 38.105.2 --- pkgs/by-name/re/renovate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index edea55abb82d..6f20acf9d03e 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -20,13 +20,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "renovate"; - version = "38.93.1"; + version = "38.105.2"; src = fetchFromGitHub { owner = "renovatebot"; repo = "renovate"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-4NvFS4WWdV3Csuv28/wq6EvB+in5bo1N4Fn602bi4rE="; + hash = "sha256-gF8bxzNF1AUJJDxFdNfa+sr/TP0S4uLCXyu3tjRuBjc="; }; postPatch = '' @@ -43,7 +43,7 @@ stdenv'.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-cjk7PS4DUAgmg+mLUaWJFTjQv2GcPdr1VchNRjJgqsk="; + hash = "sha256-zTbwivYqNeArgwA6tePe2vExKoT/iLV3TS5ag8PlRgQ="; }; env.COREPACK_ENABLE_STRICT = 0; From 171b6c26f9e817a716b72f8532ce99efdda0dd5d Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Fri, 4 Oct 2024 22:51:11 +0200 Subject: [PATCH 02/18] stalwart-mail: 0.10.2 -> 0.10.3 --- pkgs/by-name/st/stalwart-mail/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index e77b69093b94..5c7fec29e037 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -2,7 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - fetchpatch, pkg-config, protobuf, bzip2, @@ -26,7 +25,7 @@ let # See upstream issue for rocksdb 9.X support # https://github.com/stalwartlabs/mail-server/issues/407 rocksdb = rocksdb_8_11; - version = "0.10.2"; + version = "0.10.3"; in rustPlatform.buildRustPackage { pname = "stalwart-mail"; @@ -36,11 +35,11 @@ rustPlatform.buildRustPackage { owner = "stalwartlabs"; repo = "mail-server"; rev = "refs/tags/v${version}"; - hash = "sha256-wH26uwaYzfqiamiJ/oosVEiTfCOItwVGbHdRh6Ykpgk="; + hash = "sha256-xpNSMZWWiFU6OOooAD7ENzOggqYHdU88baPsXnovpXU="; fetchSubmodules = true; }; - cargoHash = "sha256-1AFDyZpkcvFzWBczMAPfajmhBmVl4ou4JdKnrK2KlQI="; + cargoHash = "sha256-qiKfHrxQ4TSSomDLlPJ2+GOEri/ZuMCvUNdxRVoplgg="; nativeBuildInputs = [ pkg-config From 8fda6add4802da7d8223d23454d1435287159dde Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Fri, 4 Oct 2024 22:51:46 +0200 Subject: [PATCH 03/18] stalwart-mail.webadmin: 0.1.15 -> 0.1.17 --- pkgs/by-name/st/stalwart-mail/webadmin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stalwart-mail/webadmin.nix b/pkgs/by-name/st/stalwart-mail/webadmin.nix index 645af460f681..0dfa42cf5561 100644 --- a/pkgs/by-name/st/stalwart-mail/webadmin.nix +++ b/pkgs/by-name/st/stalwart-mail/webadmin.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { pname = "webadmin"; - version = "0.1.15"; + version = "0.1.17"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "webadmin"; rev = "refs/tags/v${version}"; - hash = "sha256-YglpdxZT5CyFLla6uXTKPtq9EbA9SEQacyR9KNToYT0="; + hash = "sha256-kMfdCb2dwoVd9G1uZw2wcfaAAPt6obFfWQbbXG/MDB4="; }; npmDeps = fetchNpmDeps { @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-na1HEueX8w7kuDp8LEtJ0nD1Yv39cyk6sEMpS1zix2s="; }; - cargoHash = "sha256-piZ+oLL8FqS8Ishi7byYfdedkszreGuxI56pTLcYXn4="; + cargoHash = "sha256-0Urr0MsmenFqg25lZAzg7LgJ/NkZHINoOWtPad7G6GE="; postPatch = '' # Using local tailwindcss for compilation From 7658294ee47a6c8f38e3a0f88b2a86d9cbbc12e5 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Sun, 6 Oct 2024 21:43:22 +0200 Subject: [PATCH 04/18] stalwart-mail: fix updateScript --- pkgs/by-name/st/stalwart-mail/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 5c7fec29e037..3fffbafd32bb 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -148,7 +148,7 @@ rustPlatform.buildRustPackage { passthru = { webadmin = callPackage ./webadmin.nix { }; - update-script = nix-update-script { }; + updateScript = nix-update-script { }; tests.stalwart-mail = nixosTests.stalwart-mail; }; From 5d11f195a298d76ada93a8abc55f29eb45f20950 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Sun, 6 Oct 2024 21:57:32 +0200 Subject: [PATCH 05/18] stalwart-mail.webadmin: add updateScript --- pkgs/by-name/st/stalwart-mail/webadmin.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/st/stalwart-mail/webadmin.nix b/pkgs/by-name/st/stalwart-mail/webadmin.nix index 0dfa42cf5561..e11ef03b6534 100644 --- a/pkgs/by-name/st/stalwart-mail/webadmin.nix +++ b/pkgs/by-name/st/stalwart-mail/webadmin.nix @@ -5,6 +5,7 @@ trunk-ng, tailwindcss, fetchNpmDeps, + nix-update-script, nodejs, npmHooks, llvmPackages, @@ -60,6 +61,10 @@ rustPlatform.buildRustPackage rec { zip -r $out/webadmin.zip * ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "Secure & modern all-in-one mail server Stalwart (webadmin module)"; homepage = "https://github.com/stalwartlabs/webadmin"; From ebf5ffda4c7af4c9a0491b279c3bd38c4b9c1cd9 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Sun, 6 Oct 2024 23:08:53 +0200 Subject: [PATCH 06/18] stalwart-mail: skip failing test --- pkgs/by-name/st/stalwart-mail/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 3fffbafd32bb..bb8a0859230a 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -141,6 +141,8 @@ rustPlatform.buildRustPackage { # Failed to read system DNS config: io error: No such file or directory (os error 2) "--skip=smtp::inbound::auth::auth" # Failed to read system DNS config: io error: No such file or directory (os error 2) + "--skip=smtp::inbound::antispam::antispam" + # Failed to read system DNS config: io error: No such file or directory (os error 2) "--skip=smtp::inbound::vrfy::vrfy_expn" ]; From dc32d18e521e75f5be833bf5e8e5d980bb5211a3 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 6 Oct 2024 21:02:23 +0100 Subject: [PATCH 07/18] lowdown: add flag to disable the Darwin sandbox MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a program written in a memory‐unsafe language that processes potentially‐untrusted user input. We shouldn’t disable upstream’s sandboxing mechanisms for all downstream consumers without good reason. Although the sandbox API is officially marked as deprecated, it is used as the basis for the supported App Sandbox and it is extremely unlikely to ever be removed as it is used extensively throughout the OS for service hardening and by third parties like the Chrome sandbox. Nix itself uses it to sandbox builds, and its lack of support for nesting is why this caused problems in the first place. Instead, introduce a `lowdown-unsandboxed` package that can be used in the `nativeBuildInputs` of Nix builds, while keeping the sandboxed version of the program for general use. The name might not be ideal, as it remains identical to `lowdown` on non‐Darwin platforms, but I couldn’t think of a better one. See: #125004 Closes: #346933 --- pkgs/tools/typesetting/lowdown/default.nix | 10 +++++++--- pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index e898d7326964..7449be94e12c 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -2,12 +2,13 @@ , fetchpatch , enableShared ? !stdenv.hostPlatform.isStatic , enableStatic ? stdenv.hostPlatform.isStatic +, enableDarwinSandbox ? true # for passthru.tests , nix }: stdenv.mkDerivation rec { - pname = "lowdown"; + pname = "lowdown${lib.optionalString (stdenv.hostPlatform.isDarwin && !enableDarwinSandbox) "-unsandboxed"}"; version = "1.1.0"; outputs = [ "out" "lib" "dev" "man" ]; @@ -54,7 +55,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which dieHook ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; - preConfigure = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' + # The Darwin sandbox calls fail inside Nix builds, presumably due to + # being nested inside another sandbox. + preConfigure = lib.optionalString (stdenv.hostPlatform.isDarwin && !enableDarwinSandbox) '' echo 'HAVE_SANDBOX_INIT=0' > configure.local ''; @@ -103,7 +106,8 @@ stdenv.mkDerivation rec { ''; doInstallCheck = true; - installCheckPhase = '' + + installCheckPhase = lib.optionalString (!stdenv.hostPlatform.isDarwin || !enableDarwinSandbox) '' runHook preInstallCheck echo '# TEST' > test.md $out/bin/lowdown test.md diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8cd809caae6..2ba0aea070f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5434,6 +5434,11 @@ with pkgs; lowdown = callPackage ../tools/typesetting/lowdown { }; + # Less secure variant of lowdown for use inside Nix builds. + lowdown-unsandboxed = lowdown.override { + enableDarwinSandbox = false; + }; + numatop = callPackage ../os-specific/linux/numatop { }; numworks-udev-rules = callPackage ../os-specific/linux/numworks-udev-rules { }; From b370a686cac3d414fbfa3246a74069e4d7fc39d2 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 6 Oct 2024 21:02:23 +0100 Subject: [PATCH 08/18] treewide: use lowdown-unsandboxed where appropriate --- pkgs/applications/blockchains/clightning/default.nix | 4 ++-- pkgs/by-name/ce/certspotter/package.nix | 4 ++-- pkgs/tools/package-management/lix/common.nix | 3 ++- pkgs/tools/package-management/nix/common.nix | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index 9f84685e8c10..6ed103a4b287 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -8,7 +8,7 @@ , automake , gettext , libtool -, lowdown +, lowdown-unsandboxed , protobuf , unzip , which @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # when building on darwin we need cctools to provide the correct libtool # as libwally-core detects the host as darwin and tries to add the -static # option to libtool, also we have to add the modified gsed package. - nativeBuildInputs = [ autoconf autogen automake gettext libtool lowdown protobuf py3 unzip which ] + nativeBuildInputs = [ autoconf autogen automake gettext libtool lowdown-unsandboxed protobuf py3 unzip which ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.autoSignDarwinBinariesHook ]; buildInputs = [ gmp libsodium sqlite zlib jq ]; diff --git a/pkgs/by-name/ce/certspotter/package.nix b/pkgs/by-name/ce/certspotter/package.nix index e40c58061849..72cb1e54c0b8 100644 --- a/pkgs/by-name/ce/certspotter/package.nix +++ b/pkgs/by-name/ce/certspotter/package.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , buildGoModule -, lowdown +, lowdown-unsandboxed }: buildGoModule rec { @@ -19,7 +19,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - nativeBuildInputs = [ lowdown ]; + nativeBuildInputs = [ lowdown-unsandboxed ]; postInstall = '' cd man diff --git a/pkgs/tools/package-management/lix/common.nix b/pkgs/tools/package-management/lix/common.nix index dd1580bc4336..521c27b7e7bc 100644 --- a/pkgs/tools/package-management/lix/common.nix +++ b/pkgs/tools/package-management/lix/common.nix @@ -39,6 +39,7 @@ assert (hash == null) -> (src != null); libcpuid, libsodium, lowdown, + lowdown-unsandboxed, lsof, mercurial, mdbook, @@ -119,7 +120,7 @@ stdenv.mkDerivation { ] ++ lib.optionals isLegacyParser [ bison ] ++ lib.optionals enableDocumentation [ - (lib.getBin lowdown) + (lib.getBin lowdown-unsandboxed) mdbook mdbook-linkcheck doxygen diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index c26cb410399d..4d04cbb6274d 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -59,6 +59,7 @@ in , libxml2 , libxslt , lowdown +, lowdown-unsandboxed , toml11 , man , mdbook @@ -122,7 +123,7 @@ self = stdenv.mkDerivation { docbook_xsl_ns docbook5 ] ++ lib.optionals (enableDocumentation && atLeast24) [ - (lib.getBin lowdown) + (lib.getBin lowdown-unsandboxed) mdbook ] ++ lib.optionals (atLeast213 && enableDocumentation) [ mdbook-linkcheck From e5542cc78c5a7175d444d14f3063e97d47eaff6b Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 5 Sep 2024 19:50:38 -0400 Subject: [PATCH 09/18] icoutils: defining missing target conditions on Darwin --- pkgs/tools/graphics/icoutils/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 8c50ffdce62e..1806699b1c23 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -21,9 +21,8 @@ stdenv.mkDerivation rec { buildInputs = [ libpng perl ]; propagatedBuildInputs = [ perlPackages.LWP ]; - # Fixes a build failure on aarch64-darwin. Define for all Darwin targets for when x86_64-darwin - # upgrades to a newer SDK. - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DTARGET_OS_IPHONE=0"; + # Fixes build failures on Darwin. These should be defined in `TargetConditional.h`, but it’s failing anyway. + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DTARGET_OS_IPHONE=0 -DTARGET_OS_EMBEDDED=0"; postPatch = '' patchShebangs extresso/extresso From 445953f80deb2dabdf4ead1299111ef29e40de37 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 29 Aug 2024 21:50:47 -0400 Subject: [PATCH 10/18] libcaca: fix build on Darwin libcaca tries to access a private API that is no longer available. It worked before the SDK changes because no Darwin frameworks were available in the build environment, but there is now always an SDK available, causing it to try to build Cocoa code that no longer works. --- pkgs/by-name/li/libcaca/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/li/libcaca/package.nix b/pkgs/by-name/li/libcaca/package.nix index bb0d57168766..78b81bf49169 100644 --- a/pkgs/by-name/li/libcaca/package.nix +++ b/pkgs/by-name/li/libcaca/package.nix @@ -39,6 +39,10 @@ stdenv.mkDerivation rec { configureFlags = [ (if x11Support then "--enable-x11" else "--disable-x11") + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Suppresses a build failure building Cocoa support due to accessing private ivar `_running`, + # which no longer available. + (lib.enableFeature false "cocoa") ]; env.NIX_CFLAGS_COMPILE = lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING"; From f018dd26aeb1225241695bac1a243f1ab38966de Mon Sep 17 00:00:00 2001 From: sarahec Date: Sun, 6 Oct 2024 12:46:45 -0700 Subject: [PATCH 11/18] python3Packages.langgraph-* 2.0.0 --- .../langgraph-checkpoint-postgres/default.nix | 4 ++-- .../langgraph-checkpoint-sqlite/default.nix | 4 ++-- .../python-modules/langgraph-checkpoint/default.nix | 11 +++++++++-- .../python-modules/langgraph-sdk/default.nix | 4 ++-- pkgs/development/python-modules/langgraph/default.nix | 9 ++++++--- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix index 7d511994b6d5..b2091019084d 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "langgraph-checkpoint-postgres"; - version = "1.0.6"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/checkpointpostgres==${version}"; - hash = "sha256-F9sgZQQBFs5hDUsaR5BI9ERve9L8LTUvEKOgyz5ioqY="; + hash = "sha256-piBWr6F1YWML9D8+Bk4KvReQJhgb1Z7Xf5q8bcVUeEQ="; }; postgresqlTestSetupPost = '' diff --git a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix index e94cca80eb54..3bf88e24f998 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "langgraph-checkpoint-sqlite"; - version = "1.0.3"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/checkpointsqlite==${version}"; - hash = "sha256-/pHJtK691anqn2It4ZstCGXJS0JGtdKZvqS9f3ly+FQ="; + hash = "sha256-aG7kHdlOkrjfYcdDWwCum0mQvWNMlF2CcEDlkzbv4Zw="; }; sourceRoot = "${src.name}/libs/checkpoint-sqlite"; diff --git a/pkgs/development/python-modules/langgraph-checkpoint/default.nix b/pkgs/development/python-modules/langgraph-checkpoint/default.nix index 3857de5bd735..b25b03b420c9 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint/default.nix @@ -5,15 +5,17 @@ fetchFromGitHub, langchain-core, langgraph-sdk, + msgpack, poetry-core, pytest-asyncio, + pytest-mock, pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "langgraph-checkpoint"; - version = "1.0.9"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +24,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/checkpoint==${version}"; - hash = "sha256-3gm+L67pPAKpY1kqnX1lPnca40KoBVZdRZ1Cy6D0dzU="; + hash = "sha256-LBIQyDWKmT89OgYUk3LFIZ5VDXX9KQXFkR9A8XHOCBQ="; }; sourceRoot = "${src.name}/libs/checkpoint"; @@ -31,11 +33,16 @@ buildPythonPackage rec { dependencies = [ langchain-core ]; + propagatedBuildInputs = [ msgpack ]; + + pythonRelaxDeps = [ "msgpack" ]; # Can drop after msgpack 1.0.10 lands in nixpkgs + pythonImportsCheck = [ "langgraph.checkpoint" ]; nativeCheckInputs = [ dataclasses-json pytest-asyncio + pytest-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix index 710433dfe134..1ce25fc35aa9 100644 --- a/pkgs/development/python-modules/langgraph-sdk/default.nix +++ b/pkgs/development/python-modules/langgraph-sdk/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "langgraph-sdk"; - version = "0.1.30"; + version = "0.1.32"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/sdk==${version}"; - hash = "sha256-gI12XuxFplqIKVlVjeO60YxT7WG/SSsZ0aWfjg5bHIs="; + hash = "sha256-qOxtrRbdK0M4aFWJX0SFn7U27rvAyqu53iCbYZX3s8A="; }; sourceRoot = "${src.name}/libs/sdk-py"; diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix index 087db330d195..20e8b241033d 100644 --- a/pkgs/development/python-modules/langgraph/default.nix +++ b/pkgs/development/python-modules/langgraph/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { pname = "langgraph"; - version = "0.2.21"; + version = "0.2.34"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/${version}"; - hash = "sha256-1Ch2V85omAKnXK9rMihNtyjIoOvmVUm8Dbdo5GBoik4="; + hash = "sha256-5Suyj6pEslgR383MkYGGz7IC2A0A++02YooZmi8YtyM="; }; postgresqlTestSetupPost = '' @@ -88,7 +88,10 @@ buildPythonPackage rec { ]; disabledTests = [ - "test_doesnt_warn_valid_schema" # test is flaky due to pydantic error on the exception + # test is flaky due to pydantic error on the exception + "test_doesnt_warn_valid_schema" + "test_tool_node_inject_store" + # Disabling tests that requires to create new random databases "test_cancel_graph_astream" "test_cancel_graph_astream_events_v2" From 407c4c1fb641e62a6b37c60158dfe2366d9dcc31 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Mon, 7 Oct 2024 22:29:15 +0200 Subject: [PATCH 12/18] linuxPackages.nvidiaPackages.vulkan_beta: 550.40.75 -> 550.40.76 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 60588ea4f03a..ee5aa5e8eaea 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -69,11 +69,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "550.40.75"; + version = "550.40.76"; persistencedVersion = "550.54.14"; settingsVersion = "550.54.14"; - sha256_64bit = "sha256-Bgze1hx2gTKhchNHNVTnPnGOqpUe5UjNXJW5tVFi0wE="; - openSha256 = "sha256-NnJ3AxLWg90WjoZ81vzjII/UT2RaERF4IEZp5bRgElk="; + sha256_64bit = "sha256-dgeK0gIOrCvt7Au8sihBVjNwqAIhBjLK/X1q5hG5F8k="; + openSha256 = "sha256-VU0awnFnFbM7MUcKiHCQ+fHhnrL/kZom4ymRX3qeuKk="; settingsSha256 = "sha256-m2rNASJp0i0Ez2OuqL+JpgEF0Yd8sYVCyrOoo/ln2a4="; persistencedSha256 = "sha256-XaPN8jVTjdag9frLPgBtqvO/goB5zxeGzaTU0CdL6C4="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux"; From 03401121580cd20702757fc575981cd793e073f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Oct 2024 22:08:41 +0000 Subject: [PATCH 13/18] bruno: 1.30.1 -> 1.32.1 --- pkgs/by-name/br/bruno/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index f84548760979..c9eec26b1558 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -26,13 +26,13 @@ let in buildNpmPackage' rec { pname = "bruno"; - version = "1.30.1"; + version = "1.32.1"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; rev = "v${version}"; - hash = "sha256-9dH79ytqkZcdgUMbTa32VHKr2dHiNsJu6GawDtRsJx0="; + hash = "sha256-n/3zNS3aME7ZSoJ7TQ7gqVod469g7PGTsLcdNIwB09Y="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json From aa1b127de40cd2c6712edb2ff605faad0ee8fc3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Oct 2024 23:42:55 +0000 Subject: [PATCH 14/18] picom-pijulius: 8.2-unstable-2024-09-27 -> 8.2-unstable-2024-10-05 --- pkgs/by-name/pi/picom-pijulius/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/picom-pijulius/package.nix b/pkgs/by-name/pi/picom-pijulius/package.nix index 686e9c371bb9..a735f2691331 100644 --- a/pkgs/by-name/pi/picom-pijulius/package.nix +++ b/pkgs/by-name/pi/picom-pijulius/package.nix @@ -9,13 +9,13 @@ }: picom.overrideAttrs (previousAttrs: { pname = "picom-pijulius"; - version = "8.2-unstable-2024-09-27"; + version = "8.2-unstable-2024-10-05"; src = fetchFromGitHub { owner = "pijulius"; repo = "picom"; - rev = "d1d5a32d9ac125e1db1c2235834060fd0535b262"; - hash = "sha256-1ycxVHaWpqGD1GuWQ8dpKrbmSSSQS8CoaY56wM18bWk="; + rev = "9977760e5ace3b17453e3cd89d14bc0f8de5b5f9"; + hash = "sha256-lqmZqEmD/+qZg+8UOOGJB6L0FdUuZFN5qBdL593RC/A="; }; buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ pcre ]; From 0a3cdcf4e55204e9347bb120d2f9e7688d2a614a Mon Sep 17 00:00:00 2001 From: lukts30 Date: Wed, 2 Oct 2024 11:49:11 +0200 Subject: [PATCH 15/18] libnbd: format with nixfmt-rfc-style --- pkgs/by-name/li/libnbd/package.nix | 36 +++++++++++++++++------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/li/libnbd/package.nix b/pkgs/by-name/li/libnbd/package.nix index e7b93924b7f5..8eff742e1c47 100644 --- a/pkgs/by-name/li/libnbd/package.nix +++ b/pkgs/by-name/li/libnbd/package.nix @@ -1,14 +1,16 @@ -{ lib -, stdenv -, fetchurl -, bash-completion -, pkg-config -, perl -, buildPythonBindings ? false, python3 -, libxml2 -, fuse -, fuse3 -, gnutls +{ + lib, + stdenv, + fetchurl, + bash-completion, + pkg-config, + perl, + buildPythonBindings ? false, + python3, + libxml2, + fuse, + fuse3, + gnutls, }: stdenv.mkDerivation rec { @@ -24,8 +26,7 @@ stdenv.mkDerivation rec { bash-completion pkg-config perl - ] - ++ lib.optionals buildPythonBindings [ python3 ]; + ] ++ lib.optionals buildPythonBindings [ python3 ]; buildInputs = [ fuse @@ -34,7 +35,9 @@ stdenv.mkDerivation rec { libxml2 ]; - configureFlags = lib.optionals buildPythonBindings [ "--with-python-installdir=${placeholder "out"}/${python3.sitePackages}" ]; + configureFlags = lib.optionals buildPythonBindings [ + "--with-python-installdir=${placeholder "out"}/${python3.sitePackages}" + ]; installFlags = [ "bashcompdir=$(out)/share/bash-completion/completions" ]; @@ -63,7 +66,10 @@ stdenv.mkDerivation rec { - Shell (nbdsh) for command line and scripting. ''; license = with licenses; lgpl21Plus; - maintainers = with maintainers; [ AndersonTorres humancalico ]; + maintainers = with maintainers; [ + AndersonTorres + humancalico + ]; platforms = with platforms; linux; }; } From f6f24b0bbb0461887719d10c77c9fe81e7bea37d Mon Sep 17 00:00:00 2001 From: lukts30 Date: Wed, 2 Oct 2024 15:36:09 +0200 Subject: [PATCH 16/18] ocamlPackages.nbd: init at 1.20.2 --- pkgs/by-name/li/libnbd/package.nix | 33 ++++++++++++++++++++++++------ pkgs/top-level/ocaml-packages.nix | 5 +++++ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/li/libnbd/package.nix b/pkgs/by-name/li/libnbd/package.nix index 8eff742e1c47..76e94bcf0475 100644 --- a/pkgs/by-name/li/libnbd/package.nix +++ b/pkgs/by-name/li/libnbd/package.nix @@ -6,13 +6,19 @@ pkg-config, perl, buildPythonBindings ? false, + buildOcamlBindings ? false, + ocamlPackages, python3, libxml2, fuse, fuse3, gnutls, + autoreconfHook, }: +lib.throwIf (buildOcamlBindings && !lib.versionAtLeast ocamlPackages.ocaml.version "4.05") + "OCaml binding are not available for OCaml < 4.05" + stdenv.mkDerivation rec { pname = "libnbd"; version = "1.20.2"; @@ -22,11 +28,21 @@ stdenv.mkDerivation rec { hash = "sha256-7DgviwGPPLccTPvomyH+0CMknXmR2wENsxpXD97OP84="; }; - nativeBuildInputs = [ - bash-completion - pkg-config - perl - ] ++ lib.optionals buildPythonBindings [ python3 ]; + nativeBuildInputs = + [ + bash-completion + pkg-config + perl + autoreconfHook + ] + ++ lib.optionals buildPythonBindings [ python3 ] + ++ lib.optionals buildOcamlBindings ( + with ocamlPackages; + [ + findlib + ocaml + ] + ); buildInputs = [ fuse @@ -35,6 +51,11 @@ stdenv.mkDerivation rec { libxml2 ]; + postPatch = lib.optionalString buildOcamlBindings '' + substituteInPlace ocaml/Makefile.am \ + --replace-fail '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib' + ''; + configureFlags = lib.optionals buildPythonBindings [ "--with-python-installdir=${placeholder "out"}/${python3.sitePackages}" ]; @@ -75,4 +96,4 @@ stdenv.mkDerivation rec { } # TODO: package the 1.6-stable version too # TODO: git version needs ocaml -# TODO: bindings for go and ocaml +# TODO: bindings for go diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 31a17e4c260a..2df26252524f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1229,6 +1229,11 @@ let ### N ### + nbd = pkgs.libnbd.override { + ocamlPackages = self; + buildOcamlBindings = true; + }; + netchannel = callPackage ../development/ocaml-modules/netchannel { }; ninja_utils = callPackage ../development/ocaml-modules/ninja_utils { }; From cd7f80982baf5f972747a18eb161e2b8c743ed57 Mon Sep 17 00:00:00 2001 From: lukts30 Date: Thu, 3 Oct 2024 11:15:13 +0200 Subject: [PATCH 17/18] maintainers: add lukts30 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e0848db6a9ec..e568256461f6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12586,6 +12586,12 @@ githubId = 2486026; name = "Luca Fulchir"; }; + lukts30 = { + email = "llukas21307@gmail.com"; + github = "lukts30"; + githubId = 24390575; + name = "lukts30"; + }; luleyleo = { email = "git@leopoldluley.de"; github = "luleyleo"; From 6322590d4653dc9231ab3cdb9bd1365412c65037 Mon Sep 17 00:00:00 2001 From: lukts30 Date: Mon, 7 Oct 2024 22:50:46 +0200 Subject: [PATCH 18/18] rhsrvany: init at 1.1 --- pkgs/by-name/rh/rhsrvany/package.nix | 30 ++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/rh/rhsrvany/package.nix diff --git a/pkgs/by-name/rh/rhsrvany/package.nix b/pkgs/by-name/rh/rhsrvany/package.nix new file mode 100644 index 000000000000..a5f548481102 --- /dev/null +++ b/pkgs/by-name/rh/rhsrvany/package.nix @@ -0,0 +1,30 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "rhsrvany"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "rwmjones"; + repo = "rhsrvany"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-eeEiAdm7NO5fFYKtHQbeBq4RhP8Xwgw2p2Wkm+n0EWM="; + }; + + strictDeps = true; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = { + description = "Free equivalent of Windows \"srvany\" program for turning any Windows program or script into a service"; + homepage = "https://github.com/rwmjones/rhsrvany"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ lukts30 ]; + platforms = lib.platforms.windows; + }; +})