From b5f3ca622c8a1c71aee084109972857ef59416ff Mon Sep 17 00:00:00 2001 From: Humaid Alqasimi Date: Mon, 3 Jun 2024 15:50:03 +0400 Subject: [PATCH 01/22] mako: fix cross-compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com> Signed-off-by: Humaid Alqasimi --- pkgs/by-name/ma/mako/package.nix | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ma/mako/package.nix b/pkgs/by-name/ma/mako/package.nix index ad518f00e582..2feeea69bee6 100644 --- a/pkgs/by-name/ma/mako/package.nix +++ b/pkgs/by-name/ma/mako/package.nix @@ -1,7 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, scdoc -, systemd, pango, cairo, gdk-pixbuf, jq, bash -, wayland, wayland-protocols -, wrapGAppsHook3 }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, scdoc +, systemd +, pango +, cairo +, gdk-pixbuf +, jq +, bash +, wayland +, wayland-scanner +, wayland-protocols +, wrapGAppsHook3 +}: stdenv.mkDerivation (finalAttrs: { pname = "mako"; @@ -14,7 +28,9 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-QtYtondP7E5QXLRnmcaOQlAm9fKXctfjxeUFqK6FnnE="; }; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook3 ]; + strictDeps = true; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook3 wayland-scanner ]; buildInputs = [ systemd pango cairo gdk-pixbuf wayland ]; mesonFlags = [ From d2adfad3bdb649679d40b79d8bc61169dd643714 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 6 Jun 2024 19:34:06 -0700 Subject: [PATCH 02/22] pkgs/top-level/release{,-lib}.nix: remove hardcoded system --- pkgs/top-level/release-lib.nix | 3 ++- pkgs/top-level/release.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 9f2886895689..a1dcc3e9f334 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -1,4 +1,5 @@ { supportedSystems +, system ? builtins.currentSystem , packageSet ? (import ../..) , scrubJobs ? true , # Attributes passed to nixpkgs. Don't build packages marked as unfree. @@ -33,7 +34,7 @@ let systems ; - pkgs = packageSet (recursiveUpdate { system = "x86_64-linux"; config.allowUnsupportedSystem = true; } nixpkgsArgs); + pkgs = packageSet (recursiveUpdate { inherit system; config.allowUnsupportedSystem = true; } nixpkgsArgs); hydraJob' = if scrubJobs then hydraJob else id; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index d11d1d1dbd43..4f95c7d084ef 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -9,6 +9,7 @@ $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux */ { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; revision = "0000000000000000000000000000000000000000"; } +, system ? builtins.currentSystem , officialRelease ? false # The platform doubles for which we build Nixpkgs. , supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ] @@ -54,7 +55,7 @@ let release-lib = import ./release-lib.nix { - inherit supportedSystems scrubJobs nixpkgsArgs; + inherit supportedSystems scrubJobs nixpkgsArgs system; }; inherit (release-lib) mapTestOn pkgs; From 013e398b0fbd51ef36930a91284156241300d38c Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 6 Jun 2024 00:07:09 -0700 Subject: [PATCH 03/22] lib/tests/release.nix: make pure --- lib/tests/release.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/tests/release.nix b/lib/tests/release.nix index 1447e8817091..ea6263ebf014 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -24,7 +24,10 @@ in # # https://github.com/NixOS/nixpkgs/issues/272591 # - [(import ../../pkgs/test/release {})] + [(import ../../pkgs/test/release { + inherit pkgs; + pkgs-path = pkgs.path; + })] ; } From 8233812d546ab7eb23e830d7c516f067893cad88 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 6 Jun 2024 21:18:15 -0700 Subject: [PATCH 04/22] flake.nix: make pure --- flake.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index d920d5d0ddda..90d249647896 100644 --- a/flake.nix +++ b/flake.nix @@ -5,14 +5,15 @@ outputs = { self }: let - jobs = import ./pkgs/top-level/release.nix { - nixpkgs = self; - }; - libVersionInfoOverlay = import ./lib/flake-version-info.nix self; lib = (import ./lib).extend libVersionInfoOverlay; forAllSystems = lib.genAttrs lib.systems.flakeExposed; + + jobs = forAllSystems (system: import ./pkgs/top-level/release.nix { + nixpkgs = self; + inherit system; + }); in { lib = lib.extend (final: prev: { @@ -44,11 +45,12 @@ }); checks.x86_64-linux = { - tarball = jobs.tarball; + tarball = jobs.x86_64-linux.tarball; # Test that ensures that the nixosSystem function can accept a lib argument # Note: prefer not to extend or modify `lib`, especially if you want to share reusable modules # alternatives include: `import` a file, or put a custom library in an option or in `_module.args.` nixosSystemAcceptsLib = (self.lib.nixosSystem { + pkgs = self.legacyPackages.x86_64-linux; lib = self.lib.extend (final: prev: { ifThisFunctionIsMissingTheTestFails = final.id; }); @@ -67,7 +69,7 @@ }; htmlDocs = { - nixpkgsManual = jobs.manual; + nixpkgsManual = jobs.x86_64-linux.manual; nixosManual = (import ./nixos/release-small.nix { nixpkgs = self; }).nixos.manual.x86_64-linux; From 9ebed2c8ea6d93b9279b835a20b604c58394f1de Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 6 Jun 2024 21:20:49 -0700 Subject: [PATCH 05/22] flake.nix: make checks friendly for non-x86_64-linux systems --- flake.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 90d249647896..8df05dc91263 100644 --- a/flake.nix +++ b/flake.nix @@ -44,13 +44,14 @@ ); }); - checks.x86_64-linux = { - tarball = jobs.x86_64-linux.tarball; + checks = forAllSystems (system: { + tarball = jobs.${system}.tarball; + } // lib.optionalAttrs (self.legacyPackages.${system}.stdenv.isLinux) { # Test that ensures that the nixosSystem function can accept a lib argument # Note: prefer not to extend or modify `lib`, especially if you want to share reusable modules # alternatives include: `import` a file, or put a custom library in an option or in `_module.args.` nixosSystemAcceptsLib = (self.lib.nixosSystem { - pkgs = self.legacyPackages.x86_64-linux; + pkgs = self.legacyPackages.${system}; lib = self.lib.extend (final: prev: { ifThisFunctionIsMissingTheTestFails = final.id; }); @@ -66,13 +67,13 @@ }) ]; }).config.system.build.toplevel; - }; + }); htmlDocs = { - nixpkgsManual = jobs.x86_64-linux.manual; + nixpkgsManual = builtins.mapAttrs (_: jobSet: jobSet.manual) jobs; nixosManual = (import ./nixos/release-small.nix { nixpkgs = self; - }).nixos.manual.x86_64-linux; + }).nixos.manual; }; # The "legacy" in `legacyPackages` doesn't imply that the packages exposed From 0acc5576ae1e85be4e71e40ae45f4cb4576bbfca Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 8 Jun 2024 20:38:34 +0100 Subject: [PATCH 06/22] weston: 13.0.2 -> 13.0.3 --- pkgs/applications/window-managers/weston/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 8bca4417f256..b0aee762946e 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "weston"; - version = "13.0.2"; + version = "13.0.3"; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz"; - hash = "sha256-T+EUAfVe3Dp7Z1/RwJ8VmGAWL6p9PJegpNaCOzHu0Qw="; + hash = "sha256-J/aNluO5fZjare8TogI1ZSSST6OBQY+mcWuRNu8JkJM="; }; postPatch = '' From 8bb66a4929ed907ac592a70cf0d123c1bef11f5d Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 6 Jun 2024 21:26:49 -0700 Subject: [PATCH 07/22] lib/tests/release.nix: fix pkgs.lib error by passing lib --- lib/tests/release.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/tests/release.nix b/lib/tests/release.nix index ea6263ebf014..084fbd94d34c 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -25,8 +25,7 @@ in # https://github.com/NixOS/nixpkgs/issues/272591 # [(import ../../pkgs/test/release { - inherit pkgs; - pkgs-path = pkgs.path; + inherit pkgs lib nix; })] ; From 6de18dbe0fa66538e8596e0550fd0b085e48bc4f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 10 Jun 2024 14:57:13 +0200 Subject: [PATCH 08/22] python311Packages.langchain-community: 0.2.1 -> 0.2.4 Diff: https://github.com/langchain-ai/langchain/compare/langchain-community==0.2.1...langchain-community==0.2.4 Changelog: https://github.com/langchain-ai/langchain/releases/tag/v0.2.4 --- .../python-modules/langchain-community/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index 684591f833eb..7346d6fbbf32 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "langchain-community"; - version = "0.2.1"; + version = "0.2.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langchain"; rev = "langchain-community==${version}"; - hash = "sha256-h8ZJiQYmyvzaRrEVNS7SamJTq4zY7J1IgYdQiVBFh4I="; + hash = "sha256-rqlYaSfDZIQHCndsnydeR1oeVZNIOH6NAgXeOSdBF5A="; }; sourceRoot = "${src.name}/libs/community"; @@ -83,11 +83,13 @@ buildPythonPackage rec { updateScript = langchain-core.updateScript; }; - meta = with lib; { + __darwinAllowLocalNetworking = true; + + meta = { description = "Community contributed LangChain integrations"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/community"; changelog = "https://github.com/langchain-ai/langchain/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ natsukium ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; }; } From 8a4e3469e6b842a30861f73baa11d96a82a2ca84 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 10 Jun 2024 15:53:40 +0200 Subject: [PATCH 09/22] python311Packages.langchain: 0.2.1 -> 0.2.3 Diff: https://github.com/langchain-ai/langchain/compare/refs/tags/langchain==0.2.1...0.2.3 Changelog: https://github.com/langchain-ai/langchain/releases/tag/v0.2.3 --- pkgs/development/python-modules/langchain/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 94dad83b0f31..5b50f1fffe6b 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.2.1"; + version = "0.2.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -57,7 +57,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain==${version}"; - hash = "sha256-cLJhdeft9XNLk5njSBaEBSuP31c2VFCJ1ET+ypo6mNY="; + hash = "sha256-9WrWQuZxtl/eBEDdgKCUqT7fYBl6gSsW9rB8tTBqMso="; }; sourceRoot = "${src.name}/libs/langchain"; @@ -164,12 +164,12 @@ buildPythonPackage rec { updateScript = langchain-core.updateScript; }; - meta = with lib; { + meta = { description = "Building applications with LLMs through composability"; homepage = "https://github.com/langchain-ai/langchain"; changelog = "https://github.com/langchain-ai/langchain/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ natsukium ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; mainProgram = "langchain-server"; }; } From 34e518edbc43d15299102c5c3f30139a7413bb7b Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Jun 2024 17:58:32 +0300 Subject: [PATCH 10/22] linux-firmware: 20240513 -> 20240610 --- pkgs/os-specific/linux/firmware/linux-firmware/source.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix index 7098f1f3203e..adaa4968fd56 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix @@ -1,7 +1,7 @@ # This file is autogenerated! Run ./update.sh to regenerate. { - version = "20240513"; - revision = "20240513"; - sourceHash = "sha256-8yzs8lgPHG3zbUvlsWSuP1O/4s28dRFbju2c9kbaFsg="; - outputHash = "sha256-LDd6FU1/16X7KoCCDq0yPvwJzK4H9NxHgrEdhEfaUGY="; + version = "20240610"; + revision = "20240610"; + sourceHash = "sha256-tjDqviOMvrBoEG8+Yn+XqdBlIDfQUX0KK2kpW6/jed8="; + outputHash = "sha256-2VxzN778TLov5N1DPSnnkT7wQnLg85PyKsljZOoSoNM="; } From 02b5fcd44cbf0f2c59dc0d43287446d61de10fed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Jun 2024 20:52:01 +0200 Subject: [PATCH 11/22] python312Packages.pyschlage: 2024.2.0 -> 2024.6.0 Diff: https://github.com/dknowles2/pyschlage/compare/refs/tags/2024.2.0...2024.6.0 Changelog: https://github.com/dknowles2/pyschlage/releases/tag/2024.6.0 --- pkgs/development/python-modules/pyschlage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyschlage/default.nix b/pkgs/development/python-modules/pyschlage/default.nix index 340a2546c653..649618409a63 100644 --- a/pkgs/development/python-modules/pyschlage/default.nix +++ b/pkgs/development/python-modules/pyschlage/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyschlage"; - version = "2024.2.0"; + version = "2024.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pyschlage"; rev = "refs/tags/${version}"; - hash = "sha256-kjAV7VHKp7WpT6dNjuzYMTlcXbyIB2MNZQXOckDLWF8="; + hash = "sha256-mfrESWXkGV6r+VNw1dHRpIEtfZsLdsCf3D74ydgcy58="; }; nativeBuildInputs = [ From 5754c0e4af08c90964c6931041f75b0498aa6152 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Jun 2024 20:56:17 +0200 Subject: [PATCH 12/22] trivy: 0.52.0 -> 0.52.1 Diff: https://github.com/aquasecurity/trivy/compare/refs/tags/v0.52.0...v0.52.1 Changelog: https://github.com/aquasecurity/trivy/releases/tag/v0.52.1 --- pkgs/tools/admin/trivy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 6aa1e95630e7..c8cbf6bf8ce2 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "trivy"; - version = "0.52.0"; + version = "0.52.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "trivy"; rev = "refs/tags/v${version}"; - hash = "sha256-lsUqzbHv+/P5RAOc774GhFMaY21+T7NnPKK9v/uLP8M="; + hash = "sha256-7jM0eTUydehzlY8esSxIvQ11Y8VEF6Uyk7mSC0whmq0="; }; # Hash mismatch on across Linux and Darwin From 8963ddcbfdb0ed11d910134d5ac28e7dea97a0b2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 10 Jun 2024 15:58:00 +0200 Subject: [PATCH 13/22] python311Packages.langchain-core: 0.2.1 -> 0.2.5 Diff: https://github.com/langchain-ai/langchain/compare/langchain-core==0.2.1...langchain-core==0.2.5 Changelog: https://github.com/langchain-ai/langchain/releases/tag/v0.2.5 --- .../python-modules/langchain-core/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index cf919d3404da..49521e7cfa65 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.2.1"; + version = "0.2.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langchain"; rev = "langchain-core==${version}"; - hash = "sha256-D0y6kW5bWcCKW2TwVPlZcAUxqADgsOm9fWySAjHYYIg="; + hash = "sha256-EBs6BHxBPBR1TfSyesM2gJJtxgClM6lLXko1qisrz7A="; }; sourceRoot = "${src.name}/libs/core"; @@ -71,6 +71,11 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests/unit_tests" ]; + disabledTests = [ + "test_config_traceable_handoff" + "test_config_traceable_async_handoff" + ]; + passthru = { updateScript = writeScript "update.sh" '' #!/usr/bin/env nix-shell @@ -84,11 +89,11 @@ buildPythonPackage rec { ''; }; - meta = with lib; { + meta = { description = "Building applications with LLMs through composability"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/core"; changelog = "https://github.com/langchain-ai/langchain/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ natsukium ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; }; } From b016219a3e0c9d4deeca2660d588c4b4c4b4d0da Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 10 Jun 2024 15:59:51 +0200 Subject: [PATCH 14/22] python311Packages.langchain-text-splitters: 0.2.0 -> 0.2.1 Diff: https://github.com/langchain-ai/langchain/compare/refs/tags/langchain-text-splitters==0.2.0...0.2.1 Changelog: https://github.com/langchain-ai/langchain/releases/tag/refs/tags/langchain-text-splitters==0.2.1 --- .../langchain-text-splitters/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index 73a1e722019a..d24c177a0712 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "langchain-text-splitters"; - version = "0.2.0"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-text-splitters==${version}"; - hash = "sha256-QrgZ0j/YdOgEgLeQNSKjOIwqdr/Izuw9Gh6eKQ/00tQ="; + hash = "sha256-5le+P+7iGjrTetnTHiJilqtc7G7kJbZnEsUgFyF2aQ8="; }; sourceRoot = "${src.name}/libs/text-splitters"; @@ -42,11 +42,11 @@ buildPythonPackage rec { inherit (langchain-core) updateScript; }; - meta = with lib; { + meta = { description = "Build context-aware reasoning applications"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/text-splitters"; changelog = "https://github.com/langchain-ai/langchain/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } From 3c0320c3c09e009c18738ce3adfb16626da366bf Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Tue, 11 Jun 2024 01:08:40 +0200 Subject: [PATCH 15/22] kdePackages.plasma-workspace: Mark `plasma-sourceenv.sh` as non-exec --- pkgs/kde/plasma/plasma-workspace/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix index 24e41b971cf0..42f46eef5eb0 100644 --- a/pkgs/kde/plasma/plasma-workspace/default.nix +++ b/pkgs/kde/plasma/plasma-workspace/default.nix @@ -31,6 +31,11 @@ mkKdeDerivation { }) ]; + postInstall = '' + # Prevent patching this shell file, it only is used by sourcing it from /bin/sh. + chmod -x $out/libexec/plasma-sourceenv.sh + ''; + extraNativeBuildInputs = [pkg-config spirv-tools]; extraBuildInputs = [ qtsvg From 724b7e23e1cc794e276ec699c89724c8dcb7a411 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 10 Jun 2024 19:45:45 -0400 Subject: [PATCH 16/22] mesa: disable glvnd on Darwin Disabling glvnd ensures Mesa builds libGL.dylib and installs the GL headers on Darwin. --- pkgs/development/libraries/mesa/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 91f8c2f9d9c1..43a3c84f5e12 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -270,6 +270,8 @@ self = stdenv.mkDerivation { (lib.mesonEnable "gallium-va" false) (lib.mesonEnable "gallium-xa" false) (lib.mesonEnable "lmsensors" false) + # Don’t build with glvnd support to make sure Mesa builds libGL on Darwin + (lib.mesonEnable "glvnd" false) ] ++ lib.optionals enableOpenCL [ # Clover, old OpenCL frontend (lib.mesonOption "gallium-opencl" "icd") From 8aeb30ae73b20a53422fa3190d64e7e7b692ee79 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 11 Jun 2024 03:51:50 +0200 Subject: [PATCH 17/22] php.packages.composer: 2.7.6 -> 2.7.7 (#318910) diff: https://github.com/composer/composer/compare/2.7.6..2.7.7 changelog: https://github.com/composer/composer/releases/tag/2.7.7 Fix: CVE-2024-35241, CVE-2024-35242 --- pkgs/development/php-packages/composer/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index d8bfca7c348f..150d069ca67c 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -15,13 +15,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "composer"; - version = "2.7.6"; + version = "2.7.7"; # Hash used by ../../../build-support/php/pkgs/composer-phar.nix to # use together with the version from this package to keep the # bootstrap phar file up-to-date together with the end user composer # package. - passthru.pharHash = "sha256-KdyaGe8zU12wYbMRgLKoM6fPjSz0FFszovg1BId7ugg="; + passthru.pharHash = "sha256-qrlAzVPShaVMUEZYIKIID8txgqS6Hl95Wr+xBBSktL4="; composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix { inherit (finalAttrs) version; @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "composer"; repo = "composer"; rev = finalAttrs.version; - hash = "sha256-LZwg3PR3zl07Nb6MS8oKkRfjLgqtT/c4sfUOzWE4S+U="; + hash = "sha256-N8el4oyz3ZGIXN2qmpf6Df0SIjuc1GjyuMuQCcR/xN4="; }; nativeBuildInputs = [ makeBinaryWrapper ]; @@ -86,7 +86,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-AyX57oV5Jf8U4B9tEl+b2Rnt/Igu7ockEap0wfN9b2Q="; + outputHash = "sha256-AsuiTDXJs7jN4N/dJr10BT2PH0f6K2CWDvI8zQW5L9c="; }; installPhase = '' From 3b8aed7da723872c637550c1742b82a2148bb333 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Jun 2024 17:58:04 +0000 Subject: [PATCH 18/22] telegraf: 1.30.3 -> 1.31.0 --- pkgs/servers/monitoring/telegraf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 193425f9b6a0..691928555495 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -9,7 +9,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.30.3"; + version = "1.31.0"; subPackages = [ "cmd/telegraf" ]; @@ -17,10 +17,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-B3Eeh3eOYg58NnMpV6f04HFzOtOn/enBqzCJRst6u2U="; + hash = "sha256-bnto39X/Mn8M5YbdM8JSoEPGCb5+UpHS6FPc5Q0kprE="; }; - vendorHash = "sha256-Cudnc5ZyCQUqgao58ww69gfF6tPW6/oGP9zXbuPSTAE="; + vendorHash = "sha256-uyZZnEdAfkCYtgyjgPTLt463kcfdNczOruHaVmA+VIk="; proxyVendor = true; ldflags = [ From 77665dc3548eeb9434de61df07530081e5c80931 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jun 2024 03:51:29 +0000 Subject: [PATCH 19/22] jsoncons: 0.175.0 -> 0.176.0 --- pkgs/by-name/js/jsoncons/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/js/jsoncons/package.nix b/pkgs/by-name/js/jsoncons/package.nix index 1aa9ea6bf605..cc39e4c895c6 100644 --- a/pkgs/by-name/js/jsoncons/package.nix +++ b/pkgs/by-name/js/jsoncons/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jsoncons"; - version = "0.175.0"; + version = "0.176.0"; src = fetchFromGitHub { owner = "danielaparker"; repo = "jsoncons"; rev = "v${finalAttrs.version}"; - hash = "sha256-pLOKgZx3f0Jka0Tm3SBC1JlQ2Rc3ViPgmXRbjgF4UXI="; + hash = "sha256-RDF5HL6utM/6wna1TxCefl7X8B1qp6nsEDrguTLrtgA="; }; nativeBuildInputs = [ cmake ]; From ec74c63861e4a10f0fc6d2a1ae142ed47469c382 Mon Sep 17 00:00:00 2001 From: famfo Date: Tue, 11 Jun 2024 04:53:52 +0000 Subject: [PATCH 20/22] python312Packages.nbxmpp: 4.5.4 -> 5.0.0, gajim: 1.8.4 -> 1.9.0 (#318836) * python312Packages.nbxmpp: 4.5.4 -> 5.0.0 * gajim: 1.8.4 -> 1.9.0 --- .../networking/instant-messengers/gajim/default.nix | 6 +++--- pkgs/development/python-modules/nbxmpp/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 4ccef1e1d4dc..7f273359de4e 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -21,11 +21,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.8.4"; + version = "1.9.0"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - hash = "sha256-WPzth7HOAbPVJpvN8zSZJGUzsBtACNlwHrHhDPlOScU="; + hash = "sha256-eiRLQZr60BvjqqnoYEY+LswgW6e+S9mTLvBKVCXrCzI="; }; format = "pyproject"; @@ -52,7 +52,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools packaging gssapi - omemo-dr qrcode + omemo-dr qrcode sqlalchemy emoji ] ++ lib.optionals enableE2E [ pycrypto python-gnupg ] ++ lib.optional enableRST docutils ++ extraPythonPackages python3.pkgs; diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index e15a8a081d7a..94715f449203 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "4.5.4"; + version = "5.0.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "gajim"; repo = "python-nbxmpp"; rev = "refs/tags/${version}"; - hash = "sha256-n5Pzw8aikzCml+dOhkLoHR0ytFkEb4AYpw/bIpo6Wd4="; + hash = "sha256-WSeY9v1ELIZEWvbVHGZFq+8tZVVPkOwUwQ/4cOh8IwQ="; }; nativeBuildInputs = [ From cae5fb3e5cf2d28dd8b4d457d9e921a2877febf7 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 11 Jun 2024 07:58:50 +0300 Subject: [PATCH 21/22] syslinux: pick proposed patch to fix build on gnu-efi >= 3.0.17 --- pkgs/os-specific/linux/syslinux/default.nix | 2 ++ pkgs/os-specific/linux/syslinux/define-wchar_t.patch | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/os-specific/linux/syslinux/define-wchar_t.patch diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index b976a3be83e5..6023c6e82ff8 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -69,6 +69,8 @@ stdenv.mkDerivation { "sha256-dVzXBi/oSV9vYgU85mRFHBKuZdup+1x1BipJX74ED7E=") # Fixes build with "modern" gnu-efi ./import-efisetjmp.patch + # Upstream patch: https://www.syslinux.org/archives/2024-February/026903.html + ./define-wchar_t.patch ]; postPatch = '' diff --git a/pkgs/os-specific/linux/syslinux/define-wchar_t.patch b/pkgs/os-specific/linux/syslinux/define-wchar_t.patch new file mode 100644 index 000000000000..92baf101fb41 --- /dev/null +++ b/pkgs/os-specific/linux/syslinux/define-wchar_t.patch @@ -0,0 +1,11 @@ +diff --git a/com32/include/stddef.h b/com32/include/stddef.h +index f52d62f3..437b11f2 100644 +--- a/com32/include/stddef.h ++++ b/com32/include/stddef.h +@@ -29,4 +29,6 @@ + */ + #define container_of(p, c, m) ((c *)((char *)(p) - offsetof(c,m))) + ++typedef short wchar_t; ++ + #endif /* _STDDEF_H */ From a1672c9877a3c506068be0e396437f5fc075a86e Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 11 Jun 2024 08:02:18 +0300 Subject: [PATCH 22/22] gnu-efi: add primary consumers to passthru.tests --- pkgs/development/libraries/gnu-efi/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index fe078db1206b..31b6f7c7d228 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages, fetchFromGitHub, pciutils -, gitUpdater }: +, gitUpdater, fwupd-efi, ipxe, refind, syslinux }: stdenv.mkDerivation rec { pname = "gnu-efi"; @@ -27,9 +27,14 @@ stdenv.mkDerivation rec { --replace "-Werror" "" ''; - passthru.updateScript = gitUpdater { - # No nicer place to find latest release. - url = "https://git.code.sf.net/p/gnu-efi/code"; + passthru = { + updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://git.code.sf.net/p/gnu-efi/code"; + }; + tests = { + inherit fwupd-efi ipxe refind syslinux; + }; }; meta = with lib; {