From cb965e378b014d0f690415c5dc41859fea3f00b4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 12 Sep 2025 18:59:57 +0200 Subject: [PATCH 01/16] =?UTF-8?q?ocamlPackages.utop:=202.15.0=20=E2=86=92?= =?UTF-8?q?=202.16.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/ocaml/utop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index ec650923b713..d6856fbaf211 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { pname = "utop"; - version = "2.15.0"; + version = "2.16.0"; propagatedBuildInputs = [ findlib lambda-term @@ -28,8 +28,8 @@ buildDunePackage rec { minimalOCamlVersion = "4.11"; src = fetchurl { - url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tar.gz"; - hash = "sha256-dlneoKf3pbFuMAJO5oFEUXn4wPh2MOXNrlVCgNrNb6w="; + url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz"; + hash = "sha256-C595E10hMvshHL6ImUHP0NVMx7uAYrigRD44xUC4x2M="; }; nativeBuildInputs = [ From 517bece4b136642ceeb17c47bd52ea67bb9127ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Sep 2025 12:07:32 +0000 Subject: [PATCH 02/16] openlinkhub: 0.6.2 -> 0.6.4 --- pkgs/by-name/op/openlinkhub/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openlinkhub/package.nix b/pkgs/by-name/op/openlinkhub/package.nix index bf7c145f497a..d9031a3a6c77 100644 --- a/pkgs/by-name/op/openlinkhub/package.nix +++ b/pkgs/by-name/op/openlinkhub/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "openlinkhub"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "jurkovic-nikola"; repo = "OpenLinkHub"; tag = version; - hash = "sha256-fmWfHJ6alB+UlHlUrwMQ/npv7SuMjAz5hT0UGhB7O/E="; + hash = "sha256-xwUkTWK4K6OQoopj7GmuptauCav6xCZLv8ITeCQKv4M="; }; proxyVendor = true; From 29e8141ad67d2b3eff241fe337bf884ed4a1b649 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Sep 2025 14:16:35 +0000 Subject: [PATCH 03/16] rime-wanxiang: 12.0.2 -> 12.4.1 --- pkgs/by-name/ri/rime-wanxiang/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ri/rime-wanxiang/package.nix b/pkgs/by-name/ri/rime-wanxiang/package.nix index d34e314a5412..d478ce982312 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.0.2"; + version = "12.4.1"; src = fetchFromGitHub { owner = "amzxyz"; repo = "rime_wanxiang"; tag = "v" + finalAttrs.version; - hash = "sha256-tWpcoO8gEuais/4s8S3zrxjmop6NHZOQwcIo6V4OuCs="; + hash = "sha256-Z4rHSWN784+djARztQK7b24pLk42kUwCm9mct3ojPM4="; }; installPhase = '' From 83259ce13b8ca57ae545d9aa6bf54490f79728e8 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 17 Sep 2025 23:00:28 +0200 Subject: [PATCH 04/16] rstudio: 2025.05.1+513 -> 2025.09.0+387 --- pkgs/by-name/rs/rstudio/bump-node-abi.patch | 67 --------------------- pkgs/by-name/rs/rstudio/dont-npm-ci.patch | 30 +++++++++ pkgs/by-name/rs/rstudio/fix-darwin.patch | 37 ++---------- pkgs/by-name/rs/rstudio/package.nix | 40 ++++++------ 4 files changed, 58 insertions(+), 116 deletions(-) delete mode 100644 pkgs/by-name/rs/rstudio/bump-node-abi.patch create mode 100644 pkgs/by-name/rs/rstudio/dont-npm-ci.patch diff --git a/pkgs/by-name/rs/rstudio/bump-node-abi.patch b/pkgs/by-name/rs/rstudio/bump-node-abi.patch deleted file mode 100644 index 10d3c424f25d..000000000000 --- a/pkgs/by-name/rs/rstudio/bump-node-abi.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/src/node/desktop/package-lock.json b/src/node/desktop/package-lock.json -index e4cf455..f822c46 100644 ---- a/src/node/desktop/package-lock.json -+++ b/src/node/desktop/package-lock.json -@@ -18,7 +18,7 @@ - "line-reader": "0.4.0", - "lodash.debounce": "4.0.8", - "net-ipc": "2.2.0", -- "node-abi": "3.71.0", -+ "node-abi": "^4.10.0", - "node-addon-api": "8.3.1", - "node-system-fonts": "1.0.1", - "properties-reader": "2.3.0", -@@ -1068,6 +1068,19 @@ - "node": ">=12.13.0" - } - }, -+ "node_modules/@electron/rebuild/node_modules/node-abi": { -+ "version": "3.75.0", -+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.75.0.tgz", -+ "integrity": "sha512-OhYaY5sDsIka7H7AtijtI9jwGYLyl29eQn/W623DiN/MIv5sUqc4g7BIDThX+gb7di9f6xK02nkp8sdfFWZLTg==", -+ "dev": true, -+ "license": "MIT", -+ "dependencies": { -+ "semver": "^7.3.5" -+ }, -+ "engines": { -+ "node": ">=10" -+ } -+ }, - "node_modules/@electron/universal": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-2.0.2.tgz", -@@ -9615,15 +9628,15 @@ - } - }, - "node_modules/node-abi": { -- "version": "3.71.0", -- "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.71.0.tgz", -- "integrity": "sha512-SZ40vRiy/+wRTf21hxkkEjPJZpARzUMVcJoQse2EF8qkUWbbO2z7vd5oA/H6bVH6SZQ5STGcu0KRDS7biNRfxw==", -+ "version": "4.10.0", -+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-4.10.0.tgz", -+ "integrity": "sha512-99+BHGmmk969uU3Q4DM9t2tBvDKmqZ3prz/yumY7n+fV2zA+DAOBXuodsp9ZD/QSXK8aSKgWIpkg8tbrAe9JBg==", - "license": "MIT", - "dependencies": { -- "semver": "^7.3.5" -+ "semver": "^7.6.3" - }, - "engines": { -- "node": ">=10" -+ "node": ">=22.12.0" - } - }, - "node_modules/node-abort-controller": { -diff --git a/src/node/desktop/package.json b/src/node/desktop/package.json -index 1fe9294..e3797cf 100644 ---- a/src/node/desktop/package.json -+++ b/src/node/desktop/package.json -@@ -76,7 +76,7 @@ - "line-reader": "0.4.0", - "lodash.debounce": "4.0.8", - "net-ipc": "2.2.0", -- "node-abi": "3.71.0", -+ "node-abi": "^4.10.0", - "node-addon-api": "8.3.1", - "node-system-fonts": "1.0.1", - "properties-reader": "2.3.0", diff --git a/pkgs/by-name/rs/rstudio/dont-npm-ci.patch b/pkgs/by-name/rs/rstudio/dont-npm-ci.patch new file mode 100644 index 000000000000..b0552fb4ee67 --- /dev/null +++ b/pkgs/by-name/rs/rstudio/dont-npm-ci.patch @@ -0,0 +1,30 @@ +diff --git a/src/node/desktop/CMakeLists.txt b/src/node/desktop/CMakeLists.txt +index bccf5b3..71e10a7 100644 +--- a/src/node/desktop/CMakeLists.txt ++++ b/src/node/desktop/CMakeLists.txt +@@ -117,11 +117,7 @@ file(MAKE_DIRECTORY "${ELECTRON_BINARY_DIR}") + file( + COPY "${CMAKE_CURRENT_SOURCE_DIR}/" + DESTINATION "${ELECTRON_BINARY_DIR}/" +- REGEX "/.webpack$" EXCLUDE +- REGEX "/build$" EXCLUDE +- REGEX "/bin$" EXCLUDE +- REGEX "/out$" EXCLUDE +- REGEX "/node_modules$" EXCLUDE) ++) + + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/src/main/build-info.ts.in +diff --git a/src/node/desktop/package.json b/src/node/desktop/package.json +index df92166..47ca4b4 100644 +--- a/src/node/desktop/package.json ++++ b/src/node/desktop/package.json +@@ -10,7 +10,7 @@ + "scripts": { + "clean": "ts-node scripts/clean.ts", + "lint": "eslint ./src ./test", +- "package": "npm ci && electron-forge package", ++ "package": "electron-forge package", + "start": "electron-forge start -- --no-sandbox", + "debug": "electron-forge start --inspect-electron", + "fullstart": "npm install && electron-forge start", diff --git a/pkgs/by-name/rs/rstudio/fix-darwin.patch b/pkgs/by-name/rs/rstudio/fix-darwin.patch index d07ecc6e5056..be15630fa12d 100644 --- a/pkgs/by-name/rs/rstudio/fix-darwin.patch +++ b/pkgs/by-name/rs/rstudio/fix-darwin.patch @@ -56,37 +56,12 @@ index 40ae0f3..756fd5f 100644 # Detect node.js, npm, and npx; use versions supplied by the dependency scripts find_program(NODEJS diff --git a/src/node/desktop/CMakeLists.txt b/src/node/desktop/CMakeLists.txt -index 35438fd..f9b1951 100644 +index bccf5b3..0cc798a 100644 --- a/src/node/desktop/CMakeLists.txt +++ b/src/node/desktop/CMakeLists.txt -@@ -122,22 +122,9 @@ if (APPLE) - # configure Info.plist - configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in - ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) -+endif() - -- # copy sources to build directory. note that the build directory cannot -- # be the "true" CMake directory as some files are resolved relative to -- # the desktop project's relative path in the application structure -- set(ELECTRON_BUILD_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../desktop-build-${UNAME_M}" CACHE INTERNAL "") -- file(REMOVE_RECURSE "${ELECTRON_BUILD_DIR}") -- file(MAKE_DIRECTORY "${ELECTRON_BUILD_DIR}") -- file( -- COPY "${CMAKE_CURRENT_SOURCE_DIR}/" -- DESTINATION "${ELECTRON_BUILD_DIR}/" -- REGEX "/.webpack$" EXCLUDE -- REGEX "/build$" EXCLUDE -- REGEX "/bin$" EXCLUDE -- REGEX "/out$" EXCLUDE -- REGEX "/node_modules$" EXCLUDE) --else() -+if(true) - set(ELECTRON_BUILD_DIR "${ELECTRON_SOURCE_DIR}" CACHE INTERNAL "") - endif() - -@@ -233,16 +220,21 @@ if(WIN32) - PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} - DESTINATION "${RSTUDIO_INSTALL_BIN}") +@@ -236,16 +236,21 @@ if(WIN32) + install(FILES ${VCRUNTIME_X86_FILES} DESTINATION "${RSTUDIO_INSTALL_BIN}/x86") + install(FILES ${VCRUNTIME_X64_FILES} DESTINATION "${RSTUDIO_INSTALL_BIN}") -elseif(LINUX) +elseif(LINUX OR APPLE) @@ -104,8 +79,8 @@ index 35438fd..f9b1951 100644 + endif() install( -- DIRECTORY "${ELECTRON_BUILD_DIR}/out/RStudio-linux-${ELECTRON_ARCH}/" -+ DIRECTORY "${ELECTRON_BUILD_DIR}/out/RStudio-${ELECTRON_PLATFORM}-${ELECTRON_ARCH}/" +- DIRECTORY "${ELECTRON_BINARY_DIR}/out/RStudio-linux-${ELECTRON_ARCH}/" ++ DIRECTORY "${ELECTRON_BINARY_DIR}/out/RStudio-${ELECTRON_PLATFORM}-${ELECTRON_ARCH}/" DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix index a235a626ab37..49ba9ec88850 100644 --- a/pkgs/by-name/rs/rstudio/package.nix +++ b/pkgs/by-name/rs/rstudio/package.nix @@ -26,7 +26,7 @@ apple-sdk_11, boost187, - electron_36, + electron_37, fontconfig, gnumake, hunspellDicts, @@ -45,19 +45,28 @@ }: let - electron = electron_36; + electron = electron_37; mathJaxSrc = fetchzip { url = "https://s3.amazonaws.com/rstudio-buildtools/mathjax-27.zip"; hash = "sha256-J7SZK/9q3HcXTD7WFHxvh++ttuCd89Vc4SEBrUEU0AI="; }; - # rev should ideally be the last commit of the release/rstudio-[codename] branch + # Note: we could build this from source, but let's just do what upstream does for now + gwt = fetchzip { + url = "https://rstudio-buildtools.s3.us-east-1.amazonaws.com/gwt/gwt-2.12.2.tar.gz"; + stripRoot = false; + hash = "sha256-DgcCiheYeP7sISduz6E3WhTty2nSs14k2OYIG93KmkY="; + }; + quartoSrc = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto"; - rev = "8ee12b5d6bd49c7b212eae894bd011ffbeea1c48"; - hash = "sha256-pTrWedYeG2SWQ4jl2fstKjsweWhj4aAvVDiSfkdU3No="; + # Note: rev should ideally be the last commit of the release/rstudio-[codename] branch + # Note: This is the last working revision, because https://github.com/quarto-dev/quarto/pull/757 + # started using `file:` in the lockfile, which our fetcher can't handle + rev = "faef822a085df65809adf55fb77c273e9cdb87b9"; + hash = "sha256-DLpVYl0OkaBQtkFinJAS2suZ8gqx9BVS5HBaYrrT1HA="; }; hunspellDictionaries = lib.filter lib.isDerivation (lib.unique (lib.attrValues hunspellDicts)); @@ -79,13 +88,13 @@ let in stdenv.mkDerivation rec { pname = "RStudio"; - version = "2025.05.1+513"; + version = "2025.09.0+387"; src = fetchFromGitHub { owner = "rstudio"; repo = "rstudio"; tag = "v${version}"; - hash = "sha256-KaolU82bxzAlYl+aYwlFljqsmNv0dn8XP1llaLK3LQE="; + hash = "sha256-je2nfWIToGGizWyH/YbhtD4XhtP39qUIhatzDOUnsSc="; }; # sources fetched into _deps via cmake's FetchContent @@ -117,7 +126,7 @@ stdenv.mkDerivation rec { dontBuild = true; dontFixup = true; - outputHash = "sha256-YW+l0/RZf8ek217pfWTwsR4PTugMGHyW+vaZEwGjMas="; + outputHash = "sha256-pXpp42hjjKrV75f2XLDYK7A9lrvWhuQBDJ0oymXE8Fg="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; @@ -207,8 +216,8 @@ stdenv.mkDerivation rec { ./ignore-etc-os-release.patch ./dont-yarn-install.patch + ./dont-npm-ci.patch ./fix-darwin.patch - ./bump-node-abi.patch ]; postPatch = '' @@ -223,7 +232,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { src = quartoSrc; - hash = "sha256-F+gqVNNhLmyrC+tJuElw7cpx5z/WLHOiYow/y86KR5c="; + hash = "sha256-9ObJ3fzxPyGVfIgBj4BhCWqkrG1A2JqZsCreJA+1fWQ="; }; dontYarnInstallDeps = true; # will call manually in preConfigure @@ -239,11 +248,7 @@ stdenv.mkDerivation rec { name = "rstudio-${version}-npm-deps"; inherit src; postPatch = "cd ${npmRoot}"; - patches = [ - # needed for support for electron versions above electron_34 - ./bump-node-abi.patch - ]; - hash = "sha256-64PJPUE/xwdQdxVGiKzy8ADnxXH/qGQtFMib0unZpoA="; + hash = "sha256-HfJsm/UauA5Vdi22WfTJGiI9K979Sw7RYApYdZU0AUs="; }; preConfigure = '' @@ -270,6 +275,8 @@ stdenv.mkDerivation rec { done done + ln -s ${gwt} dependencies/common/gwtproject + ln -s ${quartoWrapper} dependencies/quarto # version in dependencies/common/install-mathjax @@ -284,9 +291,6 @@ stdenv.mkDerivation rec { + lib.optionalString (!server) '' pushd $npmRoot - substituteInPlace package.json \ - --replace-fail "npm ci && " "" - # use electron's headers to make node-gyp compile against the electron ABI export npm_config_nodedir="${electron.headers}" From 007dc528ae151ec7e724a6a3ec60f84c2fa39457 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 18 Sep 2025 12:10:25 -0500 Subject: [PATCH 05/16] jankyborders: 1.8.0 -> 1.8.3 Signed-off-by: Austin Horstman --- pkgs/by-name/ja/jankyborders/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ja/jankyborders/package.nix b/pkgs/by-name/ja/jankyborders/package.nix index 89ff417e67a6..166a1d80b5ca 100644 --- a/pkgs/by-name/ja/jankyborders/package.nix +++ b/pkgs/by-name/ja/jankyborders/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "JankyBorders"; - version = "1.8.0"; + version = "1.8.3"; src = fetchFromGitHub { owner = "FelixKratz"; repo = "JankyBorders"; rev = "v${finalAttrs.version}"; - hash = "sha256-LG3I2Zp7GU9khrDTBRMO0+qhreVL+4rwAQRI+AbXbW0="; + hash = "sha256-lc61PjaRZ8ZOWAFhsf/G3sQkd1oUyePHU43w4pt1AWY="; }; nativeBuildInputs = [ From b7429be85dcf7b8e73d9899f6966216a6d3cd37c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Sep 2025 17:42:03 +0000 Subject: [PATCH 06/16] versitygw: 1.0.17 -> 1.0.18 --- pkgs/by-name/ve/versitygw/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ve/versitygw/package.nix b/pkgs/by-name/ve/versitygw/package.nix index d3d3bcc06174..a9d6327c0285 100644 --- a/pkgs/by-name/ve/versitygw/package.nix +++ b/pkgs/by-name/ve/versitygw/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "versitygw"; - version = "1.0.17"; + version = "1.0.18"; src = fetchFromGitHub { owner = "versity"; repo = "versitygw"; tag = "v${version}"; - hash = "sha256-RNxB0VxyYeR3CkzNVkDiAwV6qAUAl37JzHTSWbvaiTs="; + hash = "sha256-IZWcRlVfXAZjkgwD9sdIX6Z2YEshkV+q4vUwPFSB5P4="; }; - vendorHash = "sha256-YJ7p19o3SWLLdSRuqqIUvtyF6UBJ8AKhMqe7SuIIlG4="; + vendorHash = "sha256-L7cxMkPJVDG91PXWA3eu0hWRcDfbp3U3HKXc1IziCBM="; doCheck = false; # Require access to online S3 services From 660fd74d85300209a0f72daa3e59593800b5bc2c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Sep 2025 18:54:46 +0000 Subject: [PATCH 07/16] s7: 11.5-unstable-2025-09-06 -> 11.5-unstable-2025-09-18 --- pkgs/by-name/s7/s7/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix index 100df45b8da3..a8dbaa69e057 100644 --- a/pkgs/by-name/s7/s7/package.nix +++ b/pkgs/by-name/s7/s7/package.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "s7"; - version = "11.5-unstable-2025-09-06"; + version = "11.5-unstable-2025-09-18"; src = fetchFromGitLab { domain = "cm-gitlab.stanford.edu"; owner = "bil"; repo = "s7"; - rev = "cc2781b08764f820a3b9dc7dfbbc40505a3131db"; - hash = "sha256-8hwCzoELeDsnIz+XvfHHyRov4KajqCe1icI8uobrbDk="; + rev = "b1a393a89850ba54423a2360247703b2f51a8dc0"; + hash = "sha256-+nNryibKZhNQPdExDOAjsJngMdsVauBUzDSB1JcWVlo="; }; buildInputs = From c0fed23683efa20bbccacaed1e86ce42890c17ee Mon Sep 17 00:00:00 2001 From: Hugo ARNAL Date: Thu, 18 Sep 2025 21:25:47 +0200 Subject: [PATCH 08/16] vscode: 1.104.0 -> 1.104.1 --- pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 5a726bb88ece..cb741ef730fd 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -36,20 +36,20 @@ let hash = { - x86_64-linux = "sha256-ABnbLiF8AKClsGjhHb/yK4jD3Tt8y/NdbxicSkp+Hbs="; - x86_64-darwin = "sha256-eVMePttMG9z/gpvH7PraIV7uNL7mvBEPzb+2ileSaXQ="; - aarch64-linux = "sha256-ktKbIgbF1el5xHB+AS3uP3o35H2dIhUJ4NHNCoQhI3s="; - aarch64-darwin = "sha256-xa+CR4g/CaDLLtsooY+fVcTsPtO/fcFo4DYAYFCVrvY="; - armv7l-linux = "sha256-MyLZj+hiHW1yP3mhNJlb2hh40KaqkG1CYz00Me7wzeo="; + x86_64-linux = "sha256-y0Bjrxmp7DYV4iUDnQGC0aIYrQNM3oPicajbeVuEtqc="; + x86_64-darwin = "sha256-6/BiMvVp955PW0hz22+NzdvC+IC+pNYjz25n3Op6V/k="; + aarch64-linux = "sha256-DF8QnqvVFqNyxjrphR6NaUXOKr8Koe34NitRa5mTBYs="; + aarch64-darwin = "sha256-v+m8AMpPph6CztUCjneBKC9txEOAKvcHsAXr/8KjIeA="; + armv7l-linux = "sha256-py1FZYd77YVNloQbXm36ou4HGowmteY8HzOiUioGD8Y="; } .${system} or throwSystem; # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.104.0"; + version = "1.104.1"; # This is used for VS Code - Remote SSH test - rev = "f220831ea2d946c0dcb0f3eaa480eb435a2c1260"; + rev = "0f0d87fa9e96c856c5212fc86db137ac0d783365"; in callPackage ./generic.nix { pname = "vscode" + lib.optionalString isInsiders "-insiders"; @@ -82,7 +82,7 @@ callPackage ./generic.nix { src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - hash = "sha256-arCYSIxRJSKQxjhnYfFexY3CAjsw4mNoP197C/LzaV4="; + hash = "sha256-o0O/WDH+hr3R9np+WPLJo+/nIVBRjP8H2JVwa8volfg="; }; stdenv = stdenvNoCC; }; From 26bdd1074bf60637fa0f585a9caa5c5c35f3fed7 Mon Sep 17 00:00:00 2001 From: Hugo ARNAL Date: Thu, 18 Sep 2025 21:30:04 +0200 Subject: [PATCH 09/16] vscodium: 1.104.06114 -> 1.104.16282 --- pkgs/applications/editors/vscode/vscodium.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 7dfe635d81a8..fab99312b9e3 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -26,11 +26,11 @@ let hash = { - x86_64-linux = "sha256-4ynELB05qymWH5p8zx1yJ4ZFdkr/LHFV2ntBNE9vWbc="; - x86_64-darwin = "sha256-4otc7yM06HLU7i60qrbZcA9aX8tZkDZo89xdeF5ztTM="; - aarch64-linux = "sha256-fUgj9gGgjvsrLeSMIgWGgHdnUQydj8Jo9Aq9uOi19oA="; - aarch64-darwin = "sha256-ZlWZIHAmAirwWML2rV8CrVWOGCn64yyE+aCobCK5kR0="; - armv7l-linux = "sha256-JqESQgxVAG+NTFUUEqxZCP+utxYzwFBv65xuQUTRZfU="; + x86_64-linux = "sha256-nGGaEEPP1LIm0NqqMu5DoYqVkwVYMn0fI5h3QySMT4Y="; + x86_64-darwin = "sha256-Fuv0iQGVFnO2CTWkdBd1fTKWJKhId18vfbWC23F8i/s="; + aarch64-linux = "sha256-5p9njg1YHaNuRSItG9QD9UTgm47+Qm3mJWevTh0HFKM="; + aarch64-darwin = "sha256-LMrvGlPkl2QHdVQnLSwWtCT08SBtm4C3kXxzHvsLpXg="; + armv7l-linux = "sha256-EAgd0s/4Wl58hgBM+oUeFmXPyXQdmDwTC+EXqaJf7ME="; } .${system} or throwSystem; @@ -41,7 +41,7 @@ callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.104.06114"; + version = "1.104.16282"; pname = "vscodium"; executableName = "codium"; From 51caf3bd633284dab05c97405d76cc6c86e0265b Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 18 Sep 2025 23:56:26 +0100 Subject: [PATCH 10/16] mariadb_{106,1011}: fix build with CMake 4 --- pkgs/servers/sql/mariadb/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 014b85a1f7ed..f02c9c579df9 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -310,6 +310,10 @@ let "-DWITHOUT_FEDERATED=1" "-DWITHOUT_TOKUDB=1" ] + ++ lib.optionals (lib.versionOlder version "11.4") [ + # Fix the build with CMake 4. + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + ] ++ lib.optionals withNuma [ "-DWITH_NUMA=ON" ] From 3b2c18ef500a1315c0802052cec61485d53f2e86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Sep 2025 23:37:15 +0000 Subject: [PATCH 11/16] python3Packages.weaviate-client: 4.16.9 -> 4.16.10 --- pkgs/development/python-modules/weaviate-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 6ce17cffc8e6..e9dd929cb33c 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "4.16.9"; + version = "4.16.10"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "weaviate"; repo = "weaviate-python-client"; tag = "v${version}"; - hash = "sha256-vnBBZUUTv8GVPxjkxqKgTYA9/UaJ7VPr9QoRBIBVek8="; + hash = "sha256-wI/lbMFxxh5Kl30hf42o5FnFiXmANl69/ll9d3ZQC70="; }; pythonRelaxDeps = [ From e9c54611c3e97275dcee9b248e844acaf02aa6e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 00:26:48 +0000 Subject: [PATCH 12/16] supabase-cli: 2.40.6 -> 2.45.2 --- pkgs/by-name/su/supabase-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix index 50a90c32de42..8fa9a70a8c62 100644 --- a/pkgs/by-name/su/supabase-cli/package.nix +++ b/pkgs/by-name/su/supabase-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "2.40.6"; + version = "2.45.2"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-SZ0lmOeT3gPEX/13vmN6c1exweFIf8UIB8TJJw1d49U="; + hash = "sha256-Vrb3EFDko5ih9IFtGuKkN2V0MrXMUNiMSNAhYrRuimY="; }; - vendorHash = "sha256-WxgDEMw6IWmREe1Z9IUER3aWLP4xoUrqrUCE6u2J3aI="; + vendorHash = "sha256-BrR7I+wMME2a5xSwz+3/u/wfeNtxy6YbtYoPOgRvJ40="; ldflags = [ "-s" From 7869f0c9674e33c1a8b0c1d8e0961062ddd9d0d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 00:33:44 +0000 Subject: [PATCH 13/16] last: 1642 -> 1645 --- pkgs/by-name/la/last/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/last/package.nix b/pkgs/by-name/la/last/package.nix index 618bc0345708..9af741b13067 100644 --- a/pkgs/by-name/la/last/package.nix +++ b/pkgs/by-name/la/last/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1642"; + version = "1645"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = "refs/tags/${version}"; - hash = "sha256-CBpx7dTL709nTBIUxbnuUBGpgaxo7zj5SPMvsBsvYVs="; + hash = "sha256-oIGs5taAfT448BxXv6/ND+8CXAWgGd2jt7fO+vIXOZU="; }; nativeBuildInputs = [ From a035fc15d971d924d5fb7f50c25087b16e5ca9e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 02:03:22 +0000 Subject: [PATCH 14/16] terraform-providers.huaweicloud: 1.78.1 -> 1.78.4 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 693de1973bcf..b8d78e1e808b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -633,11 +633,11 @@ "vendorHash": "sha256-SsEWNIBkgcdTlSrB4hIvRmhMv2eJ2qQaPUmiN09A+NM=" }, "huaweicloud": { - "hash": "sha256-GHwwOk8ehMICu024vcJKEs1ruO7KZqIq+tvQIgPnbjg=", + "hash": "sha256-0bfwqqI/o+erzfF2f0Hp0ULl6FxHjqXQAcdphTGI0CY=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.78.1", + "rev": "v1.78.4", "spdx": "MPL-2.0", "vendorHash": null }, From 221e9c7c43e580a9b1f2862f794cd70d24764851 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 03:30:28 +0000 Subject: [PATCH 15/16] terraform-providers.migadu: 2025.8.28 -> 2025.9.18 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 693de1973bcf..79e0bf16fd3b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -831,13 +831,13 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "migadu": { - "hash": "sha256-4nNOcRM3iOtEs7HVCXKhhERankS1DKUY7cApWcfnHLY=", + "hash": "sha256-G9/xg4wpqPesRg3+iJU6j71eP8iiFBuQNbSOBpvRR50=", "homepage": "https://registry.terraform.io/providers/metio/migadu", "owner": "metio", "repo": "terraform-provider-migadu", - "rev": "2025.8.28", + "rev": "2025.9.18", "spdx": "0BSD", - "vendorHash": "sha256-33hZ+MB96pFkHCG3UkKcnPp8wpE8POEHLz12OSF8ujI=" + "vendorHash": "sha256-cmmTZNYnUebEUiRYZ300VqMz0AiuiTYLZyVOozqC8wo=" }, "minio": { "hash": "sha256-+I1nTNxLVny0pgdMF7vXPC3WxkInSXnbeHcqgrWG55s=", From e823a50247057c6240280d06efe62daf1a9a327d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 03:40:15 +0000 Subject: [PATCH 16/16] terraform-providers.opentelekomcloud: 1.36.47 -> 1.36.48 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 693de1973bcf..b8338e4857ef 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -994,13 +994,13 @@ "vendorHash": "sha256-AlB9tC3KejgUAjjT2pY7Q2mTS/AV4QRusSnyPiOheXE=" }, "opentelekomcloud": { - "hash": "sha256-eZHDzF7029QKzvVegQnVVNe/BaG4m53tydcQlKeE57o=", + "hash": "sha256-o4RIRu4SqjA+8mI+XvB1m8ecm2blINkK59UJOYGCyKk=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.47", + "rev": "v1.36.48", "spdx": "MPL-2.0", - "vendorHash": "sha256-yTkPnoyOwp+eL8xDf4WISphw5IrGi3gL7WuLvG02rUE=" + "vendorHash": "sha256-TwF/DxoPDtaXyLhE432Su7h/nGncAP8ArsbnvcnABH8=" }, "openwrt": { "hash": "sha256-z78IceF2VJtiQpVqC+rTUDsph73LZawIK+az3rEhljA=",