diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index c192a8f35231..87c309e6a2e9 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -350,7 +350,7 @@ in PrivateMounts = true; PrivateTmp = true; ProtectClock = true; - ProtectControlGroups = true; + ProtectControlGroups = "strict"; ProtectHome = true; ProtectHostname = true; ProtectKernelLogs = true; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index db5c54b222f4..289f0f72293c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1707,8 +1707,8 @@ let mktplcRef = { name = "vscode-jest-runner"; publisher = "firsttris"; - version = "0.4.82"; - hash = "sha256-8sKMxatSaibMESktDJdQ84jINsE05ZVSjLMGjHFw7VI="; + version = "0.4.84"; + hash = "sha256-x4CaSa/CRZgs7vGthFcn8UXYrbQhQXkULPBbGnj3zpw="; }; meta = { description = "Simple way to run or debug a single (or multiple) tests from context-menu"; diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix index 7c82d89ee4a4..75c742aef34c 100644 --- a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix +++ b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.31.3"; - hash = "sha256-Kvg5gmvAcz+K6mWBzWoNnkqEWAPRgC+w0idUC6RzM0g="; + version = "0.31.5"; + hash = "sha256-D7k+hA786w7IZHVI+Og6vHGAAohpfpuOmmCcDUU0WsY="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix index eda3e894cd86..af57b462dcd7 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ms-azuretools"; name = "vscode-bicep"; - version = "0.37.4"; - hash = "sha256-RBoScMaYWKfA9SONCLkFEcGwj8ffQ3ZlAOiyQY9LtVw="; + version = "0.38.33"; + hash = "sha256-gmSUPHdbxXu5jUASsbu+yVO2ZdVBo5+uQNeLdTsvQVU="; }; buildInputs = [ diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0f9e99273f65..26993ae6894b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -417,13 +417,13 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-1a5ooJvZqZGvFXcvp0abEOn6BTNkN6hcxUEl1dXYwPA=", + "hash": "sha256-QE8ukiQHZqhSsZyFnInIpnGvsSlFuFMun7paK/Z3HTM=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v4.2.1", + "rev": "v4.3.0", "spdx": "MIT", - "vendorHash": "sha256-uRfbpNLBsll7lLuUBZ57StAhlP1eVEGBkTRDxJzjUd8=" + "vendorHash": "sha256-BzlSPZ11K9wZXd66jh3CAL+5qco6m0Hb/QiVtAi1Ub8=" }, "exoscale": { "hash": "sha256-tTFGYzDwx7VXzS287eNUUjsAuwY/Rh2zuOsGwLT6BRU=", @@ -1218,13 +1218,13 @@ "vendorHash": "sha256-4gtM8U//RXpYc4klCgpZS/3ZRzAHfcbOPTnNqlX4H7M=" }, "spacelift": { - "hash": "sha256-gcdbL2rJNTzyn/Nd1F+7Ru0fcrTg2kTWHU6g0haYR/k=", + "hash": "sha256-pYe8xmqudCkRvXNHJ4bSm9uitcDfpRlaGij7CrjQjd8=", "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift", "owner": "spacelift-io", "repo": "terraform-provider-spacelift", - "rev": "v1.33.0", + "rev": "v1.34.0", "spdx": "MIT", - "vendorHash": "sha256-D8VG9CWP4wo+cxb/ewP+b6qAeaBCu6lNwH2leoiBMAc=" + "vendorHash": "sha256-DLiS2fqr/gNdZGkhvqjdgpICY0QTlE/Ejl3m29Vanm4=" }, "spotinst": { "hash": "sha256-bbQ7WDizMnCF95E/iXOSSx0e5K2wMtUW39OxT/45Jn4=", @@ -1263,11 +1263,11 @@ "vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo=" }, "sysdig": { - "hash": "sha256-C2jHcYSVdDyP42XyMleMmTYo5A+xDJuTVcE4LXHwFWk=", + "hash": "sha256-pSiygCYpPP0fXt0RKPmU5FTMpRDuclZlXIBvbQzb3lg=", "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig", "owner": "sysdiglabs", "repo": "terraform-provider-sysdig", - "rev": "v1.60.0", + "rev": "v2.0.0", "spdx": "MPL-2.0", "vendorHash": "sha256-rWiafaFE1RolO9JUN1WoW4EWJjR7kpfeVEOTLf21j50=" }, diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 86383f95aca2..c4061e7dd7c9 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - hash = "sha256-sYhmXVc1pU0nzG57AIuaLqUOWz9MfFlpJZQ9B5Ki5ik="; + hash = "sha256-HGhwO0bILHbRyk6YjzI+v6wiIANvTkIRR+SkL4mxv0w="; }; doCheck = false; diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index b7be83f5d33c..8988fe5569c3 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -70,8 +70,24 @@ stdenv.mkDerivation rec { url = "https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0.patch"; sha256 = "1n3y4wnjra8blss7642jgpxnm9n92zhhjj541bb9i60m4b7bgfzz"; }) + + # lib, tests: use GioUnix to use platform-specific Gio classes + # https://github.com/awesomeWM/awesome/pull/4022 + (fetchpatch { + name = "glib-2.86.0.patch"; + url = "https://github.com/void-linux/void-packages/raw/933b305b313a2c7d971d746835deb9f49b652204/srcpkgs/awesome/patches/glib-2.86.0.patch"; + hash = "sha256-qVzD8O34sULcV6S4daDUBPnxVDd8T6ZyLOE+gYxCmf0="; + }) ]; + # Fix build with CMake 4 + # https://github.com/awesomeWM/awesome/pull/4030#issuecomment-3370822668 + postPatch = '' + substituteInPlace {,tests/examples/}CMakeLists.txt \ + --replace-fail 'cmake_minimum_required(VERSION 3.0.0)' 'cmake_minimum_required(VERSION 3.10)' \ + --replace-warn 'cmake_policy(VERSION 2.6)' 'cmake_policy(VERSION 3.10)' + ''; + nativeBuildInputs = [ cmake doxygen diff --git a/pkgs/by-name/co/collada-dom/package.nix b/pkgs/by-name/co/collada-dom/package.nix index 640d2bf15b91..12765e966f85 100644 --- a/pkgs/by-name/co/collada-dom/package.nix +++ b/pkgs/by-name/co/collada-dom/package.nix @@ -36,6 +36,11 @@ stdenv.mkDerivation (finalAttrs: { readline ]; + cmakeFlags = [ + # See https://github.com/NixOS/nixpkgs/issues/445447 + "-DCMAKE_POLICY_VERSION_MINIMUM=3.10" + ]; + meta = { description = "API that provides a C++ object representation of a COLLADA XML instance document"; longDescription = "This is a fork of [rdiankov/collada-dom](https://github.com/rdiankov/collada-dom) which has been unmaintained for six years."; diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix index 06091fb1427d..217c4ae371ff 100644 --- a/pkgs/by-name/fi/fish/package.nix +++ b/pkgs/by-name/fi/fish/package.nix @@ -152,13 +152,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fish"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = "fish-shell"; repo = "fish-shell"; tag = finalAttrs.version; - hash = "sha256-3VwDwRjYo9/ifkl2Vt9pTmLabt+XyS0FXi0el+YgC/A="; + hash = "sha256-oNRC1NWYE0LEK2a/7nHtlmp20f8hn/1FZgaySqzwSbg="; }; env = { @@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src patches; - hash = "sha256-WZdfon6mnM+5caWW6yInQx5B1GjCxQ0XLbJlbvHa3Zc="; + hash = "sha256-7mYWCHH6DBWTIJV8GPRjjf6QulwlYjwv0slablDvBF8="; }; patches = [ diff --git a/pkgs/by-name/fo/fosrl-olm/package.nix b/pkgs/by-name/fo/fosrl-olm/package.nix index 2ea4efd1c053..f27e7d50aed8 100644 --- a/pkgs/by-name/fo/fosrl-olm/package.nix +++ b/pkgs/by-name/fo/fosrl-olm/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "olm"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "fosrl"; repo = "olm"; tag = version; - hash = "sha256-9QqVfq7tYOtPsKMgH0YAhpiwMHh+yJT4npF0f9yl5wU="; + hash = "sha256-Lv04rPZUz2thSs6/CgIj16YNKgRzeb4M4uGKGhAS4Kc="; }; vendorHash = "sha256-4j7l1vvorcdbHE4XXOUH2MaOSIwS70l8w7ZBmp3a/XQ="; diff --git a/pkgs/by-name/ge/gemini-cli-bin/package.nix b/pkgs/by-name/ge/gemini-cli-bin/package.nix index 0925a0a919b0..88421d39c918 100644 --- a/pkgs/by-name/ge/gemini-cli-bin/package.nix +++ b/pkgs/by-name/ge/gemini-cli-bin/package.nix @@ -8,11 +8,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "gemini-cli-bin"; - version = "0.6.1"; + version = "0.8.0"; src = fetchurl { url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini.js"; - hash = "sha256-gTd+uw5geR7W87BOiE6YmDDJ4AiFlYxbuLE2GWgg0kw="; + hash = "sha256-Xb9cE5Gz6V//dOe6AbQ2y9MFk0yeBuvcOoK5Z1L62s0="; }; phases = [ diff --git a/pkgs/by-name/ge/gersemi/package.nix b/pkgs/by-name/ge/gersemi/package.nix index 963030083e9f..85cb52ef8b4f 100644 --- a/pkgs/by-name/ge/gersemi/package.nix +++ b/pkgs/by-name/ge/gersemi/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "gersemi"; - version = "0.22.2"; + version = "0.22.3"; format = "pyproject"; src = fetchFromGitHub { owner = "BlankSpruce"; repo = "gersemi"; tag = version; - hash = "sha256-VxpKhNpJiDRRlp+yM5vSNCuVWOu/r+v/De7Uh9ivRTs="; + hash = "sha256-B45+j53p61+LTAw7C1h+9icc27zhoYittdxn7iDmZCo="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/gn/gnome-menus/package.nix b/pkgs/by-name/gn/gnome-menus/package.nix index 247f7a529214..3efd6f8a698b 100644 --- a/pkgs/by-name/gn/gnome-menus/package.nix +++ b/pkgs/by-name/gn/gnome-menus/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "gnome-menus"; - version = "3.36.0"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "07xvaf8s0fiv0035nk8zpzymn5www76w2a1vflrgqmp9plw8yd6r"; + sha256 = "EZipHNvc+yMt+U5x71QnYX0mAp4ye+P4YMOwkhxEgRg="; }; makeFlags = [ diff --git a/pkgs/by-name/li/libndctl/package.nix b/pkgs/by-name/li/libndctl/package.nix index 37c1580b7a16..8c5d570d810a 100644 --- a/pkgs/by-name/li/libndctl/package.nix +++ b/pkgs/by-name/li/libndctl/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libndctl"; - version = "82"; + version = "83"; src = fetchFromGitHub { owner = "pmem"; repo = "ndctl"; tag = "v${finalAttrs.version}"; - hash = "sha256-zTIYGKUVIINeSisSCghImfjtJLdecQGL2i6ftxf8QXc="; + hash = "sha256-xhTZyRAQNomVyHCPUBwmM0Uuu1sMngTIJm8MF0gnRLk="; }; patches = lib.optionals (!stdenv.hostPlatform.isGnu) [ diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix index 7ef5b8b632a7..c428bb8f8757 100644 --- a/pkgs/by-name/lx/lxgw-neoxihei/package.nix +++ b/pkgs/by-name/lx/lxgw-neoxihei/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.223"; + version = "1.224"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-mTfA4gHGtCKP7diimj9YzzEEQpXVdyYAXBezBEWiWHE="; + hash = "sha256-Wib8zZsdw9K5dmVYPymzv4hkAhrOWyEjflzEX8tv0zc="; }; dontUnpack = true; diff --git a/pkgs/by-name/mi/mint-x-icons/package.nix b/pkgs/by-name/mi/mint-x-icons/package.nix index ab1657c0b785..872feeabab6e 100644 --- a/pkgs/by-name/mi/mint-x-icons/package.nix +++ b/pkgs/by-name/mi/mint-x-icons/package.nix @@ -12,13 +12,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-x-icons"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = "mint-x-icons"; rev = version; - hash = "sha256-sbNA8fhzhQ6iod3GHb3+/D5jFAWFr1kS+9GhH6Qgla4="; + hash = "sha256-Ea0NkN9vnfqqqXpE+aM6zca1m7ri4mP1DMTQhvx9guQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/by-name/mi/mint-y-icons/package.nix b/pkgs/by-name/mi/mint-y-icons/package.nix index 1f6fbf976487..4fe569451779 100644 --- a/pkgs/by-name/mi/mint-y-icons/package.nix +++ b/pkgs/by-name/mi/mint-y-icons/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-y-icons"; - version = "1.8.6"; + version = "1.8.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = "mint-y-icons"; rev = version; - hash = "sha256-CCkyv0NAfs1sNNiZfAvWgdFILypKk44YyY3cBiSaEZY="; + hash = "sha256-PFq0NVUD6uQtHtObJfIsn/wPSwYMT6267UWjBnIpWAQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/by-name/op/openobserve/package.nix b/pkgs/by-name/op/openobserve/package.nix index 88b6f2ff9870..3b65726b5611 100644 --- a/pkgs/by-name/op/openobserve/package.nix +++ b/pkgs/by-name/op/openobserve/package.nix @@ -95,6 +95,9 @@ rustPlatform.buildRustPackage { checkFlags = [ "--skip=handler::http::router::tests::test_get_proxy_routes" "--skip=tests::e2e_test" + # test_export_operator unit test panics when run on the 0.14.7 release + # see this issue for more details : https://github.com/NixOS/nixpkgs/issues/447106 + "--skip=tests::test_export_operator" "--skip=service::organization::tests::test_organization" ]; diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix index 1d778d7f9c1a..abb94bc45b1d 100644 --- a/pkgs/by-name/re/redpanda-client/package.nix +++ b/pkgs/by-name/re/redpanda-client/package.nix @@ -7,12 +7,12 @@ stdenv, }: let - version = "25.2.5"; + version = "25.2.8"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-hSL2IsequX/gsBnk7C0JkDDPjreoPhmsNgpR+x6hFUE="; + sha256 = "sha256-WSE5PIv58yMlMlzGJmCWOg6XHbY7NEvQVtm07IWmR4k="; }; in buildGoModule rec { diff --git a/pkgs/by-name/ri/rime-wanxiang/package.nix b/pkgs/by-name/ri/rime-wanxiang/package.nix index 546a58753349..da36f5d6d724 100644 --- a/pkgs/by-name/ri/rime-wanxiang/package.nix +++ b/pkgs/by-name/ri/rime-wanxiang/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "rime-wanxiang"; - version = "12.6.13"; + version = "13.0.6"; src = fetchFromGitHub { owner = "amzxyz"; repo = "rime_wanxiang"; tag = "v" + finalAttrs.version; - hash = "sha256-wOCfJG/k30fyO7jxRpjQBTN6Xc/gusuwerjYykDl2JQ="; + hash = "sha256-ThO4bXxp55cOivFo9eq9XEKpEvX9O5LiE6WsMGoq3gA="; }; installPhase = '' diff --git a/pkgs/by-name/su/sundials/package.nix b/pkgs/by-name/su/sundials/package.nix index 05e3f972ce15..aea189af3a20 100644 --- a/pkgs/by-name/su/sundials/package.nix +++ b/pkgs/by-name/su/sundials/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "7.4.0"; + version = "7.5.0"; outputs = [ "out" @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz"; - hash = "sha256-Z53azdd2EBEOYTFk6Cl9bQzTW66OnDr8jo/2+ZocKns="; + hash = "sha256-CJrGWVB973OLemW1dP/jqQDThWnjMj2XCevtPkRa3sw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vg/vgmstream/package.nix b/pkgs/by-name/vg/vgmstream/package.nix index 7e1c541c4e1f..d17e6585ecc8 100644 --- a/pkgs/by-name/vg/vgmstream/package.nix +++ b/pkgs/by-name/vg/vgmstream/package.nix @@ -37,13 +37,13 @@ in stdenv.mkDerivation rec { pname = "vgmstream"; - version = "2023"; + version = "2055"; src = fetchFromGitHub { owner = "vgmstream"; repo = "vgmstream"; tag = "r${version}"; - hash = "sha256-RyVh9twBZqFs4bKRZKmat0JB25R+rQtnAARo0dvCS+8="; + hash = "sha256-GNsoWCTLDd49T639lKkLoyBWpWYocDP6gZB2e8ZUyEU="; }; passthru.updateScript = nix-update-script { diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index 492f8f0beb60..d93a92167b64 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "yabai"; - version = "7.1.15"; + version = "7.1.16"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} @@ -67,13 +67,13 @@ stdenv.mkDerivation (finalAttrs: { # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information. "aarch64-darwin" = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz"; - hash = "sha256-QDGt/v5t7g6+y6ijpLRF7YkqF8bISfxk684m7uUg4eM="; + hash = "sha256-rEO+qcat6heF3qrypJ02Ivd2n0cEmiC/cNUN53oia4w="; }; "x86_64-darwin" = fetchFromGitHub { owner = "koekeishiya"; repo = "yabai"; rev = "v${finalAttrs.version}"; - hash = "sha256-HvaMPmXNlFVOezqWxqXaAUq8E8O2ZkXMQPwkKXCAOcY="; + hash = "sha256-WXvM0ub4kJ3rKXynTxmr2Mx+LzJOgmm02CcEx2nsy/A="; }; }; diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index a42084e404fd..8c38c5ce701b 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -45,27 +45,27 @@ let in jdk.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk" + lib.optionalString withJcef "-jcef"; - javaVersion = "21.0.7"; - build = "1038.58"; + javaVersion = "21.0.8"; + build = "1140.54"; # To get the new tag: # git clone https://github.com/jetbrains/jetbrainsruntime # cd jetbrainsruntime # git tag --points-at [revision] # Look for the line that starts with jbr- - openjdkTag = "jbr-release-21.0.7b1038.58"; + openjdkTag = "jbr-release-21.0.8b1140.54"; version = "${javaVersion}-b${build}"; src = fetchFromGitHub { owner = "JetBrains"; repo = "JetBrainsRuntime"; rev = "jb${version}"; - hash = "sha256-sGAMrE9gAt73jgLlNW8p5Lz37gFiK4ZvMQ8giE2Ia54="; + hash = "sha256-Iz5Sh9qRktFYsT7m90IG6LC5+tARtVnvqaiEEGLCAXc="; }; env = { BOOT_JDK = jdk.home; # run `git log -1 --pretty=%ct` in jdk repo for new value on update - SOURCE_DATE_EPOCH = 1745907200; + SOURCE_DATE_EPOCH = 1758959208; }; patches = [ ]; diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix index ed517361a166..516dd447affc 100644 --- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix +++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix @@ -99,14 +99,29 @@ let .${platform}; inherit (arches) depsArch projectArch targetArch; + thrift20 = thrift.overrideAttrs (old: { + version = "0.20.0"; + + src = fetchFromGitHub { + owner = "apache"; + repo = "thrift"; + tag = "v0.20.0"; + hash = "sha256-cwFTcaNHq8/JJcQxWSelwAGOLvZHoMmjGV3HBumgcWo="; + }; + + cmakeFlags = (old.cmakeFlags or [ ]) ++ [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.10" + ]; + }); + in stdenv.mkDerivation rec { pname = "jcef-jetbrains"; - rev = "7a7b9383b3bf39c850feb0d103c6b829e2f48a6b"; + rev = "bb9fb310ed7f3abf858faf248c53bbb707be21f7"; # This is the commit number # Currently from the branch: https://github.com/JetBrains/jcef/tree/251 # Run `git rev-list --count HEAD` - version = "1014"; + version = "1083"; nativeBuildInputs = [ cmake @@ -125,23 +140,23 @@ stdenv.mkDerivation rec { libXdamage nss nspr - thrift + thrift20 ]; src = fetchFromGitHub { owner = "jetbrains"; repo = "jcef"; inherit rev; - hash = "sha256-ZMxx5mwmsBiUneULHFUDOrJQ8yKuK9bfPz89vN31ql4="; + hash = "sha256-BHmGEhfkrUWDfrUFR8d5AgIq8qkAr+blX9n7ZVg8mtc="; }; cef-bin = let # `cef_binary_${CEF_VERSION}_linux64_minimal`, where CEF_VERSION is from $src/CMakeLists.txt - name = "cef_binary_122.1.9+gd14e051+chromium-122.0.6261.94_${platform}_minimal"; + name = "cef_binary_137.0.17+gf354b0e+chromium-137.0.7151.104_${platform}_minimal"; hash = { - "linuxarm64" = "sha256-wABtvz0JHitlkkB748I7yr02Oxs5lXvqDfrBAQiKWHU="; - "linux64" = "sha256-qlutM0IsE1emcMe/3p7kwMIK7ou1rZGvpUkrSMVPnCc="; + "linuxarm64" = "sha256-QKkJwLtYS3o7lf4T31jIww2LGuAJT3sNTeI3Jq0VEYQ="; + "linux64" = "sha256-qE5SOi0/6dPsewyemarTbWG9MbWCQUlng8TgqU+4Tak="; } .${platform}; urlName = builtins.replaceStrings [ "+" ] [ "%2B" ] name; @@ -184,7 +199,7 @@ stdenv.mkDerivation rec { -e 's|vcpkg_install_package(boost-filesystem boost-interprocess thrift)||' \ -i CMakeLists.txt - sed -e 's|vcpkg_bring_host_thrift()|set(THRIFT_COMPILER_HOST ${thrift}/bin/thrift)|' -i remote/CMakeLists.txt + sed -e 's|vcpkg_bring_host_thrift()|set(THRIFT_COMPILER_HOST ${lib.getExe thrift20})|' -i remote/CMakeLists.txt mkdir jcef_build cd jcef_build diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index c0b710f89700..979cafdd18c7 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -298,6 +298,14 @@ in url = "https://github.com/psychon/lgi/commit/46a163d9925e7877faf8a4f73996a20d7cf9202a.patch"; sha256 = "0gfvvbri9kyzhvq3bvdbj2l6mwvlz040dk4mrd5m9gz79f7w109c"; }) + + # https://github.com/lgi-devs/lgi/issues/346 + # https://gitlab.archlinux.org/archlinux/packaging/packages/lgi/-/issues/1 + (fetchpatch { + name = "glib-2.86.0.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/lgi/-/raw/05a0c9df75883da235bacd4379b769e7d7713fb9/0001-Use-TypeClass.get-instead-of-.ref.patch"; + hash = "sha256-Z1rNv0VzVrK41rV73KiPXq9yLaNxbTOFiSd6eLZyrbY="; + }) ]; # https://github.com/lgi-devs/lgi/pull/300 diff --git a/pkgs/development/python-modules/lib4vex/default.nix b/pkgs/development/python-modules/lib4vex/default.nix index 0eaa362bff7e..5eca654f074b 100644 --- a/pkgs/development/python-modules/lib4vex/default.nix +++ b/pkgs/development/python-modules/lib4vex/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "lib4vex"; - version = "0.2.0"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "anthonyharrison"; repo = "lib4vex"; tag = "v${version}"; - hash = "sha256-mR9ZpJDC2O04js3Kd/8qlg4Ds/jy2CmpTywRVYqmnQw="; + hash = "sha256-n8bWhYwKtJ4fH5VtQUfQqCNuEJj8I8S6eLkm+2SKqL8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/py-eth-sig-utils/default.nix b/pkgs/development/python-modules/py-eth-sig-utils/default.nix deleted file mode 100644 index bf95fb2da73f..000000000000 --- a/pkgs/development/python-modules/py-eth-sig-utils/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - eth-abi, - py-ecc, - pycryptodome, - python, - rlp, -}: - -buildPythonPackage rec { - pname = "py-eth-sig-utils"; - version = "0.4.0"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "rmeissner"; - repo = "py-eth-sig-utils"; - rev = "v${version}"; - hash = "sha256-PNvEHH5w2ptntRGzqWrqlbIzJJsT60OXg/Dh5f6Wq9k="; - }; - - propagatedBuildInputs = [ - eth-abi - py-ecc - pycryptodome - rlp - ]; - - # lots of: isinstance() arg 2 must be a type or tuple of types - doCheck = false; - - checkPhase = '' - ${python.interpreter} -m unittest - ''; - - pythonImportsCheck = [ "py_eth_sig_utils" ]; - - meta = with lib; { - description = "Collection of functions to generate hashes for signing on Ethereum"; - homepage = "https://github.com/rmeissner/py-eth-sig-utils"; - license = licenses.mit; - maintainers = [ ]; - # TODO: upstream is stale and doesn't not work with the new `eth-abi` package any more. - broken = true; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 6e6e1d7f3160..a9770ef24527 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -562,6 +562,7 @@ mapAliases { pwndbg = throw "'pwndbg' has been removed due to dependency version incompatibilities that are infeasible to maintain in nixpkgs. Use the downstream flake that pwndbg provides instead: https://github.com/pwndbg/pwndbg"; # Added 2025-02-09 pxml = throw "pxml was removed, because it was disabled on all python version since 3.8 and last updated in 2020."; # added 2024-05-13 py3to2 = throw "py3to2 is unmaintained and source is no longer available"; # added 2024-10-23 + py-eth-sig-utils = throw "py-eth-sig-utils has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04 pypcap = throw "pypcap has been removed because it is broken and unmaintained upstream."; # added 2025-06-18 pytedee-async = aiotedee; # added 2025-07-06 pytricia = throw "pytricia has been removed, since it is unmaintained"; # added 2025-05-25 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4fa90e9f45dd..29e52f59adc5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12447,8 +12447,6 @@ self: super: with self; { py-ecc = callPackage ../development/python-modules/py-ecc { }; - py-eth-sig-utils = callPackage ../development/python-modules/py-eth-sig-utils { }; - py-evm = callPackage ../development/python-modules/py-evm { }; py-expression-eval = callPackage ../development/python-modules/py-expression-eval { };