From 55347c1937026a5d389034e28607bd8a529fd623 Mon Sep 17 00:00:00 2001 From: soyouzpanda Date: Mon, 5 May 2025 10:30:22 +0200 Subject: [PATCH 01/62] python3Packages.livekit-protocol: add updateScript --- pkgs/development/python-modules/livekit-protocol/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/livekit-protocol/default.nix b/pkgs/development/python-modules/livekit-protocol/default.nix index 14aa92d3e9d0..cc4ab9da79df 100644 --- a/pkgs/development/python-modules/livekit-protocol/default.nix +++ b/pkgs/development/python-modules/livekit-protocol/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, setuptools, protobuf, + gitUpdater, }: buildPythonPackage rec { @@ -32,6 +33,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "livekit" ]; + passthru.updateScript = gitUpdater { rev-prefix = "protocol-v"; }; + meta = { description = "LiveKit real-time and server SDKs for Python"; homepage = "https://github.com/livekit/python-sdks/"; From c451881bbae95b9c29c27fc699e274fa9bc506c8 Mon Sep 17 00:00:00 2001 From: soyouzpanda Date: Mon, 5 May 2025 10:30:45 +0200 Subject: [PATCH 02/62] python3Packages.livekit-api: add updateScript --- pkgs/development/python-modules/livekit-api/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/livekit-api/default.nix b/pkgs/development/python-modules/livekit-api/default.nix index 6a95357173bd..862fe59a6f0b 100644 --- a/pkgs/development/python-modules/livekit-api/default.nix +++ b/pkgs/development/python-modules/livekit-api/default.nix @@ -8,6 +8,7 @@ protobuf, livekit-protocol, pytestCheckHook, + gitUpdater, }: buildPythonPackage rec { @@ -43,6 +44,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "livekit" ]; + passthru.updateScript = gitUpdater { rev-prefix = "api-v"; }; + meta = { description = "LiveKit real-time and server SDKs for Python"; homepage = "https://github.com/livekit/python-sdks/"; From d58e93638b928b508d57b398e7d0309ccebb9520 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Fri, 16 May 2025 11:44:02 +0000 Subject: [PATCH 03/62] rs-tftpd: 0.3.3 -> 0.4.0 --- pkgs/by-name/rs/rs-tftpd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rs/rs-tftpd/package.nix b/pkgs/by-name/rs/rs-tftpd/package.nix index b94c02c955e2..392e6c2f1fce 100644 --- a/pkgs/by-name/rs/rs-tftpd/package.nix +++ b/pkgs/by-name/rs/rs-tftpd/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "rs-tftpd"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "altugbakan"; repo = "rs-tftpd"; rev = version; - hash = "sha256-qazPEzLMIlnqKTayurZgNJ8TLLdB4qNO88tKMoh6VVI="; + hash = "sha256-iUoIBQTMC+oXsuZcnSp1K4uFuETKTcfaW6+fBa5PQw8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-xnvruSfrd2RWgWjV+mqMciGY/L2ynJrYW/j+P6rphEs="; + cargoHash = "sha256-ZED5+WnOALLXAW/l/QMFKWco6kJnz4rFv8nfp00HS78="; buildFeatures = [ "client" ]; From b44be5fc6f042c8974a91b2eb4133e28dbc375fb Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Fri, 16 May 2025 07:44:46 -0400 Subject: [PATCH 04/62] rs-tftpd: add adamcstephens as maintainer --- pkgs/by-name/rs/rs-tftpd/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/rs/rs-tftpd/package.nix b/pkgs/by-name/rs/rs-tftpd/package.nix index 392e6c2f1fce..7b9fd6324873 100644 --- a/pkgs/by-name/rs/rs-tftpd/package.nix +++ b/pkgs/by-name/rs/rs-tftpd/package.nix @@ -27,7 +27,10 @@ rustPlatform.buildRustPackage rec { description = "TFTP Server Daemon implemented in Rust"; homepage = "https://github.com/altugbakan/rs-tftpd"; license = licenses.mit; - maintainers = with maintainers; [ matthewcroughan ]; + maintainers = with maintainers; [ + adamcstephens + matthewcroughan + ]; mainProgram = "tftpd"; }; } From ce802f152e61ff7244bb692009ceae719e879859 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sat, 17 May 2025 12:33:57 +0000 Subject: [PATCH 05/62] fractal: 11 -> 11.1 --- pkgs/by-name/fr/fractal/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix index b7ffd27ba01b..f2aab7a59bf5 100644 --- a/pkgs/by-name/fr/fractal/package.nix +++ b/pkgs/by-name/fr/fractal/package.nix @@ -30,19 +30,19 @@ stdenv.mkDerivation rec { pname = "fractal"; - version = "11"; + version = "11.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "fractal"; tag = version; - hash = "sha256-gb6DHb7pFFAmNQxK1vnBQtVRiMRu0BCvkhACkLeRHXs="; + hash = "sha256-G8vJvoOVVQ9cPnwoxNoKrQwGNxnA78HG285iSy6lSjk="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-Yc+/aTaIq/9NmdIhHSKixWTwSZRNtxA6p5n9OWkYH/U="; + hash = "sha256-yxo1ZSOqjh2lrdmiCrKQGFHpSPRgye64rFNZpghZqI0="; }; patches = [ From 540c43dc3d4ae0282cd7f65645fb24bb77ad4499 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Tue, 6 May 2025 10:37:54 +0800 Subject: [PATCH 06/62] python3Packages.openusd: use `openimageio` --- pkgs/development/python-modules/openusd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index f359e88ad818..ca7944fd71bc 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -23,7 +23,7 @@ ninja, numpy, opencolorio, - openimageio_2, + openimageio, opensubdiv, osl, ptex, @@ -118,7 +118,7 @@ buildPythonPackage rec { imath materialx opencolorio - openimageio_2 + openimageio opensubdiv ptex tbb From 22c320b5dc6412674b0ced5098f88853410c38b9 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Sun, 18 May 2025 00:19:20 +0800 Subject: [PATCH 07/62] opensubdiv: fix static target path --- pkgs/by-name/op/opensubdiv/cmake-config.patch | 13 +++++++++++++ pkgs/by-name/op/opensubdiv/package.nix | 19 ++++++++++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 pkgs/by-name/op/opensubdiv/cmake-config.patch diff --git a/pkgs/by-name/op/opensubdiv/cmake-config.patch b/pkgs/by-name/op/opensubdiv/cmake-config.patch new file mode 100644 index 000000000000..214482a0e4b7 --- /dev/null +++ b/pkgs/by-name/op/opensubdiv/cmake-config.patch @@ -0,0 +1,13 @@ +diff --git a/opensubdiv-config.cmake.in b/opensubdiv-config.cmake.in +index 08a005aa..48fd2cdc 100644 +--- a/opensubdiv-config.cmake.in ++++ b/opensubdiv-config.cmake.in +@@ -1,6 +1,6 @@ + @PACKAGE_INIT@ + +-set_and_check(OpenSubdiv_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@") +-set_and_check(OpenSubdiv_LIB_DIR "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_LIBDIR@") ++set(OpenSubdiv_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@") ++set(OpenSubdiv_LIB_DIR "@CMAKE_INSTALL_FULL_LIBDIR@") + + include("${CMAKE_CURRENT_LIST_DIR}/OpenSubdivTargets.cmake") diff --git a/pkgs/by-name/op/opensubdiv/package.nix b/pkgs/by-name/op/opensubdiv/package.nix index 8d42b97d3640..8fd12d64ab90 100644 --- a/pkgs/by-name/op/opensubdiv/package.nix +++ b/pkgs/by-name/op/opensubdiv/package.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; + buildInputs = lib.optionals stdenv.hostPlatform.isUnix [ libGLU @@ -55,12 +56,18 @@ stdenv.mkDerivation (finalAttrs: { xorg.libXinerama xorg.libXi ] - ++ lib.optionals (openclSupport && stdenv.hostPlatform.isLinux) [ ocl-icd ] - + ++ lib.optionals (openclSupport && stdenv.hostPlatform.isLinux) [ + ocl-icd + ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]; + patches = [ + # Prevent CMake from generating a redundant nested path like /nix/store/.../nix/store/... + ./cmake-config.patch + ]; + # It's important to set OSD_CUDA_NVCC_FLAGS, # because otherwise OSD might piggyback unwanted architectures: # https://github.com/PixarAnimationStudios/OpenSubdiv/blob/7d0ab5530feef693ac0a920585b5c663b80773b3/CMakeLists.txt#L602 @@ -105,9 +112,15 @@ stdenv.mkDerivation (finalAttrs: { '' else '' - moveToOutput "lib/*.a" $static + moveToOutput "lib/libosd*.a" $static ''; + postFixup = '' + # Adjust static library path to reflect relocation to $static + sed -i -E "s|\\\$\{_IMPORT_PREFIX\}/lib/(libosd.*\.a)|$static/lib/\1|" \ + $dev/lib/cmake/OpenSubdiv/OpenSubdivTargets-release.cmake + ''; + meta = { description = "Open-Source subdivision surface library"; homepage = "http://graphics.pixar.com/opensubdiv"; From 7660fe5ce074bcfb40acc0719fc904f1f5e1fea6 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Mon, 19 May 2025 19:32:11 +0800 Subject: [PATCH 08/62] osl: 1.13.11.0 -> 1.14.5.1 --- pkgs/development/compilers/osl/default.nix | 14 +++++++++----- pkgs/top-level/all-packages.nix | 6 +++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 8a4f54b091c7..ad66b987c5f5 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -15,6 +15,7 @@ bison, partio, pugixml, + robin-map, util-linux, python3, }: @@ -24,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "openshadinglanguage"; - version = "1.13.11.0"; + version = "1.14.5.1"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenShadingLanguage"; rev = "v${version}"; - hash = "sha256-E/LUTtT0ZU0SBuwtJPA0FznvOuc2a3aJn2/n3ru5l0s="; + hash = "sha256-dmGVCx4m2bkeKhAJbU1mrzEDAmnL++7GA5okb9wwk/Y="; }; cmakeFlags = [ @@ -43,11 +44,13 @@ stdenv.mkDerivation rec { "-DLLVM_DIRECTORY=${llvm}" "-DLLVM_CONFIG=${llvm.dev}/bin/llvm-config" "-DLLVM_BC_GENERATOR=${clang}/bin/clang++" - - # Set C++11 to C++14 required for LLVM10+ - "-DCMAKE_CXX_STANDARD=14" ]; + prePatch = '' + substituteInPlace src/cmake/modules/FindLLVM.cmake \ + --replace-fail "NO_DEFAULT_PATH" "" + ''; + preConfigure = "patchShebangs src/liboslexec/serialize-bc.bash "; nativeBuildInputs = [ @@ -67,6 +70,7 @@ stdenv.mkDerivation rec { partio pugixml python3.pkgs.pybind11 + robin-map util-linux # needed just for hexdump zlib ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6215f373cde0..a274161f2144 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4098,9 +4098,9 @@ with pkgs; }; osl = libsForQt5.callPackage ../development/compilers/osl { - libclang = llvmPackages_15.libclang; - clang = clang_15; - llvm = llvm_15; + libclang = llvmPackages_19.libclang; + clang = clang_19; + llvm = llvm_19; }; ossec-agent = callPackage ../tools/security/ossec/agent.nix { }; From 64e60fe76dd2ff8c83d32f72b837e272266f37b5 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Mon, 19 May 2025 19:32:25 +0800 Subject: [PATCH 09/62] osl: use `openimageio` --- pkgs/development/compilers/osl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index ad66b987c5f5..1f73cf5c6fe2 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -8,7 +8,7 @@ libxml2, zlib, openexr, - openimageio_2, + openimageio, llvm, boost, flex, @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { libclang llvm openexr - openimageio_2 + openimageio partio pugixml python3.pkgs.pybind11 From 40d30b9ec5ecadbf7189a576dec1e6b94d576a17 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Mon, 19 May 2025 19:35:06 +0800 Subject: [PATCH 10/62] osl: mordernize --- pkgs/development/compilers/osl/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 1f73cf5c6fe2..92b12ea37605 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -23,14 +23,14 @@ let boost_static = boost.override { enableStatic = true; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openshadinglanguage"; version = "1.14.5.1"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenShadingLanguage"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-dmGVCx4m2bkeKhAJbU1mrzEDAmnL++7GA5okb9wwk/Y="; }; @@ -51,7 +51,9 @@ stdenv.mkDerivation rec { --replace-fail "NO_DEFAULT_PATH" "" ''; - preConfigure = "patchShebangs src/liboslexec/serialize-bc.bash "; + preConfigure = '' + patchShebangs src/liboslexec/serialize-bc.bash + ''; nativeBuildInputs = [ bison @@ -83,11 +85,11 @@ stdenv.mkDerivation rec { --replace '=''${exec_prefix}//' '=/' ''; - meta = with lib; { + meta = { description = "Advanced shading language for production GI renderers"; homepage = "https://opensource.imageworks.com/osl.html"; - maintainers = with maintainers; [ hodapp ]; - license = licenses.bsd3; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ hodapp ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; }; -} +}) From 82221e7543737fdaa016593a091d1bb078518df0 Mon Sep 17 00:00:00 2001 From: pinpox Date: Tue, 20 May 2025 11:24:19 +0200 Subject: [PATCH 11/62] satty: 0.18.1 -> 0.19.0 --- pkgs/by-name/sa/satty/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix index 7fa70a01419d..fc1e47b2b58f 100644 --- a/pkgs/by-name/sa/satty/package.nix +++ b/pkgs/by-name/sa/satty/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "satty"; - version = "0.18.1"; + version = "0.19.0"; src = fetchFromGitHub { owner = "gabm"; repo = "Satty"; rev = "v${version}"; - hash = "sha256-IqXzY4mccwVgRaq1TLr1dSyqSbIvClDyF6ahA6f5UP8="; + hash = "sha256-AKzTDBKqZuZfEgPJqv8I5IuCeDkD2+fBY44aAPFaYvI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-xfRuEq7YgyYD9IvEzVAor/Iz4LUBUawDREXtqerDn6A="; + cargoHash = "sha256-hvJOjWD5TRXlDr5KfpFlzAi44Xd6VuaFexXziXgDLCk="; nativeBuildInputs = [ copyDesktopItems From cb681b5810d9f6b9811f883170f1886bf193acfe Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Mon, 19 May 2025 19:35:36 +0800 Subject: [PATCH 12/62] openusd: 25.02a -> 25.05.01 --- pkgs/development/python-modules/openusd/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index ca7944fd71bc..6084cca6478e 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -51,14 +51,14 @@ in buildPythonPackage rec { pname = "openusd"; - version = "25.02a"; + version = "25.05.01"; pyproject = false; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenUSD"; tag = "v${version}"; - hash = "sha256-QFwG6kOLM+R+QIAozk/Dbldj8LRt9kCJv0W/EGHkq6Q="; + hash = "sha256-gxikEC4MqTkhgYaRsCVYtS/VmXClSaCMdzpQ0LmiR7Q="; }; stdenv = python.stdenv; @@ -69,8 +69,8 @@ buildPythonPackage rec { (fetchpatch { name = "port-to-embree-4.patch"; # https://github.com/PixarAnimationStudios/OpenUSD/pull/2266 - url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/a07a6b4d1da19bfc499db49641d74fb7c1a71e9b.patch?full_index=1"; - hash = "sha256-Gww6Ll2nKwpcxMY9lnf5BZ3eqUWz1rik9P3mPKDOf+Y="; + url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/9ea3bc1ab550ec46c426dab04292d9667ccd2518.patch?full_index=1"; + hash = "sha256-QjA3kjUDsSleUr+S/bQLb+QK723SNFvnmRPT+ojjgq8="; }) ]; @@ -100,6 +100,8 @@ buildPythonPackage rec { cmake ninja setuptools + opensubdiv.dev + opensubdiv.static ] ++ lib.optionals withDocs [ git From c0ebaebf996ef3e52d003dcfbfda30ccc0f5e7fc Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Wed, 9 Apr 2025 13:17:47 -0700 Subject: [PATCH 13/62] nebula-sans: init at 1.010 --- pkgs/by-name/ne/nebula-sans/package.nix | 33 +++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/ne/nebula-sans/package.nix diff --git a/pkgs/by-name/ne/nebula-sans/package.nix b/pkgs/by-name/ne/nebula-sans/package.nix new file mode 100644 index 000000000000..4f76bfea936e --- /dev/null +++ b/pkgs/by-name/ne/nebula-sans/package.nix @@ -0,0 +1,33 @@ +{ + lib, + stdenvNoCC, + fetchzip, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "nebula-sans"; + version = "1.010"; + + src = fetchzip { + url = "https://nebulasans.com/download/NebulaSans-${finalAttrs.version}.zip"; + stripRoot = false; + hash = "sha256-jFoHgxczU7VdZcVj7HI4OOjK28jcptu8sGOrs3O+0S0="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/truetype + mv TTF/*.ttf $out/share/fonts/truetype + + runHook postInstall + ''; + + meta = { + description = "Versatile, modern, humanist sans-serif with a neutral aesthetic, designed for legibility in both digital and print applications"; + maintainers = [ lib.maintainers.colemickens ]; + platforms = lib.platforms.all; + homepage = "https://nebulasans.com/"; + license = lib.licenses.ofl; + }; +}) From be6efd6f2a27c077eb6414b4b467d5c5f7157c47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 18:50:34 +0000 Subject: [PATCH 14/62] lakectl: 1.55.0 -> 1.56.1 --- pkgs/by-name/la/lakectl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/la/lakectl/package.nix b/pkgs/by-name/la/lakectl/package.nix index 124f9dc795ca..5d99fc2a5df5 100644 --- a/pkgs/by-name/la/lakectl/package.nix +++ b/pkgs/by-name/la/lakectl/package.nix @@ -7,18 +7,18 @@ buildGoModule (finalAttrs: { pname = "lakectl"; - version = "1.55.0"; + version = "1.56.1"; src = fetchFromGitHub { owner = "treeverse"; repo = "lakeFS"; tag = "v${finalAttrs.version}"; - hash = "sha256-T/baBUkcRXQkNqgTwqsaHmv91ZfW00ti+86b0vGWNmo="; + hash = "sha256-aUiY/MxE4KbIDh6hZMk4cdl+TTK8WKJs8h/bmDJowMA="; }; subPackages = [ "cmd/lakectl" ]; proxyVendor = true; - vendorHash = "sha256-HdJeWHQmLOHZaq60xavt7MlkY1siF8JfX5tb+8FexJ4="; + vendorHash = "sha256-BUFip+NCYvTaGIVG8S8TNF+xyzAyOSgXAmzigW8VnDU="; ldflags = [ "-s" From 088fc2ba116c828cc62a8c2eab2d4fb2a5e209b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 21 May 2025 03:40:46 +0200 Subject: [PATCH 15/62] matrix-synapse-unwrapped: 1.129.0 -> 1.130.0 https://github.com/element-hq/synapse/releases/tag/v1.130.0 --- .../ma/matrix-synapse-unwrapped/package.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix index a2c01eb52dc1..b39467d5750e 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, python3, openssl, libiconv, @@ -18,31 +17,22 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.129.0"; + version = "1.130.0"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-JDaTFbRb2eNtzxZBLn8wOBEN5uJcInNrhFnGFZjI8is="; + hash = "sha256-/rPVJvIJfPMV+8hMenNF2dJzgemhaD2Z+/G4+6d7r1k="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-PdAyEGLYmMLgcPQjzjuwvQo55olKgr079gsgQnUoKTM="; + hash = "sha256-Gq3QvQSRfxRovzuvdboLCheNuMW58GFO9x2N2os+p38="; }; - patches = [ - # fix compatibility with authlib 1.5.2 - # https://github.com/element-hq/synapse/pull/18390 - (fetchpatch { - url = "https://github.com/element-hq/synapse/commit/c9adbc6a1ce6039b1c04ae3298e463a3e3b25c38.patch"; - hash = "sha256-0EZL0esZ6IEjmBV1whSpfZoFsMJ2yZQPi1GjW7NQ484="; - }) - ]; - postPatch = '' # Remove setuptools_rust from runtime dependencies # https://github.com/element-hq/synapse/blob/v1.69.0/pyproject.toml#L177-L185 From 204a4f6052ecda8c694eda8bbbadf52ffb5a77c5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 21 May 2025 20:42:00 +0800 Subject: [PATCH 16/62] xfce.xfce4-eyes-plugin: 4.6.2 -> 4.7.0 https://gitlab.xfce.org/panel-plugins/xfce4-eyes-plugin/-/compare/xfce4-eyes-plugin-4.6.2...xfce4-eyes-plugin-4.7.0 --- .../xfce4-eyes-plugin/default.nix | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix index 95f4506e7399..b5397798feb2 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix @@ -3,29 +3,32 @@ stdenv, fetchurl, gettext, + meson, + ninja, pkg-config, libxfce4util, xfce4-panel, libxfce4ui, - xfconf, + glib, gtk3, gitUpdater, }: -let - category = "panel-plugins"; -in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-eyes-plugin"; - version = "4.6.2"; + version = "4.7.0"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ArSsY3YEoLkmJhbLlhPg/meX+2sPH8KImnfh4K1KAaU="; + url = "mirror://xfce/src/panel-plugins/xfce4-eyes-plugin/${lib.versions.majorMinor finalAttrs.version}/xfce4-eyes-plugin-${finalAttrs.version}.tar.xz"; + hash = "sha256-h/m5eMp1q7OqXtsTFetl75hlSmYsFGIYR93/6KpldK0="; }; + strictDeps = true; + nativeBuildInputs = [ gettext + meson + ninja pkg-config ]; @@ -33,20 +36,20 @@ stdenv.mkDerivation rec { libxfce4util libxfce4ui xfce4-panel - xfconf + glib gtk3 ]; passthru.updateScript = gitUpdater { - url = "https://gitlab.xfce.org/panel-plugins/${pname}"; - rev-prefix = "${pname}-"; + url = "https://gitlab.xfce.org/panel-plugins/xfce4-eyes-plugin"; + rev-prefix = "xfce4-eyes-plugin-"; }; - meta = with lib; { + meta = { homepage = "https://docs.xfce.org/panel-plugins/xfce4-eyes-plugin"; description = "Rolling eyes (following mouse pointer) plugin for the Xfce panel"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - teams = [ teams.xfce ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + teams = [ lib.teams.xfce ]; }; -} +}) From 64e3a34120c9c712cb7368c3b8de5046d53a68ad Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 21 May 2025 20:46:54 +0800 Subject: [PATCH 17/62] xfce.xfce4-fsguard-plugin: 1.1.4 -> 1.2.0 https://gitlab.xfce.org/panel-plugins/xfce4-fsguard-plugin/-/compare/xfce4-fsguard-plugin-1.1.4...xfce4-fsguard-plugin-1.2.0 --- .../xfce4-fsguard-plugin/default.nix | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix index 96970846b7e8..86dd2246d3d4 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix @@ -3,30 +3,32 @@ stdenv, fetchurl, gettext, + meson, + ninja, pkg-config, libxfce4util, xfce4-panel, libxfce4ui, - xfconf, glib, gtk3, gitUpdater, }: -let - category = "panel-plugins"; -in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-fsguard-plugin"; - version = "1.1.4"; + version = "1.2.0"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-JLN4m+bekmeOcDZnhTDE2ks4OKo82kKEOaqNFAcEpKY="; + url = "mirror://xfce/src/panel-plugins/xfce4-fsguard-plugin/${lib.versions.majorMinor finalAttrs.version}/xfce4-fsguard-plugin-${finalAttrs.version}.tar.xz"; + hash = "sha256-nkDPPOezThwn1rRC86BniGw1FUtdDE1kSiOQOGEdpk8="; }; + strictDeps = true; + nativeBuildInputs = [ gettext + meson + ninja pkg-config ]; @@ -34,21 +36,20 @@ stdenv.mkDerivation rec { libxfce4util libxfce4ui xfce4-panel - xfconf glib gtk3 ]; passthru.updateScript = gitUpdater { - url = "https://gitlab.xfce.org/panel-plugins/${pname}"; - rev-prefix = "${pname}-"; + url = "https://gitlab.xfce.org/panel-plugins/xfce4-fsguard-plugin"; + rev-prefix = "xfce4-fsguard-plugin-"; }; - meta = with lib; { + meta = { homepage = "https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin"; description = "Filesystem usage monitor plugin for the Xfce panel"; - license = licenses.bsd2; - platforms = platforms.linux; - teams = [ teams.xfce ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.linux; + teams = [ lib.teams.xfce ]; }; -} +}) From 9ba1df7952d557470f696a5d82b7e30b49f9d5ce Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 21 May 2025 20:52:01 +0800 Subject: [PATCH 18/62] xfce.xfce4-genmon-plugin: 4.2.1 -> 4.3.0 https://gitlab.xfce.org/panel-plugins/xfce4-genmon-plugin/-/compare/xfce4-genmon-plugin-4.2.1...xfce4-genmon-plugin-4.3.0 --- .../xfce4-genmon-plugin/default.nix | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix index 7527abf65e8c..e3e10aa01e57 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix @@ -3,29 +3,33 @@ stdenv, fetchurl, gettext, + meson, + ninja, pkg-config, libxfce4util, xfce4-panel, xfconf, libxfce4ui, + glib, gtk3, gitUpdater, }: -let - category = "panel-plugins"; -in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-genmon-plugin"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-3lQFYuHqWPNanIFeIHNtJq9UGgqTcgERSMt1tfC2WVE="; + url = "mirror://xfce/src/panel-plugins/xfce4-genmon-plugin/${lib.versions.majorMinor finalAttrs.version}/xfce4-genmon-plugin-${finalAttrs.version}.tar.xz"; + hash = "sha256-B3GXkR2E5boi57uJXObAONu9jo4AZ+1vTkhQK3FnooI="; }; + strictDeps = true; + nativeBuildInputs = [ gettext + meson + ninja pkg-config ]; @@ -34,19 +38,20 @@ stdenv.mkDerivation rec { libxfce4ui xfce4-panel xfconf + glib gtk3 ]; passthru.updateScript = gitUpdater { - url = "https://gitlab.xfce.org/panel-plugins/${pname}"; - rev-prefix = "${pname}-"; + url = "https://gitlab.xfce.org/panel-plugins/xfce4-genmon-plugin"; + rev-prefix = "xfce4-genmon-plugin-"; }; - meta = with lib; { + meta = { homepage = "https://docs.xfce.org/panel-plugins/xfce4-genmon-plugin"; description = "Generic monitor plugin for the Xfce panel"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - teams = [ teams.xfce ]; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; + teams = [ lib.teams.xfce ]; }; -} +}) From 13cd3dd8f8322657f43590fd1210965048e27162 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 21 May 2025 21:00:19 +0800 Subject: [PATCH 19/62] xfce.xfce4-mailwatch-plugin: 1.3.2 -> 1.4.0 https://gitlab.xfce.org/panel-plugins/xfce4-mailwatch-plugin/-/compare/xfce4-mailwatch-plugin-1.3.2...xfce4-mailwatch-plugin-1.4.0 --- .../xfce4-mailwatch-plugin/default.nix | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix index 05ef1dccc0ee..aba48cca097a 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix @@ -3,6 +3,8 @@ stdenv, fetchurl, gettext, + meson, + ninja, pkg-config, xfce4-panel, libxfce4ui, @@ -15,21 +17,21 @@ gitUpdater, }: -let - category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-mailwatch-plugin"; - version = "1.3.2"; + version = "1.4.0"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-xHg/FTOJHNLgw0Bm2oWYZNzkWiPKpgFbWMufqdZafkQ="; + url = "mirror://xfce/src/panel-plugins/xfce4-mailwatch-plugin/${lib.versions.majorMinor finalAttrs.version}/xfce4-mailwatch-plugin-${finalAttrs.version}.tar.xz"; + hash = "sha256-XCEQJdsQlmY/prjMQSE0ZKbXHyTnYyZJnYV/+B6jhh8="; }; + strictDeps = true; + nativeBuildInputs = [ gettext + meson + ninja pkg-config ]; @@ -45,15 +47,15 @@ stdenv.mkDerivation rec { ]; passthru.updateScript = gitUpdater { - url = "https://gitlab.xfce.org/panel-plugins/${pname}"; - rev-prefix = "${pname}-"; + url = "https://gitlab.xfce.org/panel-plugins/xfce4-mailwatch-plugin"; + rev-prefix = "xfce4-mailwatch-plugin-"; }; - meta = with lib; { + meta = { homepage = "https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin"; description = "Mail watcher plugin for Xfce panel"; - license = licenses.gpl2Only; - platforms = platforms.linux; - teams = [ teams.xfce ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + teams = [ lib.teams.xfce ]; }; -} +}) From 542389a88fc3cdd9547dfeff059a2d73180d89c8 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 21 May 2025 21:03:10 +0800 Subject: [PATCH 20/62] xfce.xfce4-mpc-plugin: 0.5.5 -> 0.6.0 https://gitlab.xfce.org/panel-plugins/xfce4-mpc-plugin/-/compare/xfce4-mpc-plugin-0.5.5...xfce4-mpc-plugin-0.6.0 --- .../xfce4-mpc-plugin/default.nix | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix index 49ef8f6822c9..14bc1ffdbeb2 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix @@ -3,7 +3,10 @@ stdenv, fetchurl, gettext, + meson, + ninja, pkg-config, + libmpd, libxfce4util, xfce4-panel, libxfce4ui, @@ -12,25 +15,24 @@ gitUpdater, }: -let - category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-mpc-plugin"; - version = "0.5.5"; + version = "0.6.0"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-TOfXdmeiY+6ZFsDKsqczsX471lcFzU7VzsPL3m5ymM8="; + url = "mirror://xfce/src/panel-plugins/xfce4-mpc-plugin/${lib.versions.majorMinor finalAttrs.version}/xfce4-mpc-plugin-${finalAttrs.version}.tar.xz"; + hash = "sha256-3uW8wFZrotyVucO0yt1eizuyeYpUoqjYZScIkV/kXVA="; }; nativeBuildInputs = [ gettext + meson + ninja pkg-config ]; buildInputs = [ + libmpd libxfce4util libxfce4ui xfce4-panel @@ -39,15 +41,15 @@ stdenv.mkDerivation rec { ]; passthru.updateScript = gitUpdater { - url = "https://gitlab.xfce.org/panel-plugins/${pname}"; - rev-prefix = "${pname}-"; + url = "https://gitlab.xfce.org/panel-plugins/xfce4-mpc-plugin"; + rev-prefix = "xfce4-mpc-plugin-"; }; - meta = with lib; { + meta = { homepage = "https://docs.xfce.org/panel-plugins/xfce4-mpc-plugin"; description = "MPD plugin for Xfce panel"; - platforms = platforms.linux; - license = licenses.bsd2; - teams = [ teams.xfce ]; + platforms = lib.platforms.linux; + license = lib.licenses.bsd0; + teams = [ lib.teams.xfce ]; }; -} +}) From 448ae8f0bc783a1230ee0f87d01a3a86d7614e10 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 21 May 2025 21:55:01 +0300 Subject: [PATCH 21/62] nixos/opencloud: slightly better documentation --- nixos/modules/services/web-apps/opencloud.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nixos/modules/services/web-apps/opencloud.nix b/nixos/modules/services/web-apps/opencloud.nix index 0eded3cc96f9..90820822d64e 100644 --- a/nixos/modules/services/web-apps/opencloud.nix +++ b/nixos/modules/services/web-apps/opencloud.nix @@ -80,6 +80,18 @@ in The possible config options are currently not well documented, see source code: https://github.com/opencloud-eu/opencloud/blob/main/pkg/config/config.go ''; + + example = { + proxy = { + auto_provision_accounts = true; + oidc.rewrite_well_known = true; + role_assignment = { + driver = "oidc"; + oidc_role_mapper.role_claim = "opencloud_roles"; + }; + }; + web.web.config.oidc.scope = "openid profile email opencloud_roles"; + }; }; environmentFile = lib.mkOption { @@ -105,6 +117,8 @@ in Use this to set configuration that may affect multiple microservices. + Set `OC_INSECURE = "false"` if you want OpenCloud to terminate TLS. + Configuration provided here will override `settings`. ''; example = { From 7ed2b28ffb57832f404b78420cdf1b31b96c8a14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 May 2025 00:44:49 +0000 Subject: [PATCH 22/62] xapp: 2.8.8 -> 2.8.9 --- pkgs/by-name/xa/xapp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xa/xapp/package.nix b/pkgs/by-name/xa/xapp/package.nix index 491f01c601e3..10f411e9409b 100644 --- a/pkgs/by-name/xa/xapp/package.nix +++ b/pkgs/by-name/xa/xapp/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "xapp"; - version = "2.8.8"; + version = "2.8.9"; outputs = [ "out" @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-vd3uAihOF4dgZ49VVhRjG+Cx7sjMvHI/0oRLvIs2ZaM="; + hash = "sha256-ub5OwtB+LR86gt17342cmgvoWJu2kYzkWhl9V1QVCzQ="; }; # Recommended by upstream, which enables the build of xapp-debug. From 862562241926b3ede2425c4a1f8b0454df38a79e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 May 2025 00:59:25 +0000 Subject: [PATCH 23/62] mint-l-theme: 1.9.9 -> 2.0.0 --- pkgs/by-name/mi/mint-l-theme/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/mint-l-theme/package.nix b/pkgs/by-name/mi/mint-l-theme/package.nix index 4ef7e9447f42..1dcac8620302 100644 --- a/pkgs/by-name/mi/mint-l-theme/package.nix +++ b/pkgs/by-name/mi/mint-l-theme/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-l-theme"; - version = "1.9.9"; + version = "2.0.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "mint-l-theme"; rev = version; - hash = "sha256-umY14seqUjNugN6+wzMDIGbCiis/InseDwVR85PqrGs="; + hash = "sha256-G2wwzt02WVVsKjY7tHAfRzxUIa3OUKkYiazUFTDeR9Q="; }; nativeBuildInputs = [ From e3ef5a9275e256d1ddec3ac38b6fe0370ade112d Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 22 May 2025 04:40:43 +0200 Subject: [PATCH 24/62] nekoray: 4.3.4 -> 4.3.5 --- pkgs/by-name/ne/nekoray/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/nekoray/package.nix b/pkgs/by-name/ne/nekoray/package.nix index fc524827a1d6..1dbc4839de32 100644 --- a/pkgs/by-name/ne/nekoray/package.nix +++ b/pkgs/by-name/ne/nekoray/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nekoray"; - version = "4.3.4"; + version = "4.3.5"; src = fetchFromGitHub { owner = "Mahdi-zarei"; repo = "nekoray"; tag = finalAttrs.version; - hash = "sha256-h0LkH58+QQFeSwqhqOZDcFF0n98YJEHH/1tq72LdZpI="; + hash = "sha256-dq3rBvCFEs+4+UadFObMnHhIiYeFlpvvLjTo0lcG8rE="; }; strictDeps = true; @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) version src; sourceRoot = "${finalAttrs.src.name}/core/server"; - vendorHash = "sha256-CTI9wDPJ9dYpUwvszY2nRfi+NW0nO8imt9lsQ7Nd1Q8="; + vendorHash = "sha256-hZiEIJ4/TcLUfT+pkqs6WfzjqppSTjKXEtQC+DS26Ug="; # ldflags and tags are taken from script/build_go.sh ldflags = [ From a6e2dd2eb5156a294b9bded489a43d63c9150d49 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 May 2025 03:38:15 +0000 Subject: [PATCH 25/62] balena-cli: 21.1.11 -> 21.1.14 --- pkgs/by-name/ba/balena-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix index 2df1c531049f..075467650e1a 100644 --- a/pkgs/by-name/ba/balena-cli/package.nix +++ b/pkgs/by-name/ba/balena-cli/package.nix @@ -22,16 +22,16 @@ let in buildNpmPackage' rec { pname = "balena-cli"; - version = "21.1.11"; + version = "21.1.14"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-fWFXlespMcnMAOSgkVh7c9QmvBf3kJyFfH7Gtu5nylw="; + hash = "sha256-6KiH7hgyltvWv/ZALnYZ9LkkTEp5aJ6X/3fNwcj0qck="; }; - npmDepsHash = "sha256-WGTmOfnVhxRV0ERpmRx77gOmfqyHRJkdoPaCYgoHq88="; + npmDepsHash = "sha256-jBxF179wdnH5j6cZLzuFm2XKd2n0iEjc+W1X+HGdJPg="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json From 84b5fe533099a9995d0af3aa31c3dd7f7783f98b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 May 2025 04:05:12 +0000 Subject: [PATCH 26/62] python3Packages.sense-energy: 0.13.7 -> 0.13.8 --- pkgs/development/python-modules/sense-energy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix index 9638b9f227dd..47f09ceebb8a 100644 --- a/pkgs/development/python-modules/sense-energy/default.nix +++ b/pkgs/development/python-modules/sense-energy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.13.7"; + version = "0.13.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "scottbonline"; repo = "sense"; tag = version; - hash = "sha256-RCJKx0FvB3hKQC1pwv1LWqwbM23SoY/2qUxBnrXd14k="; + hash = "sha256-hIE7wjKP+JcXQZ1lGbKCaKKK2ZlCF5BbJu3H7gqrsKU="; }; postPatch = '' @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "API for the Sense Energy Monitor"; homepage = "https://github.com/scottbonline/sense"; - changelog = "https://github.com/scottbonline/sense/releases/tag/${version}"; + changelog = "https://github.com/scottbonline/sense/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; From 8bc2ab90d12596438fc83d3e06f853ee7815d9f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 May 2025 04:40:53 +0000 Subject: [PATCH 27/62] aws-sso-cli: 2.0.0 -> 2.0.1 --- pkgs/by-name/aw/aws-sso-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/aw/aws-sso-cli/package.nix b/pkgs/by-name/aw/aws-sso-cli/package.nix index edbaed61c55f..c46a6230b9da 100644 --- a/pkgs/by-name/aw/aws-sso-cli/package.nix +++ b/pkgs/by-name/aw/aws-sso-cli/package.nix @@ -9,13 +9,13 @@ }: buildGoModule rec { pname = "aws-sso-cli"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "synfinatic"; repo = pname; rev = "v${version}"; - hash = "sha256-D6ytiuh335r1XHwX6riI5OkpA8C1Ta0EwD1yPwob2ms="; + hash = "sha256-hzX5gqr8tJk9EtP3ophbJ5m3rb92ZOs9UuDVTvxFcpI="; }; vendorHash = "sha256-SNMU7qDfLRGUSLjzrJHtIMgbcRc2DxXwWEUaUEY6PME="; From 0adbcf3f8a9049709969a99deda88baa22135eb2 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 22 May 2025 08:49:20 +0300 Subject: [PATCH 28/62] opencloud.idp-web: fix typo --- pkgs/by-name/op/opencloud/idp-web.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/op/opencloud/idp-web.nix b/pkgs/by-name/op/opencloud/idp-web.nix index ea8e181ed03e..4c53aa7175ce 100644 --- a/pkgs/by-name/op/opencloud/idp-web.nix +++ b/pkgs/by-name/op/opencloud/idp-web.nix @@ -44,7 +44,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "OpenCloud - IDP Web UI"; homepage = "https://github.com/opencloud-eu/opencloud"; - changelog = "https://github.com/opencloud-eu/opencloud/blob/v${finalAttrs.src.tag}/CHANGELOG.md"; + changelog = "https://github.com/opencloud-eu/opencloud/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ christoph-heiss From 9b8ced6e698f3cd5d92882bd7e10e7ddbbe7d19e Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Wed, 21 May 2025 10:27:36 +0200 Subject: [PATCH 29/62] meilisearch_1_11: init at 1.11.3 --- pkgs/by-name/me/meilisearch/package.nix | 20 +++++++++++++++++--- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix index 7336f922581b..20849417bd41 100644 --- a/pkgs/by-name/me/meilisearch/package.nix +++ b/pkgs/by-name/me/meilisearch/package.nix @@ -4,10 +4,24 @@ fetchFromGitHub, nixosTests, nix-update-script, + version ? "1.14.0", }: let - version = "1.14.0"; + # Version 1.11 is kept here as it was the last version not to support dumpless + # upgrades, meaning NixOS systems that have set up their data before 25.05 + # would not be able to update to 1.12+ without manual data migration. + # We're planning to remove it towards NixOS 25.11. Make sure to update + # the meilisearch module accordingly and to remove the meilisearch_1_11 + # attribute from all-packages.nix at that point too. + hashes = { + "1.14.0" = "sha256-nPOhiJJbZCr9PBlR6bsZ9trSn/2XCI2O+nXeYbZEQpU="; + "1.11.3" = "sha256-CVofke9tOGeDEhRHEt6EYwT52eeAYNqlEd9zPpmXQ2U="; + }; + cargoHashes = { + "1.14.0" = "sha256-8fcOXAzheG9xm1v7uD3T+6oc/dD4cjtu3zzBBh2EkcE="; + "1.11.3" = "sha256-cEJTokDJQuc9Le5+3ObMDNJmEhWEb+Qh0TV9xZkD9D8="; + }; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -17,13 +31,13 @@ rustPlatform.buildRustPackage { owner = "meilisearch"; repo = "meiliSearch"; tag = "v${version}"; - hash = "sha256-nPOhiJJbZCr9PBlR6bsZ9trSn/2XCI2O+nXeYbZEQpU="; + hash = hashes.${version}; }; cargoBuildFlags = [ "--package=meilisearch" ]; useFetchCargoVendor = true; - cargoHash = "sha256-8fcOXAzheG9xm1v7uD3T+6oc/dD4cjtu3zzBBh2EkcE="; + cargoHash = cargoHashes.${version}; # Default features include mini dashboard which downloads something from the internet. buildNoDefaultFeatures = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12e622afedf0..08e590200c1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16284,6 +16284,8 @@ with pkgs; icu = icu71; }; + meilisearch_1_11 = callPackage ../by-name/me/meilisearch/package.nix { version = "1.11.3"; }; + mongocxx = callPackage ../development/libraries/mongocxx/default.nix { }; muse = libsForQt5.callPackage ../applications/audio/muse { }; From aac2e41ce04c2dfab59497a741d34ab6994e9512 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Wed, 21 May 2025 10:42:05 +0200 Subject: [PATCH 30/62] nixos/meilisearch: use meilisearch_1_11 for stateVersion below 25.05 --- nixos/modules/services/search/meilisearch.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nixos/modules/services/search/meilisearch.nix b/nixos/modules/services/search/meilisearch.nix index 03b581c4d8cd..0194a658c0d3 100644 --- a/nixos/modules/services/search/meilisearch.nix +++ b/nixos/modules/services/search/meilisearch.nix @@ -129,6 +129,22 @@ in config = lib.mkIf cfg.enable { + warnings = lib.optional (lib.versionOlder cfg.package.version "1.12") '' + Meilisearch 1.11 will be removed in NixOS 25.11. As it was the last + version not to support dumpless upgrades, you will have to manually + migrate your data before that. Instructions can be found at + https://www.meilisearch.com/docs/learn/update_and_migration/updating#using-a-dump + and afterwards, you can set `services.meilisearch.package = pkgs.meilisearch;` + to use the latest version. + ''; + + services.meilisearch.package = lib.mkDefault ( + if lib.versionAtLeast config.system.stateVersion "25.05" then + pkgs.meilisearch + else + pkgs.meilisearch_1_11 + ); + # used to restore dumps environment.systemPackages = [ cfg.package ]; From cf2920853261f78bf5574feb09890a7b1ab51da6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 May 2025 06:59:18 +0000 Subject: [PATCH 31/62] ruffle: 0-nightly-2025-05-11 -> 0-nightly-2025-05-22 --- pkgs/by-name/ru/ruffle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix index 70276d790f80..cbf78df9c448 100644 --- a/pkgs/by-name/ru/ruffle/package.nix +++ b/pkgs/by-name/ru/ruffle/package.nix @@ -22,17 +22,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "ruffle"; - version = "0-nightly-2025-05-11"; + version = "0-nightly-2025-05-22"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = "ruffle"; tag = lib.strings.removePrefix "0-" finalAttrs.version; - hash = "sha256-m/4e15znssmDASvuLu7BpkhKLZmw7TZ2nXB0bAPrN+4="; + hash = "sha256-30mKM2CfqlFXLjp8Ui7qXodrfVL1GFvjkEYBPMAiQsI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-JtapILlrDbTFBa763h04lMMP2xQxW0vOpAfyIlHPjeI="; + cargoHash = "sha256-RqvFLGYVxB9WimReMXDuAkSkLRuySHkjmAUliapCSdo="; cargoBuildFlags = lib.optional withRuffleTools "--workspace"; env = From 0d14c3cc5b94aceef28f1991ae7ef2f973e43bd2 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Tue, 20 May 2025 22:16:12 +0200 Subject: [PATCH 32/62] nixos: autoUpgrade: allow disabling flake upgrades When auto-upgrading based on a flake, it might be desirable to only upgrade to the newer flake, without updating the nixpkgs from the flake lock. This option makes that possible. --- nixos/modules/tasks/auto-upgrade.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/modules/tasks/auto-upgrade.nix b/nixos/modules/tasks/auto-upgrade.nix index 0d3756a772f4..4effda9ef4cd 100644 --- a/nixos/modules/tasks/auto-upgrade.nix +++ b/nixos/modules/tasks/auto-upgrade.nix @@ -61,6 +61,16 @@ in ''; }; + upgrade = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Disable adding the `--upgrade` parameter when `channel` + is not set, such as when upgrading to the latest version + of a flake honouring its lockfile. + ''; + }; + flags = lib.mkOption { type = lib.types.listOf lib.types.str; default = [ ]; @@ -235,7 +245,7 @@ in date = "${pkgs.coreutils}/bin/date"; readlink = "${pkgs.coreutils}/bin/readlink"; shutdown = "${config.systemd.package}/bin/shutdown"; - upgradeFlag = lib.optional (cfg.channel == null) "--upgrade"; + upgradeFlag = lib.optional (cfg.channel == null && cfg.upgrade) "--upgrade"; in if cfg.allowReboot then '' From 845134719941b3a2087842eae23e521d67e35ad5 Mon Sep 17 00:00:00 2001 From: Keegan Carruthers-Smith Date: Thu, 22 May 2025 10:20:34 +0200 Subject: [PATCH 33/62] amp-cli: fix homepage URL The GitHub link is to a (currently) private repository. --- pkgs/by-name/am/amp-cli/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix index 0774eaddc0c4..0e7021fd0d6d 100644 --- a/pkgs/by-name/am/amp-cli/package.nix +++ b/pkgs/by-name/am/amp-cli/package.nix @@ -72,7 +72,7 @@ buildNpmPackage rec { meta = { description = "Amp is an AI coding agent, in research preview from Sourcegraph. This is the CLI for Amp."; - homepage = "https://github.com/sourcegraph/amp"; + homepage = "https://ampcode.com/"; downloadPage = "https://www.npmjs.com/package/@sourcegraph/amp"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ From 597be6db591f18c7510f52abde7e24f5b4bab6e1 Mon Sep 17 00:00:00 2001 From: Keegan Carruthers-Smith Date: Thu, 22 May 2025 10:29:27 +0200 Subject: [PATCH 34/62] amp-cli: 0.0.1747483284-g8cf01d -> 0.0.1747886591-g90f24f --- pkgs/by-name/am/amp-cli/package-lock.json | 8 ++++---- pkgs/by-name/am/amp-cli/package.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/am/amp-cli/package-lock.json b/pkgs/by-name/am/amp-cli/package-lock.json index 0e79a7f7113c..4af359c48208 100644 --- a/pkgs/by-name/am/amp-cli/package-lock.json +++ b/pkgs/by-name/am/amp-cli/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "@sourcegraph/amp": "^0.0.1747483284-g8cf01d" + "@sourcegraph/amp": "^0.0.1747886591-g90f24f" } }, "node_modules/@colors/colors": { @@ -29,9 +29,9 @@ } }, "node_modules/@sourcegraph/amp": { - "version": "0.0.1747483284-g8cf01d", - "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1747483284-g8cf01d.tgz", - "integrity": "sha512-LTlMR3cs5ax9EGIuyu92g85SJdsXV7fvADsEnYmBOd/no7r1CIxeEtOzLFY1FPDCxLHjN74BivwHs0piMiLktg==", + "version": "0.0.1747886591-g90f24f", + "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1747886591-g90f24f.tgz", + "integrity": "sha512-therl4OchUfqcVPhG3YNJKjcZUvXadnfowKzJeZtVNZAcJMWz2+u0gZoWE+V8FPgrMaX/crYcYwPmiBl5NM6lg==", "dependencies": { "@types/runes": "^0.4.3", "@vscode/ripgrep": "1.15.11", diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix index 0e7021fd0d6d..b1a7664d338b 100644 --- a/pkgs/by-name/am/amp-cli/package.nix +++ b/pkgs/by-name/am/amp-cli/package.nix @@ -8,11 +8,11 @@ buildNpmPackage rec { pname = "amp-cli"; - version = "0.0.1747483284-g8cf01d"; + version = "0.0.1747886591-g90f24f"; src = fetchzip { url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${version}.tgz"; - hash = "sha256-8mPYdr0t/5kEGK/0nG0GyxviAU9EhjA1bAQXggvuF6k="; + hash = "sha256-knNzJYGXmLuerlw6j+lbIf45uv0tYtMOfsIQVfpJ0Kc="; }; postPatch = '' @@ -44,7 +44,7 @@ buildNpmPackage rec { chmod +x bin/amp-wrapper.js ''; - npmDepsHash = "sha256-aFB9EuWp7skmY5uzNRBBs8/UcFgtrQpBqciO2UK1fwY="; + npmDepsHash = "sha256-ir13FuVQtxEcryqmSh5BOdrCUWeXAUUX72BYZweUNBU="; propagatedBuildInputs = [ ripgrep From c06a4060f2a5516ca478ff7f819fd15f94395a50 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 22 May 2025 01:25:35 +0200 Subject: [PATCH 35/62] xcircuit: fix build with gcc 14 --- .../xcircuit/declare-missing-prototype.patch | 24 +++++++++++++++++++ pkgs/by-name/xc/xcircuit/package.nix | 5 ++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/by-name/xc/xcircuit/declare-missing-prototype.patch diff --git a/pkgs/by-name/xc/xcircuit/declare-missing-prototype.patch b/pkgs/by-name/xc/xcircuit/declare-missing-prototype.patch new file mode 100644 index 000000000000..3c155ee70573 --- /dev/null +++ b/pkgs/by-name/xc/xcircuit/declare-missing-prototype.patch @@ -0,0 +1,24 @@ +From 323c4c437b0eb027ac5acbd2d0c5b6d62a38befb Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Tue, 11 Apr 2023 09:03:09 +0200 +Subject: [PATCH] Declare UDrawXAt in prototypes.h + +This avoids an implicit function declaration in functions.c for +HAVE_CAIRO. Future compilers will not accept such implicit function +declarations by default, leading to a build failure. +--- + prototypes.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/prototypes.h b/prototypes.h +index d577c854c48eddf1b9d086294930c714d69b7af5..5ec4b272722fd658253b70a3fe211c65881075a5 100644 +--- a/prototypes.h ++++ b/prototypes.h +@@ -431,6 +431,7 @@ extern void UDrawSimpleLine(XPoint *, XPoint *); + extern void UDrawLine(XPoint *, XPoint *); + extern void UDrawCircle(XPoint *, u_char); + extern void UDrawX(labelptr); ++extern void UDrawXAt(XPoint *); + extern void UDrawXDown(labelptr); + extern int toplevelwidth(objinstptr, short *); + extern int toplevelheight(objinstptr, short *); diff --git a/pkgs/by-name/xc/xcircuit/package.nix b/pkgs/by-name/xc/xcircuit/package.nix index 7fb29d3f0f6a..f0593eb8bb64 100644 --- a/pkgs/by-name/xc/xcircuit/package.nix +++ b/pkgs/by-name/xc/xcircuit/package.nix @@ -38,6 +38,11 @@ stdenv.mkDerivation { "--with-ngspice=${lib.getBin ngspice}/bin/ngspice" ]; + patches = [ + # fix compilation with GCC 14 + ./declare-missing-prototype.patch + ]; + buildInputs = with xorg; [ cairo ghostscript From accb7207bc449161fa60ffbaeb54161704fac39a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 May 2025 10:35:18 +0000 Subject: [PATCH 36/62] yandex-music: 5.50.0 -> 5.51.1 --- pkgs/by-name/ya/yandex-music/package.nix | 4 ++-- pkgs/by-name/ya/yandex-music/ym_info.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ya/yandex-music/package.nix b/pkgs/by-name/ya/yandex-music/package.nix index 524b64a7dfc0..4830d8c30667 100644 --- a/pkgs/by-name/ya/yandex-music/package.nix +++ b/pkgs/by-name/ya/yandex-music/package.nix @@ -29,13 +29,13 @@ assert lib.assertMsg (trayStyle >= 1 && trayStyle <= 3) "Tray style must be with assert lib.assertMsg (vibeAnimationMaxFps >= 0) "Vibe animation max FPS must be greater then 0"; stdenvNoCC.mkDerivation rec { pname = "yandex-music"; - version = "5.50.0"; + version = "5.51.1"; src = fetchFromGitHub { owner = "cucumber-sp"; repo = "yandex-music-linux"; rev = "v${version}"; - hash = "sha256-xn/9LjRLm6CNLrnrLiYr9deeo09iRMEKCRFuM3SELjw="; + hash = "sha256-jk/u0a6rnLDANHebtJ9yTAeFSIPg/CEIqm0oZnGdD0k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ya/yandex-music/ym_info.json b/pkgs/by-name/ya/yandex-music/ym_info.json index 53080379232f..4013bff5e2c5 100644 --- a/pkgs/by-name/ya/yandex-music/ym_info.json +++ b/pkgs/by-name/ya/yandex-music/ym_info.json @@ -1,6 +1,6 @@ { - "version": "5.50.0", - "exe_name": "Yandex_Music_x64_5.50.0.exe", - "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.50.0.exe", - "exe_hash": "sha256-l0QyY8iJkBO0hPUZ1gA0wyJgppO46nURa3L7JzxRBG0=" + "version": "5.51.1", + "exe_name": "Yandex_Music_x64_5.51.1.exe", + "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.51.1.exe", + "exe_hash": "sha256-iu7DqcFs9/4aw46eIgWKIYyZ6fIzoW6XkiqdpERup/M=" } From d1bc54ae6c7870053c5038710de8a9847b434700 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Thu, 22 May 2025 13:08:28 +0200 Subject: [PATCH 37/62] floorp: 11.26.1 -> 11.26.2 Security fixes. Release announcement: https://blog.floorp.app/en/release/11.26.2.html Git changelog: https://github.com/Floorp-Projects/Floorp/compare/v11.26.1...v11.26.2 Signed-off-by: Christoph Heiss --- pkgs/applications/networking/browsers/floorp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 517d79942a0a..3a27b7a78531 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -9,7 +9,7 @@ ( (buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.26.1"; + packageVersion = "11.26.2"; applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official"; @@ -17,14 +17,14 @@ allowAddonSideload = true; # Must match the contents of `browser/config/version.txt` in the source tree - version = "128.10.0"; + version = "128.11.0"; src = fetchFromGitHub { owner = "Floorp-Projects"; repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-WX7I81Rjv/6+L+HCN6j/HvLOPJk0vyiLpUmxoK+FDn8="; + hash = "sha256-tbdEiCFwMkeBB5n82TycyZ0wwE2+cCgLmjROl9kTHS8="; }; extraConfigureFlags = [ From 187f5f4474ccd4df424920e503de8a6eccd40f2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 May 2025 11:13:25 +0000 Subject: [PATCH 38/62] libretro.beetle-psx: 0-unstable-2025-04-18 -> 0-unstable-2025-05-16 --- pkgs/applications/emulators/libretro/cores/beetle-psx.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix index 746cb598e41f..045d1daf5e3a 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "mednafen-psx" + lib.optionalString withHw "-hw"; - version = "0-unstable-2025-04-18"; + version = "0-unstable-2025-05-16"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-psx-libretro"; - rev = "4e0cb4ddf0c52ef802cd4f7f2b7d3a187ab9962d"; - hash = "sha256-XjJf/EPgJmbxGPJl2SEoVA47iRzjSKISt/3rmW5Wysg="; + rev = "47910f9c8b1e51d049327ab768189c24e34efafb"; + hash = "sha256-XliePwpMYGQLYoWQU0l9Ctcmtf0TlXKpA5PagCurXhE="; }; extraBuildInputs = lib.optionals withHw [ From 50712d80963d91ebfab06920139e0426bb4311be Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 22 May 2025 11:29:02 +0200 Subject: [PATCH 39/62] python312Packages.keras: skip hanging test on aarch64-linux --- .../python-modules/keras/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index dbd00f718c0b..28deb800ad1f 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -80,17 +81,22 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ]; - disabledTests = [ - # NameError: name 'MockRemat' is not defined - # https://github.com/keras-team/keras/issues/21126 - "test_functional_model_with_remat" + disabledTests = + [ + # NameError: name 'MockRemat' is not defined + # https://github.com/keras-team/keras/issues/21126 + "test_functional_model_with_remat" - # Tries to install the package in the sandbox - "test_keras_imports" + # Tries to install the package in the sandbox + "test_keras_imports" - # TypeError: this __dict__ descriptor does not support '_DictWrapper' objects - "test_reloading_default_saved_model" - ]; + # TypeError: this __dict__ descriptor does not support '_DictWrapper' objects + "test_reloading_default_saved_model" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # Hangs forever + "test_fit_with_data_adapter" + ]; disabledTestPaths = [ # These tests succeed when run individually, but crash within the full test suite: From b9cf02b95b35f6840ca7f6a8c211684e28eabd70 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 19 May 2025 14:29:58 +0200 Subject: [PATCH 40/62] python312Packages.ax-platform: 0.5.0 -> 1.0.0 Diff: https://github.com/facebook/ax/compare/refs/tags/0.5.0...refs/tags/1.0.0 Changelog: https://github.com/facebook/Ax/releases/tag/1.0.0 --- .../python-modules/ax-platform/default.nix | 76 +++++++++---------- 1 file changed, 37 insertions(+), 39 deletions(-) diff --git a/pkgs/development/python-modules/ax-platform/default.nix b/pkgs/development/python-modules/ax-platform/default.nix index e7ba1895624e..c99f7ae07f99 100644 --- a/pkgs/development/python-modules/ax-platform/default.nix +++ b/pkgs/development/python-modules/ax-platform/default.nix @@ -1,41 +1,42 @@ { lib, - botorch, + stdenv, buildPythonPackage, fetchFromGitHub, - hypothesis, + + # build-system + setuptools, + setuptools-scm, + + # dependencies + botorch, ipywidgets, jinja2, - jupyter, - mercurial, + markdown, pandas, plotly, - pyfakefs, pyre-extensions, + scikit-learn, + scipy, + sympy, + + # tests + pyfakefs, pytestCheckHook, - pythonAtLeast, - pythonOlder, - setuptools-scm, - setuptools, sqlalchemy, - stdenvNoCC, tabulate, - typeguard, - yappi, }: buildPythonPackage rec { pname = "ax-platform"; - version = "0.5.0"; + version = "1.0.0"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "facebook"; repo = "ax"; tag = version; - hash = "sha256-CMKdnPvzQ9tvU9/01mRaWi/Beuyo19CtaXNJCoiwLOw="; + hash = "sha256-DFsV1w6J7bTZNUq9OYExDvfc7IfTcthGKAnRMNujRKI="; }; env.ALLOW_BOTORCH_LATEST = "1"; @@ -49,39 +50,47 @@ buildPythonPackage rec { botorch ipywidgets jinja2 + markdown pandas plotly - typeguard pyre-extensions + scikit-learn + scipy + sympy ]; - optional-dependencies = { - mysql = [ sqlalchemy ]; - notebook = [ jupyter ]; - }; - nativeCheckInputs = [ - hypothesis - mercurial pyfakefs + # pytest-xdist pytestCheckHook + sqlalchemy tabulate - yappi - ] ++ lib.flatten (lib.attrValues optional-dependencies); + ]; + pytestFlagsArray = [ + # Hangs forever + "--deselect=ax/analysis/plotly/tests/test_top_surfaces.py::TestTopSurfacesAnalysis::test_online" + ]; disabledTestPaths = [ "ax/benchmark" "ax/runners/tests/test_torchx.py" + # broken with sqlalchemy 2 "ax/core/tests/test_experiment.py" "ax/service/tests/test_ax_client.py" "ax/service/tests/test_scheduler.py" "ax/service/tests/test_with_db_settings_base.py" - "ax/storage" ]; disabledTests = [ + # sqlalchemy.exc.ArgumentError: Strings are not accepted for attribute names in loader options; please use class-bound attributes directly. + "SQAStoreUtilsTest" + "SQAStoreTest" + + # ValueError: `db_settings` argument should be of type ax.storage.sqa_store + "test_get_next_trials_with_db" + # exact comparison of floating points "test_optimize_l0_homotopy" # AssertionError: 5 != 2 @@ -93,18 +102,7 @@ buildPythonPackage rec { # broken with sqlalchemy 2 "test_sql_storage" ] - ++ lib.optionals (pythonAtLeast "3.13") [ - # Both `metric_aggregation` and `criterion` must be `ReductionCriterion` - "test_SingleDiagnosticBestModelSelector_max_mean" - "test_SingleDiagnosticBestModelSelector_min_mean" - "test_SingleDiagnosticBestModelSelector_min_min" - "test_SingleDiagnosticBestModelSelector_model_cv_kwargs" - "test_init" - "test_gen" - # "use MIN or MAX" does not match "Both `metric_aggregation` and `criterion` must be `ReductionCriterion` - "test_user_input_error" - ] - ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # flaky on x86 "test_gen_with_expanded_parameter_space" ]; From a472781a17db13db744318876a5e9bf9b479507e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 22 May 2025 13:44:13 +0200 Subject: [PATCH 41/62] python312Packages.transformers: 4.52.0 -> 4.52.2 Diff: https://github.com/huggingface/transformers/compare/refs/tags/v4.52.0...refs/tags/v4.52.2 Changelog: https://github.com/huggingface/transformers/releases/tag/v4.52.2 --- pkgs/development/python-modules/transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index ebbe924c181c..c174a6c6986f 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -58,14 +58,14 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.52.0"; + version = "4.52.2"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "transformers"; tag = "v${version}"; - hash = "sha256-dMdXkhLClFxClBl/Nk4nnfrFZaulnhMsGFKmhkMq2Q0="; + hash = "sha256-fSU6xXNKl465QvEbAy+LsleIi/I2hWXF0Q4HBaKtXoU="; }; build-system = [ setuptools ]; From 49842e98a730949807386d1698f5dc662439f37b Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 22 May 2025 14:50:03 +0300 Subject: [PATCH 42/62] wireplumber: 0.5.8 -> 0.5.10 Diff: https://gitlab.freedesktop.org/pipewire/wireplumber/-/compare/0.5.8...0.5.10 --- pkgs/development/libraries/pipewire/wireplumber.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix index d3f60a42cf7e..c2779fa06991 100644 --- a/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/pkgs/development/libraries/pipewire/wireplumber.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.5.8"; + version = "0.5.10"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - hash = "sha256-RILzGhFQEpwGlpLbTzw7qrXIX3uNQZfJJ4d5ftXZzzw="; + hash = "sha256-CZjVCy9FKTBO7C5f+vOejJyVjo2a5YoOKgqzH+w2k3w="; }; nativeBuildInputs = From 4fcf069b943a2c3c0f410f8916e6441ae04115c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 May 2025 11:55:15 +0000 Subject: [PATCH 43/62] release-plz: 0.3.134 -> 0.3.135 --- pkgs/by-name/re/release-plz/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix index 9102b17a9097..edf7eadfbc08 100644 --- a/pkgs/by-name/re/release-plz/package.nix +++ b/pkgs/by-name/re/release-plz/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "release-plz"; - version = "0.3.134"; + version = "0.3.135"; src = fetchFromGitHub { owner = "MarcoIeni"; repo = "release-plz"; rev = "release-plz-v${version}"; - hash = "sha256-G2xXNeyKEix/kCJ1zUn0YILMmikuvhu3f6t3pq3GjHI="; + hash = "sha256-P84yow5NcZlYTRGo7Nir1JERtii86vZUsMkSnlaoVYg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-1bFIeWYBGefT1K545sNp7/LWG4oU+q4FlOL189a/wI0="; + cargoHash = "sha256-t1dqbF70HOxnPTFyMv9j4s2r8D6l/gaxw7FoGPMVVbk="; nativeBuildInputs = [ installShellFiles From 554e92840b3633f4a79d6f6adbbe01e4214bbd19 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 9 May 2025 19:12:10 +0900 Subject: [PATCH 44/62] crystal: set SOURCE_DATE_EPOCH with src/SOURCE_DATE_EPOCH To fix `crystal --version` displayed timestamp --- pkgs/development/compilers/crystal/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index dcb586405faa..83975fcc809a 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -96,6 +96,7 @@ let "docs" "release=1" ], + hasEpochFile ? true, # Available since 1.13.0 https://github.com/crystal-lang/crystal/pull/14574 }: stdenv.mkDerivation (finalAttrs: { pname = "crystal"; @@ -164,12 +165,16 @@ let ''; # Defaults are 4 - preBuild = '' - export CRYSTAL_WORKERS=$NIX_BUILD_CORES - export threads=$NIX_BUILD_CORES - export CRYSTAL_CACHE_DIR=$TMP - export MACOSX_DEPLOYMENT_TARGET=10.11 - ''; + preBuild = + '' + export CRYSTAL_WORKERS=$NIX_BUILD_CORES + export threads=$NIX_BUILD_CORES + export CRYSTAL_CACHE_DIR=$TMP + export MACOSX_DEPLOYMENT_TARGET=10.11 + '' + + lib.optionalString hasEpochFile '' + export SOURCE_DATE_EPOCH="$( Date: Wed, 21 May 2025 22:48:58 +0900 Subject: [PATCH 45/62] crystal: replace hasEpochFile with file existence check Co-authored-by: Peter H. Hoeg --- .../development/compilers/crystal/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 83975fcc809a..5aaf4914c2a5 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -96,7 +96,6 @@ let "docs" "release=1" ], - hasEpochFile ? true, # Available since 1.13.0 https://github.com/crystal-lang/crystal/pull/14574 }: stdenv.mkDerivation (finalAttrs: { pname = "crystal"; @@ -165,16 +164,17 @@ let ''; # Defaults are 4 - preBuild = - '' - export CRYSTAL_WORKERS=$NIX_BUILD_CORES - export threads=$NIX_BUILD_CORES - export CRYSTAL_CACHE_DIR=$TMP - export MACOSX_DEPLOYMENT_TARGET=10.11 - '' - + lib.optionalString hasEpochFile '' + preBuild = '' + export CRYSTAL_WORKERS=$NIX_BUILD_CORES + export threads=$NIX_BUILD_CORES + export CRYSTAL_CACHE_DIR=$TMP + export MACOSX_DEPLOYMENT_TARGET=10.11 + + # Available since 1.13.0 https://github.com/crystal-lang/crystal/pull/14574 + if [[ -f src/SOURCE_DATE_EPOCH ]]; then export SOURCE_DATE_EPOCH="$( Date: Thu, 22 May 2025 14:17:14 +0200 Subject: [PATCH 46/62] uiua: 0.16.0 -> 0.16.2 --- pkgs/by-name/ui/uiua/stable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ui/uiua/stable.nix b/pkgs/by-name/ui/uiua/stable.nix index a814452e07a1..58f8dc371ac5 100644 --- a/pkgs/by-name/ui/uiua/stable.nix +++ b/pkgs/by-name/ui/uiua/stable.nix @@ -1,7 +1,7 @@ rec { - version = "0.16.0"; + version = "0.16.2"; tag = version; - hash = "sha256-/BSn0B/yJY9rmGLBxnCwCNf2BGQOsbzpHu6Ww4NQpAs="; - cargoHash = "sha256-sxCcnfI3i81oDsmAingNesNP3CAAnvKtSoFPYP8uaqs="; + hash = "sha256-YX2okLBN+6celACktfLgTO4NJPvEalrS/C885qwAp8A="; + cargoHash = "sha256-aoHqcE+0OaxZAxjAZUdSmAuLaI0kiRfbPhaFjNvFce8="; updateScript = ./update-stable.sh; } From 3fdddb79f0e4aecc210a676d2a9ddaf9c7ce42eb Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 22 May 2025 14:17:14 +0200 Subject: [PATCH 47/62] uiua-unstable: 0.16.0 -> 0.16.2 --- pkgs/by-name/ui/uiua/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ui/uiua/unstable.nix b/pkgs/by-name/ui/uiua/unstable.nix index cdd554a09a7b..336487955235 100644 --- a/pkgs/by-name/ui/uiua/unstable.nix +++ b/pkgs/by-name/ui/uiua/unstable.nix @@ -1,7 +1,7 @@ rec { - version = "0.16.0"; + version = "0.16.2"; tag = version; - hash = "sha256-/BSn0B/yJY9rmGLBxnCwCNf2BGQOsbzpHu6Ww4NQpAs="; - cargoHash = "sha256-sxCcnfI3i81oDsmAingNesNP3CAAnvKtSoFPYP8uaqs="; + hash = "sha256-YX2okLBN+6celACktfLgTO4NJPvEalrS/C885qwAp8A="; + cargoHash = "sha256-aoHqcE+0OaxZAxjAZUdSmAuLaI0kiRfbPhaFjNvFce8="; updateScript = ./update-unstable.sh; } From 9810b2ce386187553fddc019a457df9ddff22304 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Thu, 22 May 2025 15:13:54 +0200 Subject: [PATCH 48/62] lazygit: 0.50.0 -> 0.51.0 Changelog: https://github.com/jesseduffield/lazygit/releases/tag/v0.51.0 Diff: https://github.com/jesseduffield/lazygit/compare/v0.50.0...v0.51.0 --- pkgs/by-name/la/lazygit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index 8c55d3ed90ea..3ae71d30b722 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "lazygit"; - version = "0.50.0"; + version = "0.51.0"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; tag = "v${version}"; - hash = "sha256-LxPKV6Zt4R+gsZAp7FXqWnAXjEoaFTn44qJBOpbh0P8="; + hash = "sha256-wX+FYTVn9XwEdMGsNPT+v0ZuSXGydzuzFiwFrw8AZ5A="; }; vendorHash = null; From 18882b2d9b5a4d6834bf50610161a9f7389137c3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 May 2025 23:16:42 +1000 Subject: [PATCH 49/62] home-assistant-custom-lovelace-modules.advanced-camera-card: 7.6.5 -> 7.7.1 (#409662) https://github.com/dermotduffy/advanced-camera-card/releases/tag/v7.7.0 https://github.com/dermotduffy/advanced-camera-card/releases/tag/v7.7.1 --- .../custom-lovelace-modules/advanced-camera-card/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix index 7395f5c0c07d..838804d1bce6 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "advanced-camera-card"; - version = "7.6.5"; + version = "7.7.1"; src = fetchzip { url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip"; - hash = "sha256-q7zn/7xovGLTNq4FRdoEOMB3wy/IZ80QOYqVNLRNAZA="; + hash = "sha256-+C/vLNbjr8CvI+7AkEJR7gVcM4wdvFOXYrX3ZSuk0qk="; }; # TODO: build from source once yarn berry support lands in nixpkgs From e6ee64c4d4657e625c8e2246d50155ba1b0f9ec9 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Thu, 22 May 2025 15:19:59 +0200 Subject: [PATCH 50/62] leo-editor: update meta.homepage meta.homepage seems outdated --- pkgs/applications/editors/leo-editor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index b4d32534e284..2672900910ad 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -99,7 +99,7 @@ mkDerivation rec { ''; meta = with lib; { - homepage = "http://leoeditor.com"; + homepage = "https://leo-editor.github.io/leo-editor/"; description = "A powerful folding editor"; longDescription = "Leo is a PIM, IDE and outliner that accelerates the work flow of programmers, authors and web designers."; license = licenses.mit; From 918e79dfd0cc6f1d99decdbc23c056d803e111a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 May 2025 13:41:25 +0000 Subject: [PATCH 51/62] clouddrive2: 0.8.17 -> 0.8.19 --- pkgs/by-name/cl/clouddrive2/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix index ab7966ce3fda..8c94416ecd4b 100644 --- a/pkgs/by-name/cl/clouddrive2/package.nix +++ b/pkgs/by-name/cl/clouddrive2/package.nix @@ -11,16 +11,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "clouddrive2"; - version = "0.8.17"; + version = "0.8.19"; src = fetchurl { url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz"; hash = { - x86_64-linux = "sha256-j3QJJ6cF+dcotkMJcDbW1rf1ETdfofiTotDcV+bH8zY="; - aarch64-linux = "sha256-0N+D0ba3+D6xfiW8RjV1XHTcypLiGyuuHZFOqYS3JZE="; - x86_64-darwin = "sha256-YCn7jvpgh2+i6qWBbsqSBFmNlwPduPNExXF+QnxiQ+c="; - aarch64-darwin = "sha256-EOgrnJljZVSkzjZRZSUIfn1Ly6IrTS6I/8uwRVktnzE="; + x86_64-linux = "sha256-pLimn6OfqByOyFIDYq0VD4yQ0BpL+st5VwYBKP5zSug="; + aarch64-linux = "sha256-Xr3locwzuCg0LRPvNBphhleHFZOnXLi9Md8R17k4vWU="; + x86_64-darwin = "sha256-klwicOa/jbjsGL09HR6v2CTA+vhHd1EjCbblAmEPqWQ="; + aarch64-darwin = "sha256-47AbC8SHDb1hRlePF6CszHqf2gpwIxsOhJK4+PMCHbQ="; } .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; From fc409c1a2ff5b2815feadd5ebd2a67f3bba45b8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 15:11:46 +0000 Subject: [PATCH 52/62] snakemake: 9.3.4 -> 9.4.0 --- pkgs/by-name/sn/snakemake/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix index fb5946819044..adc35d8ae10b 100644 --- a/pkgs/by-name/sn/snakemake/package.nix +++ b/pkgs/by-name/sn/snakemake/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "9.3.4"; + version = "9.4.0"; pyproject = true; src = fetchFromGitHub { owner = "snakemake"; repo = "snakemake"; tag = "v${version}"; - hash = "sha256-7yU1vhPrcuZC2d15VileZJpweDhB0rEEGVHjhm6Gmgc="; + hash = "sha256-lRW/YDD0uiaCfY6lbcbusM5TCqfp6hwTB8xeFYr3jCQ="; }; postPatch = '' From 4ab3936154d7aa5d4ed1fbcf59bd8d79fad8bf64 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 22 May 2025 16:15:28 +0200 Subject: [PATCH 53/62] python313Packages.pynetbox: 7.4.1 -> 7.5.0 https://github.com/netbox-community/pynetbox/releases/tag/v7.5.0 --- pkgs/development/python-modules/pynetbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix index 6679f980729c..016ecee277be 100644 --- a/pkgs/development/python-modules/pynetbox/default.nix +++ b/pkgs/development/python-modules/pynetbox/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pynetbox"; - version = "7.4.1"; + version = "7.5.0"; pyproject = true; src = fetchFromGitHub { owner = "netbox-community"; repo = "pynetbox"; tag = "v${version}"; - hash = "sha256-pP4DEHf4Dj3sQ7qx7tU0B0PaMCuzUM9R2pIYRI1Fpso="; + hash = "sha256-gDcTWXGE0GOEmuDSwFgKytCidg8Py1PFMfJCDhuOMoQ="; }; build-system = [ From 7fa90f0748a9c46334ea6da3eb385704b81e6064 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 22 May 2025 16:19:39 +0200 Subject: [PATCH 54/62] python313Packages.django-localflavor: 4.0 -> 5.0 https://github.com/django/django-localflavor/blob/5.0/docs/changelog.rst --- .../python-modules/django-localflavor/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-localflavor/default.nix b/pkgs/development/python-modules/django-localflavor/default.nix index 7576c4e83eef..f93766058764 100644 --- a/pkgs/development/python-modules/django-localflavor/default.nix +++ b/pkgs/development/python-modules/django-localflavor/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "django-localflavor"; - version = "4.0"; + version = "5.0"; pyproject = true; src = fetchFromGitHub { owner = "django"; repo = "django-localflavor"; tag = version; - hash = "sha256-UWp3ei1VlEsEfjbJIE+MpffSzYF4X1HEQw+z+5kZoP0="; + hash = "sha256-eYhkWfxoZlnxhCIaqBhoEt0+SbkZKkUNUAy4p3tYf4A="; }; build-system = [ setuptools ]; @@ -53,6 +53,7 @@ buildPythonPackage rec { env.DJANGO_SETTINGS_MODULE = "tests.settings"; meta = with lib; { + changelog = "https://github.com/django/django-localflavor/blob/${src.tag}/docs/changelog.rst"; description = "Country-specific Django helpers"; homepage = "https://github.com/django/django-localflavor"; license = licenses.bsd3; From b8c413e93b5c5d4d2b4337f4cac00e5ec0ef004f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 22 May 2025 16:54:24 +0200 Subject: [PATCH 55/62] pretix: relax django-localflavor constraint --- pkgs/by-name/pr/pretix/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 9c735d4dd548..0b77b9e562ed 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -82,6 +82,7 @@ python.pkgs.buildPythonApplication rec { "beautifulsoup4" "celery" "django-bootstrap3" + "django-localflavor" "django-phonenumber-field" "dnspython" "drf_ujson2" From de6905ee3749082bb256ddbc30010b79c489f5c6 Mon Sep 17 00:00:00 2001 From: hustlerone Date: Wed, 21 May 2025 16:46:04 +0200 Subject: [PATCH 56/62] nixos/limine: tidy up the boot menu --- .../boot/loader/limine/limine-install.py | 34 +++++++++++++++---- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/nixos/modules/system/boot/loader/limine/limine-install.py b/nixos/modules/system/boot/loader/limine/limine-install.py index 3407d778d62b..c775d65d4057 100644 --- a/nixos/modules/system/boot/loader/limine/limine-install.py +++ b/nixos/modules/system/boot/loader/limine/limine-install.py @@ -168,14 +168,29 @@ def config_entry(levels: int, bootspec: BootSpec, label: str, time: str) -> str: return entry -def generate_config_entry(profile: str, gen: str) -> str: +def generate_config_entry(profile: str, gen: str, special: bool) -> str: time = datetime.datetime.fromtimestamp(os.stat(get_system_path(profile,gen), follow_symlinks=False).st_mtime).strftime("%F %H:%M:%S") boot_json = json.load(open(os.path.join(get_system_path(profile, gen), 'boot.json'), 'r')) boot_spec = bootjson_to_bootspec(boot_json) - entry = config_entry(2, boot_spec, f'Generation {gen}', time) - for spec, spec_boot_spec in boot_spec.specialisations.items(): - entry += config_entry(2, spec_boot_spec, f'Generation {gen}, Specialisation {spec}', str(time)) + specialisation_list = boot_spec.specialisations.items() + depth = 2 + entry = "" + + if len(specialisation_list) > 0: + depth += 1 + entry += '/' * (depth-1) + + if special: + entry += '+' + + entry += f'Generation {gen}' + '\n' + entry += config_entry(depth, boot_spec, f'Default', str(time)) + else: + entry += config_entry(depth, boot_spec, f'Generation {gen}', str(time)) + + for spec, spec_boot_spec in specialisation_list: + entry += config_entry(depth, spec_boot_spec, f'{spec}', str(time)) return entry @@ -269,13 +284,17 @@ def main(): editor_enabled = 'yes' if config('enableEditor') else 'no' hash_mismatch_panic = 'yes' if config('panicOnChecksumMismatch') else 'no' + last_gen = get_gens()[-1] + last_gen_json = json.load(open(os.path.join(get_system_path('system', last_gen), 'boot.json'), 'r')) + last_gen_boot_spec = bootjson_to_bootspec(last_gen_json) + config_file = config('extraConfig') + '\n' config_file += textwrap.dedent(f''' timeout: {timeout} editor_enabled: {editor_enabled} hash_mismatch_panic: {hash_mismatch_panic} graphics: yes - default_entry: 2 + default_entry: {3 if len(last_gen_boot_spec.specialisations.items()) > 0 else 2} ''') for wallpaper in config('style', 'wallpapers'): @@ -307,8 +326,11 @@ def main(): group_name = 'default profile' if profile == 'system' else f"profile '{profile}'" config_file += f'/+NixOS {group_name}\n' + isFirst = True + for gen in sorted(gens, key=lambda x: x, reverse=True): - config_file += generate_config_entry(profile, gen) + config_file += generate_config_entry(profile, gen, isFirst) + isFirst = False config_file_path = os.path.join(limine_dir, 'limine.conf') config_file += '\n# NixOS boot entries end here\n\n' From bb749337a73b3948589ba90eaab1687b261df8fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 May 2025 16:06:43 +0000 Subject: [PATCH 57/62] phpExtensions.blackfire: 1.92.32 -> 1.92.36 --- pkgs/by-name/bl/blackfire/php-probe.nix | 38 ++++++++++++------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/bl/blackfire/php-probe.nix b/pkgs/by-name/bl/blackfire/php-probe.nix index 0b545d374d58..aa133ac2653f 100644 --- a/pkgs/by-name/bl/blackfire/php-probe.nix +++ b/pkgs/by-name/bl/blackfire/php-probe.nix @@ -16,50 +16,50 @@ let phpMajor = lib.versions.majorMinor php.version; inherit (stdenv.hostPlatform) system; - version = "1.92.32"; + version = "1.92.36"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-oRd6PbBLOboH9EVRfZl5u71ZoVMFO4K/uftxlL/vm18="; - "8.2" = "sha256-95qBidNHIGLGCb3QbUIzBMHsRi2GTPhwAjJg+JTteDk="; - "8.3" = "sha256-8TO28o4YYFK1r2tInjXKenki/izHzZL0Dblaippekl8="; - "8.4" = "sha256-Dg+Q0W6Rh2L4J7hmxLxuM3l/dKYHT499Mix4Zpu2Vno="; + "8.1" = "sha256-Fn+6aZi8UuyF0f94t09SwhUwvHqjvN6m2HBq2mbr/CA="; + "8.2" = "sha256-b8YyT9P+KQonwHqXSn17EDRTdTw9CuvIX0PzjvGlmCo="; + "8.3" = "sha256-YLQi530JkoQfAx/ZBR9w2dthK6IsDSyqq3U+rGugUPw="; + "8.4" = "sha256-zpXYElris1fjMlwpTwuRDkCdO3MNHCLp3D24x5X/S88="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-mXJ1hO8NcODG7Wj3lQ+5lkSjcbkKLN5OOzcobigScKI="; - "8.2" = "sha256-P5fQTVfE/DvLD4E3kUPE+eeOM9YVNNixgWVRq3Ca5M4="; - "8.3" = "sha256-rMUv2EUlepBahMaEvs60i7RFTmaBe4P4qB1hcARqP9Y="; - "8.4" = "sha256-g7v7oN7wfrER9VPk6bGhr+l6GMh2iYHUihcXF9T4GOc="; + "8.1" = "sha256-3mNgyfrkgiZBkLE8ppans7R72lOeXFup2nwLoP6Gve0="; + "8.2" = "sha256-PT7virnfH8Ujkol/fK84TmVTc4jK4xGfaDL1kb9bj/4="; + "8.3" = "sha256-h4Gf4YR2I+R9dMDiFpAN1WB2o6BNP3C80fX7vKEN6Gs="; + "8.4" = "sha256-lRunm8coAkwiLvPELWquAsoNQEZv0LvL13Hdg+9dOfA="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-Tj7LHXS4m9hF9gY/9vfOQPJVP+vHM1h8XdBY9vyRhFo="; - "8.2" = "sha256-6kfotMptfVLPL414mr6LeJZ3ODnjepYQYnKvg4fHIAg="; - "8.3" = "sha256-M/GTdinOi3Em7GJOm1iUKkuDNg8La3iQpG+wGHp0ycE="; - "8.4" = "sha256-/wwgP76liAb6//uvDLGD5l+skh4P22Q8KdZN7nlEbXI="; + "8.1" = "sha256-DDco6F8cD/D4J3KM1B111bjcJkRxd++CLR+x0azcR0g="; + "8.2" = "sha256-AQPQQM5Q5wlhvkXOnVNgPLcQpZ5xda/CYFqvm5J7e0c="; + "8.3" = "sha256-Yae7UVRrIdShIVZDSza9IrukYHgfX5CrVIpuH4rEAek="; + "8.4" = "sha256-l0+DN5zEqGJLg8Ig5U4PvZGms1O0eZ/PqjXgSw4bCA4="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-TZ6D8sTlLuM+8707ncECPNQlpySc7BYKIwSEth3MUT8="; - "8.2" = "sha256-4VJBo1TzEkstKo2ed9bxb/3g0JFjHlfTIfmDq2dCfUk="; - "8.3" = "sha256-gIIoRRNCed5cgbcFxvwXKgWZs4HgoOMCx6k0urVPxbs="; + "8.1" = "sha256-xb28nloEKKfJfddrDShBFuLHPOIyBo74erHWB9H5im4="; + "8.2" = "sha256-vmjjmGem7SdEkBWIjDfxgLQhmO9B/x1gIP5GSlAPPDs="; + "8.3" = "sha256-l6XrHQIigav6gMpgg7HEwm+2PeuU76AX3je8UVrcPEQ="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-tO52c8FKZXXgx7+0IGiwy5rPLEsU/5ji/c79wzb1S34="; - "8.2" = "sha256-eUkM5KzZLPK2hCnFqRN8eOwLiX54qXuLkdfxJdjuZTk="; - "8.3" = "sha256-CaRs3DI5TTHNSk91pqFaHt1OVQzGozATOUs7GNi8cqY="; + "8.1" = "sha256-xY/5UQuLM/UrdDvA1WUF117m+Coj3ElEgV3cbelfKvM="; + "8.2" = "sha256-bGpijGg++VJNZFHN9K6Gx1R+jBn3o+Qeh/RpmPC8NPE="; + "8.3" = "sha256-3uiTuEmEsp3sKOOR0WxH72pVPCs5ogR1yi3VQ7+/fw8="; }; }; }; From d68ce45fa18c9a15a2805011cab66f15f1f93e8b Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Wed, 21 May 2025 18:03:28 -0400 Subject: [PATCH 58/62] ocamlPackages.tyre: init at 0.5 --- .../ocaml-modules/tyre/default.nix | 41 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/ocaml-modules/tyre/default.nix diff --git a/pkgs/development/ocaml-modules/tyre/default.nix b/pkgs/development/ocaml-modules/tyre/default.nix new file mode 100644 index 000000000000..d3699255840d --- /dev/null +++ b/pkgs/development/ocaml-modules/tyre/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildDunePackage, + fetchurl, + re, + result, + seq, + alcotest, +}: + +buildDunePackage rec { + pname = "tyre"; + version = "0.5"; + + minimalOCamlVersion = "4.03.0"; + + src = fetchurl { + url = "https://github.com/Drup/tyre/releases/download/${version}/${pname}-${version}.tbz"; + hash = "sha256-eqB/racqpxu5hVlC4Os+4AfDOeYj4UXF3S/4Ckkem2k="; + }; + + propagatedBuildInputs = [ + re + result + seq + ]; + + checkInputs = [ + alcotest + ]; + + doCheck = true; + + meta = { + description = "Typed Regular Expressions"; + homepage = "https://github.com/Drup/tyre"; + changelog = "https://github.com/Drup/tyre/blob/${version}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ infinidoge ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 27d54dfe05a4..e9bee00dcd49 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -2076,6 +2076,8 @@ let type_id = callPackage ../development/ocaml-modules/type_id { }; + tyre = callPackage ../development/ocaml-modules/tyre { }; + tyxml = callPackage ../development/ocaml-modules/tyxml { }; tyxml-lwd = callPackage ../development/ocaml-modules/lwd/tyxml-lwd.nix { }; From 3b4c8c2653894d7ab8921cfaeaf6fd6e57b69465 Mon Sep 17 00:00:00 2001 From: Casey Link Date: Thu, 22 May 2025 16:31:06 +0200 Subject: [PATCH 59/62] claude-code: 0.2.122 -> 1.0.0 --- pkgs/by-name/cl/claude-code/package-lock.json | 8 ++++---- pkgs/by-name/cl/claude-code/package.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index e2fdd266549a..8bf9d38634eb 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -5,13 +5,13 @@ "packages": { "": { "dependencies": { - "@anthropic-ai/claude-code": "^0.2.122" + "@anthropic-ai/claude-code": "^1.0.0" } }, "node_modules/@anthropic-ai/claude-code": { - "version": "0.2.122", - "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.122.tgz", - "integrity": "sha512-q9XnW6a4btqHM2XYxkcl2d7dDNRTX8pvaeisiNWYzAOSKC+wUfOrkioUUS3BG+i6sNtJB03jPKJdqvEvtXbZjw==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.0.tgz", + "integrity": "sha512-5+FV9oNtV3sZ8rq1pw3B6KX24Ib+qs9FoLR1ghxOAzk4ZXKzCSSHhW4GOWJy+6N9926KHN2wFNVcuZC9NW75Xg==", "hasInstallScript": true, "license": "SEE LICENSE IN README.md", "bin": { diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index c395e785c544..2d651b9e6702 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "claude-code"; - version = "0.2.122"; + version = "1.0.0"; nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; - hash = "sha256-9w1wjuOTSphEfgKfNJhDFiTKuIJqfV6Bz4XEYXMIaGE="; + hash = "sha256-DwZJDl+Yt6ULpumSnwktWCJZPxFgdsDkRHAt+6C/BcM="; }; - npmDepsHash = "sha256-71YPsgeI8bmb+wwFHS5XOXKJXsagWZj+hBf2T/+GYMU="; + npmDepsHash = "sha256-taZ6yFGWj6oSa0llhByX49qfID9grzNpBt9dQhLl1vo="; postPatch = '' cp ${./package-lock.json} package-lock.json From b3a5cf52f3180e6ff918263d37c49d8a4e173fbc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 May 2025 17:34:54 +0000 Subject: [PATCH 60/62] dnsproxy: 0.75.4 -> 0.75.5 --- pkgs/by-name/dn/dnsproxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dn/dnsproxy/package.nix b/pkgs/by-name/dn/dnsproxy/package.nix index 8dc40c0f1df0..cabe6b432f44 100644 --- a/pkgs/by-name/dn/dnsproxy/package.nix +++ b/pkgs/by-name/dn/dnsproxy/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.75.4"; + version = "0.75.5"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = "dnsproxy"; rev = "v${version}"; - hash = "sha256-pKIUyB/GXuqLos2OdYw6heTbsaj4l2xhSy3iCQKdbaA="; + hash = "sha256-VkvYh4ksQkxhcEH0ZaaUT2h1L0Zw44s8hoDiZjdEMx0="; }; - vendorHash = "sha256-imML/SK4NdHGH5FsjvKjt5GM3vwi6v+pF1Mu8Dy8Lms="; + vendorHash = "sha256-ev05aQ+A67BT+Xtt7HVSTqmmqN/DgFp56AHWDcbkoGE="; ldflags = [ "-s" From 771d70fb47e41f70704fde7bb0c7dde063bbbab6 Mon Sep 17 00:00:00 2001 From: programmerlexi Date: Wed, 21 May 2025 21:13:26 +0200 Subject: [PATCH 61/62] nixos/limine: add test for specialisations --- nixos/tests/limine/default.nix | 1 + nixos/tests/limine/specialisations.nix | 28 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 nixos/tests/limine/specialisations.nix diff --git a/nixos/tests/limine/default.nix b/nixos/tests/limine/default.nix index 9497e06a18f6..dad761b1f882 100644 --- a/nixos/tests/limine/default.nix +++ b/nixos/tests/limine/default.nix @@ -5,5 +5,6 @@ { checksum = runTest ./checksum.nix; secureBoot = runTest ./secure-boot.nix; + specialisations = runTest ./specialisations.nix; uefi = runTest ./uefi.nix; } diff --git a/nixos/tests/limine/specialisations.nix b/nixos/tests/limine/specialisations.nix new file mode 100644 index 000000000000..7d7e24a184e3 --- /dev/null +++ b/nixos/tests/limine/specialisations.nix @@ -0,0 +1,28 @@ +{ lib, ... }: +{ + name = "specialisations"; + meta.maintainers = with lib.maintainers; [ + lzcunt + phip1611 + programmerlexi + ]; + nodes.machine = + { ... }: + { + virtualisation.useBootLoader = true; + virtualisation.useEFIBoot = true; + + specialisation.test = { }; + + boot.loader.efi.canTouchEfiVariables = true; + boot.loader.limine.enable = true; + boot.loader.limine.efiSupport = true; + boot.loader.timeout = 0; + }; + + testScript = '' + machine.start() + with subtest('Machine boots correctly'): + machine.wait_for_unit('multi-user.target') + ''; +} From 89abf8819fd4510c4fed1f33e3f91bd07472d963 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Thu, 22 May 2025 19:20:26 +0300 Subject: [PATCH 62/62] nixos/dex: add `package` option --- nixos/modules/services/web-apps/dex.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/dex.nix b/nixos/modules/services/web-apps/dex.nix index 37b27ae8f1cd..392a2f5b16b5 100644 --- a/nixos/modules/services/web-apps/dex.nix +++ b/nixos/modules/services/web-apps/dex.nix @@ -47,6 +47,8 @@ in options.services.dex = { enable = mkEnableOption "the OpenID Connect and OAuth2 identity provider"; + package = mkPackageOption pkgs "dex-oidc" { }; + environmentFile = mkOption { type = types.nullOr types.path; default = null; @@ -84,7 +86,7 @@ in ''; description = '' The available options can be found in - [the example configuration](https://github.com/dexidp/dex/blob/v${pkgs.dex-oidc.version}/config.yaml.dist). + [the example configuration](https://github.com/dexidp/dex/blob/v${cfg.package.version}/config.yaml.dist). It's also possible to refer to environment variables (defined in [services.dex.environmentFile](#opt-services.dex.environmentFile)) using the syntax `$VARIABLE_NAME`. @@ -103,7 +105,7 @@ in restartTriggers = restartTriggers; serviceConfig = { - ExecStart = "${pkgs.dex-oidc}/bin/dex serve /run/dex/config.yaml"; + ExecStart = "${cfg.package}/bin/dex serve /run/dex/config.yaml"; ExecStartPre = [ "${pkgs.coreutils}/bin/install -m 600 ${configFile} /run/dex/config.yaml" "+${startPreScript}"