From 9be70d9ad13edc388bea9649ecbfecd32c08d6ae Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 17 Jul 2025 14:33:11 +0200 Subject: [PATCH 01/96] llvmPackages.llvm: drop a test on loongarch64 --- pkgs/development/compilers/llvm/common/llvm/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index 519de80c8f8e..2a8f8f169eab 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -519,6 +519,14 @@ stdenv.mkDerivation ( # Fails in sandbox substituteInPlace unittests/Support/LockFileManagerTest.cpp --replace-fail "Basic" "DISABLED_Basic" '' + + + # https://github.com/llvm/llvm-project/issues/149616 + optionalString stdenv.hostPlatform.isLoongArch64 '' + substituteInPlace unittests/tools/llvm-exegesis/X86/SnippetRepetitorTest.cpp \ + --replace-fail \ + "TEST_F(X86SnippetRepetitorTest, Loop)" \ + "TEST_F(X86SnippetRepetitorTest, DISABLED_Loop)" + '' + '' patchShebangs test/BugPoint/compile-custom.ll.py '' From 7259b7ca67392490f869013e27155553ba950ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 23 Jul 2025 21:46:16 +0200 Subject: [PATCH 02/96] nixos/hedgedoc: add configureNginx option --- nixos/modules/services/web-apps/hedgedoc.nix | 36 +++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-apps/hedgedoc.nix b/nixos/modules/services/web-apps/hedgedoc.nix index 587cf10f9c53..e78e197795be 100644 --- a/nixos/modules/services/web-apps/hedgedoc.nix +++ b/nixos/modules/services/web-apps/hedgedoc.nix @@ -47,6 +47,12 @@ in package = lib.mkPackageOption pkgs "hedgedoc" { }; enable = lib.mkEnableOption "the HedgeDoc Markdown Editor"; + configureNginx = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Whether to configure nginx as a reverse proxy."; + }; + settings = mkOption { type = types.submodule { freeformType = settingsFormat.type; @@ -249,10 +255,32 @@ in isSystemUser = true; }; - services.hedgedoc.settings = { - defaultNotePath = lib.mkDefault "${cfg.package}/share/hedgedoc/public/default.md"; - docsPath = lib.mkDefault "${cfg.package}/share/hedgedoc/public/docs"; - viewPath = lib.mkDefault "${cfg.package}/share/hedgedoc/public/views"; + services = { + hedgedoc.settings = { + defaultNotePath = lib.mkDefault "${cfg.package}/share/hedgedoc/public/default.md"; + docsPath = lib.mkDefault "${cfg.package}/share/hedgedoc/public/docs"; + viewPath = lib.mkDefault "${cfg.package}/share/hedgedoc/public/views"; + }; + + nginx = lib.mkIf cfg.configureNginx.enable { + enable = true; + upstreams.hedgedoc.servers."unix:${config.services.hedgedoc.settings.path}" = { }; + virtualHosts."${cfg.settings.domain}" = { + enableACME = true; + forceSSL = true; + locations = { + "/" = { + proxyPass = "http://hedgedoc"; + recommendedProxySettings = true; + }; + "/socket.io/" = { + proxyPass = "http://hedgedoc"; + proxyWebsockets = true; + recommendedProxySettings = true; + }; + }; + }; + }; }; systemd.services.hedgedoc = { From ebb095396d4ade9589e33ce90a03d3c963819272 Mon Sep 17 00:00:00 2001 From: henning phan Date: Sat, 16 Aug 2025 22:06:09 +0200 Subject: [PATCH 03/96] nixos/zookeeper: replace outdated log4j with logback.xml Since some versions back zookeeper replaced log4j with logback.xml See issue https://issues.apache.org/jira/browse/ZOOKEEPER-4427 See commit https://github.com/apache/zookeeper/commit/85551f9be5b054fa4aee0636597b12bda2ecb2e8 --- .../manual/release-notes/rl-2511.section.md | 2 +- nixos/modules/services/misc/zookeeper.nix | 29 ++++++++++++++----- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index db028db407e9..71e91dfc5925 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -112,7 +112,7 @@ - The `zigbee2mqtt` package was updated to version 2.x, which contains breaking changes. See the [discussion](https://github.com/Koenkk/zigbee2mqtt/discussions/24198) for further information. - []{#sec-release-25.11-incompatibilities-sourcehut-removed} The `services.sourcehut` module and corresponding `sourcehut` packages were removed due to being broken and unmaintained. - +- The zookeeper project changed their logging tool to logback, therefore `services.zookeeper.logging` option has been updated to expect a logback compatible string. - The `dovecot` systemd service was renamed from `dovecot2` to `dovecot`. The former is now just an alias. Update any overrides on the systemd unit to the new name. - `Prosody` has been updated to major release 13 which removed some obsoleted modules and brought a couple of major and breaking changes: diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix index 498eab040f26..fd14f3a9ad94 100644 --- a/nixos/modules/services/misc/zookeeper.nix +++ b/nixos/modules/services/misc/zookeeper.nix @@ -19,7 +19,7 @@ let name = "zookeeper-conf"; paths = [ (pkgs.writeTextDir "zoo.cfg" zookeeperConfig) - (pkgs.writeTextDir "log4j.properties" cfg.logging) + (pkgs.writeTextDir "logback.xml" cfg.logging) ]; }; @@ -71,14 +71,27 @@ in }; logging = lib.mkOption { - description = "Zookeeper logging configuration."; + description = "Zookeeper logging configuration, logback.xml."; default = '' - zookeeper.root.logger=INFO, CONSOLE - log4j.rootLogger=INFO, CONSOLE - log4j.logger.org.apache.zookeeper.audit.Log4jAuditLogger=INFO, CONSOLE - log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender - log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout - log4j.appender.CONSOLE.layout.ConversionPattern=[myid:%X{myid}] - %-5p [%t:%C{1}@%L] - %m%n + + + + + + + + + + %d{ISO8601} [myid:%X{myid}] - %-5p [%t:%C{1}@%L] - %m%n + + + ''${zookeeper.console.threshold} + + + + + + ''; type = lib.types.lines; }; From 2a2909634efa550b04c439b69b5fa896b30b6c86 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 10 Aug 2025 00:45:28 +0100 Subject: [PATCH 04/96] bazel_7: fix build with modern Clang on macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This would also work for Bazel 6, but it’s being removed anyway. --- .../tools/build-managers/bazel/bazel_7/default.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index 4f5c45f6f464..7cd90a1f5822 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -707,6 +707,16 @@ stdenv.mkDerivation rec { dontStrip = true; dontPatchELF = true; + # Work around an issue with the old vendored zlib and modern versions + # of Clang on macOS. + # + # Fixed in newer versions of Bazel and rules_java; see + # . + # + # Credit to Homebrew for the hack: + # + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-fno-define-target-os-macros"; + passthru = { # TODO add some tests to cover basic functionality, and also tests for enableNixHacks=true (buildBazelPackage tests) # tests = ... diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a08d4f67c496..8deccec68a19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6778,7 +6778,6 @@ with pkgs; inherit (darwin) sigtool; buildJdk = jdk21_headless; runJdk = jdk21_headless; - stdenv = if stdenv.cc.isClang then llvmPackages_17.stdenv else stdenv; bazel_self = bazel_7; }; From c7b552857e82a5b106ad50719f4870f6e9a800ad Mon Sep 17 00:00:00 2001 From: qzylinra Date: Mon, 25 Aug 2025 09:36:38 +0800 Subject: [PATCH 05/96] fbjni: drop The software build has failed. It has no maintainer, and the library is not used by any other packages. Since it is difficult to maintain, it should be removed. --- pkgs/by-name/fb/fbjni/package.nix | 63 ------------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 pkgs/by-name/fb/fbjni/package.nix diff --git a/pkgs/by-name/fb/fbjni/package.nix b/pkgs/by-name/fb/fbjni/package.nix deleted file mode 100644 index 991e9531b7c5..000000000000 --- a/pkgs/by-name/fb/fbjni/package.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - fetchpatch, - jdk_headless, - gtest, -}: - -stdenv.mkDerivation rec { - pname = "fbjni"; - version = "0.5.1"; - - src = fetchFromGitHub { - owner = "facebookincubator"; - repo = "fbjni"; - rev = "v${version}"; - sha256 = "sha256-97KqfFWtR3VJe2s0D60L3dsIDm4kMa0hpkKoZSAEoVY="; - }; - - patches = [ - # Upstram fix for builds on GCC 13. Should be removable with next release after 0.5.1 - (fetchpatch { - name = "add-cstdint-include.patch"; - url = "https://github.com/facebookincubator/fbjni/commit/59461eff6c7881d58e958287481e1f1cd99e08d3.patch"; - hash = "sha256-r27C+ODTCZdd1tEz3cevnNNyZlrRhq1jOzwnIYlkglM="; - }) - - # Part of https://github.com/facebookincubator/fbjni/pull/76 - # fix cmake file installation directory - (fetchpatch { - url = "https://github.com/facebookincubator/fbjni/commit/ab02e60b5da28647bfcc864b0bb1b9a90504cdb1.patch"; - sha256 = "sha256-/h6kosulRH/ZAU2u0zRSaNDK39jsnFt9TaSxyBllZqM="; - }) - - # install headers - (fetchpatch { - url = "https://github.com/facebookincubator/fbjni/commit/74e125caa9a815244f1e6bd08eaba57d015378b4.patch"; - sha256 = "sha256-hQS35D69GD3ewV4zzPG+LO7jk7ncCj2CYDbLJ6SnpqE="; - }) - ]; - - nativeBuildInputs = [ - cmake - jdk_headless - ]; - - buildInputs = [ - gtest - ]; - - cmakeFlags = [ - "-DJAVA_HOME=${jdk_headless.passthru.home}" - ]; - - meta = with lib; { - description = "Library designed to simplify the usage of the Java Native Interface"; - homepage = "https://github.com/facebookincubator/fbjni"; - license = licenses.asl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6a6ac68b11a7..6a7c9452f9d2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -864,6 +864,7 @@ mapAliases { faustStk = faustPhysicalModeling; # Added 2023-05-16 fastnlo = throw "'fastnlo' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2024-10-17 fastnlo_toolkit = fastnlo-toolkit; # Added 2024-01-03 + fbjni = throw "fbjni has been removed, as it was broken"; # Added 2025-08-25 fcitx5-catppuccin = catppuccin-fcitx5; # Added 2024-06-19 fdr = throw "fdr has been removed, as it cannot be built from source and depends on Python 2.x"; # Added 2025-03-19 inherit (luaPackages) fennel; # Added 2022-09-24 From 501c0637d1012dea0de00e0fb09b6fe8e1c86002 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Aug 2025 07:33:40 +0000 Subject: [PATCH 06/96] python3Packages.islpy: 2025.2.4 -> 2025.2.5 --- pkgs/development/python-modules/islpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index 9ccafe8c6c5e..7cae30dc77b7 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "islpy"; - version = "2025.2.4"; + version = "2025.2.5"; pyproject = true; src = fetchFromGitHub { owner = "inducer"; repo = "islpy"; tag = "v${version}"; - hash = "sha256-6VNA07XnzmOTsrH16fXzEdl1HmShmrtUjQyUs18CxYc="; + hash = "sha256-E3DRj1WpMr79BVFUeJftp1JZafP2+Zn6yyf9ClfdWqI="; }; build-system = [ From e986605cacbf29a38f75ee2ba2961a90c996eec6 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Tue, 26 Aug 2025 23:58:22 -0400 Subject: [PATCH 07/96] pwdsphinx: init at 2.0.3 Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/pw/pwdsphinx/package.nix | 74 +++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 pkgs/by-name/pw/pwdsphinx/package.nix diff --git a/pkgs/by-name/pw/pwdsphinx/package.nix b/pkgs/by-name/pw/pwdsphinx/package.nix new file mode 100644 index 000000000000..73ce0ed9eef9 --- /dev/null +++ b/pkgs/by-name/pw/pwdsphinx/package.nix @@ -0,0 +1,74 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + installShellFiles, + pandoc, + writableTmpDirAsHomeHook, +}: + +python3Packages.buildPythonApplication rec { + pname = "pwdsphinx"; + version = "2.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "stef"; + repo = "pwdsphinx"; + tag = "v${version}"; + hash = "sha256-COSfA5QqIGWEnahmo5klFECK7XjyabGs1nG9vyhj/DM="; + }; + + postPatch = '' + substituteInPlace ./setup.py \ + --replace-fail 'zxcvbn-python' 'zxcvbn' + ''; + + build-system = [ python3Packages.setuptools ]; + + dependencies = with python3Packages; [ + cbor2 + pyequihash + pyoprf + pysodium + qrcodegen + securestring + zxcvbn + ]; + + # for man pages + nativeBuildInputs = [ + installShellFiles + pandoc + ]; + + postInstall = '' + mkdir -p $out/share/doc/pwdsphinx/ + cp -r ./configs $out/share/doc/pwdsphinx/ + installManPage man/*.1 + ''; + + nativeCheckInputs = [ + python3Packages.pytestCheckHook + writableTmpDirAsHomeHook + ]; + + preCheck = '' + mkdir -p ~/.config/sphinx + cp ${src}/configs/config ~/.config/sphinx/config + # command fails without key but the command generates the key, so always pass + $out/bin/sphinx init || true + ''; + + pythonImportsCheck = [ "pwdsphinx" ]; + + meta = { + description = "Native backend for web-extensions for Sphinx-based password storage"; + homepage = "https://www.ctrlc.hu/~stef/blog/posts/sphinx.html"; + downloadPage = "https://github.com/stef/pwdsphinx"; + changelog = "https://github.com/stef/pwdsphinx/releases/tag/v${version}"; + teams = [ lib.teams.ngi ]; + license = lib.licenses.gpl3Plus; + mainProgram = "sphinx"; + }; +} From a8e8cced5477ece89ebb47ba0237bc74d20901c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Aug 2025 21:12:18 +0000 Subject: [PATCH 08/96] dependency-track: 4.13.3 -> 4.13.4 --- pkgs/by-name/de/dependency-track/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/de/dependency-track/package.nix b/pkgs/by-name/de/dependency-track/package.nix index 4be4e8cc6f1b..b020c2f4a9a7 100644 --- a/pkgs/by-name/de/dependency-track/package.nix +++ b/pkgs/by-name/de/dependency-track/package.nix @@ -12,7 +12,7 @@ nixosTests, }: let - version = "4.13.3"; + version = "4.13.4"; frontend = buildNpmPackage { pname = "dependency-track-frontend"; @@ -25,7 +25,7 @@ let owner = "DependencyTrack"; repo = "frontend"; rev = version; - hash = "sha256-I6vR4FCVxyoNlj/iPopEJn98jsJWt4rGZZXS+iPDcmI="; + hash = "sha256-CBO69GSUDENBRGDGn7nbxxh9++SAqcFgRBg/SYPze5U="; }; installPhase = '' @@ -33,7 +33,7 @@ let cp -R ./dist $out/ ''; - npmDepsHash = "sha256-t+FPHb+OzavTUXjNw75EuFOuHmv8fQYqRQrUnF2zDXw="; + npmDepsHash = "sha256-W3EkDJ0raRNXXZO9ajob+cVN6vcdoUrZYYmkiruSHCE="; forceGitDeps = true; makeCacheWritable = true; @@ -50,7 +50,7 @@ maven.buildMavenPackage rec { owner = "DependencyTrack"; repo = "dependency-track"; rev = version; - hash = "sha256-9kkWb1YfUANoVAb9mnLkmVswE4f+YdEtd5aPEP+TRFo="; + hash = "sha256-bEODby53pVg/3KVUbLJvDAqfpyc0G+iIUxpLKy7LwJc="; }; patches = [ @@ -65,7 +65,7 @@ maven.buildMavenPackage rec { ''; mvnJdk = jre_headless; - mvnHash = "sha256-jsS8/xfvoowzcym3cxv9L5rYSr8YezPEQaUofs7yxUI="; + mvnHash = "sha256-zM4iPFwQV/sAX666SdfArcjJNVaWXAUeQoiNsYbv2GA="; manualMvnArtifacts = [ "com.coderplus.maven.plugins:copy-rename-maven-plugin:1.0.1" ]; buildOffline = true; From 8020a147882dc81fc67e7334f615dac135016f0d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Aug 2025 22:21:59 +0200 Subject: [PATCH 09/96] python313Packages.mkdocs-autorefs: 1.4.2 -> 1.4.3 Diff: https://github.com/mkdocstrings/autorefs/compare/1.4.2...1.4.3 Changelog: https://github.com/mkdocstrings/autorefs/blob/1.4.3/CHANGELOG.md --- pkgs/development/python-modules/mkdocs-autorefs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-autorefs/default.nix b/pkgs/development/python-modules/mkdocs-autorefs/default.nix index 113234cd1b35..0e27715fc230 100644 --- a/pkgs/development/python-modules/mkdocs-autorefs/default.nix +++ b/pkgs/development/python-modules/mkdocs-autorefs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "mkdocs-autorefs"; - version = "1.4.2"; + version = "1.4.3"; pyproject = true; src = fetchFromGitHub { owner = "mkdocstrings"; repo = "autorefs"; tag = version; - hash = "sha256-MO1ovW95v3QFaUfY2MDNLi14Hq/TbPkLKClQfOPc5no="; + hash = "sha256-/UPhoJL026jpdvC22uRFiAGN4pU/uqcDrROZmkTFWv0="; }; postPatch = '' From a9b4ed50350acc5fec3a9593a6c87f3f0d7f3a20 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 30 Aug 2025 11:52:15 +0300 Subject: [PATCH 10/96] heaptrack: 1.5.0 -> 1.5.0-unstable, switch to Qt6 --- .../tools/profiling/heaptrack/default.nix | 28 ++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix index f0920e8b850f..e5f6e15696d0 100644 --- a/pkgs/development/tools/profiling/heaptrack/default.nix +++ b/pkgs/development/tools/profiling/heaptrack/default.nix @@ -1,9 +1,7 @@ { lib, stdenv, - mkDerivation, - fetchFromGitHub, - fetchpatch, + fetchFromGitLab, cmake, extra-cmake-modules, makeBinaryWrapper, @@ -14,6 +12,7 @@ sparsehash, zstd, qtbase, + wrapQtAppsHook, kio, kitemmodels, threadweaver, @@ -22,30 +21,25 @@ kdiagram, }: -mkDerivation rec { +stdenv.mkDerivation { pname = "heaptrack"; - version = "1.5.0"; + version = "1.5.0-unstable-2025-07-21"; - src = fetchFromGitHub { - owner = "KDE"; + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "sdk"; repo = "heaptrack"; - rev = "v${version}"; - hash = "sha256-pP+s60ERnmOctYTe/vezCg0VYzziApNY0QaF3aTccZU="; + rev = "9db5d53df554959478575e080648f6854d362faf"; + hash = "sha256-8NLpp/+PK3wIB5Sx0Z1185DCDQ18zsGj9Wp5YNKgX8E="; }; - patches = [ - # cmake: Fix C compatibility of libunwind probes - (fetchpatch { - url = "https://invent.kde.org/sdk/heaptrack/-/commit/c6c45f3455a652c38aefa402aece5dafa492e8ab.patch"; - hash = "sha256-eou53UUQX+S7yrz2RS95GwkAnNIZY/aaze0eAdjnbPU="; - }) - ]; - nativeBuildInputs = [ cmake extra-cmake-modules makeBinaryWrapper + wrapQtAppsHook ]; + buildInputs = [ zlib boost diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe5094154213..7dd36b61c0dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3141,7 +3141,7 @@ with pkgs; hdf5-threadsafe = hdf5.override { threadsafe = true; }; - heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack { }; + heaptrack = kdePackages.callPackage ../development/tools/profiling/heaptrack { }; headscale = callPackage ../servers/headscale { }; From 50021ed95d54a83ceb77649e5f955cb54af7e819 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 22 Aug 2025 11:02:21 +0300 Subject: [PATCH 11/96] kbibtex: drop --- .../office/kbibtex/cpp-17-for-icu.patch | 13 --- pkgs/applications/office/kbibtex/default.nix | 91 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 106 deletions(-) delete mode 100644 pkgs/applications/office/kbibtex/cpp-17-for-icu.patch delete mode 100644 pkgs/applications/office/kbibtex/default.nix diff --git a/pkgs/applications/office/kbibtex/cpp-17-for-icu.patch b/pkgs/applications/office/kbibtex/cpp-17-for-icu.patch deleted file mode 100644 index 0bb72f184b6a..000000000000 --- a/pkgs/applications/office/kbibtex/cpp-17-for-icu.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 901e6979..d4fd549e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -10,7 +10,7 @@ project( - LANGUAGES CXX - ) - --set(CMAKE_CXX_STANDARD 11) -+set(CMAKE_CXX_STANDARD 17) - set(QT_MIN_VERSION 5.9.0) - # Somewhat arbitrary chosen version number ... - set(KF5_MIN_VERSION 5.51) diff --git a/pkgs/applications/office/kbibtex/default.nix b/pkgs/applications/office/kbibtex/default.nix deleted file mode 100644 index 8465279a6063..000000000000 --- a/pkgs/applications/office/kbibtex/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ - lib, - mkDerivation, - fetchurl, - # build-time - extra-cmake-modules, - shared-mime-info, - # Qt - qtxmlpatterns, - qtwebengine, - qca-qt5, - qtnetworkauth, - # KDE - ki18n, - kxmlgui, - kio, - kiconthemes, - kitemviews, - kparts, - kcoreaddons, - kservice, - ktexteditor, - kdoctools, - kwallet, - kcrash, - # other - poppler, - bibutils, -}: - -mkDerivation rec { - pname = "kbibtex"; - version = "0.10.0"; - - src = - let - majorMinorPatch = lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version)); - in - fetchurl { - url = "mirror://kde/stable/KBibTeX/${majorMinorPatch}/kbibtex-${version}.tar.xz"; - hash = "sha256-sSeyQKfNd8U4YZ3IgqOZs8bM13oEQopJevkG8U0JuMQ="; - }; - - patches = [ - # TODO remove when kbibtex updates past 0.10.0 - ./cpp-17-for-icu.patch - ]; - - nativeBuildInputs = [ - extra-cmake-modules - shared-mime-info - ]; - - buildInputs = [ - qtxmlpatterns - qtwebengine - qca-qt5 - qtnetworkauth - # TODO qtoauth - ki18n - kxmlgui - kio - kiconthemes - kitemviews - kparts - kcoreaddons - kservice - ktexteditor - kdoctools - kwallet - kcrash - poppler - ]; - - qtWrapperArgs = [ - "--prefix" - "PATH" - ":" - "${lib.makeBinPath [ bibutils ]}" - ]; - - meta = { - description = "Bibliography editor for KDE"; - mainProgram = "kbibtex"; - homepage = "https://userbase.kde.org/KBibTeX"; - changelog = "https://invent.kde.org/office/kbibtex/-/raw/v${version}/ChangeLog"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ dotlambda ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 06decd7bd8db..c5c80f817179 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1226,6 +1226,7 @@ mapAliases { kanidm_1_3 = throw "'kanidm_1_3' has been removed as it has reached end of life"; # Added 2025-03-10 kanidm_1_4 = throw "'kanidm_1_4' has been removed as it has reached end of life"; # Added 2025-06-18 kanidmWithSecretProvisioning_1_4 = throw "'kanidmWithSecretProvisioning_1_4' has been removed as it has reached end of life"; # Added 2025-06-18 + kbibtex = throw "'kbibtex' has been removed, as it is unmaintained upstream"; # Added 2025-08-30 kdbplus = throw "'kdbplus' has been removed from nixpkgs"; # Added 2024-05-06 kdeconnect = throw "'kdeconnect' has been renamed to/replaced by 'plasma5Packages.kdeconnect-kde'"; # Converted to throw 2024-10-17 keepkey_agent = keepkey-agent; # added 2024-01-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7dd36b61c0dd..dc54e40067f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12159,8 +12159,6 @@ with pkgs; k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; - kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { }; - kiwix = libsForQt5.callPackage ../applications/misc/kiwix { }; kiwix-tools = callPackage ../applications/misc/kiwix/tools.nix { }; From fd434e8dfc1c590ccfce77667716b63a8be00e0c Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 22 Aug 2025 11:02:21 +0300 Subject: [PATCH 12/96] kmplayer: drop --- pkgs/applications/video/kmplayer/default.nix | 81 ------------------- .../kmplayer_part-plugin_metadata.patch | 11 --- .../applications/video/kmplayer/no-docs.patch | 12 --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 5 files changed, 1 insertion(+), 106 deletions(-) delete mode 100644 pkgs/applications/video/kmplayer/default.nix delete mode 100644 pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch delete mode 100644 pkgs/applications/video/kmplayer/no-docs.patch diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix deleted file mode 100644 index 0c3d3d74e8df..000000000000 --- a/pkgs/applications/video/kmplayer/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ - mkDerivation, - lib, - fetchurl, - extra-cmake-modules, - makeWrapper, - libpthreadstubs, - libXdmcp, - qtsvg, - qtx11extras, - ki18n, - kdelibs4support, - kio, - kmediaplayer, - kwidgetsaddons, - phonon, - cairo, - mplayer, -}: - -mkDerivation rec { - majorMinorVersion = "0.12"; - patchVersion = "0b"; - version = "${majorMinorVersion}.${patchVersion}"; - pname = "kmplayer"; - - src = fetchurl { - url = "mirror://kde/stable/kmplayer/${majorMinorVersion}/kmplayer-${version}.tar.bz2"; - sha256 = "0wzdxym4fc83wvqyhcwid65yv59a2wvp1lq303cn124mpnlwx62y"; - }; - - patches = [ - ./kmplayer_part-plugin_metadata.patch # Qt 5.9 doesn't like an empty string for the optional "FILE" argument of "Q_PLUGIN_METADATA" - ./no-docs.patch # Don't build docs due to errors (kdelibs4support propagates kdoctools) - ]; - - postPatch = '' - sed -i src/kmplayer.desktop \ - -e "s,^Exec.*,Exec=$out/bin/kmplayer -qwindowtitle %c %i %U," - ''; - - # required for kf5auth to work correctly - cmakeFlags = [ "-DCMAKE_POLICY_DEFAULT_CMP0012=NEW" ]; - - nativeBuildInputs = [ - extra-cmake-modules - makeWrapper - ]; - - buildInputs = [ - libpthreadstubs - libXdmcp - qtsvg - qtx11extras - ki18n - kdelibs4support - kio - kmediaplayer - kwidgetsaddons - phonon - cairo - ]; - - postInstall = '' - wrapProgram $out/bin/kmplayer --suffix PATH : ${mplayer}/bin - ''; - - meta = with lib; { - description = "MPlayer front-end for KDE"; - license = with licenses; [ - gpl2Plus - lgpl2Plus - fdl12Plus - ]; - homepage = "https://kmplayer.kde.org/"; - maintainers = with maintainers; [ - sander - zraexy - ]; - }; -} diff --git a/pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch b/pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch deleted file mode 100644 index 9b6652b0be58..000000000000 --- a/pkgs/applications/video/kmplayer/kmplayer_part-plugin_metadata.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/kmplayer_part.h -+++ b/src/kmplayer_part.h -@@ -36,7 +36,7 @@ - - class KMPlayerFactory : public KPluginFactory { - Q_OBJECT -- Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory" FILE "") -+ Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory") - Q_INTERFACES(KPluginFactory) - public: - KMPlayerFactory(); diff --git a/pkgs/applications/video/kmplayer/no-docs.patch b/pkgs/applications/video/kmplayer/no-docs.patch deleted file mode 100644 index c93453f908c9..000000000000 --- a/pkgs/applications/video/kmplayer/no-docs.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -79,9 +79,6 @@ - - add_subdirectory(src) - add_subdirectory(icons) --if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc" AND KF5DocTools_VERSION) -- add_subdirectory(doc) --endif(KF5DocTools_VERSION) - add_subdirectory(data) - - if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c5c80f817179..97672f03762d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1240,6 +1240,7 @@ mapAliases { kibana = kibana7; kio-admin = makePlasma5Throw "kio-admin"; # Added 2023-03-18 kiwitalk = throw "KiwiTalk has been removed because the upstream has been deprecated at the request of Kakao and it's now obsolete."; # Added 2024-10-10 + kmplayer = throw "'kmplayer' has been removed, as it is unmaintained upstream"; # Added 2025-08-30 kodiGBM = kodi-gbm; kodiPlain = kodi; kodiPlainWayland = kodi-wayland; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc54e40067f5..6ef438ef7f4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12169,8 +12169,6 @@ with pkgs; llvmPackages = llvmPackages_13; }; - kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; - alkimia = kdePackages.callPackage ../development/libraries/alkimia { }; kmymoney = kdePackages.callPackage ../applications/office/kmymoney { }; From 8343919d409bdb57273849384ada9dc7aad0ff57 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 30 Aug 2025 12:51:31 +0300 Subject: [PATCH 13/96] kotatogram-desktop: build without kimageformats --- .../telegram/kotatogram-desktop/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 00fa69b85b8f..ca81dd98029d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -13,7 +13,11 @@ }: let - telegram-desktop = libsForQt5.callPackage ../telegram-desktop { inherit stdenv; }; + telegram-desktop = libsForQt5.callPackage ../telegram-desktop { + inherit stdenv; + # N/A on Qt5 + kimageformats = null; + }; version = "1.4.9"; tg_owt = telegram-desktop.tg_owt.overrideAttrs (oldAttrs: { version = "0-unstable-2024-06-15"; From 40528dc1d684093743948f58789b643e9b5163ac Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 22 Aug 2025 11:02:21 +0300 Subject: [PATCH 14/96] krename: drop --- pkgs/applications/misc/krename/default.nix | 68 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 pkgs/applications/misc/krename/default.nix diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix deleted file mode 100644 index fd385e7eddfe..000000000000 --- a/pkgs/applications/misc/krename/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - mkDerivation, - fetchurl, - fetchpatch, - lib, - extra-cmake-modules, - kdoctools, - wrapGAppsHook3, - kconfig, - kinit, - kjsembed, - taglib, - exiv2, - podofo_0_9, - kcrash, -}: - -let - pname = "krename"; - version = "5.0.2"; - -in -mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "sha256-sjxgp93Z9ttN1/VaxV/MqKVY+miq+PpcuJ4er2kvI+0="; - }; - - patches = [ - (fetchpatch { - name = "fix-build-with-exiv2-0.28.patch"; - url = "https://invent.kde.org/utilities/krename/-/commit/e7dd767a9a1068ee1fe1502c4d619b57d3b12add.patch"; - hash = "sha256-JpLVbegRHJbXi/Z99nZt9kgNTetBi+L9GfKv5s3LAZw="; - }) - ]; - - buildInputs = [ - taglib - exiv2 - podofo_0_9 - ]; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - wrapGAppsHook3 - ]; - - propagatedBuildInputs = [ - kconfig - kcrash - kinit - kjsembed - ]; - - NIX_LDFLAGS = "-ltag"; - - meta = with lib; { - description = "Powerful batch renamer for KDE"; - mainProgram = "krename"; - homepage = "https://kde.org/applications/utilities/krename/"; - license = licenses.gpl2; - maintainers = with maintainers; [ peterhoeg ]; - inherit (kconfig.meta) platforms; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 97672f03762d..0287f427a4b5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1248,6 +1248,7 @@ mapAliases { kramdown-rfc2629 = throw "'kramdown-rfc2629' has been renamed to/replaced by 'rubyPackages.kramdown-rfc2629'"; # Converted to throw 2024-10-17 krb5Full = krb5; kreative-square-fonts = throw "'kreative-square-fonts' has been renamed to 'kreative-square'"; # Added 2025-04-16 + krename = throw "'krename' has been removed, as it is unmaintained upstream"; # Added 2025-08-30 krita-beta = throw "'krita-beta' has been renamed to/replaced by 'krita'"; # Converted to throw 2024-10-17 krun = throw "'krun' has been renamed to/replaced by 'muvm'"; # Added 2025-05-01 kubei = kubeclarity; # Added 2023-05-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ef438ef7f4a..c35231b9cec3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3322,7 +3322,6 @@ with pkgs; kio-fuse = libsForQt5.callPackage ../tools/filesystems/kio-fuse { }; - krename = libsForQt5.callPackage ../applications/misc/krename { }; krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { }; From 03279a69c46f453c633c590c9d53a587ab9b12b9 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 22 Aug 2025 11:02:21 +0300 Subject: [PATCH 15/96] krunner-translator: drop --- .../tools/misc/krunner-translator/default.nix | 58 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 pkgs/tools/misc/krunner-translator/default.nix diff --git a/pkgs/tools/misc/krunner-translator/default.nix b/pkgs/tools/misc/krunner-translator/default.nix deleted file mode 100644 index ce20c400f5b9..000000000000 --- a/pkgs/tools/misc/krunner-translator/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - extra-cmake-modules, - krunner, - kconfigwidgets, - ktextwidgets, - kservice, - ki18n, - translate-shell, - qtbase, - qtdeclarative, - qtlocation, -}: - -stdenv.mkDerivation rec { - pname = "krunner-translator"; - version = "1.5.0"; - - src = fetchFromGitHub { - owner = "naraesk"; - repo = pname; - rev = "v${version}"; - sha256 = "8MusGvNhTxa8Sm8WiSwRaVIfZOeXmgcO4T6H9LqFGLs="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - dontWrapQtApps = true; - - buildInputs = [ - krunner - kconfigwidgets - ktextwidgets - kservice - ki18n - qtbase - qtdeclarative - qtlocation - ]; - - postPatch = '' - substituteInPlace src/translateShellProcess.cpp --replace "start(\"trans\", arguments);" "start(\"${translate-shell}/bin/trans\", arguments);" - ''; - - meta = with lib; { - description = "Plugin for KRunner which integrates a translator, supports Google Translate, Bing Translator, youdao and Baidu Fanyi"; - homepage = "https://github.com/naraesk/krunner-translator"; - license = licenses.gpl3; - maintainers = with maintainers; [ pongo1231 ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0287f427a4b5..6d9ed5ed7e3e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1251,6 +1251,7 @@ mapAliases { krename = throw "'krename' has been removed, as it is unmaintained upstream"; # Added 2025-08-30 krita-beta = throw "'krita-beta' has been renamed to/replaced by 'krita'"; # Converted to throw 2024-10-17 krun = throw "'krun' has been renamed to/replaced by 'muvm'"; # Added 2025-05-01 + krunner-translator = throw "'krunner-translator' has been removed, as it only works on Plasma 5"; # Added 2025-08-30 kubei = kubeclarity; # Added 2023-05-20 kubo-migrator-all-fs-repo-migrations = kubo-fs-repo-migrations; # Added 2024-09-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c35231b9cec3..7e3f1779c081 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3325,8 +3325,6 @@ with pkgs; krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { }; - krunner-translator = libsForQt5.callPackage ../tools/misc/krunner-translator { }; - krunvm = callPackage ../applications/virtualization/krunvm { inherit (darwin) sigtool; }; From 8dc328a87b2f6675752ccd07fc5cd1725fece387 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 22 Aug 2025 11:02:21 +0300 Subject: [PATCH 16/96] krunner-pass: drop --- pkgs/tools/security/krunner-pass/default.nix | 63 ------------------- .../security/krunner-pass/pass-path.patch | 13 ---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 - 4 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 pkgs/tools/security/krunner-pass/default.nix delete mode 100644 pkgs/tools/security/krunner-pass/pass-path.patch diff --git a/pkgs/tools/security/krunner-pass/default.nix b/pkgs/tools/security/krunner-pass/default.nix deleted file mode 100644 index 00f76354d09d..000000000000 --- a/pkgs/tools/security/krunner-pass/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - mkDerivation, - lib, - fetchFromGitHub, - fetchpatch, - cmake, - extra-cmake-modules, - kauth, - krunner, - pass, -}: - -mkDerivation rec { - pname = "krunner-pass"; - # when upgrading the version, check if cmakeFlags is still needed - version = "1.3.0"; - - src = fetchFromGitHub { - owner = "akermu"; - repo = "krunner-pass"; - rev = "v${version}"; - sha256 = "032fs2174ls545kjixbhzyd65wgxkw4s5vg8b20irc5c9ak3pxm0"; - }; - - buildInputs = [ - kauth - krunner - (pass.withExtensions (p: with p; [ pass-otp ])) - ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - patches = [ - (fetchpatch { - url = "https://github.com/peterhoeg/krunner-pass/commit/be2695f4ae74b0cccec8294defcc92758583d96b.patch"; - sha256 = "098dqnal57994p51p2srfzg4lgcd6ybp29h037llr9cdv02hdxvl"; - name = "fix_build.patch"; - }) - ./pass-path.patch - ]; - - CXXFLAGS = [ - ''-DNIXPKGS_PASS=\"${lib.getBin pass}/bin/pass\"'' - ]; - - cmakeFlags = [ - # there are *lots* of pointless warnings in v1.3.0 - "-Wno-dev" - # required for kf5auth to work correctly - "-DCMAKE_POLICY_DEFAULT_CMP0012=NEW" - ]; - - meta = with lib; { - description = "Integrates krunner with pass the unix standard password manager (https://www.passwordstore.org/)"; - homepage = "https://github.com/akermu/krunner-pass"; - license = licenses.gpl3; - maintainers = with maintainers; [ ysndr ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/tools/security/krunner-pass/pass-path.patch b/pkgs/tools/security/krunner-pass/pass-path.patch deleted file mode 100644 index 4ceb3c5d92da..000000000000 --- a/pkgs/tools/security/krunner-pass/pass-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pass.cpp b/pass.cpp -index c02f9d0..85c5b99 100644 ---- a/pass.cpp -+++ b/pass.cpp -@@ -193,7 +193,7 @@ void Pass::run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &m - } else { - args << "show" << match.text(); - } -- pass->start("pass", args); -+ pass->start(NIXPKGS_PASS, args); - - connect(pass, static_cast(&QProcess::finished), - [=](int exitCode, QProcess::ExitStatus exitStatus) { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6d9ed5ed7e3e..2f90195e3481 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1251,6 +1251,7 @@ mapAliases { krename = throw "'krename' has been removed, as it is unmaintained upstream"; # Added 2025-08-30 krita-beta = throw "'krita-beta' has been renamed to/replaced by 'krita'"; # Converted to throw 2024-10-17 krun = throw "'krun' has been renamed to/replaced by 'muvm'"; # Added 2025-05-01 + krunner-pass = throw "'krunner-pass' has been removed, as it only works on Plasma 5"; # Added 2025-08-30 krunner-translator = throw "'krunner-translator' has been removed, as it only works on Plasma 5"; # Added 2025-08-30 kubei = kubeclarity; # Added 2023-05-20 kubo-migrator-all-fs-repo-migrations = kubo-fs-repo-migrations; # Added 2024-09-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e3f1779c081..e9fe3b9a024c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3322,9 +3322,6 @@ with pkgs; kio-fuse = libsForQt5.callPackage ../tools/filesystems/kio-fuse { }; - - krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { }; - krunvm = callPackage ../applications/virtualization/krunvm { inherit (darwin) sigtool; }; From bf727c16d0342af17e3bd5f3a71c53fdaca8ea42 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 30 Aug 2025 12:07:13 +0300 Subject: [PATCH 17/96] libreoffice: drop Qt5 builds --- .../office/libreoffice/default.nix | 128 +++++++----------- pkgs/top-level/aliases.nix | 6 + pkgs/top-level/all-packages.nix | 27 +--- 3 files changed, 55 insertions(+), 106 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 19a34a5f3f9e..3eb603288d47 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -134,16 +134,10 @@ withFonts ? false, withHelp ? true, kdeIntegration ? false, - qtbase ? null, - qtx11extras ? null, - qtwayland ? null, - ki18n ? null, - kconfig ? null, - kcoreaddons ? null, - kio ? null, - kwindowsystem ? null, variant ? "fresh", debugLogging ? variant == "still", + qt6, + kdePackages, symlinkJoin, libpq, makeFontsConf, @@ -164,24 +158,6 @@ lp_solve, xmlsec, libcmis, - # The rest are used only in passthru, for the wrapper - kauth ? null, - kcompletion ? null, - kconfigwidgets ? null, - kglobalaccel ? null, - kitemviews ? null, - knotifications ? null, - ktextwidgets ? null, - kwidgetsaddons ? null, - kxmlgui ? null, - phonon ? null, - qtdeclarative ? null, - qtmultimedia ? null, - qtquickcontrols ? null, - qtsvg ? null, - qttools ? null, - solid ? null, - sonnet ? null, }: assert builtins.elem variant [ @@ -272,8 +248,6 @@ let help = srcsAttributes.help { inherit fetchurl fetchgit; }; }; - qtMajor = lib.versions.major qtbase.version; - # See `postPatch` for details kdeDeps = symlinkJoin { name = "libreoffice-kde-dependencies-${version}"; @@ -284,14 +258,13 @@ let (getLib e) ]) [ - qtbase - qtmultimedia - qtx11extras - kconfig - kcoreaddons - ki18n - kio - kwindowsystem + qt6.qtbase + qt6.qtmultimedia + kdePackages.kconfig + kdePackages.kcoreaddons + kdePackages.ki18n + kdePackages.kio + kdePackages.kwindowsystem ] ); }; @@ -402,7 +375,7 @@ stdenv.mkDerivation (finalAttrs: { zip ] ++ optionals kdeIntegration [ - qtbase + qt6.qtbase ]; buildInputs = @@ -503,10 +476,9 @@ stdenv.mkDerivation (finalAttrs: { zlib ] ++ optionals kdeIntegration [ - qtbase - qtx11extras - kcoreaddons - kio + qt6.qtbase + kdePackages.kcoreaddons + kdePackages.kio ]; preConfigure = '' @@ -534,10 +506,10 @@ stdenv.mkDerivation (finalAttrs: { # The 2nd option is not very Nix'y, but I'll take robust over nice any day. # Additionally, it's much easier to fix if LO breaks on the next upgrade (just # add the missing dependencies to it). - export QT${qtMajor}INC=${kdeDeps}/include - export QT${qtMajor}LIB=${kdeDeps}/lib - export KF${qtMajor}INC="${kdeDeps}/include ${kdeDeps}/include/KF${qtMajor}" - export KF${qtMajor}LIB=${kdeDeps}/lib + export QT6INC=${kdeDeps}/include + export QT6LIB=${kdeDeps}/lib + export KF6INC="${kdeDeps}/include ${kdeDeps}/include/KF6" + export KF6LIB=${kdeDeps}/lib ''; configureFlags = [ @@ -619,11 +591,8 @@ stdenv.mkDerivation (finalAttrs: { "--without-system-zxcvbn" ] ++ optionals kdeIntegration [ - "--enable-kf${qtMajor}" - "--enable-qt${qtMajor}" - ] - ++ optionals (kdeIntegration && qtMajor == "5") [ - "--enable-gtk3-kde5" + "--enable-kf6" + "--enable-qt6" ] ++ ( if variant == "fresh" || variant == "collabora" then @@ -657,9 +626,7 @@ stdenv.mkDerivation (finalAttrs: { buildTargets = [ "build-nocheck" ]; - # Disable tests for the Qt5 build, as they seem even more flaky - # than usual, and we will drop the Qt5 build after 24.11 anyway. - doCheck = !(kdeIntegration && qtMajor == "5"); + doCheck = true; preCheck = '' export HOME=$(pwd) @@ -715,7 +682,7 @@ stdenv.mkDerivation (finalAttrs: { inherit gtk3; # Although present in qtPackages, we need qtbase.qtPluginPrefix and # qtbase.qtQmlPrefix - inherit qtbase; + inherit (qt6) qtbase; gst_packages = with gst_all_1; [ gst-libav gst-plugins-bad @@ -725,35 +692,34 @@ stdenv.mkDerivation (finalAttrs: { gstreamer ]; qmlPackages = [ - ki18n - knotifications - qtdeclarative - qtmultimedia - qtquickcontrols - qtwayland - solid - sonnet + kdePackages.ki18n + kdePackages.knotifications + qt6.qtdeclarative + qt6.qtmultimedia + qt6.qtwayland + kdePackages.solid + kdePackages.sonnet ]; qtPackages = [ - kauth - kcompletion - kconfigwidgets - kglobalaccel - ki18n - kio - kitemviews - ktextwidgets - kwidgetsaddons - kwindowsystem - kxmlgui - phonon - qtbase - qtdeclarative - qtmultimedia - qtsvg - qttools - qtwayland - sonnet + kdePackages.kauth + kdePackages.kcompletion + kdePackages.kconfigwidgets + kdePackages.kglobalaccel + kdePackages.ki18n + kdePackages.kio + kdePackages.kitemviews + kdePackages.ktextwidgets + kdePackages.kwidgetsaddons + kdePackages.kwindowsystem + kdePackages.kxmlgui + kdePackages.phonon + qt6.qtbase + qt6.qtdeclarative + qt6.qtmultimedia + qt6.qtsvg + qt6.qttools + qt6.qtwayland + kdePackages.sonnet ]; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2f90195e3481..70c98a7184cb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1325,6 +1325,12 @@ mapAliases { LibreArp-lv2 = librearp-lv2; # Added 2024-06-12 libreddit = throw "'libreddit' has been removed because it is unmaintained upstream. Consider using 'redlib', a maintained fork"; # Added 2024-07-17 librtlsdr = rtl-sdr; # Added 2023-02-18 + libreoffice-qt6 = libreoffice-qt; # Added 2025-08-30 + libreoffice-qt6-unwrapped = libreoffice-qt.unwrapped; # Added 2025-08-30 + libreoffice-qt6-fresh = libreoffice-qt-fresh; # Added 2025-08-30 + libreoffice-qt6-fresh-unwrapped = libreoffice-qt-fresh.unwrapped; # Added 2025-08-30 + libreoffice-qt6-still = libreoffice-qt-still; # Added 2025-08-30 + libreoffice-qt6-still-unwrapped = libreoffice-qt-still.unwrapped; # Added 2025-08-30 librewolf-wayland = librewolf; # Added 2022-11-15 libseat = throw "'libseat' has been renamed to/replaced by 'seatd'"; # Converted to throw 2024-10-17 libsForQt515 = libsForQt5; # Added 2022-11-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9fe3b9a024c..7e4f35b5a192 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12249,7 +12249,7 @@ with pkgs; libreoffice-qt-fresh = lowPrio ( callPackage ../applications/office/libreoffice/wrapper.nix { - unwrapped = libsForQt5.callPackage ../applications/office/libreoffice { + unwrapped = kdePackages.callPackage ../applications/office/libreoffice { kdeIntegration = true; variant = "fresh"; }; @@ -12259,7 +12259,7 @@ with pkgs; libreoffice-qt-still = lowPrio ( callPackage ../applications/office/libreoffice/wrapper.nix { - unwrapped = libsForQt5.callPackage ../applications/office/libreoffice { + unwrapped = kdePackages.callPackage ../applications/office/libreoffice { kdeIntegration = true; variant = "still"; }; @@ -12267,29 +12267,6 @@ with pkgs; ); libreoffice-qt-still-unwrapped = libreoffice-qt-still.unwrapped; - libreoffice-qt6 = hiPrio libreoffice-qt6-still; - libreoffice-qt6-unwrapped = libreoffice-qt6.unwrapped; - - libreoffice-qt6-fresh = lowPrio ( - callPackage ../applications/office/libreoffice/wrapper.nix { - unwrapped = kdePackages.callPackage ../applications/office/libreoffice { - kdeIntegration = true; - variant = "fresh"; - }; - } - ); - libreoffice-qt6-fresh-unwrapped = libreoffice-qt6-fresh.unwrapped; - - libreoffice-qt6-still = lowPrio ( - callPackage ../applications/office/libreoffice/wrapper.nix { - unwrapped = kdePackages.callPackage ../applications/office/libreoffice { - kdeIntegration = true; - variant = "still"; - }; - } - ); - libreoffice-qt6-still-unwrapped = libreoffice-qt-still.unwrapped; - libreoffice-fresh = lowPrio ( callPackage ../applications/office/libreoffice/wrapper.nix { unwrapped = callPackage ../applications/office/libreoffice { From ef013d7b426e6919e40cacd054c9f6ad318db3ec Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 22 Aug 2025 11:02:21 +0300 Subject: [PATCH 18/96] libsForQt5.kpeoplevcard: drop --- .../libraries/kpeoplevcard/default.nix | 42 ------------------- pkgs/top-level/qt5-packages.nix | 2 - 2 files changed, 44 deletions(-) delete mode 100644 pkgs/development/libraries/kpeoplevcard/default.nix diff --git a/pkgs/development/libraries/kpeoplevcard/default.nix b/pkgs/development/libraries/kpeoplevcard/default.nix deleted file mode 100644 index 834556e3e1ca..000000000000 --- a/pkgs/development/libraries/kpeoplevcard/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - cmake, - pkg-config, - wrapQtAppsHook, - extra-cmake-modules, - kcoreaddons, - kpeople, - kcontacts, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "kpeoplevcard"; - version = "0.1"; - - src = fetchurl { - url = "mirror://kde/stable/kpeoplevcard/${finalAttrs.version}/kpeoplevcard-${finalAttrs.version}.tar.xz"; - sha256 = "1hv3fq5k0pps1wdvq9r1zjnr0nxf8qc3vwsnzh9jpvdy79ddzrcd"; - }; - - buildInputs = [ - kcoreaddons - kpeople - kcontacts - ]; - - nativeBuildInputs = [ - cmake - pkg-config - wrapQtAppsHook - extra-cmake-modules - ]; - - meta = with lib; { - description = "Pulseaudio bindings for Qt"; - homepage = "https://github.com/KDE/kpeoplevcard"; - license = with licenses; [ lgpl2 ]; - maintainers = with maintainers; [ doronbehar ]; - }; -}) diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index fa1d67e1b997..e1eb16e5f244 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -99,8 +99,6 @@ makeScopeWithSplicing' { kproperty = callPackage ../development/libraries/kproperty { }; - kpeoplevcard = callPackage ../development/libraries/kpeoplevcard { }; - kquickimageedit = callPackage ../development/libraries/kquickimageedit/0.3.0.nix { }; kuserfeedback = callPackage ../development/libraries/kuserfeedback { }; From 45c8546d76b2cd07e35e879a00608b4c12112031 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 22 Aug 2025 11:02:21 +0300 Subject: [PATCH 19/96] libsForQt5.kweathercore: drop --- .../libraries/kweathercore/default.nix | 38 ------------------- pkgs/top-level/qt5-packages.nix | 2 - 2 files changed, 40 deletions(-) delete mode 100644 pkgs/development/libraries/kweathercore/default.nix diff --git a/pkgs/development/libraries/kweathercore/default.nix b/pkgs/development/libraries/kweathercore/default.nix deleted file mode 100644 index 69fd778b59a5..000000000000 --- a/pkgs/development/libraries/kweathercore/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - mkDerivation, - lib, - fetchFromGitLab, - extra-cmake-modules, - kholidays, - ki18n, - qtlocation, -}: - -mkDerivation rec { - pname = "kweathercore"; - version = "0.7"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "libraries"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-CnnoPkgz97SfDG13zfyIWweVnp2oxAChTPKFxJC+L8A="; - }; - - buildInputs = [ - kholidays - ki18n - qtlocation - ]; - - nativeBuildInputs = [ extra-cmake-modules ]; - - meta = with lib; { - license = [ licenses.cc0 ]; - maintainers = [ ]; - description = '' - Library to facilitate retrieval of weather information including forecasts and alerts - ''; - }; -} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index e1eb16e5f244..8ec3af5a0414 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -103,8 +103,6 @@ makeScopeWithSplicing' { kuserfeedback = callPackage ../development/libraries/kuserfeedback { }; - kweathercore = libsForQt5.callPackage ../development/libraries/kweathercore { }; - ldutils = callPackage ../development/libraries/ldutils { }; libcommuni = callPackage ../development/libraries/libcommuni { }; From 1c69df60e052cc9dc5155815817eb47716c41b5b Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 22 Aug 2025 11:02:21 +0300 Subject: [PATCH 20/96] nm-tray: drop --- pkgs/tools/networking/networkmanager/tray.nix | 50 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 pkgs/tools/networking/networkmanager/tray.nix diff --git a/pkgs/tools/networking/networkmanager/tray.nix b/pkgs/tools/networking/networkmanager/tray.nix deleted file mode 100644 index 1e1882c35cf9..000000000000 --- a/pkgs/tools/networking/networkmanager/tray.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - lib, - mkDerivation, - fetchFromGitHub, - cmake, - pkg-config, - qttools, - qtbase, - networkmanager-qt, - modemmanager-qt, -}: - -mkDerivation rec { - pname = "nm-tray"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "palinek"; - repo = pname; - rev = version; - sha256 = "sha256-JTH1cmkgdW2aRWMYPRvOAvCJz0ClCIpjUtcWcqJQGSU="; - }; - - postPatch = '' - sed -i -e '1i#include ' src/nmmodel.cpp - ''; - - nativeBuildInputs = [ - cmake - pkg-config - qttools - ]; - - cmakeFlags = [ "-DWITH_MODEMMANAGER_SUPPORT=ON" ]; - - buildInputs = [ - qtbase - networkmanager-qt - modemmanager-qt - ]; - - meta = with lib; { - description = "Simple Network Manager frontend written in Qt"; - mainProgram = "nm-tray"; - homepage = "https://github.com/palinek/nm-tray"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ dtzWill ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 70c98a7184cb..26ca575b5c5a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1717,6 +1717,7 @@ mapAliases { # When the nixops_unstable alias is removed, nixops_unstable_minimal can be renamed to nixops_unstable. nixosTest = testers.nixosTest; # Added 2022-05-05 + nm-tray = throw "'nm-tray' has been removed, as it only works with Plasma 5"; # Added 2025-08-30 nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2024-10-17 noah = throw "'noah' has been removed because it was broken and its upstream archived"; # Added 2025-05-10 nodejs_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; # Added 2025-04-23 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e4f35b5a192..a0c49a34fff6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3684,8 +3684,6 @@ with pkgs; libnma-gtk4 = libnma.override { withGtk4 = true; }; - nm-tray = libsForQt5.callPackage ../tools/networking/networkmanager/tray.nix { }; - inherit (callPackages ../servers/nextcloud { }) nextcloud30 nextcloud31 From bc779518c97c405e35fe9a37d8cb904878c8cf6e Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 30 Aug 2025 11:56:09 +0300 Subject: [PATCH 21/96] nomacs: switch to Qt6 only --- pkgs/by-name/no/nomacs/package.nix | 28 +++++++++++----------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/no/nomacs/package.nix b/pkgs/by-name/no/nomacs/package.nix index ac699f437056..bd57d951d3b9 100644 --- a/pkgs/by-name/no/nomacs/package.nix +++ b/pkgs/by-name/no/nomacs/package.nix @@ -4,18 +4,13 @@ exiv2, fetchFromGitHub, libraw, - libsForQt5, kdePackages, + qt6, libtiff, opencv4, pkg-config, stdenv, - qtVersion ? 5, }: -let - myQt = if qtVersion == 5 then libsForQt5 else kdePackages; - inherit (myQt) wrapQtAppsHook; -in stdenv.mkDerivation (finalAttrs: { pname = "nomacs"; version = "3.21.1"; @@ -53,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - wrapQtAppsHook + qt6.wrapQtAppsHook pkg-config ]; @@ -65,15 +60,14 @@ stdenv.mkDerivation (finalAttrs: { # note `dev` is selected by `mkDerivation` automatically, so one should omit `getOutput "dev"`; # see: https://github.com/NixOS/nixpkgs/pull/314186#issuecomment-2129974277 (lib.getOutput "cxxdev" opencv4) - ] - ++ (with myQt; [ - kimageformats - qtbase - qtimageformats - qtsvg - qttools - quazip - ]); + + kdePackages.kimageformats + qt6.qtbase + qt6.qtimageformats + qt6.qtsvg + qt6.qttools + kdePackages.quazip + ]; cmakeFlags = [ (lib.cmakeBool "ENABLE_OPENCV" true) @@ -123,6 +117,6 @@ stdenv.mkDerivation (finalAttrs: { mindavi ppenguin ]; - inherit (myQt.qtbase.meta) platforms; + inherit (qt6.qtbase.meta) platforms; }; }) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 26ca575b5c5a..731d98cb3727 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1725,6 +1725,7 @@ mapAliases { corepack_18 = nodejs_18; # Added 2025-04-23 nodejs-18_x = nodejs_18; # Added 2022-11-06 nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06 + nomacs-qt6 = nomacs; # Added 2025-08-30 nomad_1_4 = throw "nomad_1_4 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-02-02 nomad_1_5 = throw "nomad_1_5 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-02-02 nomad_1_6 = throw "nomad_1_6 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-02-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0c49a34fff6..0c482df87bb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3700,8 +3700,6 @@ with pkgs; nomad_1_10 ; - nomacs-qt6 = nomacs.override { qtVersion = 6; }; - nth = with python3Packages; toPythonApplication name-that-hash; nvchecker = From a3192abffff03121a776927815f7f3b645332a75 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 30 Aug 2025 12:35:14 +0300 Subject: [PATCH 22/96] skrooge: switch to Qt6 --- pkgs/applications/office/skrooge/default.nix | 35 ++++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index bc526578fdbb..884f2ff7bc77 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -1,35 +1,35 @@ { - mkDerivation, + stdenv, lib, fetchurl, cmake, extra-cmake-modules, + pkg-config, + qtbase, + wrapQtAppsHook, qtwebengine, - qtscript, grantlee, - qtxmlpatterns, kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, - kdesignerplugin, kiconthemes, knewstuff, sqlcipher, - qca-qt5, - kactivities, + qca, + plasma-activities, karchive, kguiaddons, knotifyconfig, krunner, + ktexttemplate, kwindowsystem, libofx, shared-mime-info, - qtquickcontrols2, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "skrooge"; version = "25.4.0"; @@ -42,37 +42,38 @@ mkDerivation rec { cmake extra-cmake-modules kdoctools + pkg-config shared-mime-info + wrapQtAppsHook ]; buildInputs = [ + qtbase qtwebengine - qtscript grantlee kxmlgui kwallet kparts - qtxmlpatterns kjobwidgets - kdesignerplugin kiconthemes knewstuff sqlcipher - qca-qt5 - kactivities + qca + plasma-activities karchive kguiaddons knotifyconfig krunner + ktexttemplate kwindowsystem libofx - qtquickcontrols2 ]; - # SKG_DESIGNER must be used to generate the needed library for QtDesigner. - # This is needed ONLY for developers. So NOT NEEDED for end user. - # Source: https://forum.kde.org/viewtopic.php?f=210&t=143375#p393675 cmakeFlags = [ + "-DQT_MAJOR_VERSION=6" + # SKG_DESIGNER must be used to generate the needed library for QtDesigner. + # This is needed ONLY for developers. So NOT NEEDED for end user. + # Source: https://forum.kde.org/viewtopic.php?f=210&t=143375#p393675 "-DSKG_DESIGNER=OFF" "-DSKG_WEBENGINE=ON" "-DSKG_WEBKIT=OFF" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c482df87bb2..bb43f819e2c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13039,7 +13039,7 @@ with pkgs; super-slicer-latest = super-slicer.latest; - skrooge = libsForQt5.callPackage ../applications/office/skrooge { }; + skrooge = kdePackages.callPackage ../applications/office/skrooge { }; soci = callPackage ../development/libraries/soci { }; From 99d4380aaa526304685deafc77229dbe0a803f3d Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 22 Aug 2025 11:02:21 +0300 Subject: [PATCH 23/96] treewide: trim some leaves from KF5 We can't really drop all of this yet, but there's at least some progress here. --- .../libraries/kde-frameworks/baloo.nix | 53 ----- .../libraries/kde-frameworks/bluez-qt.nix | 24 --- .../libraries/kde-frameworks/default.nix | 188 +++++++++--------- .../libraries/kde-frameworks/kapidox.nix | 37 ---- .../libraries/kde-frameworks/kcontacts.nix | 33 --- .../libraries/kde-frameworks/kdav.nix | 33 --- .../kde-frameworks/kdesu/default.nix | 31 --- ...desu-search-for-wrapped-daemon-first.patch | 38 ---- .../kfilemetadata/cmake-install-paths.patch | 13 -- .../kde-frameworks/kfilemetadata/default.nix | 41 ---- .../libraries/kde-frameworks/kholidays.nix | 34 ---- .../libraries/kde-frameworks/khtml.nix | 53 ----- .../kde-frameworks/kimageformats.nix | 36 ---- .../libraries/kde-frameworks/kjs.nix | 24 --- .../libraries/kde-frameworks/kjsembed.nix | 23 --- .../libraries/kde-frameworks/kmediaplayer.nix | 15 -- .../libraries/kde-frameworks/kpeople.nix | 25 --- .../libraries/kde-frameworks/kpty.nix | 21 -- .../libraries/kde-frameworks/kquickcharts.nix | 15 -- .../libraries/kde-frameworks/kross.nix | 39 ---- .../libraries/kde-frameworks/ktexteditor.nix | 53 ----- .../kde-frameworks/kxmlrpcclient.nix | 17 -- .../kde-frameworks/modemmanager-qt.nix | 21 -- .../kde-frameworks/networkmanager-qt.nix | 22 -- .../libraries/kde-frameworks/oxygen-icons.nix | 14 -- .../libraries/kde-frameworks/prison.nix | 27 --- .../kde-frameworks/qqc2-desktop-style.nix | 21 -- pkgs/top-level/qt5-packages.nix | 1 + 28 files changed, 98 insertions(+), 854 deletions(-) delete mode 100644 pkgs/development/libraries/kde-frameworks/baloo.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/bluez-qt.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kapidox.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kcontacts.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kdav.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kdesu/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch delete mode 100644 pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch delete mode 100644 pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kholidays.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/khtml.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kimageformats.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kjs.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kjsembed.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kmediaplayer.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kpeople.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kpty.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kquickcharts.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kross.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/ktexteditor.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/oxygen-icons.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/prison.nix delete mode 100644 pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix deleted file mode 100644 index b71c851dccd8..000000000000 --- a/pkgs/development/libraries/kde-frameworks/baloo.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kauth, - kconfig, - kcoreaddons, - kcrash, - kdbusaddons, - kfilemetadata, - ki18n, - kidletime, - kio, - lmdb, - qtbase, - qtdeclarative, - solid, -}: - -mkDerivation { - pname = "baloo"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kauth - kconfig - kcrash - kdbusaddons - ki18n - kio - kidletime - lmdb - qtdeclarative - solid - ]; - outputs = [ - "out" - "dev" - ]; - propagatedBuildInputs = [ - kcoreaddons - kfilemetadata - qtbase - ]; - - # kde-baloo.service uses `ExecCondition=@KDE_INSTALL_FULL_BINDIR@/kde-systemd-start-condition ...` - # which comes from the "plasma-workspace" derivation, but KDE_INSTALL_* all point at the "baloo" one - # (`${lib.getBin pkgs.plasma-workspace}` would cause infinite recursion) - postUnpack = '' - substituteInPlace "$sourceRoot"/src/file/kde-baloo.service.in \ - --replace @KDE_INSTALL_FULL_BINDIR@ /run/current-system/sw/bin - ''; - meta.platforms = lib.platforms.linux ++ lib.platforms.freebsd; -} diff --git a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix deleted file mode 100644 index a94d15596afb..000000000000 --- a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - qtbase, - qtdeclarative, - udevCheckHook, -}: - -mkDerivation { - pname = "bluez-qt"; - nativeBuildInputs = [ - extra-cmake-modules - udevCheckHook - ]; - buildInputs = [ qtdeclarative ]; - propagatedBuildInputs = [ qtbase ]; - preConfigure = '' - substituteInPlace CMakeLists.txt \ - --replace /lib/udev/rules.d "$bin/lib/udev/rules.d" - ''; - doInstallCheck = true; - meta.platforms = lib.platforms.linux; -} diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 59b9c75804f2..1aad44bf359f 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -23,6 +23,7 @@ */ { + config, libsForQt5, lib, fetchurl, @@ -134,103 +135,108 @@ let }; + mkThrow = + name: throw "libsForQt5.${name} has been removed, as KDE Frameworks 5 has reached end of life."; in - { - extra-cmake-modules = callPackage ./extra-cmake-modules { }; + ( + { + extra-cmake-modules = callPackage ./extra-cmake-modules { }; - # TIER 1 - attica = callPackage ./attica.nix { }; - bluez-qt = callPackage ./bluez-qt.nix { }; - breeze-icons = callPackage ./breeze-icons.nix { }; - kapidox = callPackage ./kapidox.nix { }; - karchive = callPackage ./karchive.nix { }; - kcalendarcore = callPackage ./kcalendarcore.nix { }; - kcodecs = callPackage ./kcodecs.nix { }; - kconfig = callPackage ./kconfig.nix { }; - kcoreaddons = callPackage ./kcoreaddons.nix { }; - kdbusaddons = callPackage ./kdbusaddons.nix { }; - kdnssd = callPackage ./kdnssd.nix { }; - kguiaddons = callPackage ./kguiaddons.nix { }; - kholidays = callPackage ./kholidays.nix { }; - ki18n = callPackage ./ki18n.nix { }; - kidletime = callPackage ./kidletime.nix { }; - kirigami2 = callPackage ./kirigami2.nix { }; - kitemmodels = callPackage ./kitemmodels.nix { }; - kitemviews = callPackage ./kitemviews.nix { }; - kplotting = callPackage ./kplotting.nix { }; - kquickcharts = callPackage ./kquickcharts.nix { }; - kwayland = callPackage ./kwayland.nix { }; - kwidgetsaddons = callPackage ./kwidgetsaddons.nix { }; - kwindowsystem = callPackage ./kwindowsystem { }; - modemmanager-qt = callPackage ./modemmanager-qt.nix { }; - networkmanager-qt = callPackage ./networkmanager-qt.nix { }; - oxygen-icons = callPackage ./oxygen-icons.nix { }; - oxygen-icons5 = oxygen-icons; - prison = callPackage ./prison.nix { }; - qqc2-desktop-style = callPackage ./qqc2-desktop-style.nix { }; - solid = callPackage ./solid { }; - sonnet = callPackage ./sonnet.nix { }; - syntax-highlighting = callPackage ./syntax-highlighting.nix { }; - threadweaver = callPackage ./threadweaver.nix { }; + # TIER 1 + attica = callPackage ./attica.nix { }; + breeze-icons = callPackage ./breeze-icons.nix { }; + karchive = callPackage ./karchive.nix { }; + kcalendarcore = callPackage ./kcalendarcore.nix { }; + kcodecs = callPackage ./kcodecs.nix { }; + kconfig = callPackage ./kconfig.nix { }; + kcoreaddons = callPackage ./kcoreaddons.nix { }; + kdbusaddons = callPackage ./kdbusaddons.nix { }; + kdnssd = callPackage ./kdnssd.nix { }; + kguiaddons = callPackage ./kguiaddons.nix { }; + ki18n = callPackage ./ki18n.nix { }; + kidletime = callPackage ./kidletime.nix { }; + kirigami2 = callPackage ./kirigami2.nix { }; + kitemmodels = callPackage ./kitemmodels.nix { }; + kitemviews = callPackage ./kitemviews.nix { }; + kplotting = callPackage ./kplotting.nix { }; + kwayland = callPackage ./kwayland.nix { }; + kwidgetsaddons = callPackage ./kwidgetsaddons.nix { }; + kwindowsystem = callPackage ./kwindowsystem { }; + solid = callPackage ./solid { }; + sonnet = callPackage ./sonnet.nix { }; + syntax-highlighting = callPackage ./syntax-highlighting.nix { }; - # TIER 2 - kactivities = callPackage ./kactivities.nix { }; - kauth = callPackage ./kauth { }; - kcompletion = callPackage ./kcompletion.nix { }; - kcontacts = callPackage ./kcontacts.nix { }; - kcrash = callPackage ./kcrash.nix { }; - kdoctools = callPackage ./kdoctools { }; - kfilemetadata = callPackage ./kfilemetadata { }; - kimageformats = callPackage ./kimageformats.nix { }; - kjobwidgets = callPackage ./kjobwidgets.nix { }; - knotifications = callPackage ./knotifications.nix { }; - kpackage = callPackage ./kpackage { }; - kpeople = callPackage ./kpeople.nix { }; - kpty = callPackage ./kpty.nix { }; - kunitconversion = callPackage ./kunitconversion.nix { }; - syndication = callPackage ./syndication.nix { }; + # TIER 2 + kactivities = callPackage ./kactivities.nix { }; + kauth = callPackage ./kauth { }; + kcompletion = callPackage ./kcompletion.nix { }; + kcrash = callPackage ./kcrash.nix { }; + kdoctools = callPackage ./kdoctools { }; + kjobwidgets = callPackage ./kjobwidgets.nix { }; + knotifications = callPackage ./knotifications.nix { }; + kpackage = callPackage ./kpackage { }; + kunitconversion = callPackage ./kunitconversion.nix { }; + syndication = callPackage ./syndication.nix { }; - # TIER 3 - baloo = callPackage ./baloo.nix { }; - kactivities-stats = callPackage ./kactivities-stats.nix { }; - kbookmarks = callPackage ./kbookmarks.nix { }; - kcmutils = callPackage ./kcmutils.nix { }; - kconfigwidgets = callPackage ./kconfigwidgets.nix { }; - kdav = callPackage ./kdav.nix { }; - kdeclarative = callPackage ./kdeclarative.nix { }; - kded = callPackage ./kded.nix { }; - kdesu = callPackage ./kdesu { }; - kemoticons = callPackage ./kemoticons.nix { }; - kglobalaccel = callPackage ./kglobalaccel.nix { }; - kiconthemes = callPackage ./kiconthemes { }; - kinit = callPackage ./kinit { }; - kio = callPackage ./kio { }; - knewstuff = callPackage ./knewstuff { }; - knotifyconfig = callPackage ./knotifyconfig.nix { }; - kparts = callPackage ./kparts.nix { }; - krunner = callPackage ./krunner.nix { }; - kservice = callPackage ./kservice { }; - ktexteditor = callPackage ./ktexteditor.nix { }; - ktextwidgets = callPackage ./ktextwidgets.nix { }; - kwallet = callPackage ./kwallet.nix { }; - kxmlgui = callPackage ./kxmlgui.nix { }; - plasma-framework = callPackage ./plasma-framework.nix { }; - kpurpose = callPackage ./purpose.nix { }; + # TIER 3 + kactivities-stats = callPackage ./kactivities-stats.nix { }; + kbookmarks = callPackage ./kbookmarks.nix { }; + kcmutils = callPackage ./kcmutils.nix { }; + kconfigwidgets = callPackage ./kconfigwidgets.nix { }; + kdeclarative = callPackage ./kdeclarative.nix { }; + kded = callPackage ./kded.nix { }; + kemoticons = callPackage ./kemoticons.nix { }; + kglobalaccel = callPackage ./kglobalaccel.nix { }; + kiconthemes = callPackage ./kiconthemes { }; + kinit = callPackage ./kinit { }; + kio = callPackage ./kio { }; + knewstuff = callPackage ./knewstuff { }; + knotifyconfig = callPackage ./knotifyconfig.nix { }; + kparts = callPackage ./kparts.nix { }; + kservice = callPackage ./kservice { }; + ktextwidgets = callPackage ./ktextwidgets.nix { }; + kwallet = callPackage ./kwallet.nix { }; + kxmlgui = callPackage ./kxmlgui.nix { }; + plasma-framework = callPackage ./plasma-framework.nix { }; - # TIER 4 - frameworkintegration = callPackage ./frameworkintegration.nix { }; + # TIER 4 + frameworkintegration = callPackage ./frameworkintegration.nix { }; - # PORTING AIDS - kdelibs4support = callPackage ./kdelibs4support { }; - kdesignerplugin = callPackage ./kdesignerplugin.nix { }; - khtml = callPackage ./khtml.nix { }; - kjs = callPackage ./kjs.nix { }; - kjsembed = callPackage ./kjsembed.nix { }; - kmediaplayer = callPackage ./kmediaplayer.nix { }; - kross = callPackage ./kross.nix { }; - kxmlrpcclient = callPackage ./kxmlrpcclient.nix { }; - - }; + # PORTING AIDS + kdelibs4support = callPackage ./kdelibs4support { }; + kdesignerplugin = callPackage ./kdesignerplugin.nix { }; + } + // lib.optionalAttrs config.allowAliases { + baloo = mkThrow "baloo"; + bluez-qt = mkThrow "bluez-qt"; + kapidox = mkThrow "kapidox"; + kcontacts = mkThrow "kcontacts"; + kdav = mkThrow "kdav"; + kdesu = mkThrow "kdesu"; + kfilemetadata = mkThrow "kfilemetadata"; + kholidays = mkThrow "kholidays"; + khtml = mkThrow "kthml"; + kimageformats = mkThrow "kimageformats"; + kjs = mkThrow "kjs"; + kjsembed = mkThrow "kjsembed"; + kmediaplayer = mkThrow "kmediaplayer"; + kpeople = mkThrow "kpeople"; + kpty = mkThrow "kpty"; + kpurpose = mkThrow "kpurpose"; + kquickcharts = mkThrow "kquickcharts"; + kross = mkThrow "kross"; + krunner = mkThrow "krunner"; + ktexteditor = mkThrow "ktexteditor"; + kxmlrpcclient = mkThrow "kxmlrpcclient"; + modemmanager-qt = mkThrow "modemmanager-qt"; + networkmanager-qt = mkThrow "networkmanager-qt"; + oxygen-icons = mkThrow "oxygen-icons"; + oxygen-icons5 = mkThrow "oxygen-icons"; + prison = mkThrow "prison"; + qqc2-desktop-style = mkThrow "qqc2-desktop-style"; + threadweaver = mkThrow "threadweaver"; + } + ); in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/development/libraries/kde-frameworks/kapidox.nix b/pkgs/development/libraries/kde-frameworks/kapidox.nix deleted file mode 100644 index dda2c55c0daa..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kapidox.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - mkDerivation, - python3, - qtbase, -}: - -mkDerivation { - pname = "kapidox"; - nativeBuildInputs = [ - python3.pkgs.setuptools - qtbase - ]; - - buildInputs = with python3.pkgs; [ - jinja2 - pyyaml - requests - ]; - - postPatch = '' - sed -i -e 's|"doxy\w\+", ||g' setup.py - ''; - - buildPhase = '' - runHook preBuild - ${python3.interpreter} setup.py build - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - ${python3.interpreter} setup.py install --prefix="$out" - runHook postInstall - ''; - - outputs = [ "out" ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kcontacts.nix b/pkgs/development/libraries/kde-frameworks/kcontacts.nix deleted file mode 100644 index 00602918417f..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kcontacts.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - isocodes, - kcoreaddons, - kconfig, - kcodecs, - ki18n, - qtbase, -}: - -mkDerivation { - pname = "kcontacts"; - meta = { - license = [ lib.licenses.lgpl21 ]; - }; - propagatedBuildInputs = [ - isocodes - ]; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcoreaddons - kconfig - kcodecs - ki18n - qtbase - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kdav.nix b/pkgs/development/libraries/kde-frameworks/kdav.nix deleted file mode 100644 index 968063d611c6..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kdav.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - kcoreaddons, - kio, - qtxmlpatterns, -}: - -mkDerivation { - pname = "kdav"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcoreaddons - kio - qtxmlpatterns - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kdesu/default.nix b/pkgs/development/libraries/kde-frameworks/kdesu/default.nix deleted file mode 100644 index a16f4afe0048..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kdesu/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kcoreaddons, - ki18n, - kpty, - kservice, - qtbase, - useSudo ? false, -}: - -mkDerivation { - pname = "kdesu"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcoreaddons - ki18n - kpty - kservice - qtbase - ]; - propagatedBuildInputs = [ kpty ]; - outputs = [ - "out" - "dev" - ]; - patches = [ ./kdesu-search-for-wrapped-daemon-first.patch ]; - cmakeFlags = lib.optionals useSudo [ "-DKDESU_USE_SUDO_DEFAULT=On" ]; - meta.platforms = lib.platforms.linux ++ lib.platforms.freebsd; -} diff --git a/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch b/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch deleted file mode 100644 index 1379707f02fe..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 01af4d2a098e5819c09bca37568941dcd4b89d0b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= -Date: Thu, 16 Jul 2020 13:21:42 -0300 -Subject: [PATCH] Search for the daemon first in /run/wrappers/bin - -If looking first in libexec, the eventually wrapped one in -/run/wrappers/bin can not be found. ---- - src/client.cpp | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/src/client.cpp b/src/client.cpp -index 44fbacd..6b5abf5 100644 ---- a/src/client.cpp -+++ b/src/client.cpp -@@ -384,11 +384,14 @@ int KDEsuClient::stopServer() - - static QString findDaemon() - { -- QString daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF "/kdesud"); -- if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH -- daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); -- if (daemon.isEmpty()) { -- qCWarning(KSU_LOG) << "kdesud daemon not found."; -+ QString daemon = QFile::decodeName("/run/wrappers/bin/kdesud"); -+ if (!QFile::exists(daemon)) { // if not in wrappers -+ daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF "/kdesud"); -+ if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH -+ daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); -+ if (daemon.isEmpty()) { -+ qCWarning(KSU_LOG) << "kdesud daemon not found."; -+ } - } - } - return daemon; --- -2.27.0 - diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch deleted file mode 100644 index daeaf222b630..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: kfilemetadata-5.18.0/src/CMakeLists.txt -=================================================================== ---- kfilemetadata-5.18.0.orig/src/CMakeLists.txt -+++ kfilemetadata-5.18.0/src/CMakeLists.txt -@@ -49,7 +49,7 @@ install(TARGETS KF5FileMetaData EXPORT K - - install(EXPORT KF5FileMetaDataTargets - NAMESPACE KF5:: -- DESTINATION ${KDE_INSTALL_LIBDIR}/cmake/KF5FileMetaData -+ DESTINATION ${KDE_INSTALL_FULL_CMAKEPACKAGEDIR}/KF5FileMetaData - FILE KF5FileMetaDataTargets.cmake) - - install(FILES diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix deleted file mode 100644 index 1bdfc378d031..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - mkDerivation, - lib, - stdenv, - extra-cmake-modules, - attr, - ebook_tools, - exiv2, - ffmpeg, - karchive, - kcoreaddons, - ki18n, - poppler, - qtbase, - qtmultimedia, - taglib, -}: - -mkDerivation { - pname = "kfilemetadata"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - attr - ] - ++ [ - ebook_tools - exiv2 - ffmpeg - karchive - kcoreaddons - ki18n - poppler - qtbase - qtmultimedia - taglib - ]; - patches = [ - ./cmake-install-paths.patch - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kholidays.nix b/pkgs/development/libraries/kde-frameworks/kholidays.nix deleted file mode 100644 index 2b88650322a0..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kholidays.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - kdoctools, - qtbase, - qtdeclarative, - qttools, -}: - -mkDerivation { - pname = "kholidays"; - meta = { - license = with lib.licenses; [ - gpl2Plus - lgpl21Plus - fdl12Plus - ]; - maintainers = with lib.maintainers; [ bkchr ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - qtbase - qtdeclarative - qttools - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/khtml.nix b/pkgs/development/libraries/kde-frameworks/khtml.nix deleted file mode 100644 index a513f0f499af..000000000000 --- a/pkgs/development/libraries/kde-frameworks/khtml.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - perl, - giflib, - karchive, - kcodecs, - kglobalaccel, - ki18n, - kiconthemes, - kio, - kjs, - knotifications, - kparts, - ktextwidgets, - kwallet, - kwidgetsaddons, - kwindowsystem, - kxmlgui, - phonon, - qtx11extras, - sonnet, - gperf, -}: - -mkDerivation { - pname = "khtml"; - nativeBuildInputs = [ - extra-cmake-modules - perl - ]; - buildInputs = [ - giflib - karchive - kcodecs - kglobalaccel - ki18n - kiconthemes - kio - knotifications - kparts - ktextwidgets - kwallet - kwidgetsaddons - kwindowsystem - kxmlgui - phonon - qtx11extras - sonnet - gperf - ]; - propagatedBuildInputs = [ kjs ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix deleted file mode 100644 index bc1b86099939..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - ilmbase, - karchive, - openexr, - libavif, - libheif, - libjxl, - libraw, - qtbase, -}: - -let - inherit (lib) getDev; -in - -mkDerivation { - pname = "kimageformats"; - - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - karchive - openexr - libavif - libheif - libjxl - libraw - qtbase - ]; - outputs = [ "out" ]; # plugins only - cmakeFlags = [ - "-DKIMAGEFORMATS_HEIF=ON" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kjs.nix b/pkgs/development/libraries/kde-frameworks/kjs.nix deleted file mode 100644 index 681748d86e70..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kjs.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - lib, - mkDerivation, - extra-cmake-modules, - kdoctools, - qtbase, -}: - -mkDerivation { - pname = "kjs"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - qtbase - ]; - cmakeFlags = [ - # this can break stuff, see: - # https://invent.kde.org/frameworks/kjs/-/blob/3c663ad8ac16f8982784a5ebd5d9200e7aa07936/CMakeLists.txt#L36-46 - # However: It shouldn't break much considering plasma 5 is planned to be removed. - (lib.cmakeBool "KJS_FORCE_DISABLE_PCRE" true) - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kjsembed.nix b/pkgs/development/libraries/kde-frameworks/kjsembed.nix deleted file mode 100644 index 4b2af13ad7c7..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kjsembed.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kdoctools, - qttools, - ki18n, - kjs, - qtsvg, -}: - -mkDerivation { - pname = "kjsembed"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - qttools - ]; - buildInputs = [ - ki18n - qtsvg - ]; - propagatedBuildInputs = [ kjs ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix deleted file mode 100644 index 4e2944cc18dd..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kparts, - kxmlgui, -}: - -mkDerivation { - pname = "kmediaplayer"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kparts - kxmlgui - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kpeople.nix b/pkgs/development/libraries/kde-frameworks/kpeople.nix deleted file mode 100644 index 0402fa8b9187..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kpeople.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kcoreaddons, - ki18n, - kitemviews, - kservice, - kwidgetsaddons, - qtbase, - qtdeclarative, -}: - -mkDerivation { - pname = "kpeople"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcoreaddons - ki18n - kitemviews - kservice - kwidgetsaddons - qtdeclarative - ]; - propagatedBuildInputs = [ qtbase ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kpty.nix b/pkgs/development/libraries/kde-frameworks/kpty.nix deleted file mode 100644 index 0815382c9443..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kpty.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kcoreaddons, - ki18n, - qtbase, -}: - -mkDerivation { - pname = "kpty"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcoreaddons - ki18n - qtbase - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kquickcharts.nix b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix deleted file mode 100644 index 8b54c123308e..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kquickcharts.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - qtquickcontrols2, -}: - -mkDerivation { - pname = "kquickcharts"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ qtquickcontrols2 ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/kross.nix b/pkgs/development/libraries/kde-frameworks/kross.nix deleted file mode 100644 index 970dab3e05c5..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kross.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - kcompletion, - kcoreaddons, - kdoctools, - ki18n, - kiconthemes, - kio, - kparts, - kwidgetsaddons, - kxmlgui, - qtbase, - qtscript, - qtxmlpatterns, -}: - -mkDerivation { - pname = "kross"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcompletion - kcoreaddons - kxmlgui - ]; - propagatedBuildInputs = [ - ki18n - kiconthemes - kio - kparts - kwidgetsaddons - qtbase - qtscript - qtxmlpatterns - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix deleted file mode 100644 index cd9ee0aa7f5b..000000000000 --- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - mkDerivation, - lib, - stdenv, - extra-cmake-modules, - perl, - karchive, - kconfig, - kguiaddons, - ki18n, - kiconthemes, - kio, - kparts, - libgit2, - qtscript, - qtxmlpatterns, - sonnet, - syntax-highlighting, - qtquickcontrols, - editorconfig-core-c, -}: - -mkDerivation ( - { - pname = "ktexteditor"; - nativeBuildInputs = [ - extra-cmake-modules - perl - ]; - buildInputs = [ - karchive - kconfig - kguiaddons - ki18n - kiconthemes - kio - libgit2 - qtscript - qtxmlpatterns - sonnet - syntax-highlighting - qtquickcontrols - editorconfig-core-c - ]; - propagatedBuildInputs = [ kparts ]; - } - // lib.optionalAttrs stdenv.hostPlatform.isDarwin { - postPatch = '' - substituteInPlace src/part/CMakeLists.txt \ - --replace "kpart.desktop" "${kparts}/share/kservicetypes5/kpart.desktop" - ''; - } -) diff --git a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix deleted file mode 100644 index eebb1ad24930..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - ki18n, - kio, -}: - -mkDerivation { - pname = "kxmlrpcclient"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ ki18n ]; - propagatedBuildInputs = [ kio ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix deleted file mode 100644 index de2cb97e93ee..000000000000 --- a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - modemmanager, - qtbase, -}: - -mkDerivation { - pname = "modemmanager-qt"; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - modemmanager - qtbase - ]; - outputs = [ - "out" - "dev" - ]; - meta.platforms = lib.platforms.linux; -} diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix deleted file mode 100644 index 58b4f4e37a6f..000000000000 --- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - networkmanager, - qtbase, -}: - -mkDerivation { - pname = "networkmanager-qt"; - - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - networkmanager - qtbase - ]; - outputs = [ - "out" - "dev" - ]; - meta.platforms = lib.platforms.linux; -} diff --git a/pkgs/development/libraries/kde-frameworks/oxygen-icons.nix b/pkgs/development/libraries/kde-frameworks/oxygen-icons.nix deleted file mode 100644 index 6e07e1a8dd69..000000000000 --- a/pkgs/development/libraries/kde-frameworks/oxygen-icons.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - qtbase, -}: - -mkDerivation { - pname = "oxygen-icons"; - meta.license = lib.licenses.lgpl3Plus; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtbase ]; - outputs = [ "out" ]; # only runtime outputs -} diff --git a/pkgs/development/libraries/kde-frameworks/prison.nix b/pkgs/development/libraries/kde-frameworks/prison.nix deleted file mode 100644 index 25488651f605..000000000000 --- a/pkgs/development/libraries/kde-frameworks/prison.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - libdmtx, - qrencode, - qtbase, - qtmultimedia, - zxing-cpp, -}: - -mkDerivation { - pname = "prison"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - libdmtx - qrencode - zxing-cpp - ]; - propagatedBuildInputs = [ - qtbase - qtmultimedia - ]; - outputs = [ - "out" - "dev" - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix b/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix deleted file mode 100644 index 336dfcf414e2..000000000000 --- a/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - mkDerivation, - extra-cmake-modules, - qtquickcontrols2, - qtx11extras, - kconfig, - kiconthemes, - kirigami2, -}: - -mkDerivation { - pname = "qqc2-desktop-style"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - qtx11extras - qtquickcontrols2 - kconfig - kiconthemes - kirigami2 - ]; -} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 8ec3af5a0414..f216e398f8b0 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -33,6 +33,7 @@ makeScopeWithSplicing' { let mkFrameworks = import ../development/libraries/kde-frameworks; attrs = { + inherit config; inherit libsForQt5; inherit (pkgs) lib fetchurl; }; From 0075a3a3e43d0205773f6c1b08d2b75cabc6e388 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sun, 31 Aug 2025 10:54:56 +0200 Subject: [PATCH 24/96] python313Packages.boost-histogram: fix build --- pkgs/development/python-modules/boost-histogram/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix index 667d5e177ebd..c6202a915a5b 100644 --- a/pkgs/development/python-modules/boost-histogram/default.nix +++ b/pkgs/development/python-modules/boost-histogram/default.nix @@ -34,7 +34,8 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "boost-histogram"; tag = "v${version}"; - hash = "sha256-fWbvv9MiBZZiTZLu78tMR5Cx0/7xSuVIya3dkuahPE4="; + hash = "sha256-kduE5v1oQT76MRxMuGo+snCBdJ+yOjkOJFO45twcUIs="; + fetchSubmodules = true; }; nativeBuildInputs = [ cmake ]; From 89accea40190cde9923a71862ff4ca0f2953bd71 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sun, 31 Aug 2025 11:00:23 +0200 Subject: [PATCH 25/96] python313Packages.boost-histogram: update `nativeCheckInputs` Update to match upstream. This enables more tests. --- pkgs/development/python-modules/boost-histogram/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix index c6202a915a5b..d4550682f605 100644 --- a/pkgs/development/python-modules/boost-histogram/default.nix +++ b/pkgs/development/python-modules/boost-histogram/default.nix @@ -23,6 +23,9 @@ # tests pytestCheckHook, pytest-benchmark, + pytest-xdist, + cloudpickle, + hypothesis, }: buildPythonPackage rec { @@ -57,6 +60,9 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-benchmark + pytest-xdist + cloudpickle + hypothesis ]; pytestFlags = [ "--benchmark-disable" ]; From fff3dacf2dc25bd91817550aef82a85aeb634ea0 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sun, 31 Aug 2025 11:07:54 +0200 Subject: [PATCH 26/96] python313Packages.boost-histogram: add `pythonImportsCheck` --- pkgs/development/python-modules/boost-histogram/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix index d4550682f605..797e1732ce04 100644 --- a/pkgs/development/python-modules/boost-histogram/default.nix +++ b/pkgs/development/python-modules/boost-histogram/default.nix @@ -73,6 +73,8 @@ buildPythonPackage rec { "test_numpy_conversion_4" ]; + pythonImportsCheck = [ "boost_histogram" ]; + meta = { description = "Python bindings for the C++14 Boost::Histogram library"; homepage = "https://github.com/scikit-hep/boost-histogram"; From e621b5add5aa1786875dbb8d2d59361937908e4a Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 31 Aug 2025 15:21:58 +0300 Subject: [PATCH 27/96] python313Packages.pywebview: fix, use Qt 6, modernize Tests are unfortunately dead now because they segfault somewhere deep in qtwebengine code, jellyfin-mpv-shim seems to run normally though. --- .../python-modules/pywebview/default.nix | 44 +++---------------- 1 file changed, 7 insertions(+), 37 deletions(-) diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix index 935d20a765bf..ff19b1a035ed 100644 --- a/pkgs/development/python-modules/pywebview/default.nix +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -4,16 +4,11 @@ fetchFromGitHub, setuptools-scm, bottle, - importlib-resources, proxy-tools, - pygobject3, - pyqtwebengine, - pytest, - pythonOlder, - qt5, + pyside6, qtpy, six, - xvfb-run, + typing-extensions, }: buildPythonPackage rec { @@ -21,8 +16,6 @@ buildPythonPackage rec { version = "6.0"; pyproject = true; - disabled = pythonOlder "3.5"; - src = fetchFromGitHub { owner = "r0x0r"; repo = "pywebview"; @@ -30,40 +23,17 @@ buildPythonPackage rec { hash = "sha256-EuDm3Ixw1z5xwpl4U15Xwg5mE3dXslTvv0N0XyjxrAg="; }; - nativeBuildInputs = [ - setuptools-scm - qt5.wrapQtAppsHook - ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ bottle - pyqtwebengine + pyside6 proxy-tools - six - ] - ++ lib.optionals (pythonOlder "3.7") [ importlib-resources ]; - - nativeCheckInputs = [ - pygobject3 - pytest qtpy - xvfb-run + six + typing-extensions ]; - checkPhase = '' - # a Qt wrapper is required to run the Qt backend - # since the upstream script does not have a way to disable tests individually pytest is used directly instead - makeQtWrapper "$(command -v pytest)" tests/run.sh \ - --set PYWEBVIEW_LOG debug \ - --add-flags "--deselect tests/test_js_api.py::test_concurrent" - - # HOME and XDG directories are required for the tests - env \ - HOME=$TMPDIR \ - XDG_RUNTIME_DIR=$TMPDIR/xdg-runtime-dir \ - xvfb-run -s '-screen 0 800x600x24' tests/run.sh - ''; - pythonImportsCheck = [ "webview" ]; meta = with lib; { From 38ca19b24bd48c13153e69cfc191248203bed4a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Aug 2025 12:43:10 +0000 Subject: [PATCH 28/96] bup: 0.33.8 -> 0.33.9 --- pkgs/by-name/bu/bup/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bu/bup/package.nix b/pkgs/by-name/bu/bup/package.nix index 61428214a04c..e5069e993889 100644 --- a/pkgs/by-name/bu/bup/package.nix +++ b/pkgs/by-name/bu/bup/package.nix @@ -15,7 +15,7 @@ assert par2Support -> par2cmdline != null; let - version = "0.33.8"; + version = "0.33.9"; pythonDeps = with python3.pkgs; @@ -38,7 +38,7 @@ stdenv.mkDerivation { repo = "bup"; owner = "bup"; rev = version; - hash = "sha256-FIIzD+7QUwNYhJQhOPzGQxjiSlMsnA6lahh/kn3eGrg="; + hash = "sha256-MW4kScu81XW89W7WpvOj40+S8bG5QozN30Hfj4TsnX4="; }; buildInputs = [ From b26db463716c5ee80eaf76d517c8c9b4054104ee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 31 Aug 2025 17:12:23 +0200 Subject: [PATCH 29/96] python313Packages.asdf-standard: 1.3.0 -> 1.4.0 Changelog: https://github.com/asdf-format/asdf-standard/releases/tag/1.4.0 --- pkgs/development/python-modules/asdf-standard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asdf-standard/default.nix b/pkgs/development/python-modules/asdf-standard/default.nix index c7355350b6e6..b456c1d6212d 100644 --- a/pkgs/development/python-modules/asdf-standard/default.nix +++ b/pkgs/development/python-modules/asdf-standard/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "asdf-standard"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; src = fetchPypi { pname = "asdf_standard"; inherit version; - hash = "sha256-WViWHzmd6tIACnhyTaN/Wu6wSZp4C72a5Pw+y+Pq7WQ="; + hash = "sha256-DF8SHQ24fLd4DWGgh/OSxRBM4ggBbPsqEwyc6pEs/dw="; }; build-system = [ setuptools-scm ]; From d15a686e8d18f50d6191e1d1082720ce844a621b Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 31 Aug 2025 14:32:04 -0400 Subject: [PATCH 30/96] finit: init at 4.14 --- pkgs/by-name/fi/finit/package.nix | 71 +++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 pkgs/by-name/fi/finit/package.nix diff --git a/pkgs/by-name/fi/finit/package.nix b/pkgs/by-name/fi/finit/package.nix new file mode 100644 index 000000000000..580a6ca97114 --- /dev/null +++ b/pkgs/by-name/fi/finit/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + libite, + libuev, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "finit"; + version = "4.14"; + + src = fetchFromGitHub { + owner = "troglobit"; + repo = "finit"; + tag = finalAttrs.version; + hash = "sha256-v4QHc6pX50z4j4UBpw7J2k78Pqt7n503qiDRDWyrhOc="; + }; + + postPatch = '' + substituteInPlace plugins/modprobe.c --replace-fail \ + '"/lib/modules"' '"/run/booted-system/kernel-modules/lib/modules"' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + libite + libuev + ]; + + outputs = [ + "out" + "dev" + "doc" + ]; + + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + + # tweak default plugin list + "--enable-modprobe-plugin=yes" + "--enable-modules-load-plugin=yes" + "--enable-hotplug-plugin=no" + + # minimal replacement for systemd notification library + "--with-libsystemd" + ]; + + env.NIX_CFLAGS_COMPILE = toString [ + "-D_PATH_LOGIN=\"/run/current-system/sw/bin/login\"" + "-DSYSCTL_PATH=\"/run/current-system/sw/bin/sysctl\"" + ]; + + meta = { + description = "Fast init for Linux"; + mainProgram = "initctl"; + homepage = "https://troglobit.com/projects/finit/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aanderse ]; + platforms = lib.platforms.unix; + }; +}) From 0446560cd9739c9d6b5110ec1310f0a89032414e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Sep 2025 10:51:47 +0000 Subject: [PATCH 31/96] kubergrunt: 0.18.2 -> 0.18.3 --- pkgs/by-name/ku/kubergrunt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubergrunt/package.nix b/pkgs/by-name/ku/kubergrunt/package.nix index 40821ec15751..28d745dfcf32 100644 --- a/pkgs/by-name/ku/kubergrunt/package.nix +++ b/pkgs/by-name/ku/kubergrunt/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubergrunt"; - version = "0.18.2"; + version = "0.18.3"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "kubergrunt"; rev = "v${version}"; - sha256 = "sha256-S1IJRgUIuoFWOjVkgCFbEokbcRZgcBH/HlFHxKM14WY="; + sha256 = "sha256-qiAmUKOkVsCPIZ8mv8GfG8QU1Ps4Cg4+1NV8qCuJtBo="; }; - vendorHash = "sha256-f+M/aiHS0dT0Cg1jVP0E+VtlKgMmkLAfZgEK34ZOB1M="; + vendorHash = "sha256-yTi2JPLUXnORGr/31GEdwkUpqcgoJANfNbZr3dnzVzQ="; # Disable tests since it requires network access and relies on the # presence of certain AWS infrastructure From c5dc5ee21051effb3e0d2c8f202e3ea48d68d1b1 Mon Sep 17 00:00:00 2001 From: blenderfreaky Date: Mon, 1 Sep 2025 13:10:16 +0200 Subject: [PATCH 32/96] level-zero: add nix-update-sript --- pkgs/by-name/le/level-zero/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/le/level-zero/package.nix b/pkgs/by-name/le/level-zero/package.nix index 2f6651fe5438..a635bd678286 100644 --- a/pkgs/by-name/le/level-zero/package.nix +++ b/pkgs/by-name/le/level-zero/package.nix @@ -6,6 +6,7 @@ intel-compute-runtime, openvino, stdenv, + nix-update-script, }: stdenv.mkDerivation rec { @@ -28,8 +29,11 @@ stdenv.mkDerivation rec { addDriverRunpath $out/lib/libze_loader.so ''; - passthru.tests = { - inherit intel-compute-runtime openvino; + passthru = { + tests = { + inherit intel-compute-runtime openvino; + }; + updateScript = nix-update-script { }; }; meta = { From 922b1397e84a8107c4f12aa0caaff6d243e92d82 Mon Sep 17 00:00:00 2001 From: blenderfreaky Date: Mon, 1 Sep 2025 13:13:44 +0200 Subject: [PATCH 33/96] level-zero: 1.24.1 -> 1.24.2 --- pkgs/by-name/le/level-zero/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/le/level-zero/package.nix b/pkgs/by-name/le/level-zero/package.nix index a635bd678286..1637b1bd1d68 100644 --- a/pkgs/by-name/le/level-zero/package.nix +++ b/pkgs/by-name/le/level-zero/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.24.1"; + version = "1.24.2"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; tag = "v${version}"; - hash = "sha256-mDVq8wUkCvXHTqW4niYB1JIZIQQNpHTmhPu3Ydy6IyQ="; + hash = "sha256-5QkXWuMFNsYNsW8lgo9FQIZ5NuLiRZCFKGWedpddi8Y="; }; nativeBuildInputs = [ From dd7ee73d7a4a7516751b30315b1159373fd902ea Mon Sep 17 00:00:00 2001 From: Qyriad Date: Mon, 1 Sep 2025 13:24:29 +0200 Subject: [PATCH 34/96] refind: install man pages --- pkgs/by-name/re/refind/package.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/re/refind/package.nix b/pkgs/by-name/re/refind/package.nix index 2a1bbada13a2..dbb7c622a76e 100644 --- a/pkgs/by-name/re/refind/package.nix +++ b/pkgs/by-name/re/refind/package.nix @@ -9,6 +9,7 @@ withSbsigntool ? false, # currently, cross compiling sbsigntool is broken, so default to false sbsigntool, makeWrapper, + installShellFiles, }: let @@ -45,6 +46,11 @@ stdenv.mkDerivation rec { hash = "sha256-99k86A2na4bFZygeoiW2qHkHzob/dyM8k1elIsEVyPA="; }; + outputs = [ + "out" + "man" + ]; + patches = [ # Removes hardcoded toolchain for aarch64, allowing successful aarch64 builds. ./0001-toolchain.patch @@ -53,7 +59,11 @@ stdenv.mkDerivation rec { ./0002-preserve-dates.patch ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + installShellFiles + ]; + buildInputs = [ gnu-efi_3 ]; hardeningDisable = [ "stackprotector" ]; @@ -111,6 +121,7 @@ stdenv.mkDerivation rec { # docs install -D -m0644 docs/refind/* $out/share/refind/docs/html/ install -D -m0644 docs/Styles/* $out/share/refind/docs/Styles/ + installManPage docs/man/*.8 install -D -m0644 README.txt $out/share/refind/docs/README.txt install -D -m0644 NEWS.txt $out/share/refind/docs/NEWS.txt install -D -m0644 BUILDING.txt $out/share/refind/docs/BUILDING.txt From b5dee29f866b79996450c1aaf250742f1b62fafc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Sep 2025 17:41:12 +0000 Subject: [PATCH 35/96] equicord: 2025-08-24 -> 2025-09-01 --- pkgs/by-name/eq/equicord/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix index 940c43d124ac..a1ac02517ac2 100644 --- a/pkgs/by-name/eq/equicord/package.nix +++ b/pkgs/by-name/eq/equicord/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { # the Equicord repository. Dates as tags (and automatic releases) were the compromise # we came to with upstream. Please do not change the version schema (e.g., to semver) # unless upstream changes the tag schema from dates. - version = "2025-08-24"; + version = "2025-09-01"; src = fetchFromGitHub { owner = "Equicord"; repo = "Equicord"; tag = "${finalAttrs.version}"; - hash = "sha256-BK0Mvy0Bp0Q6wj4aECEtyGsW56hqbLkkELZ9yN+QRw8="; + hash = "sha256-ZijsOAixBJ7sxLZYH2PndCh1BoWfO9tHCNDh1PmBZA4="; }; pnpmDeps = pnpm_10.fetchDeps { From 80f6d365434cb3adc3cf46692e2c7855fb1f6157 Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Mon, 1 Sep 2025 22:30:43 +0100 Subject: [PATCH 36/96] {nixos/,}grocy: add diogotcorreia as maintainer --- nixos/modules/services/web-apps/grocy.nix | 2 +- nixos/tests/grocy.nix | 5 ++++- pkgs/by-name/gr/grocy/package.nix | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-apps/grocy.nix b/nixos/modules/services/web-apps/grocy.nix index 23e5844e1761..c0cd4cb67644 100644 --- a/nixos/modules/services/web-apps/grocy.nix +++ b/nixos/modules/services/web-apps/grocy.nix @@ -211,7 +211,7 @@ in }; meta = { - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ diogotcorreia ]; doc = ./grocy.md; }; } diff --git a/nixos/tests/grocy.nix b/nixos/tests/grocy.nix index cd675b16de0e..f31c9d6a7c7c 100644 --- a/nixos/tests/grocy.nix +++ b/nixos/tests/grocy.nix @@ -2,7 +2,10 @@ { name = "grocy"; meta = with pkgs.lib.maintainers; { - maintainers = [ ma27 ]; + maintainers = [ + diogotcorreia + ma27 + ]; }; nodes.machine = diff --git a/pkgs/by-name/gr/grocy/package.nix b/pkgs/by-name/gr/grocy/package.nix index e2647d8a2b31..ee2b76bd91a4 100644 --- a/pkgs/by-name/gr/grocy/package.nix +++ b/pkgs/by-name/gr/grocy/package.nix @@ -62,7 +62,7 @@ php.buildComposerProject2 (finalAttrs: { meta = with lib; { license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ diogotcorreia ]; description = "ERP beyond your fridge - grocy is a web-based self-hosted groceries & household management solution for your home"; homepage = "https://grocy.info/"; }; From d6889fec0175dda45b6e7000cab88f7448494e89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Sep 2025 21:31:11 +0000 Subject: [PATCH 37/96] libretro.fbneo: 0-unstable-2025-08-19 -> 0-unstable-2025-08-30 --- pkgs/applications/emulators/libretro/cores/fbneo.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix index ed4c98411327..52c880e10e9a 100644 --- a/pkgs/applications/emulators/libretro/cores/fbneo.nix +++ b/pkgs/applications/emulators/libretro/cores/fbneo.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fbneo"; - version = "0-unstable-2025-08-19"; + version = "0-unstable-2025-08-30"; src = fetchFromGitHub { owner = "libretro"; repo = "fbneo"; - rev = "7345d0f50079ca989e3685152687f1ee15bad829"; - hash = "sha256-MohvlQtLtDq6GGOL3nAbRGUdbJDnc0nTgSQKlUGWDBU="; + rev = "4aa5e5b8ef4fc94143680fda8c598839bb336bdc"; + hash = "sha256-xO4v5BO9V/ECoM/Mr5weDlpPJCOzRnYMTlaSkO/UiYg="; }; makefile = "Makefile"; From c1292555085e63c4f31a6ffd5b43ede66297efe7 Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Mon, 1 Sep 2025 22:36:10 +0100 Subject: [PATCH 38/96] nixos/grocy: don't set X-XSS-Protection anymore Part of #438800. The OWASP recommentation[1] is: > The X-XSS-Protection header has been deprecated by modern browsers > and its use can introduce additional security issues on the client > side. As such, it is recommended to set the header as X-XSS-Protection: 0 > in order to disable the XSS Auditor, and not allow it to take the default > behavior of the browser handling the response. Please use > Content-Security-Policy instead. [1] https://owasp.org/www-project-secure-headers/#x-xss-protection --- nixos/modules/services/web-apps/grocy.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/web-apps/grocy.nix b/nixos/modules/services/web-apps/grocy.nix index c0cd4cb67644..ce5be95ce6f3 100644 --- a/nixos/modules/services/web-apps/grocy.nix +++ b/nixos/modules/services/web-apps/grocy.nix @@ -191,7 +191,6 @@ in locations."~ \\.(js|css|ttf|woff2?|png|jpe?g|svg)$".extraConfig = '' add_header Cache-Control "public, max-age=15778463"; add_header X-Content-Type-Options nosniff; - add_header X-XSS-Protection "1; mode=block"; add_header X-Robots-Tag none; add_header X-Download-Options noopen; add_header X-Permitted-Cross-Domain-Policies none; From 2becf88d038bfdc5a7fab7775f601eeefba50b6e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Sep 2025 21:38:23 +0000 Subject: [PATCH 39/96] LycheeSlicer: 7.4.3 -> 7.4.4 --- pkgs/by-name/ly/LycheeSlicer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ly/LycheeSlicer/package.nix b/pkgs/by-name/ly/LycheeSlicer/package.nix index 8621e4ce26ca..26b490a0551b 100644 --- a/pkgs/by-name/ly/LycheeSlicer/package.nix +++ b/pkgs/by-name/ly/LycheeSlicer/package.nix @@ -9,11 +9,11 @@ }: let pname = "LycheeSlicer"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { url = "https://mango-lychee.nyc3.cdn.digitaloceanspaces.com/LycheeSlicer-${version}.AppImage"; - hash = "sha256-V+X8aF+uFnhSIm5MC8/EfYwWkLoHqqgT1G5Ozn5Y69I="; + hash = "sha256-ZbKMCbTKqdjcTefEfrhovRQSRydKf3QBsXHi/XwXuUc="; }; desktopItem = makeDesktopItem { From f15333d0c52c6aff05a2129b243238fe3c40c89f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Sep 2025 21:43:30 +0000 Subject: [PATCH 40/96] geph: 0.2.82 -> 0.2.83 --- pkgs/by-name/ge/geph/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ge/geph/package.nix b/pkgs/by-name/ge/geph/package.nix index 67d47bc8ad16..73051d72f445 100644 --- a/pkgs/by-name/ge/geph/package.nix +++ b/pkgs/by-name/ge/geph/package.nix @@ -24,16 +24,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "geph5"; - version = "0.2.82"; + version = "0.2.83"; src = fetchFromGitHub { owner = "geph-official"; repo = "geph5"; rev = "geph5-client-v${finalAttrs.version}"; - hash = "sha256-z4f6XoMSjMmq+Uf8A/6M+aJs6oDJGdMffVflwc0Q2so="; + hash = "sha256-gEhr+goQYcjhgkoFGG1swbC0LHKwVlGAijFcwzBEF/Q="; }; - cargoHash = "sha256-PhLNS6DdCisQ8sOWm1V72UJpLZX4gVNkt1779mmMB1c="; + cargoHash = "sha256-k0VZFyVqGdfXFsmQ5cscTMZZeEk3PxaEDHzfqLGH3H4="; postPatch = '' substituteInPlace binaries/geph5-client/src/vpn/*.sh \ From 45c83a49be3bb465ec17486ce2c8154480bdd78e Mon Sep 17 00:00:00 2001 From: Jasi Date: Sun, 3 Aug 2025 15:20:32 -0400 Subject: [PATCH 41/96] libmaddy-markdown: use cmake build system --- pkgs/by-name/li/libmaddy-markdown/package.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/li/libmaddy-markdown/package.nix b/pkgs/by-name/li/libmaddy-markdown/package.nix index 5c659e7ddd15..621c7d857094 100644 --- a/pkgs/by-name/li/libmaddy-markdown/package.nix +++ b/pkgs/by-name/li/libmaddy-markdown/package.nix @@ -1,11 +1,12 @@ { lib, - stdenvNoCC, + stdenv, fetchFromGitHub, + cmake, nix-update-script, }: -stdenvNoCC.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "libmaddy-markdown"; version = "1.6.0"; @@ -16,17 +17,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-WMueY199ngw9BtHSY8zypfPZjWaQsSLUx8FDfQbBt5g="; }; - dontBuild = true; - dontConfigure = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/include/maddy - install -Dm444 include/maddy/* -t $out/include/maddy - - runHook postInstall - ''; + nativeBuildInputs = [ + cmake + ]; passthru.updateScript = nix-update-script { }; From a3cdfe961dfd59803797b92278a6be7017a03710 Mon Sep 17 00:00:00 2001 From: Jasi Date: Sun, 3 Aug 2025 15:15:17 -0400 Subject: [PATCH 42/96] =?UTF-8?q?libnick:=202025.6.1=20=E2=86=92=202025.8.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/li/libnick/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/li/libnick/package.nix b/pkgs/by-name/li/libnick/package.nix index e3830e273ad6..c5307902ff76 100644 --- a/pkgs/by-name/li/libnick/package.nix +++ b/pkgs/by-name/li/libnick/package.nix @@ -9,6 +9,7 @@ openssl, sqlcipher, boost, + cpr, curl, glib, libsecret, @@ -19,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libnick"; - version = "2025.6.1"; + version = "2025.8.0"; src = fetchFromGitHub { owner = "NickvisionApps"; repo = "libnick"; tag = finalAttrs.version; - hash = "sha256-Ir2Jke1zK4pKldQJHaT0Ju0ubz7H6nx16hDNl6u48Ck="; + hash = "sha256-LgvU5a3W5Oii6pRAAKZo28yOyPRUMjxwEXDZ2jXJPGM="; }; nativeBuildInputs = [ @@ -39,17 +40,18 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost - libmaddy-markdown ] ++ lib.optionals stdenv.hostPlatform.isUnix [ glib openssl - ] - ++ lib.optional stdenv.hostPlatform.isWindows sqlcipher; + ]; propagatedBuildInputs = [ curl + cpr libsecret + libmaddy-markdown + sqlcipher ]; cmakeFlags = [ From 32bf2f319c434a952db344b03fc74593fb5b3a08 Mon Sep 17 00:00:00 2001 From: Jasi Date: Sun, 3 Aug 2025 15:37:43 -0400 Subject: [PATCH 43/96] =?UTF-8?q?parabolic:=202025.6.0=20=E2=86=92=202025.?= =?UTF-8?q?8.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream no longer supports the Qt version of the app, so all Qt related components and workarounds are dropped from the builder. In addition, upstream now vendors their own yt-dlp when the program starts up (occurs even when yt-dlp from nixpkgs and yt-dlp upstream match). This is patched out to ensure that nixpkgs users always use yt-dlp managed by Nix rather than a vendored version. --- pkgs/by-name/pa/parabolic/package.nix | 77 ++++++++------------------- 1 file changed, 22 insertions(+), 55 deletions(-) diff --git a/pkgs/by-name/pa/parabolic/package.nix b/pkgs/by-name/pa/parabolic/package.nix index 4185627fbdd9..12ae8ffefb93 100644 --- a/pkgs/by-name/pa/parabolic/package.nix +++ b/pkgs/by-name/pa/parabolic/package.nix @@ -18,29 +18,21 @@ wrapGAppsHook4, libxmlxx5, blueprint-compiler, - qt6, - qlementine, - qlementine-icons, yt-dlp, ffmpeg, aria2, nix-update-script, - uiPlatform ? "gnome", }: -assert lib.assertOneOf "uiPlatform" uiPlatform [ - "gnome" - "qt" -]; stdenv.mkDerivation (finalAttrs: { pname = "parabolic"; - version = "2025.6.0"; + version = "2025.8.1"; src = fetchFromGitHub { owner = "NickvisionApps"; repo = "Parabolic"; tag = finalAttrs.version; - hash = "sha256-Osfj/GaD4t85ZYnlFDqgHhLJLA8VvgqtHEJN8bn0SxI="; + hash = "sha256-Xft9yqkJzWu4eGPDtRl4tV4594HjJp17Osnv0kG0IMk="; }; # Patches desktop file/dbus service bypassing wrapped executable @@ -52,6 +44,13 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace "resources/linux/org.nickvision.tubeconverter.service.in" \ --replace-fail "@CMAKE_INSTALL_FULL_LIBDIR@/@PROJECT_NAME@/@OUTPUT_NAME@" \ "@CMAKE_INSTALL_FULL_BINDIR@/@PROJECT_NAME@" + '' + # Ensure that users are not downloading vendored versions of yt-dlp + # outside of nixpkgs + + '' + substituteInPlace "libparabolic/src/models/downloadmanager.cpp" \ + --replace-fail "m_ytdlpManager.checkForUpdates();" \ + "" ''; nativeBuildInputs = [ @@ -62,66 +61,39 @@ stdenv.mkDerivation (finalAttrs: { itstool yelp-tools desktop-file-utils - ] - ++ lib.optionals (uiPlatform == "gnome") [ wrapGAppsHook4 blueprint-compiler glib shared-mime-info - ] - ++ lib.optional (uiPlatform == "qt") qt6.wrapQtAppsHook; + ]; buildInputs = [ libnick boost - ] - ++ lib.optionals (uiPlatform == "qt") [ - qt6.qtbase - qt6.qtsvg - qlementine - qlementine-icons - ] - ++ lib.optionals (uiPlatform == "gnome") [ glib gtk4 libadwaita libxmlxx5 ]; - cmakeFlags = [ - (lib.cmakeFeature "UI_PLATFORM" uiPlatform) - ]; - - dontWrapGApps = true; - dontWrapQtApps = true; - - preFixup = - lib.optionalString (uiPlatform == "gnome") '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - '' - + lib.optionalString (uiPlatform == "qt") '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") - '' - + '' - makeWrapperArgs+=(--prefix PATH : ${ - lib.makeBinPath [ - aria2 - ffmpeg - yt-dlp - ] - }) - - wrapProgram $out/bin/org.nickvision.tubeconverter \ - ''${makeWrapperArgs[@]} - ''; + preFixup = '' + gappsWrapperArgs+=(--prefix PATH : ${ + lib.makeBinPath [ + aria2 + ffmpeg + yt-dlp + ] + }) + ''; passthru.updateScript = nix-update-script { }; meta = { description = "Graphical frontend for yt-dlp to download video and audio"; longDescription = '' - Parabolic is a user-friendly frontend for `yt-dlp` that supports - many features including but limited to: + Parabolic is a user-friendly adwaita application for `yt-dlp` + that supports many features including but not limited to: + - Downloading and converting videos and audio using ffmpeg. - Supporting multiple codecs. - Offering YouTube sponsorblock support. @@ -129,11 +101,6 @@ stdenv.mkDerivation (finalAttrs: { - Downloading metadata and video subtitles. - Allowing the use of `aria2` for parallel downloads. - Offering a graphical keyring to manage account credentials. - - Being available as both a Qt and GNOME application. - - By default, the GNOME interface is used, but the Qt interface - can be built by overriding the `uiPlatform` argument to `"qt"` - over the default value `"gnome"`. ''; homepage = "https://github.com/NickvisionApps/Parabolic"; license = lib.licenses.gpl3Plus; From 4496ef696c74493d21c9c0772b668aa3a24fb440 Mon Sep 17 00:00:00 2001 From: Konrad Malik Date: Tue, 2 Sep 2025 10:27:02 +0200 Subject: [PATCH 44/96] roslyn-ls: 5.0.0-2.25371.17 -> 5.0.0-2.25424.1 --- pkgs/by-name/ro/roslyn-ls/deps.json | 126 +++++++++++++++++++------- pkgs/by-name/ro/roslyn-ls/package.nix | 6 +- 2 files changed, 96 insertions(+), 36 deletions(-) diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json index 3a74e40f419e..1095fb37801b 100644 --- a/pkgs/by-name/ro/roslyn-ls/deps.json +++ b/pkgs/by-name/ro/roslyn-ls/deps.json @@ -61,9 +61,9 @@ }, { "pname": "Microsoft.Build.Locator", - "version": "1.6.10", - "hash": "sha256-hOFFiQiCNkkDqt0Ad/4Y/sggj4t0zWXmfGjE+I/cqqM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.locator/1.6.10/microsoft.build.locator.1.6.10.nupkg" + "version": "1.8.1", + "hash": "sha256-q1oZLwPGO+Q/btm3jUzNo37eBziDD/MOXE3LsUSVeA4=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.locator/1.8.1/microsoft.build.locator.1.8.1.nupkg" }, { "pname": "Microsoft.Build.Tasks.Core", @@ -79,9 +79,9 @@ }, { "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "5.0.0-1.25277.114", - "hash": "sha256-PGgx30sBP6CGFofUPNiD8bEPDdKajynSatWAqh9jbxM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.0.0-1.25277.114/microsoft.codeanalysis.analyzers.5.0.0-1.25277.114.nupkg" + "version": "3.11.0", + "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzers/3.11.0/microsoft.codeanalysis.analyzers.3.11.0.nupkg" }, { "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers", @@ -103,9 +103,9 @@ }, { "pname": "Microsoft.CodeAnalysis.NetAnalyzers", - "version": "8.0.0-preview.23468.1", - "hash": "sha256-2wF9nG7tL92RKT46l5A0EQB3uow93516Dh8hSw7kUvg=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/49a1bb2b-12b0-475f-adbd-1560fc76be38/nuget/v3/flat2/microsoft.codeanalysis.netanalyzers/8.0.0-preview.23468.1/microsoft.codeanalysis.netanalyzers.8.0.0-preview.23468.1.nupkg" + "version": "10.0.0-preview.25375.1", + "hash": "sha256-1AmmAyGxYIazQQhA0bcOOccAfP+WUL0il31XQLyeYlc=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/microsoft.codeanalysis.netanalyzers/10.0.0-preview.25375.1/microsoft.codeanalysis.netanalyzers.10.0.0-preview.25375.1.nupkg" }, { "pname": "Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers", @@ -239,6 +239,12 @@ "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/5.0.0/microsoft.netcore.platforms.5.0.0.nupkg" }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.0", + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg" + }, { "pname": "Microsoft.NETFramework.ReferenceAssemblies", "version": "1.0.3", @@ -259,9 +265,9 @@ }, { "pname": "Microsoft.ServiceHub.Client", - "version": "4.2.1017", - "hash": "sha256-Achfy4EpZfcIOf02P8onWJH1cte+rP9ZAy94Gf4MVCA=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/2a239fd0-3e21-40b0-b9d6-bc122fec7eb2/nuget/v3/flat2/microsoft.servicehub.client/4.2.1017/microsoft.servicehub.client.4.2.1017.nupkg" + "version": "4.6.3200", + "hash": "sha256-cEXlKEJbQxKztw5g+k9GNTZ0fbHVDCp8/JuMqCK6bAE=", + "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.client/4.6.3200/microsoft.servicehub.client.4.6.3200.nupkg" }, { "pname": "Microsoft.ServiceHub.Framework", @@ -269,12 +275,6 @@ "hash": "sha256-sAdzwH8lt1Z44YMGYTTwMSS8uceK8FXWR5h1p3Iu1OQ=", "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.framework/4.9.11-beta/microsoft.servicehub.framework.4.9.11-beta.nupkg" }, - { - "pname": "Microsoft.ServiceHub.Resources", - "version": "4.2.1017", - "hash": "sha256-6nq1jsXLThMritNI1CZj5Batfo/0W0Pt2iLY72yZGNw=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/2a239fd0-3e21-40b0-b9d6-bc122fec7eb2/nuget/v3/flat2/microsoft.servicehub.resources/4.2.1017/microsoft.servicehub.resources.4.2.1017.nupkg" - }, { "pname": "Microsoft.TestPlatform.ObjectModel", "version": "17.13.0", @@ -455,6 +455,30 @@ "hash": "sha256-wIOhKwvYetwytnuNX0uNC5oyBDU7xAhLqzTvyuGDVMM=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/roslyn.diagnostics.analyzers/3.11.0-beta1.24081.1/roslyn.diagnostics.analyzers.3.11.0-beta1.24081.1.nupkg" }, + { + "pname": "runtime.any.System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.diagnostics.tracing/4.3.0/runtime.any.system.diagnostics.tracing.4.3.0.nupkg" + }, + { + "pname": "runtime.any.System.Runtime", + "version": "4.3.0", + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime/4.3.0/runtime.any.system.runtime.4.3.0.nupkg" + }, + { + "pname": "runtime.native.System", + "version": "4.3.0", + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg" + }, + { + "pname": "runtime.unix.System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.private.uri/4.3.0/runtime.unix.system.private.uri.4.3.0.nupkg" + }, { "pname": "SQLitePCLRaw.bundle_green", "version": "2.1.0", @@ -493,9 +517,9 @@ }, { "pname": "System.Buffers", - "version": "4.6.1", - "hash": "sha256-sARR6R0Bb77Aka0eNh86cBXh2R1AR/fkinRFWypnPXk=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.6.1/system.buffers.4.6.1.nupkg" + "version": "4.6.0", + "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.6.0/system.buffers.4.6.0.nupkg" }, { "pname": "System.CodeDom", @@ -517,9 +541,9 @@ }, { "pname": "System.CommandLine", - "version": "2.0.0-beta5.25210.1", - "hash": "sha256-AIUy4OsHWpfbH200l+rdZ2VvYsvDDMkccFfXd1ApE8Y=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/2.0.0-beta5.25210.1/system.commandline.2.0.0-beta5.25210.1.nupkg" + "version": "2.0.0-rc.2.25420.109", + "hash": "sha256-jZMqUnzqJVY5GNdzJO8rk/NumyYDj4dqNTZjEz+Qccc=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/2.0.0-rc.2.25420.109/system.commandline.2.0.0-rc.2.25420.109.nupkg" }, { "pname": "System.ComponentModel.Composition", @@ -593,6 +617,12 @@ "hash": "sha256-t+l5WgfxivrZhWKjr0rpqtCcNXyRgytsGgWf/BIv5PU=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.performancecounter/7.0.0/system.diagnostics.performancecounter.7.0.0.nupkg" }, + { + "pname": "System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg" + }, { "pname": "System.IO.FileSystem.AccessControl", "version": "5.0.0", @@ -613,15 +643,21 @@ }, { "pname": "System.Memory", - "version": "4.6.3", - "hash": "sha256-JgeK63WMmumF6L+FH5cwJgYdpqXrSDcgTQwtIgTHKVU=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.6.3/system.memory.4.6.3.nupkg" + "version": "4.6.0", + "hash": "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.6.0/system.memory.4.6.0.nupkg" }, { "pname": "System.Numerics.Vectors", - "version": "4.6.1", - "hash": "sha256-K8UAqG3LAvIDLW2Hf54tbp5KeQgOVyObQZhnnUAx8sc=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.6.1/system.numerics.vectors.4.6.1.nupkg" + "version": "4.6.0", + "hash": "sha256-fKS3uWQ2HmR69vNhDHqPLYNOt3qpjiWQOXZDHvRE1HU=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.6.0/system.numerics.vectors.4.6.0.nupkg" + }, + { + "pname": "System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.uri/4.3.0/system.private.uri.4.3.0.nupkg" }, { "pname": "System.Reflection.Emit", @@ -653,11 +689,17 @@ "hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/9.0.0/system.reflection.metadata.9.0.0.nupkg" }, + { + "pname": "System.Runtime", + "version": "4.3.0", + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.3.0/system.runtime.4.3.0.nupkg" + }, { "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "6.1.2", - "hash": "sha256-X2p/U680Zfkr622oc+vg5JYgbDEzE7mLre5DVaayWTc=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/6.1.2/system.runtime.compilerservices.unsafe.6.1.2.nupkg" + "version": "6.1.0", + "hash": "sha256-NyqqpRcHumzSxpsgRDguD5SGwdUNHBbo0OOdzLTIzCU=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/6.1.0/system.runtime.compilerservices.unsafe.6.1.0.nupkg" }, { "pname": "System.Security.AccessControl", @@ -665,6 +707,12 @@ "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/5.0.0/system.security.accesscontrol.5.0.0.nupkg" }, + { + "pname": "System.Security.AccessControl", + "version": "6.0.0", + "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/6.0.0/system.security.accesscontrol.6.0.0.nupkg" + }, { "pname": "System.Security.Cryptography.Pkcs", "version": "8.0.0", @@ -677,6 +725,12 @@ "hash": "sha256-gPgPU7k/InTqmXoRzQfUMEKL3QuTnOKowFqmXTnWaBQ=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.protecteddata/9.0.0/system.security.cryptography.protecteddata.9.0.0.nupkg" }, + { + "pname": "System.Security.Permissions", + "version": "9.0.0", + "hash": "sha256-BFrA9ottmQtLIAiKiGRbfSUpzNJwuaOCeFRDN4Z0ku0=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.permissions/9.0.0/system.security.permissions.9.0.0.nupkg" + }, { "pname": "System.Security.Principal.Windows", "version": "5.0.0", @@ -724,5 +778,11 @@ "version": "4.5.0", "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.valuetuple/4.5.0/system.valuetuple.4.5.0.nupkg" + }, + { + "pname": "System.Windows.Extensions", + "version": "9.0.0", + "hash": "sha256-RErD+Ju15qtnwdwB7E0SjjJGAnhXwJyC7UPcl24Z3Vs=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.windows.extensions/9.0.0/system.windows.extensions.9.0.0.nupkg" } ] diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index 87ec6e89e5e5..87bb43074d98 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -53,18 +53,18 @@ in buildDotnetModule (finalAttrs: rec { inherit pname dotnet-sdk dotnet-runtime; - vsVersion = "2.87.26"; + vsVersion = "2.90.51-prerelease"; src = fetchFromGitHub { owner = "dotnet"; repo = "roslyn"; rev = "VSCode-CSharp-${vsVersion}"; - hash = "sha256-5XDE2fwBga1hhXgaNG46vruljnKulLR7yIT5BLjJBGA="; + hash = "sha256-l2/EIvN/GFIyCZRNBnS7bAzkYB1wZbD1DxD1EW040X4="; }; # versioned independently from vscode-csharp # "roslyn" in here: # https://github.com/dotnet/vscode-csharp/blob/main/package.json - version = "5.0.0-2.25371.17"; + version = "5.0.0-2.25424.1"; projectFile = "src/LanguageServer/${project}/${project}.csproj"; useDotnetFromEnv = true; nugetDeps = ./deps.json; From f2edbb6a16749b45f82bc47ead9eb98bb4b1b81a Mon Sep 17 00:00:00 2001 From: Picnoir Date: Tue, 2 Sep 2025 10:36:20 +0200 Subject: [PATCH 45/96] nixos/tests/pleroma: rm x-xss-protection See https://github.com/NixOS/nixpkgs/issues/438800 --- nixos/tests/pleroma.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/tests/pleroma.nix b/nixos/tests/pleroma.nix index dec5840bec3c..793a034b3c66 100644 --- a/nixos/tests/pleroma.nix +++ b/nixos/tests/pleroma.nix @@ -244,7 +244,6 @@ import ./make-test-python.nix ( if ($request_method = OPTIONS) { return 204; } - add_header X-XSS-Protection "1; mode=block"; add_header X-Permitted-Cross-Domain-Policies none; add_header X-Frame-Options DENY; add_header X-Content-Type-Options nosniff; From c7a90fe1f399782ea4e4eff551197d58b03e5f89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Sep 2025 08:56:02 +0000 Subject: [PATCH 46/96] python3Packages.opower: 0.15.3 -> 0.15.4 --- pkgs/development/python-modules/opower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 149d3e31e11f..7253c4116ad2 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "opower"; - version = "0.15.3"; + version = "0.15.4"; pyproject = true; src = fetchFromGitHub { owner = "tronikos"; repo = "opower"; tag = "v${version}"; - hash = "sha256-/POEHOWdjDgdMzHFMdYs2Lb1HU/92Ug3eaDGvCRSewU="; + hash = "sha256-+y2lQnF48b2PKocQw6eEDPNTqZSB4aOALMfNOIVS+Yg="; }; build-system = [ setuptools ]; From 222e5990126d1df7de8237f7fdaf49ba6cb2d9e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Sep 2025 09:01:05 +0000 Subject: [PATCH 47/96] python3Packages.aiopurpleair: 2023.12.0 -> 2025.08.1 --- pkgs/development/python-modules/aiopurpleair/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiopurpleair/default.nix b/pkgs/development/python-modules/aiopurpleair/default.nix index 5df4ab4e7cda..2684877e0afb 100644 --- a/pkgs/development/python-modules/aiopurpleair/default.nix +++ b/pkgs/development/python-modules/aiopurpleair/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiopurpleair"; - version = "2023.12.0"; + version = "2025.08.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = "aiopurpleair"; tag = version; - hash = "sha256-2Ngo2pvzwcgQvpyW5Q97VQN/tGSVhVJwRj0DMaPn+O4="; + hash = "sha256-VmKIIgfZFk9z8WORDHA4ibL4FZchiRrT6L0rCkxosoc="; }; nativeBuildInputs = [ poetry-core ]; From a536870a20cbf24a3743e5e769c4fb096abb8ecf Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sun, 31 Aug 2025 22:30:00 +0200 Subject: [PATCH 48/96] chickenPackages.chickenEggs: Adapt update script We use a new methods to update all eggs because git snapshots are no longer provided by upstream. --- pkgs/development/compilers/chicken/5/update.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/chicken/5/update.sh b/pkgs/development/compilers/chicken/5/update.sh index 2dcceef456dd..edf698c6dff4 100755 --- a/pkgs/development/compilers/chicken/5/update.sh +++ b/pkgs/development/compilers/chicken/5/update.sh @@ -1,10 +1,9 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../../.. -i ysh -p oils-for-unix chicken +#! nix-shell -I nixpkgs=../../../../.. -i ysh -p oils-for-unix chicken nix-prefetch-git jq setglobal ENV.URL_PREFIX="https://code.call-cc.org/egg-tarballs/5/" -cd $(nix-prefetch-url \ - 'https://code.call-cc.org/cgi-bin/gitweb.cgi?p=eggs-5-latest.git;a=snapshot;h=master;sf=tgz' \ - --name chicken-eggs-5-latest --unpack --print-path | tail -1) +cd $(nix-prefetch-git --deepClone --quiet \ + https://code.call-cc.org/eggs-5-latest | jq --raw-output .path) echo "# THIS IS A GENERATED FILE. DO NOT EDIT!" > $_this_dir/deps.toml for i, item in */*/*.egg { From 198f572ea3b4c62653146cef9024ff90346b0370 Mon Sep 17 00:00:00 2001 From: Moritz Heidkamp Date: Wed, 13 Aug 2025 18:46:53 +0200 Subject: [PATCH 49/96] chickenPackages.chickenEggs: update The llama egg declares a dependency on srfi-4 which is actually part of CHICKEN itself and not an egg. To salvage it, we remove such bogus dependencies now. --- .../compilers/chicken/5/default.nix | 11 +- .../development/compilers/chicken/5/deps.toml | 206 +++++++++++------- .../compilers/chicken/5/overrides.nix | 10 + 3 files changed, 150 insertions(+), 77 deletions(-) diff --git a/pkgs/development/compilers/chicken/5/default.nix b/pkgs/development/compilers/chicken/5/default.nix index 41b2283fccf4..d53588d1b51c 100644 --- a/pkgs/development/compilers/chicken/5/default.nix +++ b/pkgs/development/compilers/chicken/5/default.nix @@ -3,7 +3,14 @@ newScope, fetchurl, }: - +let + # Some eggs mistakenly declare dependencies on modules which are part of chicken itself and thus + # need not (and cannot) be installed as eggs. Instead of marking such eggs as broken, we remove + # these invalid dependencies. + invalidDependencies = [ + "srfi-4" + ]; +in lib.makeScope newScope (self: { fetchegg = @@ -39,7 +46,7 @@ lib.makeScope newScope (self: { self.eggDerivation { inherit pname version; src = self.fetchegg (eggData // { inherit pname; }); - buildInputs = map (x: eggself.${x}) dependencies; + buildInputs = map (x: eggself.${x}) (lib.subtractLists invalidDependencies dependencies); meta.homepage = "https://wiki.call-cc.org/eggref/5/${pname}"; meta.description = synopsis; meta.license = diff --git a/pkgs/development/compilers/chicken/5/deps.toml b/pkgs/development/compilers/chicken/5/deps.toml index 85c22bbfe817..0622d7a3ea77 100644 --- a/pkgs/development/compilers/chicken/5/deps.toml +++ b/pkgs/development/compilers/chicken/5/deps.toml @@ -114,9 +114,9 @@ version = "0.6" [apropos] dependencies = ["utf8", "srfi-1", "symbol-utils", "check-errors"] license = "bsd" -sha256 = "1k3n7j34rr7rwb66ba8iygzcpa6jy1ghfhxkfgyrq7rjrimjk1i0" +sha256 = "0z546hhrva65kgfm1620w0hg95h016yq2r1mjnx89r0bmmibviv3" synopsis = "CHICKEN apropos" -version = "3.11.2" +version = "3.11.3" [arcadedb] dependencies = ["medea"] @@ -177,9 +177,9 @@ version = "0.7.0" [awful-salmonella-tar] dependencies = ["awful", "srfi-1", "srfi-13"] license = "bsd" -sha256 = "1zqzhafsbc64y344pax7z68vxfigwd8rcmgafqp6knn948lamrb3" +sha256 = "05rzaj4qxxjncvqpvrmclybm4biyxir54h43cbqss1kp2crhzpc4" synopsis = "Serve salmonella report files out of tar archives" -version = "0.0.4" +version = "0.0.5" [awful-sql-de-lite] dependencies = ["awful", "sql-de-lite"] @@ -310,9 +310,9 @@ version = "1.4.1" [blas] dependencies = ["bind", "compile-file", "srfi-13"] license = "bsd" -sha256 = "1gx22ycqc3jpcmv16644ay9cygh535di4j7znqjqxn2dyq29dmkm" +sha256 = "0dx69njxvipp5kh6lgpy03yy4vg27fg12qns2xijvwbvvhbhcvg7" synopsis = "An interface to level 1, 2 and 3 BLAS routines" -version = "4.5" +version = "5.1" [blob-utils] dependencies = ["string-utils", "check-errors"] @@ -345,9 +345,9 @@ version = "2.13.20191214-0" [box] dependencies = [] license = "bsd" -sha256 = "08bhc1w5m48f6034821xkvsrh1p8qzvr6rg35mlv4c013alvwiq0" +sha256 = "1nnnb28bkmv3hc19jhvc4mvd56y6wqxd9izwhwx4g9f7jgk9xamb" synopsis = "Boxing" -version = "3.8.1" +version = "3.9.0" [breadcrumbs] dependencies = ["srfi-1"] @@ -623,11 +623,11 @@ synopsis = "two continuation interfaces" version = "1.2" [coops-utils] -dependencies = ["srfi-1", "srfi-13", "check-errors", "coops"] +dependencies = ["srfi-1", "utf8", "check-errors", "coops"] license = "bsd" -sha256 = "0ln7jp12slbh9vnvqkiqm90lq82477lywjwz22l8xq81rrbv7q6i" +sha256 = "1q7ra28h88l8ml3ia7llx7y80cbhf8k9hzwsd6l10g1bl98k2im3" synopsis = "coops utilities" -version = "2.3.0" +version = "2.3.2" [coops] dependencies = ["matchable", "miscmacros", "record-variants", "srfi-1"] @@ -814,9 +814,9 @@ version = "2.1" [dynamic-import] dependencies = [] license = "public-domain" -sha256 = "17n0z551p7kr83afpjhg3q93q10nlwf7rjc3qmff1g026yhxnvwc" +sha256 = "1xb22gv5zip4x32qyssiyxlskxz6l8kp54k7i4x8lv88p0y3ybkp" synopsis = "Dynamic Import" -version = "1.0.2" +version = "1.1.0" [edn] dependencies = ["r7rs", "srfi-69", "srfi-1", "chalk"] @@ -856,9 +856,9 @@ version = "2.1" [endian-port] dependencies = ["iset", "endian-blob"] license = "gpl-3" -sha256 = "15lxd1k6c3dxr7hx5gg8x2hd9ss49dc2h8ixm85jkl91bws757rc" +sha256 = "1y114mm5sa08m1a6n6y8m4rz909rgy57sc1p44041ivajvby9pa5" synopsis = "An I/O port that supports different endian formats." -version = "4.0" +version = "4.1" [envsubst] dependencies = ["matchable"] @@ -961,9 +961,9 @@ version = "0.7" [fcp] dependencies = ["srfi-1", "srfi-18", "srfi-69", "base64", "regex", "matchable"] license = "bsd" -sha256 = "0n44fshsbcngx45kd52mdw6dbimjpayg5xcgil6bki6x30i9y0q9" +sha256 = "0sgnz1q1c6qwa8kxw95b27dq1g23cyjc1rcm7fscbyywyf00abxp" synopsis = "Very basic interface to freenet FCP" -version = "v0.8" +version = "v0.9" [feature-test] dependencies = [] @@ -989,9 +989,9 @@ version = "1.5" [fmt] dependencies = ["srfi-1", "srfi-13", "srfi-69", "utf8"] license = "bsd" -sha256 = "0w04zfkhh8cnns6n0m1s9zh8jn7nvm3h4nzvfzxiih84i6y13yx1" +sha256 = "13llcgkm9k61ylhzj7ca7al5r8knwcw2b940vnb0xw0jhb6mmcaf" synopsis = "Combinator Formatting" -version = "0.8.11.2" +version = "0.8.11.3" [foof-loop] dependencies = [] @@ -1094,9 +1094,9 @@ version = "0.2.2" [generalized-arrays] dependencies = ["r7rs", "srfi-48", "srfi-128", "srfi-133", "srfi-143", "srfi-160", "srfi-253", "transducers"] license = "bsd-3" -sha256 = "17krc7ig1f4wvw41493bpxircxcqlic0y3sj89m7wy9b0qzsd3wf" +sha256 = "0yzzy553mawvh270zsrfgj4gyhmxjwz0l85i1h9d3hg8rvm8zsgy" synopsis = "Provides generalized arrays, intervals, and storage classes for CHICKEN Scheme." -version = "2.1.0" +version = "2.1.1" [generics] dependencies = ["simple-cells"] @@ -1168,6 +1168,13 @@ sha256 = "0mx2lpj4mly86fgnlkv7kw1xmabqkzxmjdahp9p0387v4a8nwzas" synopsis = "A compiler for a Scheme-like language targeting the GLSL" version = "0.12.2" +[glut] +dependencies = ["bind"] +license = "bsd" +sha256 = "1czd4mfkhq90sy9iaab2zw3nssga0xs1nai4gs5myb32nqkgjycr" +synopsis = "GLUT bindings" +version = "1.20" + [gmi] dependencies = [] license = "unlicense" @@ -1423,9 +1430,9 @@ version = "0.4" [ipfs] dependencies = ["http-client", "intarweb", "medea", "srfi-1", "srfi-13", "srfi-189", "srfi-197", "uri-common"] license = "unlicense" -sha256 = "0fip6rkpg14xbjg2nk191ib3n4lckn8ynpnvlmb7jwk356b499kz" +sha256 = "1qi0z6mgvlmvcjam03n6ly6n35crkfhmjpaz1m8rabl4sh2bx1qd" synopsis = "IPFS HTTP API for Scheme" -version = "0.0.18" +version = "0.0.20" [irc] dependencies = ["matchable", "regex", "srfi-1"] @@ -1477,11 +1484,11 @@ synopsis = "Parser combinators for JavaScript Object Notation (JSON)." version = "7.0" [json-rpc] -dependencies = ["r7rs", "srfi-1", "srfi-18", "srfi-69", "srfi-180", "utf8"] +dependencies = ["r7rs", "srfi-1", "srfi-18", "srfi-69", "srfi-180"] license = "mit" -sha256 = "10f2iw93fhc0vha6axqzd27akh0ys7a6q0vwhpl0jzw4s48h3ss3" +sha256 = "0sw8i11ynbsn80l94nflqb2j4bp87lq608v4r73i5dx6d72jk7aw" synopsis = "A JSON RPC library for R7RS scheme." -version = "0.4.5a" +version = "0.5.0" [json-utils] dependencies = ["utf8", "srfi-1", "srfi-69", "vector-lib", "miscmacros", "moremacros"] @@ -1602,6 +1609,13 @@ sha256 = "07jlsrw0v9d1584zqn6clbyc5qawmibqjnzpn7vb6z65smk4036j" synopsis = "Hack that replaces “define” with a version that mutates existing procedures." version = "1.1" +[llama] +dependencies = ["srfi-1", "srfi-4", "srfi-42", "srfi-69", "vector-lib", "blas", "random-mtzig", "endian-blob", "endian-port", "getopt-long"] +license = "mit" +sha256 = "07g7b9yp9h1r2zgdaqgzm5vpv77x74n34gij1fbw2l57h9r69yk8" +synopsis = "Inference with Llama2 model." +version = "1.2" + [llrb-syntax] dependencies = [] license = "bsd" @@ -1661,9 +1675,9 @@ version = "3" [lsp-server] dependencies = ["apropos", "chicken-doc", "json-rpc", "nrepl", "r7rs", "srfi-1", "srfi-18", "srfi-69", "srfi-133", "srfi-180", "uri-generic", "utf8"] license = "mit" -sha256 = "0lphdbydn7ly77i5j0ik3hb5605xyr205w94m38x1b8jfs5av8nx" +sha256 = "08lgfg2qdk7nyqw8cgcfn5is7gq1g3vlji27m4llm6k4diknikx5" synopsis = "LSP Server for CHICKEN." -version = "0.4.7" +version = "0.4.8" [macaw] dependencies = [] @@ -1724,9 +1738,9 @@ version = "0.3.1" [match-generics] dependencies = ["brev-separate", "matchable", "quasiwalk", "srfi-1"] license = "bsd-1-clause" -sha256 = "1js4kq8hp6n8182mzyrs7q7aa6hf9q5y8q3zp2lkplpp862x2sks" +sha256 = "0vpwsvanjyga1b5jxb9h7bf4rq8nms69lrwphfl1ak1218n23l45" synopsis = "matchable generics" -version = "2.8" +version = "2.12" [matchable] dependencies = [] @@ -1738,9 +1752,9 @@ version = "1.2" [math-utils] dependencies = ["memoize", "miscmacros", "srfi-1", "vector-lib"] license = "public-domain" -sha256 = "087ynv9fgzpzhx4k8kbv7qsh1j0izv0pv5cx20c20i20fhh7d5bi" +sha256 = "1n7kv2bn31ypb4vmqhwg155r7ibng7sfpkm6y14mizvqb54k51c4" synopsis = "Miscellaneous math utilities" -version = "1.7.0" +version = "1.11.0" [math] dependencies = ["srfi-1", "r6rs-bytevectors", "miscmacros", "srfi-133", "srfi-42"] @@ -1766,9 +1780,9 @@ version = "0.6rel" [md2] dependencies = ["message-digest"] license = "bsd" -sha256 = "1dcqr5dh4blrd7dphhjgywdxc93f513pyhw5c086kfcs1aiw7dpb" +sha256 = "1laxza0p8cnywb7z3x7rkhhm1igcsbz5p8zh0pzshah4y1hj62nh" synopsis = "Message Digest 2 algorithm as defined in RFC1319" -version = "1.3" +version = "1.4" [md5] dependencies = ["message-digest-primitive"] @@ -1780,9 +1794,9 @@ version = "4.1.4" [mdh] dependencies = [] license = "gpl" -sha256 = "0xkrjq9ng0rxcxllmn9nvjqilkdgmliwaw9pbrgyqsxdi9s9z7z3" +sha256 = "010k3i23d3q3mh63ggfxgnsfzcpn681j0jblagv4lbn1zz2np770" synopsis = "interface to the MDH database" -version = "0.2" +version = "0.3" [medea] dependencies = ["comparse", "srfi-1", "srfi-13", "srfi-14", "srfi-69"] @@ -1827,11 +1841,11 @@ synopsis = "Message Digest Type" version = "4.3.7" [message-digest-utils] -dependencies = ["blob-utils", "string-utils", "memory-mapped-files", "message-digest-primitive", "message-digest-type", "check-errors"] +dependencies = ["blob-utils", "string-utils", "memory-mapped-files", "message-digest-primitive", "message-digest-type", "check-errors", "miscmacros"] license = "bsd" -sha256 = "1c1jqvsm6l2kbf6mbav19fcm167ihyip3ins10c9pbkacizfi94x" +sha256 = "1g4vvkfmyqs7p55mhlld1vpa9dfyywz387dv80vxjgqr1q11dvig" synopsis = "Message Digest Support" -version = "4.3.9" +version = "4.4.0" [message-digest] dependencies = ["message-digest-primitive", "message-digest-type", "message-digest-utils"] @@ -2011,9 +2025,9 @@ version = "5.1.0" [number-limits] dependencies = [] license = "bsd" -sha256 = "1xw11mnvcwqqnjhljbpsn7966w3kqaygr3dcqqv6fkfxgccb811z" +sha256 = "0cn8ikb474qns94qh2xnpswqljkw6dczrcqlnyf8paj3fiyqqxmj" synopsis = "Limit constants for numbers" -version = "3.0.9" +version = "3.0.10" [oauth] dependencies = ["srfi-1", "srfi-13", "uri-common", "intarweb", "http-client", "hmac", "sha1", "base64"] @@ -2039,9 +2053,9 @@ version = "1.3" [opengl] dependencies = ["bind", "silex"] license = "bsd" -sha256 = "0sd75k8bm68w2c1n1jlb6yn67xsij49wfgvdakpm4aldqpi79cks" +sha256 = "1b3jasjy0h3zvglnpva0pb307n2qff0c365sk420ya6w53pshhm2" synopsis = "OpenGL bindings" -version = "1.21" +version = "1.22" [openssl] dependencies = ["srfi-1", "srfi-13", "srfi-18", "address-info"] @@ -2277,9 +2291,9 @@ version = "3.0" [pstk] dependencies = ["srfi-1", "srfi-13"] license = "bsd" -sha256 = "075w2kaljy08cx8z78pi3741is1fi63bfsfdy229gkfrbkzl8vpz" +sha256 = "0mznr8qhnm4ijacy2pxm6xh7vkcrbpycqq07j0zdva88kprd3lhw" synopsis = "PS/Tk: Portable Scheme interface to Tk" -version = "1.4.1" +version = "1.4.2" [pthreads] dependencies = ["srfi-18"] @@ -2347,9 +2361,9 @@ version = "0.1.1" [r7rs] dependencies = ["matchable", "srfi-1", "srfi-13"] license = "bsd" -sha256 = "1mipp3qafsfk4fsldi9qvggzlkby7a7glydhjjf5ifb8w6f4kx8f" +sha256 = "08bwp24x20x6cgl9nprw5grhxg022kj2hvmlai1908xaza6fpcn7" synopsis = "R7RS compatibility" -version = "1.0.10" +version = "1.0.12" [rabbit] dependencies = ["srfi-1"] @@ -2484,12 +2498,19 @@ sha256 = "1pn8igkydivysrlgc1l0c2j1cn3yvsb7ggbpfbrpdkwxb9wm810b" synopsis = "basic Scheme48 module syntax" version = "0.7" -[s9fes-char-graphics] -dependencies = ["srfi-1", "utf8", "format"] +[s9fes-char-graphics-shapes] +dependencies = ["srfi-1", "utf8", "record-variants", "s9fes-char-graphics"] license = "public-domain" -sha256 = "0wlrz5c4v12jj014c20l35vcvqc9iplnpfxifca1agm68xhdda9v" +sha256 = "08vrla2ansawggz19qa6733lyis0mzzas7kpy3ynypg1c190ji9q" +synopsis = "Scheme 9 from Empty Space Char Graphics Shapes" +version = "1.1.1" + +[s9fes-char-graphics] +dependencies = ["srfi-1", "utf8", "format", "record-variants"] +license = "public-domain" +sha256 = "1fsxh0fni6mlvkfznk2ac21lk9srsphjs02iy1f4r4hyx723nz5q" synopsis = "Scheme 9 from Empty Space Char Graphics" -version = "1.4.3" +version = "1.16.2" [salmonella-diff] dependencies = ["salmonella", "salmonella-html-report", "srfi-1", "srfi-13", "sxml-transforms"] @@ -2578,9 +2599,9 @@ version = "0.1" [scsh-process] dependencies = ["srfi-18", "llrb-tree"] license = "bsd" -sha256 = "1fn99ncj7d4qgj92pmm77mvmar2ki5q8k8qgsi8nfs56xr7gr5lm" +sha256 = "0i60h7qcn350d5wskvifqgq7h17ybi7jjzpia835689434zk353d" synopsis = "A reimplementation for CHICKEN of SCSH's process notation." -version = "1.6.0" +version = "1.6.2" [scss] dependencies = ["srfi-1", "matchable"] @@ -2800,11 +2821,11 @@ synopsis = "The SLIB applicative routines for the arrays library" version = "1.1.4" [slib-charplot] -dependencies = ["slib-arraymap", "srfi-63", "slib-compat"] +dependencies = ["utf8", "slib-arraymap", "srfi-63", "slib-compat"] license = "artistic" -sha256 = "0dbcbarn1gcw5pimjlr9nmhllsyfvbc9n5hnl29d5mfyiv0ifqnn" +sha256 = "1ms4akx76m56ny0p42gzx8nk3fip24kkxg928s9317w7k7nqidih" synopsis = "The SLIB character plotting library" -version = "1.2.4" +version = "1.3.1" [slib-compat] dependencies = ["srfi-1"] @@ -2991,9 +3012,9 @@ version = "0.5" [srfi-113] dependencies = ["r7rs", "srfi-69", "srfi-128"] license = "bsd" -sha256 = "0ripxgwfwizj9mzb04lsbvavvy7qima81cyqm830j59sixj6ldc2" +sha256 = "1dwik86f7hi3q5ppvnr38y22hkawknrx9yc2fkvynpkc9xjpdv5k" synopsis = "SRFI-113: Sets and Bags" -version = "1.2.0" +version = "1.2.1" [srfi-115] dependencies = ["srfi-14", "srfi-152"] @@ -3222,9 +3243,9 @@ version = "1.0.3" [srfi-19] dependencies = ["srfi-1", "utf8", "srfi-18", "srfi-29", "miscmacros", "locale", "record-variants", "check-errors"] license = "bsd" -sha256 = "0wi2d1966ggig5mv7jzqs5nb87bqc4f176zdphcqghchd7vhhbbj" +sha256 = "0dpgvnkv0cfiyv33w7zgrb9ycvxz4fmqsabmza5zcwl0939a2zji" synopsis = "Time Data Types and Procedures" -version = "4.10.2" +version = "4.12.0" [srfi-193] dependencies = [] @@ -3240,6 +3261,13 @@ sha256 = "1h5zyiqxh0zflh622fp151i88xglz12kzrvsakdrcljga3k1s6ww" synopsis = "Random data generators" version = "1.0.0" +[srfi-195] +dependencies = ["box"] +license = "mit" +sha256 = "1fy3s3bhx91rk3qpiv7s7y3khhpwhqp134fc9684kpkjpkfcg607" +synopsis = "SRFI 195" +version = "0.1" + [srfi-196] dependencies = ["srfi-1", "srfi-133", "typed-records", "utf8"] license = "mit" @@ -3296,6 +3324,13 @@ sha256 = "0ynasgp03kqd6nhqmcnp4cjf87p3pkjaqi2x860hma79xsslyp8n" synopsis = "SRFI 217: Integer Sets" version = "0.2" +[srfi-225] +dependencies = ["r7rs", "srfi-1", "srfi-128", "srfi-69", "srfi-146"] +license = "mit" +sha256 = "04pvjngny9ybqsi4q4vs76549zq9ldjld5zh1n838gdbz9gp1hmj" +synopsis = "Generic Dictionaries" +version = "1.0.0" + [srfi-227] dependencies = ["srfi-1"] license = "mit" @@ -3306,9 +3341,9 @@ version = "1.1" [srfi-228] dependencies = ["r7rs", "srfi-1", "srfi-128", "srfi-151"] license = "mit" -sha256 = "1psh5ha8r7ryp26pkbv8yvvpy8x6lf5l7607npbjac0k8vr2jwrn" +sha256 = "1fjjv38678nrnsra7ng16m36m8hrzmj2r2ngddj5xcw78pg1kisk" synopsis = "Composing Comparators" -version = "1.0.0" +version = "1.0.1" [srfi-232] dependencies = ["srfi-1"] @@ -3341,9 +3376,9 @@ version = "0.1.0" [srfi-259] dependencies = ["r7rs", "integer-map"] license = "mit" -sha256 = "1zlblib4k0gz40yazx2nxacspgkgcngsfk1lb5rv8kd0d3l8ckfk" -synopsis = "Tagged procedures with type safety" -version = "0.10.0" +sha256 = "1sf41jkmmakq7l194fn3zjy6hr0bjx37z3ysiym9za6hg199fnq7" +synopsis = "Tagged procedures with type safety (with SRFI-229 compatability)" +version = "1.1.1" [srfi-27] dependencies = ["srfi-1", "vector-lib", "timed-resource", "miscmacros", "check-errors"] @@ -3397,9 +3432,9 @@ version = "1.5" [srfi-41] dependencies = ["srfi-1", "record-variants", "check-errors"] license = "bsd" -sha256 = "017qpy23mq2h7pd70j5wgq570z29qpnl8fw0j272kr6g5ndhmbbp" +sha256 = "0nia0iazpkn04hnl4k9m5xlksa9bq85crx07vf76zl8hkw57pjs4" synopsis = "SRFI 41 (Streams)" -version = "2.1.5" +version = "2.3.2" [srfi-42] dependencies = ["srfi-1", "srfi-13"] @@ -3478,6 +3513,13 @@ sha256 = "0vi8l6nmbv14mfqqyyck1ayr5xdiiqypr2bcwvawfi6aanfl6xxb" synopsis = "SRFI-67: Compare Procedures" version = "0.1" +[srfi-69-weak] +dependencies = [] +license = "bsd" +sha256 = "1hd7nlj33b1nc55ch0srqd44g7kfbkm48rrags78vpxgd7605ccs" +synopsis = "SRFI-69/90 hash-table library (w/ weak references)" +version = "0.4.0" + [srfi-69] dependencies = [] license = "bsd" @@ -3506,6 +3548,13 @@ sha256 = "0x50wcb0nsi5p355y0kma23y8wbikk3as2wlspwgfmp25g9ld0il" synopsis = "SRFI-78: Lightweight testing" version = "0.5" +[srfi-90] +dependencies = ["srfi-69-weak"] +license = "bsd" +sha256 = "0jvmdnkqp5sc434il2nd8d521biz7s56w0aqsx7r8y8qfx8jm1k0" +synopsis = "SRFI-90 hash-table library" +version = "0.2.0" + [srfi-94] dependencies = ["srfi-60"] license = "mit" @@ -3607,9 +3656,9 @@ version = "1.1" [string-utils] dependencies = ["utf8", "srfi-1", "srfi-13", "srfi-69", "miscmacros", "check-errors"] license = "bsd" -sha256 = "1dns5xcm348qkcry2x2d6mqd0k7xjfi2k4qm3vhnww8qkqaxrn09" +sha256 = "0x9gsc0xd3m1g9z3v869f5crj3akl6lpd70qjign3q8sn3mz8l1f" synopsis = "String Utilities" -version = "2.7.5" +version = "2.8.0" [strse] dependencies = ["matchable", "srfi-13", "miscmacros"] @@ -3775,9 +3824,9 @@ version = "1.0.5" [test-utils] dependencies = ["test"] license = "bsd" -sha256 = "1pc4q9m64im81l6diay0hy8zwrry4pw56vwgalvs204frfjfg41l" +sha256 = "0fbhxs81s5y4sfinkipqymhxcw8z5p25ffy9cw9dzf3g82a4gv1w" synopsis = "Test Utilities (for test egg)" -version = "1.2.1" +version = "1.6.1" [test] dependencies = [] @@ -3796,9 +3845,9 @@ version = "0.1" [thread-utils] dependencies = ["queues", "srfi-1", "srfi-18", "miscmacros", "moremacros", "record-variants", "check-errors", "synch"] license = "bsd" -sha256 = "0fmdns17m8phk2k9b4kipvywpg0jmcnbkmz9jaipzfsx9a853ax3" +sha256 = "1ywncpcvd9hxix5vqap9hidwxy4cw2xhmi9qdn70y47q2hmh2zjm" synopsis = "Thread Utilities" -version = "2.2.9" +version = "2.2.10" [tiger-hash] dependencies = ["message-digest-primitive"] @@ -3943,9 +3992,9 @@ version = "4.0" [unitex-named-chars] dependencies = [] license = "bsd" -sha256 = "00i7bax8mgw2r8l61iwvircxpynjf2d2yjxlaaa4l4m1mc12bzsv" +sha256 = "0w295j15c004bx8lkwcqisjwg8fc7xmxgpn5s3l1yhkc9zdr4jd9" synopsis = "Unicode & LaTeX Named Chars" -version = "0.0.4" +version = "0.0.5" [unsafe] dependencies = [] @@ -4003,6 +4052,13 @@ sha256 = "0iv8z83zdpwxrvjrxjnvflqy5hj4x03ivm3f2dmcf82ylhvx0gd8" synopsis = "native chicken uuid library" version = "0.1" +[vandusen] +dependencies = ["irc", "chicken-doc", "regex", "sandbox", "srfi-1", "srfi-13", "srfi-18", "sql-de-lite", "uri-common"] +license = "bsd" +sha256 = "0279v7nwwd2zgr9dkpnhpn430lb6byigny3ci0mg30z293iv2fmx" +synopsis = "A cheeky IRC bot" +version = "0.15" + [vector-lib] dependencies = [] license = "bsd" diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index af6448f50db5..6ae9ad478281 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -87,6 +87,14 @@ in gl-utils = addPkgConfig; glfw3 = addToBuildInputsWithPkgConfig pkgs.glfw3; glls = addPkgConfig; + glut = + old: + (addToCscOptions [ + "-I${(lib.getDev pkgs.libglut)}/include" + "-I${(lib.getDev pkgs.libGL)}/include" + "-I${(lib.getDev pkgs.libGLU)}/include" + ] old) + // (addToBuildInputs pkgs.libglut old); iconv = addToBuildInputs (lib.optional stdenv.hostPlatform.isDarwin pkgs.libiconv); icu = addToBuildInputsWithPkgConfig pkgs.icu; imlib2 = addToBuildInputsWithPkgConfig pkgs.imlib2; @@ -261,6 +269,8 @@ in canvas-draw = broken; coops-utils = broken; crypt = broken; + gemini = broken; + gemini-client = broken; hypergiant = broken; iup = broken; kiwi = broken; From 40306c043901258dfef224b9a7db4dd4edf8dc35 Mon Sep 17 00:00:00 2001 From: Moritz Heidkamp Date: Wed, 13 Aug 2025 21:14:48 +0200 Subject: [PATCH 50/96] chickenPackages.chickenEggs.glut: mark broken on darwin --- pkgs/development/compilers/chicken/5/overrides.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index 6ae9ad478281..faad93985682 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -89,7 +89,8 @@ in glls = addPkgConfig; glut = old: - (addToCscOptions [ + (brokenOnDarwin old) + // (addToCscOptions [ "-I${(lib.getDev pkgs.libglut)}/include" "-I${(lib.getDev pkgs.libGL)}/include" "-I${(lib.getDev pkgs.libGLU)}/include" From b3123ac579272913e597156c5cb804572d5a8d0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Sep 2025 09:16:14 +0000 Subject: [PATCH 51/96] python3Packages.django-hijack: 3.7.3 -> 3.7.4 --- pkgs/development/python-modules/django-hijack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index 872f77d95671..b887daf5c631 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "django-hijack"; - version = "3.7.3"; + version = "3.7.4"; pyproject = true; src = fetchFromGitHub { owner = "django-hijack"; repo = "django-hijack"; tag = version; - hash = "sha256-0Ix8bTOt+5Bzvbx0OrgxvQU/t9IaZlq7gLtCeVPR2qc="; + hash = "sha256-0gcrV1mlodnX79vZUVAIzJaOqM+WpIy0uH4Y/Cmu2lM="; }; build-system = [ From 191d5220d8fb97f1c95d133bf8eb56200b173b3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Sep 2025 09:17:22 +0000 Subject: [PATCH 52/96] python3Packages.slixmpp: 1.10.0 -> 1.11.0 --- pkgs/development/python-modules/slixmpp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index 1a7d410e790d..f297951a08b1 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "slixmpp"; - version = "1.10.0"; + version = "1.11.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-RrxdAVB8tChcglXOXHF8C19o5U38HxcSiDmY1tciV4o="; + hash = "sha256-hQxfOxlkpQdCWlGSdotZY6eHkJr6M3xkkRv4bR0urPM="; }; patches = [ @@ -41,7 +41,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoVendor { inherit pname src; - hash = "sha256-CeuClBYEG2YCm5lnxFs5RhjIgYEOe76rzHpauLZeQR0="; + hash = "sha256-z0X9s36n1p31boxoe6Er0Ieirinaehoucsi89oDAS0c="; }; dependencies = [ From 345adbf7550ebf1ed35d0abc765d170d1b59c222 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Sep 2025 09:59:48 +0000 Subject: [PATCH 53/96] velocity: 3.4.0-unstable-2025-08-14 -> 3.4.0-unstable-2025-08-31 --- pkgs/by-name/ve/velocity/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ve/velocity/package.nix b/pkgs/by-name/ve/velocity/package.nix index 55c02819fc71..0b90228fd7ea 100644 --- a/pkgs/by-name/ve/velocity/package.nix +++ b/pkgs/by-name/ve/velocity/package.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "velocity"; - version = "3.4.0-unstable-2025-08-14"; + version = "3.4.0-unstable-2025-08-31"; src = fetchFromGitHub { owner = "PaperMC"; repo = "Velocity"; - rev = "d2d333a958af801a7b09465aa7402b0f7857aeb2"; - hash = "sha256-jdYcUZxdn8Q4A884jA5olrodJvzfIUCl8MwDsps4Pg4="; + rev = "bfd15e1a816b0928d51abef03333166ecc225358"; + hash = "sha256-+BM+oaV+CjqOErSl03nDYh9kKxq2gz/orsi66+Cn3xk="; }; nativeBuildInputs = [ From 6140cec27fc29d97e045557ed13e6b125d5662f7 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sun, 31 Aug 2025 22:45:00 +0200 Subject: [PATCH 54/96] chickenPackages.chickenEggs: update --- .../development/compilers/chicken/5/deps.toml | 174 +++++++++++------- .../compilers/chicken/5/overrides.nix | 20 +- 2 files changed, 127 insertions(+), 67 deletions(-) diff --git a/pkgs/development/compilers/chicken/5/deps.toml b/pkgs/development/compilers/chicken/5/deps.toml index 0622d7a3ea77..1a258fdc8a27 100644 --- a/pkgs/development/compilers/chicken/5/deps.toml +++ b/pkgs/development/compilers/chicken/5/deps.toml @@ -219,9 +219,9 @@ version = "0.1.6" [awful] dependencies = ["json", "http-session", "spiffy", "spiffy-cookies", "spiffy-request-vars", "sxml-transforms", "srfi-1", "srfi-13", "srfi-69"] license = "bsd" -sha256 = "1i20ib8kx2hjggi18xn72lwxaa2q38bmmffsm06s1cxrfh58s5gz" +sha256 = "08s45r046mn9cdhj6zs4vxypg8v9knxsaqdmwlrww5wng6hh72kl" synopsis = "awful provides an application and an extension to ease the development of web-based applications." -version = "1.0.3" +version = "1.0.4" [base64] dependencies = ["srfi-13"] @@ -317,9 +317,9 @@ version = "5.1" [blob-utils] dependencies = ["string-utils", "check-errors"] license = "bsd" -sha256 = "0qp696595b46gygwf1cf0096sv5rxysgcn9yqwmbp8lxnl59p42n" +sha256 = "1xg81r66yj1i2kd1w6n6w7h462s4xcwdkid5xqjk9gkvy0m0szz2" synopsis = "Blob Utilities" -version = "2.0.4" +version = "2.0.5" [bloom-filter] dependencies = ["iset", "message-digest-primitive", "message-digest-type", "message-digest-utils", "check-errors", "record-variants"] @@ -454,6 +454,13 @@ sha256 = "04048cksqnhyn0zcq0sdn426cj3fqfrj7xq464961jl72x8xqc5w" synopsis = "Chibi Scheme's simple generic function interface" version = "0.1.3" +[chiccup] +dependencies = ["srfi-1", "srfi-13", "sxml-transforms"] +license = "bsd" +sha256 = "0vwcavaxkg0dqvy6hivhfv3rfvd72c2c6sk8lkj9pndj3ic42z71" +synopsis = "Chiccup - HTML generation using sxml-transforms" +version = "0.1.0" + [chickadee] dependencies = ["matchable", "uri-common", "uri-generic", "intarweb", "simple-sha1", "spiffy", "spiffy-request-vars", "sxml-transforms", "chicken-doc", "chicken-doc-admin", "chicken-doc-html", "srfi-18"] license = "bsd" @@ -835,9 +842,9 @@ version = "1.1.0" [egg-tarballs] dependencies = ["simple-sha1", "srfi-1", "srfi-13"] license = "bsd" -sha256 = "16scw7055cclbhkcsjj0crwgirx5jihda18lirh60zf5a56khhpb" +sha256 = "09fvk82l23jdz50yjd9a70x4d9213rcvc5prdw6zs61vkj9axnsi" synopsis = "Creates tarballs for eggs in henrietta cache" -version = "1.0.1" +version = "1.1.0" [elliptic-curves] dependencies = ["srfi-1", "srfi-99", "matchable", "modular-arithmetic"] @@ -884,9 +891,9 @@ version = "0.2.2" [error-utils] dependencies = ["srfi-1"] license = "bsd" -sha256 = "1s58jisckjzjf0v1cmr67ajzzs6dc67w0kzmynqpk9kwxd01asr5" +sha256 = "0rc32v4l2mn0q92vdksh4nirz7ycvmzszi65ixg7h7s42wrx7x78" synopsis = "Error Utilities" -version = "2.1.0" +version = "2.1.1" [ersatz] dependencies = ["datatype", "silex", "lalr", "utf8", "uri-generic", "srfi-1"] @@ -1017,9 +1024,9 @@ version = "1.5" [format] dependencies = ["srfi-13"] license = "public-domain" -sha256 = "0jrllvm63850q42w7kcc4zl0537fa7iffbj4mk336r4rfgp9yxxk" +sha256 = "1dwbzvrxkx33bp32j3hsvipawk04w2g00nh8ixa00b3ppb9ys17i" synopsis = "Common-Lisp style formatted output" -version = "3.2.3" +version = "3.2.4" [fp-utils] dependencies = ["fx-utils"] @@ -1318,9 +1325,9 @@ version = "1.2.2" [http-session] dependencies = ["intarweb", "simple-sha1", "spiffy", "srfi-1", "srfi-18", "srfi-69", "uri-common"] license = "bsd" -sha256 = "1yjzkax2m3jz05640la0ry11vafrqwdhn2sd1jr0w8yhgbwwfprs" +sha256 = "18i7wkm68484kfwhkji2bs7clarz134ai8vi4bvdqppjqzvr5fwg" synopsis = "Facilities for managing HTTP sessions" -version = "2.10" +version = "2.11" [hyde] dependencies = ["sxml-transforms", "doctype", "matchable", "scss", "spiffy", "colorize", "intarweb", "uri-common", "svnwiki-sxml", "defstruct", "sxpath", "html-parser", "atom", "rfc3339", "srfi-1", "srfi-13", "srfi-18", "srfi-69"] @@ -1500,9 +1507,9 @@ version = "1.1.3" [json] dependencies = ["packrat", "srfi-1", "srfi-69"] license = "mit" -sha256 = "1h27h6z7awadijk9w51df9dyk3wma27fp180j7xwl27sbw7h76wz" +sha256 = "0p0m6f7kcf0vp3arfzn579li7lghxwx4ivlq29sknfq8jy8kq5bm" synopsis = "A JSON library" -version = "1.6" +version = "1.7" [kd-tree] dependencies = ["srfi-1", "datatype", "yasos"] @@ -1535,9 +1542,9 @@ version = "0.3" [lay] dependencies = [] license = "bsd" -sha256 = "0vrc6apz17pr9fld927g562xbbsv9hkgxdwb0r5ybc8n7jyk9mll" +sha256 = "16dq7w93yg0m0df76lf506kg30715n932sv3ww4p1fn0b5mn0g27" synopsis = "Lay eggs efficiently" -version = "0.3.1" +version = "0.3.3" [lazy-ffi] dependencies = ["bind", "srfi-1", "srfi-69"] @@ -1598,9 +1605,9 @@ version = "1.2.1" [list-utils] dependencies = ["utf8", "srfi-1", "check-errors"] license = "bsd" -sha256 = "09a7rignm474ifysryvl79ls6vj5is7ghb84w5i3dc3lavzm3947" +sha256 = "0bqfp9i10mrz5zs1mh2x7pgcp980qq9l31krxz37j619d1s5q807" synopsis = "list-utils" -version = "2.7.2" +version = "2.8.0" [live-define] dependencies = ["matchable"] @@ -1647,9 +1654,9 @@ version = "1.0.7" [locale] dependencies = ["srfi-1", "utf8", "check-errors"] license = "bsd" -sha256 = "0ccp4r0qpy65rv2llvsjm0l2y8xyac702gj761516ppps4cysw6s" +sha256 = "0f8fkl35v25lwad9nzpq3h01yxkh3k7hij9swacampl94cal1iix" synopsis = "Provides locale operations" -version = "0.9.5" +version = "0.9.6" [locals] dependencies = [] @@ -1703,9 +1710,9 @@ version = "0.1.0" [mailbox] dependencies = ["srfi-1", "srfi-18"] license = "bsd" -sha256 = "1306hqcq8g9pr8kq50czzgnwcxna70ljs7m8baqcyzzajsxjvwy8" +sha256 = "0rsd1rs7kf44ns48srzi1wrgxvq0dy0b3ilndlkjvs9imyr9n5l0" synopsis = "Thread-safe queues with timeout" -version = "3.3.11" +version = "3.3.12" [make-tests] dependencies = ["brev-separate", "srfi-1", "uri-common"] @@ -1752,9 +1759,9 @@ version = "1.2" [math-utils] dependencies = ["memoize", "miscmacros", "srfi-1", "vector-lib"] license = "public-domain" -sha256 = "1n7kv2bn31ypb4vmqhwg155r7ibng7sfpkm6y14mizvqb54k51c4" +sha256 = "0dbglbhj9bb1fbhb5ckssalvvpvmqmq71lzifzmpqlpjqra12ql5" synopsis = "Miscellaneous math utilities" -version = "1.11.0" +version = "1.12.0" [math] dependencies = ["srfi-1", "r6rs-bytevectors", "miscmacros", "srfi-133", "srfi-42"] @@ -1864,16 +1871,16 @@ version = "0.7" [micro-benchmark] dependencies = ["micro-stats", "srfi-1"] license = "gplv3" -sha256 = "10s05fxw8bsvxbnm312i3pfnzc117l3ds8zpji9ry01ps1spy74q" +sha256 = "0v1w94p4ijwv6lhnhxb9v3rc2vxa8jy0jfh1qgyv658200q4ja77" synopsis = "Easily create micro-benchmarks" -version = "0.0.21" +version = "0.1.0" [micro-stats] dependencies = ["srfi-1", "sequences", "sequences-utils"] license = "gplv3" -sha256 = "0w881dyhr5p3imp1fqfy3ycsr1azhk9h6rvqqrhqi85xj0hjf17n" +sha256 = "1l605zjij8xbj55skqr7mbmpfibf7ijzz7q8i320g7iav9z8vjmk" synopsis = "Easily create micro-stats" -version = "0.2.1" +version = "0.3.0" [mini-kanren] dependencies = ["srfi-1"] @@ -2036,6 +2043,13 @@ sha256 = "1afqv4acx1682ph81ggkpa6rrv0wyzg9094ab4xx12ygkiib8g2f" synopsis = "OAuth 1.0, 1.0a, RFC 5849" version = "0.3" +[oauthtoothy] +dependencies = ["schematra", "openssl", "http-client", "intarweb", "uri-common", "medea", "schematra", "schematra-session"] +license = "bsd" +sha256 = "02r2lmf1mqlqji0v4x808gw6hc3lciq860kf51dr9bkn3smcg1j7" +synopsis = "Oauth2 support for Schematra" +version = "0.1.0" + [object-evict] dependencies = ["srfi-69"] license = "bsd" @@ -2081,9 +2095,9 @@ version = "0.1.0" [packrat] dependencies = ["srfi-1"] license = "mit" -sha256 = "0d7ly5zvswg07gzm504min730qy16yafz3acyq45smd7q52s47fp" +sha256 = "0kiasam3d5jgqjl79fvs10djx091galnvznisd0xs5jns7gbba45" synopsis = "A packrat parsing library" -version = "1.5" +version = "1.6" [pandoc] dependencies = ["cjson", "http-client", "medea", "r7rs", "scsh-process"] @@ -2200,9 +2214,9 @@ version = "1.4" [posix-utils] dependencies = ["srfi-1", "utf8", "check-errors"] license = "bsd" -sha256 = "1am7j86pp6ym4xbg663g02hjcmq3alwmhcak0g6yrh96w1dk643c" +sha256 = "1x5591jxyz31b2d0s5ywp6ywd5ia57nv1pavwf4iizyifs500bm8" synopsis = "posix-utils" -version = "2.1.2" +version = "2.1.5" [postgresql] dependencies = ["sql-null", "srfi-1", "srfi-13", "srfi-69"] @@ -2214,9 +2228,9 @@ version = "4.1.6" [poule] dependencies = ["datatype", "mailbox", "matchable", "srfi-1", "srfi-18", "typed-records"] license = "bsd" -sha256 = "0ldh8jzqcrscgkr16s8hqjmqqxligb37xffk8s8kqa2y9sbk9d96" +sha256 = "1kx745i0gfncwfacz0knaazcxj77csc0ad9cfwdlgbcxd5mnc5gn" synopsis = "Manage pools of worker processes" -version = "0.1.1" +version = "0.1.3" [prefixes] dependencies = [] @@ -2431,9 +2445,9 @@ version = "2.0" [remote-mailbox] dependencies = ["tcp-server", "s11n", "mailbox", "srfi-18", "synch", "miscmacros", "moremacros", "llrb-tree", "condition-utils", "check-errors"] license = "bsd" -sha256 = "12fzidia913gncl9xpjyp6ri8d5fij17gkmxv0pr9fh13icx6h54" +sha256 = "1q1y9n1sfa7v11wkw0xyddnwmw2na59am0kvkxjcn5vc31xlak9r" synopsis = "Remote Mailbox" -version = "1.0.8" +version = "1.0.9" [rest-bind] dependencies = ["intarweb", "uri-common"] @@ -2499,18 +2513,18 @@ synopsis = "basic Scheme48 module syntax" version = "0.7" [s9fes-char-graphics-shapes] -dependencies = ["srfi-1", "utf8", "record-variants", "s9fes-char-graphics"] +dependencies = [] license = "public-domain" -sha256 = "08vrla2ansawggz19qa6733lyis0mzzas7kpy3ynypg1c190ji9q" +sha256 = "18v3gspj8wirkzdy42bc199j4l3s0j0n0751hxli1m3b145agf01" synopsis = "Scheme 9 from Empty Space Char Graphics Shapes" -version = "1.1.1" +version = "1.5.0" [s9fes-char-graphics] -dependencies = ["srfi-1", "utf8", "format", "record-variants"] +dependencies = [] license = "public-domain" -sha256 = "1fsxh0fni6mlvkfznk2ac21lk9srsphjs02iy1f4r4hyx723nz5q" +sha256 = "09fklvrpss4ysgviy9bf1g569c6al93vg374s44prmlmwpcbynfj" synopsis = "Scheme 9 from Empty Space Char Graphics" -version = "1.16.2" +version = "1.19.0" [salmonella-diff] dependencies = ["salmonella", "salmonella-html-report", "srfi-1", "srfi-13", "sxml-transforms"] @@ -2568,6 +2582,27 @@ sha256 = "03nn90fi18gn29vxvslyi5zxhl5hx2m7f7ikfy9a3ypnkw1bh8qk" synopsis = "Tools for Scheme development" version = "0.3.2" +[schematra-csrf] +dependencies = ["base64", "schematra", "schematra-session"] +license = "bsd" +sha256 = "0qqyjbqzaixh6d3a8zcqgm390wy4mrbr30w33f6q5nmz239ifiwl" +synopsis = "schematra-csrf - Schematra middleware to add CSRF" +version = "0.1.1" + +[schematra-session] +dependencies = ["message-digest", "hmac", "sha2", "base64", "srfi-69", "schematra"] +license = "bsd" +sha256 = "1kq0s713cysj03c0n1piknam3aghvkvjxvphj3r39hgm84ygdm9q" +synopsis = "Session support for Schematra" +version = "0.1.0" + +[schematra] +dependencies = ["spiffy", "base64", "nrepl", "srfi-1", "srfi-13", "srfi-18", "srfi-69", "chiccup", "medea"] +license = "bsd" +sha256 = "02h3a7jjpl0czymj5qp3fj2ph2qy1a44fl5cp6bm5divmba274js" +synopsis = "Schematra is a minimalistic web server built on top of spiffy" +version = "0.2.3" + [scheme-indent] dependencies = ["srfi-1"] license = "bsd" @@ -2669,9 +2704,9 @@ version = "0.6.1" [server-test] dependencies = [] license = "bsd" -sha256 = "1k3k9mkildbi9i8vgj26rj5nidrm0zif8pqf9zm5ahwn4kcp9drx" +sha256 = "1b0c3pbw0cnfh9xhczmwhanfq4zz6ay3vd7005d28n690n4aak76" synopsis = "Utilities to help testing servers" -version = "0.6" +version = "0.7" [sexp-diff] dependencies = ["srfi-1"] @@ -2848,6 +2883,13 @@ sha256 = "1cdgs1fhir777909qp43990xbn2a1xhp5rbakjyvcaf8y0m082w0" synopsis = "A slicer procedure for lists, strings and vectors" version = "1.3" +[slset] +dependencies = [] +license = "bsd" +sha256 = "0qb5pcq0n06mswyy06ckqfngsxgf7hq8l3vwfjyfm7f8dgffbbha" +synopsis = "Lists of symbols as sets" +version = "0.1" + [smtp] dependencies = ["matchable", "datatype", "utf8", "abnf"] license = "gpl-3" @@ -2900,9 +2942,9 @@ version = "0.7" [spiffy-cookies] dependencies = ["spiffy", "intarweb"] license = "bsd" -sha256 = "1jf0g1i8sz09gwmvrvhp9kq0dr0cv2g4j1jhqf5z0177506z9x0j" +sha256 = "0fj3x419lfai1550hipxrcb5cfb1v1k6k60bjkwwqwncjpghqxih" synopsis = "Procedures for managing cookies" -version = "1.2" +version = "1.3" [spiffy-directory-listing] dependencies = ["spiffy", "sxml-transforms"] @@ -2914,9 +2956,9 @@ version = "0.3" [spiffy-request-vars] dependencies = ["intarweb", "srfi-1", "srfi-13", "srfi-69", "spiffy", "uri-common"] license = "bsd" -sha256 = "06wzpmwnn7djr7iz9v8qqn6nrxcddqi4d751ym7g7na4aqypcc80" +sha256 = "0bklc2d267ihkhsr263s6pzbb6dm30jjy8vyjy8pny7pbbpr6sqq" synopsis = "Easy access to variables from HTTP requests" -version = "0.19" +version = "0.20" [spiffy-sexpr-log] dependencies = ["spiffy", "srfi-1", "srfi-13"] @@ -2991,9 +3033,9 @@ version = "0.5.1" [srfi-101] dependencies = ["srfi-1", "srfi-69", "vector-lib"] license = "bsd" -sha256 = "0jfkprl6jxyh2s241x0cmxnqdb3s1bl32jyfqyqzpadbbvrixm56" +sha256 = "115m43a5kq52y0947pq3ln92f68y68zzk3vglbx791qbsy2flzrv" synopsis = "SRFI 101" -version = "0.0.3" +version = "0.0.4" [srfi-105] dependencies = ["srfi-13", "srfi-1", "srfi-123"] @@ -3243,9 +3285,9 @@ version = "1.0.3" [srfi-19] dependencies = ["srfi-1", "utf8", "srfi-18", "srfi-29", "miscmacros", "locale", "record-variants", "check-errors"] license = "bsd" -sha256 = "0dpgvnkv0cfiyv33w7zgrb9ycvxz4fmqsabmza5zcwl0939a2zji" +sha256 = "05wc234bai2qgszqbpl2s1070ir2xkhq3xwpsyjwg9n1s1022v6z" synopsis = "Time Data Types and Procedures" -version = "4.12.0" +version = "4.12.1" [srfi-193] dependencies = [] @@ -3390,9 +3432,9 @@ version = "4.2.4" [srfi-29] dependencies = ["srfi-1", "srfi-69", "utf8", "locale", "posix-utils", "condition-utils", "check-errors"] license = "bsd" -sha256 = "1f7qc26k8wpr8vgf5vqw54bir9a6aiwn6qx2mssqvlypj4zvffwv" +sha256 = "062jrzifxlpha3y4sffgif4q3b5ydvnlwvg0g9003k52cmdk3qqa" synopsis = "Localization" -version = "3.1.0" +version = "3.2.0" [srfi-34] dependencies = [] @@ -3446,9 +3488,9 @@ version = "1.76" [srfi-45] dependencies = ["record-variants", "check-errors"] license = "bsd" -sha256 = "0axnndb3lkh5ayiqkxhwg9v6zq1zkb59gsdgwg4b2ysx92mnn449" +sha256 = "11v0x9j1ycf29cz38mwhjffx6hv2ka6s22kiawa091gqvmydjw77" synopsis = "SRFI-45: Primitives for Expressing Iterative Lazy Algorithms" -version = "4.0.8" +version = "4.0.9" [srfi-47] dependencies = [] @@ -3516,9 +3558,9 @@ version = "0.1" [srfi-69-weak] dependencies = [] license = "bsd" -sha256 = "1hd7nlj33b1nc55ch0srqd44g7kfbkm48rrags78vpxgd7605ccs" +sha256 = "14kxp8zkxrnc0rxj6sm282bznn4i0a9w86pw0v75g199q7kahhk3" synopsis = "SRFI-69/90 hash-table library (w/ weak references)" -version = "0.4.0" +version = "0.8.0" [srfi-69] dependencies = [] @@ -3551,9 +3593,9 @@ version = "0.5" [srfi-90] dependencies = ["srfi-69-weak"] license = "bsd" -sha256 = "0jvmdnkqp5sc434il2nd8d521biz7s56w0aqsx7r8y8qfx8jm1k0" +sha256 = "0spw1in29cd86y5nvdcjwssmlpg073ggnj6afb9ahk7j25xf5snw" synopsis = "SRFI-90 hash-table library" -version = "0.2.0" +version = "0.3.2" [srfi-94] dependencies = ["srfi-60"] @@ -3656,9 +3698,9 @@ version = "1.1" [string-utils] dependencies = ["utf8", "srfi-1", "srfi-13", "srfi-69", "miscmacros", "check-errors"] license = "bsd" -sha256 = "0x9gsc0xd3m1g9z3v869f5crj3akl6lpd70qjign3q8sn3mz8l1f" +sha256 = "1gkldy8l6lddwcsi31s5kww6m4107jl44qpx7zc42il92l5qzgkg" synopsis = "String Utilities" -version = "2.8.0" +version = "2.8.1" [strse] dependencies = ["matchable", "srfi-13", "miscmacros"] @@ -3705,9 +3747,9 @@ version = "0.2.14" [svnwiki2html] dependencies = ["qwiki", "svnwiki-sxml", "sxml-transforms", "srfi-1", "srfi-13"] license = "bsd" -sha256 = "014401nlkpz19bk8yk906p9i0b7ycs79rn7yq0zks8z09rgr9ghk" +sha256 = "1bb9w4j7imhr24hp037sk6p0b2mla0fmfcvqdmi5ji5jwzvn9ir0" synopsis = "A program to convert svnwiki syntax to HTML" -version = "0.0.2" +version = "0.0.3" [sxml-modifications] dependencies = ["srfi-1", "sxpath"] @@ -3859,9 +3901,9 @@ version = "4.1.3" [timed-resource] dependencies = ["record-variants", "check-errors", "thread-utils", "srfi-1", "srfi-18", "synch", "miscmacros"] license = "bsd" -sha256 = "1awlgd42zwi7gpvddqdz7fmdmv5m9pznwc871vqsz2ax8xapp8mz" +sha256 = "00aiagssa808y1kzs9bgnxs8ff12ir2vc5pz4vcnhsc8339dmc0l" synopsis = "Resource w/ Timeout" -version = "2.4.3" +version = "2.4.4" [tiny-prolog] dependencies = ["srfi-69"] diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index faad93985682..bc4ecfb4e8fe 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -128,6 +128,23 @@ in plot = addToBuildInputs pkgs.plotutils; postgresql = addToBuildInputsWithPkgConfig pkgs.libpq; rocksdb = addToBuildInputs pkgs.rocksdb_8_3; + # missing dependency in upstream egg + s9fes-char-graphics-shapes = addToPropagatedBuildInputs ( + with chickenEggs; + [ + utf8 + s9fes-char-graphics + ] + ); + # missing dependency in upstream egg + s9fes-char-graphics = addToPropagatedBuildInputs ( + with chickenEggs; + [ + srfi-1 + utf8 + record-variants + ] + ); scheme2c-compatibility = addPkgConfig; sdl-base = old: @@ -203,7 +220,8 @@ in }; opengl = old: - (addToBuildInputsWithPkgConfig (lib.optionals (!stdenv.hostPlatform.isDarwin) [ + (brokenOnDarwin old) + // (addToBuildInputsWithPkgConfig (lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkgs.libGL pkgs.libGLU ]) old) From 3b03df2b2ef56fd45b879966143870fb5262fe8a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Sep 2025 12:37:56 +0200 Subject: [PATCH 55/96] vunnel: 0.37.0 -> 0.38.0 Changelog: https://github.com/anchore/vunnel/releases/tag/v0.38.0 --- pkgs/by-name/vu/vunnel/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix index e367f90e3e77..4f5c93d3575f 100644 --- a/pkgs/by-name/vu/vunnel/package.nix +++ b/pkgs/by-name/vu/vunnel/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "vunnel"; - version = "0.37.0"; + version = "0.38.0"; pyproject = true; src = fetchFromGitHub { owner = "anchore"; repo = "vunnel"; tag = "v${version}"; - hash = "sha256-x6J0MbwPQvqG1WXrnwMf0uzAu7MDDVxmDRzbDMb+RSk="; + hash = "sha256-sb22uR34yZxLMwac15Q6d17K/TP2rAXUGFMzKyA05Lg="; leaveDotGit = true; }; @@ -45,6 +45,7 @@ python3.pkgs.buildPythonApplication rec { lxml mashumaro mergedeep + oras orjson packageurl-python pytest-snapshot @@ -77,6 +78,8 @@ python3.pkgs.buildPythonApplication rec { "test_status" # TypeError "test_parser" + # Test require network access + "test_rhel_provider_supports_ignore_hydra_errors" ]; meta = { From 3ca11776a32ca905431b64cf198a79521ea7f017 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Sep 2025 12:43:40 +0200 Subject: [PATCH 56/96] exploitdb: 2025-08-27 -> 2025-09-02 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/2025-08-27...2025-09-02 --- pkgs/by-name/ex/exploitdb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index dc1668a47478..a35646ab9458 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "exploitdb"; - version = "2025-08-27"; + version = "2025-09-02"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; tag = finalAttrs.version; - hash = "sha256-/uuTr52FKulfeZCSfMcPxVJstRWgeyhr3WPgjnWc8YE="; + hash = "sha256-QMYhLM8wE8T0fieciUv3aPOanI1GuUToGFMsJETmrS4="; }; nativeBuildInputs = [ makeWrapper ]; From 9438ceb5e4ef915b109cce05828f949faf2a7bb1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Sep 2025 12:46:27 +0200 Subject: [PATCH 57/96] feroxbuster: 2.11.0 -> 2.12.0 Diff: https://github.com/epi052/feroxbuster/compare/v2.11.0...v2.12.0 Changelog: https://github.com/epi052/feroxbuster/releases/tag/vv2.12.0 --- pkgs/by-name/fe/feroxbuster/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fe/feroxbuster/package.nix b/pkgs/by-name/fe/feroxbuster/package.nix index 943030b42100..edd176cb8460 100644 --- a/pkgs/by-name/fe/feroxbuster/package.nix +++ b/pkgs/by-name/fe/feroxbuster/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "feroxbuster"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "epi052"; repo = "feroxbuster"; tag = "v${version}"; - hash = "sha256-/NgGlXYMxGxpX93SJ6gWgZW21cSSZsgo/WMvRuLw+Bw="; + hash = "sha256-uVRZp9r3888k//UsNUr7NKQcmFe2/RLmlIt/RgZ3Ips="; }; - cargoHash = "sha256-L5s+P9eerv+O2vBUczGmn0rUMbHQtnF8hVa22wOrTGo="; + cargoHash = "sha256-W6sNc8RVItOGHIw3vmtZlJayqrzvmuET2B2AIl7LAL4="; OPENSSL_NO_VENDOR = true; From 08de50e84bb1af4215e1d2546abd475fd65af8aa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Sep 2025 13:00:39 +0200 Subject: [PATCH 58/96] python313Packages.aiopurpleair: modernize --- .../python-modules/aiopurpleair/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aiopurpleair/default.nix b/pkgs/development/python-modules/aiopurpleair/default.nix index 2684877e0afb..74352f3c3b41 100644 --- a/pkgs/development/python-modules/aiopurpleair/default.nix +++ b/pkgs/development/python-modules/aiopurpleair/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aiopurpleair"; version = "2025.08.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -27,9 +27,9 @@ buildPythonPackage rec { hash = "sha256-VmKIIgfZFk9z8WORDHA4ibL4FZchiRrT6L0rCkxosoc="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp pydantic certifi @@ -54,8 +54,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interacting with the PurpleAir API"; homepage = "https://github.com/bachya/aiopurpleair"; - changelog = "https://github.com/bachya/aiopurpleair/releases/tag/${version}"; - license = with licenses; [ mit ]; + changelog = "https://github.com/bachya/aiopurpleair/releases/tag/${src.tag}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From b5c94a70518b9b2f85fc485af5b4622de572c6bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Sep 2025 11:03:07 +0000 Subject: [PATCH 59/96] forgejo-runner: 9.1.1 -> 10.0.1 --- pkgs/by-name/fo/forgejo-runner/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index d96267f79b7f..c270c24fe6c4 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -41,17 +41,17 @@ let in buildGoModule rec { pname = "forgejo-runner"; - version = "9.1.1"; + version = "10.0.1"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-tJ1BEGKthOUf//MM8GS712YEzkcr9w2LN1ejDbVOITU="; + hash = "sha256-p9inpt3v5KnKWdkkr2viL3KxN2fawesjaziyl2QsYko="; }; - vendorHash = "sha256-hdEpA7tG1uJOBRPQTaWst/D30Y9Uez4ecK2dkZCQITk="; + vendorHash = "sha256-/LoNiNgUCFDW/nlqiDXvr2m0UwFNtyOewGmd1F35YEg="; # See upstream Makefile # https://code.forgejo.org/forgejo/runner/src/branch/main/Makefile From 2557a906a5c0618804bb9799dc0c52387b589114 Mon Sep 17 00:00:00 2001 From: kyehn Date: Tue, 2 Sep 2025 19:06:35 +0800 Subject: [PATCH 60/96] waylandpp: 1.0.0 -> 1.0.1 --- .../libraries/waylandpp/default.nix | 32 ++++++------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix index 002ae979eccf..6d0b9dea1dd0 100644 --- a/pkgs/development/libraries/waylandpp/default.nix +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, makeFontsConf, pkg-config, @@ -16,34 +15,22 @@ graphviz, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "waylandpp"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "NilsBrause"; - repo = pname; - rev = version; - hash = "sha256-Dw2RnLLyhykikHps1in+euHksO+ERbATbfmbUFOJklg="; + repo = "waylandpp"; + tag = finalAttrs.version; + hash = "sha256-vKYKUXq5lmjQcZ0rD+b2O7N1iCVnpkpKd8Z/RTI083g="; }; - patches = [ - # Pull fixes for gcc-13 compatibility: - # https://github.com/NilsBrause/waylandpp/pull/71 - # Without the change `kodi` fails to find `uint32_t` in `waylandpp` - # headers. - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/NilsBrause/waylandpp/commit/3c441910aa25f57df2a4db55f75f5d99cea86620.patch"; - hash = "sha256-bxHMP09zCwUKD0M63C1FqQySAN9hr+7t/DyFDRwdtCo="; - }) - ]; - cmakeFlags = [ - "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}" + (lib.cmakeFeature "CMAKE_INSTALL_DATADIR" (placeholder "dev")) ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++" + (lib.cmakeFeature "WAYLAND_SCANNERPP" "${buildPackages.waylandpp}/bin/wayland-scanner++") ]; # Complains about not being able to find the fontconfig config file otherwise @@ -82,7 +69,7 @@ stdenv.mkDerivation rec { export XDG_CACHE_HOME="$(mktemp -d)" ''; - meta = with lib; { + meta = { description = "Wayland C++ binding"; mainProgram = "wayland-scanner++"; homepage = "https://github.com/NilsBrause/waylandpp/"; @@ -91,5 +78,6 @@ stdenv.mkDerivation rec { hpnd ]; maintainers = with lib.maintainers; [ minijackson ]; + platforms = lib.platforms.linux; }; -} +}) From ad326215188f1d6479bac5520b406285b68c5d59 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 2 Sep 2025 13:52:08 +0200 Subject: [PATCH 61/96] python3Packages.msmart-ng: 2025.7.0 -> 2025.9.0 https://github.com/mill1000/midea-msmart/releases/tag/2025.9.0 --- .../python-modules/msmart-ng/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/msmart-ng/default.nix b/pkgs/development/python-modules/msmart-ng/default.nix index 1093542fbc36..972aa5079e20 100644 --- a/pkgs/development/python-modules/msmart-ng/default.nix +++ b/pkgs/development/python-modules/msmart-ng/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "msmart-ng"; - version = "2025.7.0"; + version = "2025.9.0"; pyproject = true; src = fetchFromGitHub { owner = "mill1000"; repo = "midea-msmart"; tag = version; - hash = "sha256-4CqdAgWkpkZ4Kz/GfLBvZ/ogb/tb3/NPGSxOpyU9CIo="; + hash = "sha256-pBAwEq1/fRLyJ9ioMmU5u1YgKQ6nW4+ol1HLh6/Wg8Y="; }; build-system = [ @@ -39,15 +39,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ - # broken in upstream CI as well - "test_properties_cascade" - ]; - - disabledTestPaths = [ - # network access - "msmart/tests/test_cloud.py" - ]; + env.CI = true; pythonImportsCheck = [ "msmart" ]; From 66223382afc204ddeaf1cd03c331ecce511bf0cd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 2 Sep 2025 13:53:08 +0200 Subject: [PATCH 62/96] home-assistant-custom-components.midea_ac: 2025.7.0 -> 2025.9.0 https://github.com/mill1000/midea-ac-py/releases/tag/2025.9.0 --- .../home-assistant/custom-components/midea_ac/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix index 8f42c65a28ec..a63f63529015 100644 --- a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix +++ b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent rec { owner = "mill1000"; domain = "midea_ac"; - version = "2025.7.0"; + version = "2025.9.0"; src = fetchFromGitHub { owner = "mill1000"; repo = "midea-ac-py"; tag = version; - hash = "sha256-tFUQa+19ksmEuSm8n2tTf7tdVnNQIovnFgbecq4XurY="; + hash = "sha256-gpCxSTUQdkpLQWIHA2kKmM9bi21tCq1+du4qU5s+Uwk="; }; dependencies = [ msmart-ng ]; From e0b4dbdcd8c8576f9109c0ac1703615ff137a826 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Sep 2025 12:13:42 +0000 Subject: [PATCH 63/96] yarn-berry: 4.9.2 -> 4.9.4 --- pkgs/by-name/ya/yarn-berry/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ya/yarn-berry/package.nix b/pkgs/by-name/ya/yarn-berry/package.nix index ba489fdcf89a..fa36fe9deb40 100644 --- a/pkgs/by-name/ya/yarn-berry/package.nix +++ b/pkgs/by-name/ya/yarn-berry/package.nix @@ -10,9 +10,9 @@ }: let - version_4 = "4.9.2"; + version_4 = "4.9.4"; version_3 = "3.8.7"; - hash_4 = "sha256-MZB70hgPiQuHHLibhrGZ11vcvtZsCDkqR1NxSq8bXps="; + hash_4 = "sha256-7OLCWG4KqgwXT7yJ87vOjjBwGijECkggciCbFrpW0Zs="; hash_3 = "sha256-vRrk+Fs/7dZha3h7yI5NpMfd1xezesnigpFgTRCACZo="; in From 1209eb8c87c9d7ec13898205117fba304b848340 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Sep 2025 12:34:54 +0000 Subject: [PATCH 64/96] python3Packages.python-ironicclient: 5.12.0 -> 5.13.0 --- .../python-modules/python-ironicclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index bd92d16db614..2a79935455f3 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "python-ironicclient"; - version = "5.12.0"; + version = "5.13.0"; pyproject = true; src = fetchFromGitHub { owner = "openstack"; repo = "python-ironicclient"; tag = version; - hash = "sha256-qw0d5tfglEjyiulwbu6hLl5B4rFOaWY5HR1bUt1AGTQ="; + hash = "sha256-ONQ/xQkpQ/KOECVUsduTi4qshqBZ/dnL/1u9OZZ6y6Y="; }; build-system = [ From fbb125b142827e82d849b1bc424e1cc740d2369c Mon Sep 17 00:00:00 2001 From: Thierry Delafontaine Date: Tue, 2 Sep 2025 14:39:06 +0200 Subject: [PATCH 65/96] opencode: 0.5.29 -> 0.6.3 --- pkgs/by-name/op/opencode/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index de9a00e1c971..4aed8ca2fd2b 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -22,12 +22,12 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "0.5.29"; + version = "0.6.3"; src = fetchFromGitHub { owner = "sst"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-l9yi+98fsFWERKsJPfhNoCTG9vKawE4aKngwBkCJupE="; + hash = "sha256-hufgCO3g0WZT4+hX1lqmhvrthFO30c0NS3ryNJMmOxo="; }; tui = buildGoModule { @@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { modRoot = "packages/tui"; - vendorHash = "sha256-78MfWF0HSeLFLGDr1Zh74XeyY71zUmmazgG2MnWPucw="; + vendorHash = "sha256-8pwVQVraLSE1DRL6IFMlQ/y8HQ8464N/QwAS8Faloq4="; subPackages = [ "cmd/opencode" ]; From 454bc0b6f8633d9ced60fda73a5ec44f856d9c2b Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 2 Sep 2025 14:49:46 +0200 Subject: [PATCH 66/96] chunksync: add yayayayaka to maintainers --- pkgs/by-name/ch/chunksync/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ch/chunksync/package.nix b/pkgs/by-name/ch/chunksync/package.nix index fe49a2747df1..be6909a7e9d5 100644 --- a/pkgs/by-name/ch/chunksync/package.nix +++ b/pkgs/by-name/ch/chunksync/package.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { homepage = "http://chunksync.florz.de/"; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [ yayayayaka ]; }; } From 05ca0642647b87001a5f4cc9a46e1458470b0f49 Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 2 Sep 2025 14:52:41 +0200 Subject: [PATCH 67/96] chunkfs: add yayayayaka to maintainers --- pkgs/by-name/ch/chunkfs/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ch/chunkfs/package.nix b/pkgs/by-name/ch/chunkfs/package.nix index 5b7dd92b1745..1709df4f5fb9 100644 --- a/pkgs/by-name/ch/chunkfs/package.nix +++ b/pkgs/by-name/ch/chunkfs/package.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://chunkfs.florz.de"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ yayayayaka ]; }; }) From 7db7de10f184227c6da2df295544b774972ae579 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Fri, 29 Aug 2025 20:30:08 +0200 Subject: [PATCH 68/96] snipe-it: 8.2.1 -> 8.3.0 Release notes: https://github.com/grokability/snipe-it/releases/tag/v8.3.0 Full changelog: https://github.com/grokability/snipe-it/compare/v8.2.1...v8.3.0 --- pkgs/by-name/sn/snipe-it/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix index 546ddca2587c..cadbb3207ce7 100644 --- a/pkgs/by-name/sn/snipe-it/package.nix +++ b/pkgs/by-name/sn/snipe-it/package.nix @@ -9,16 +9,16 @@ php84.buildComposerProject2 (finalAttrs: { pname = "snipe-it"; - version = "8.2.1"; + version = "8.3.0"; src = fetchFromGitHub { owner = "grokability"; repo = "snipe-it"; tag = "v${finalAttrs.version}"; - hash = "sha256-l0FiZZbzY49y2Q5WcCZwJD8YlQbBrOXJkMo7fMlSHxg="; + hash = "sha256-YeedBSpEzdMOPpbwqEFpVtMY4hnnN/Sb/XB1YNDnDNc="; }; - vendorHash = "sha256-+FUEBZdGu+wC9LW2UWz1wM4PZnJdTAxZU0kRkCzgjJE="; + vendorHash = "sha256-32TbhVhfi8i9jwBQ2gpeb7sLmrtHQXSjlaVVdgFdaxs="; postInstall = '' snipe_it_out="$out/share/php/snipe-it" From aaff8c16d7fc04991cac6245bee1baa31f72b1e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Aug 2025 19:41:33 +0000 Subject: [PATCH 69/96] lobster: 2025.2 -> 2025.3 --- pkgs/by-name/lo/lobster/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/lobster/package.nix b/pkgs/by-name/lo/lobster/package.nix index bc20e8e21f42..8ab45486ae5e 100644 --- a/pkgs/by-name/lo/lobster/package.nix +++ b/pkgs/by-name/lo/lobster/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lobster"; - version = "2025.2"; + version = "2025.3"; src = fetchFromGitHub { owner = "aardappel"; repo = "lobster"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-F6py2zhNk88PUGxjWim+LHVTOpYHViV7d70LV77QgdU="; + sha256 = "sha256-YGtjoRBGOqkcHaiZNPVFOoeLitJTG/M0I08EPZVCfj0="; }; nativeBuildInputs = [ cmake ]; From 869cac6faaa23732438aa4e016a61bc3efc8c1c4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 2 Sep 2025 10:19:22 +0200 Subject: [PATCH 70/96] python3Packages.fastexcel: 0.14.0 -> 0.15.1 Diff: https://github.com/ToucanToco/fastexcel/compare/v0.14.0...v0.15.1 Changelog: https://github.com/ToucanToco/fastexcel/releases/tag/v0.15.1 --- .../python-modules/fastexcel/default.nix | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/fastexcel/default.nix b/pkgs/development/python-modules/fastexcel/default.nix index 2f771895d8ab..a67d04082635 100644 --- a/pkgs/development/python-modules/fastexcel/default.nix +++ b/pkgs/development/python-modules/fastexcel/default.nix @@ -8,12 +8,10 @@ cargo, rustc, - # dependencies - pyarrow, - # optional-dependencies pandas, polars, + pyarrow, # tests pytest-mock, @@ -22,19 +20,19 @@ buildPythonPackage rec { pname = "fastexcel"; - version = "0.14.0"; + version = "0.15.1"; pyproject = true; src = fetchFromGitHub { owner = "ToucanToco"; repo = "fastexcel"; tag = "v${version}"; - hash = "sha256-sBpefpJm8b+6WQeO7zqihFDYPRnMZUQFSapcDkqekI0="; + hash = "sha256-kGGtTgy8k6TeP4iwonIwiQKiYMFAXw9v5Q5dpdcYP7A="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-gwLVxW9ETzvnI0tE8EWr8pUtvsBAQ/tC4tgEso15N3M="; + hash = "sha256-SdraNHOicCjIKFaTSRn4dEzfW8w243y/w9ym9JduMQo="; }; nativeBuildInputs = [ @@ -44,13 +42,17 @@ buildPythonPackage rec { rustc ]; - dependencies = [ - pyarrow + maturinBuildFlags = [ + "--features __maturin" ]; optional-dependencies = { + pyarrow = [ + pyarrow + ]; pandas = [ pandas + pyarrow ]; polars = [ polars @@ -59,11 +61,17 @@ buildPythonPackage rec { pythonImportsCheck = [ "fastexcel" + "fastexcel._fastexcel" ]; + preCheck = '' + rm -rf python/fastexcel + ''; + nativeCheckInputs = [ pandas polars + pyarrow pytest-mock pytestCheckHook ]; From fb9709ef29ecc5a298adaf9cef63e9ec23be88dc Mon Sep 17 00:00:00 2001 From: melvyn Date: Tue, 19 Aug 2025 10:47:29 -0700 Subject: [PATCH 71/96] nixos/seafile: drop --- .../manual/release-notes/rl-2511.section.md | 4 + nixos/modules/module-list.nix | 1 - nixos/modules/services/networking/seafile.nix | 547 ------------------ nixos/tests/all-tests.nix | 1 - nixos/tests/seafile.nix | 128 ---- 5 files changed, 4 insertions(+), 677 deletions(-) delete mode 100644 nixos/modules/services/networking/seafile.nix delete mode 100644 nixos/tests/seafile.nix diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index da007f063797..dcd8c4e23ab7 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -124,6 +124,10 @@ - The Pocket ID module ([`services.pocket-id`][#opt-services.pocket-id.enable]) and package (`pocket-id`) has been updated to 1.0.0. Some environment variables have been changed or removed, see the [migration guide](https://pocket-id.org/docs/setup/migrate-to-v1/). +- `services.seafile` has been removed, as it is unmaintained and outdated. + See [the manual](https://manual.seafile.com/13.0/upgrade/upgrade_notes_for_13.0.x/#important-release-changes) + for details and next steps. + - The `zigbee2mqtt` package was updated to version 2.x, which contains breaking changes. See the [discussion](https://github.com/Koenkk/zigbee2mqtt/discussions/24198) for further information. - []{#sec-release-25.11-incompatibilities-sourcehut-removed} The `services.sourcehut` module and corresponding `sourcehut` packages were removed due to being broken and unmaintained. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ebc7a65058b3..2a2d4bca0be6 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1324,7 +1324,6 @@ ./services/networking/scion/scion-ip-gateway.nix ./services/networking/scion/scion-router.nix ./services/networking/scion/scion.nix - ./services/networking/seafile.nix ./services/networking/searx.nix ./services/networking/shadowsocks.nix ./services/networking/shairport-sync.nix diff --git a/nixos/modules/services/networking/seafile.nix b/nixos/modules/services/networking/seafile.nix deleted file mode 100644 index 2129af18ed76..000000000000 --- a/nixos/modules/services/networking/seafile.nix +++ /dev/null @@ -1,547 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - cfg = config.services.seafile; - settingsFormat = pkgs.formats.ini { }; - - ccnetConf = settingsFormat.generate "ccnet.conf" ( - lib.attrsets.recursiveUpdate { - Database = { - ENGINE = "mysql"; - UNIX_SOCKET = "/var/run/mysqld/mysqld.sock"; - DB = "ccnet_db"; - CONNECTION_CHARSET = "utf8"; - }; - } cfg.ccnetSettings - ); - - seafileConf = settingsFormat.generate "seafile.conf" ( - lib.attrsets.recursiveUpdate { - database = { - type = "mysql"; - unix_socket = "/var/run/mysqld/mysqld.sock"; - db_name = "seafile_db"; - connection_charset = "utf8"; - }; - } cfg.seafileSettings - ); - - seahubSettings = pkgs.writeText "seahub_settings.py" '' - FILE_SERVER_ROOT = '${cfg.ccnetSettings.General.SERVICE_URL}/seafhttp' - DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.mysql', - 'NAME' : 'seahub_db', - 'HOST' : '/var/run/mysqld/mysqld.sock', - } - } - MEDIA_ROOT = '${seahubDir}/media/' - THUMBNAIL_ROOT = '${seahubDir}/thumbnail/' - - SERVICE_URL = '${cfg.ccnetSettings.General.SERVICE_URL}' - - CSRF_TRUSTED_ORIGINS = ["${cfg.ccnetSettings.General.SERVICE_URL}"] - - with open('${seafRoot}/.seahubSecret') as f: - SECRET_KEY = f.readline().rstrip() - - ${cfg.seahubExtraConf} - ''; - - seafRoot = "/var/lib/seafile"; - ccnetDir = "${seafRoot}/ccnet"; - seahubDir = "${seafRoot}/seahub"; - defaultUser = "seafile"; - -in -{ - - ###### Interface - - options.services.seafile = with lib; { - enable = mkEnableOption "Seafile server"; - - ccnetSettings = mkOption { - type = types.submodule { - freeformType = settingsFormat.type; - - options = { - General = { - SERVICE_URL = mkOption { - type = types.singleLineStr; - example = "https://www.example.com"; - description = '' - Seahub public URL. - ''; - }; - }; - }; - }; - default = { }; - description = '' - Configuration for ccnet, see - - for supported values. - ''; - }; - - seafileSettings = mkOption { - type = types.submodule { - freeformType = settingsFormat.type; - - options = { - fileserver = { - port = mkOption { - type = types.port; - default = 8082; - description = '' - The tcp port used by seafile fileserver. - ''; - }; - host = mkOption { - type = types.singleLineStr; - default = "ipv4:127.0.0.1"; - example = "unix:/run/seafile/server.sock"; - description = '' - The bind address used by seafile fileserver. - - The addr can be defined as one of the following: - - ipv6: for binding to an IPv6 address. - - unix: for binding to a unix named socket - - ipv4: for binding to an ipv4 address - Otherwise the addr is assumed to be ipv4. - ''; - }; - }; - }; - }; - default = { }; - description = '' - Configuration for seafile-server, see - - for supported values. - ''; - }; - - seahubAddress = mkOption { - type = types.singleLineStr; - default = "unix:/run/seahub/gunicorn.sock"; - example = "[::1]:8083"; - description = '' - Which address to bind the seahub server to, of the form: - - HOST - - HOST:PORT - - unix:PATH. - IPv6 HOSTs must be wrapped in brackets. - ''; - }; - - workers = mkOption { - type = types.int; - default = 4; - example = 10; - description = '' - The number of gunicorn worker processes for handling requests. - ''; - }; - - adminEmail = mkOption { - example = "john@example.com"; - type = types.singleLineStr; - description = '' - Seafile Seahub Admin Account Email. - ''; - }; - - initialAdminPassword = mkOption { - example = "someStrongPass"; - type = types.singleLineStr; - description = '' - Seafile Seahub Admin Account initial password. - Should be changed via Seahub web front-end. - ''; - }; - - seahubPackage = mkPackageOption pkgs "seahub" { }; - - user = mkOption { - type = types.singleLineStr; - default = defaultUser; - description = "User account under which seafile runs."; - }; - - group = mkOption { - type = types.singleLineStr; - default = defaultUser; - description = "Group under which seafile runs."; - }; - - dataDir = mkOption { - type = types.path; - default = "${seafRoot}/data"; - description = "Path in which to store user data"; - }; - - gc = { - enable = mkEnableOption "automatic garbage collection on stored data blocks"; - - dates = mkOption { - type = types.listOf types.singleLineStr; - default = [ "Sun 03:00:00" ]; - description = '' - When to run garbage collection on stored data blocks. - The time format is described in {manpage}`systemd.time(7)`. - ''; - }; - - randomizedDelaySec = mkOption { - default = "0"; - type = types.singleLineStr; - example = "45min"; - description = '' - Add a randomized delay before each garbage collection. - The delay will be chosen between zero and this value. - This value must be a time span in the format specified by - {manpage}`systemd.time(7)` - ''; - }; - - persistent = mkOption { - default = true; - type = types.bool; - example = false; - description = '' - Takes a boolean argument. If true, the time when the service - unit was last triggered is stored on disk. When the timer is - activated, the service unit is triggered immediately if it - would have been triggered at least once during the time when - the timer was inactive. Such triggering is nonetheless - subject to the delay imposed by RandomizedDelaySec=. This is - useful to catch up on missed runs of the service when the - system was powered down. - ''; - }; - }; - - seahubExtraConf = mkOption { - default = ""; - example = '' - CSRF_TRUSTED_ORIGINS = ["https://example.com"] - ''; - type = types.lines; - description = '' - Extra config to append to `seahub_settings.py` file. - Refer to - for all available options. - ''; - }; - }; - - ###### Implementation - - config = lib.mkIf cfg.enable { - services.mysql = { - enable = true; - package = lib.mkDefault pkgs.mariadb; - ensureDatabases = [ - "ccnet_db" - "seafile_db" - "seahub_db" - ]; - ensureUsers = [ - { - name = cfg.user; - ensurePermissions = { - "ccnet_db.*" = "ALL PRIVILEGES"; - "seafile_db.*" = "ALL PRIVILEGES"; - "seahub_db.*" = "ALL PRIVILEGES"; - }; - } - ]; - }; - - environment.etc."seafile/ccnet.conf".source = ccnetConf; - environment.etc."seafile/seafile.conf".source = seafileConf; - environment.etc."seafile/seahub_settings.py".source = seahubSettings; - - users.users = lib.optionalAttrs (cfg.user == defaultUser) { - "${defaultUser}" = { - group = cfg.group; - isSystemUser = true; - }; - }; - - users.groups = lib.optionalAttrs (cfg.group == defaultUser) { "${defaultUser}" = { }; }; - - systemd.targets.seafile = { - wantedBy = [ "multi-user.target" ]; - description = "Seafile components"; - }; - - systemd.services = - let - serviceOptions = { - ProtectHome = true; - PrivateUsers = true; - PrivateDevices = true; - PrivateTmp = true; - ProtectSystem = "strict"; - ProtectClock = true; - ProtectHostname = true; - ProtectProc = "invisible"; - ProtectKernelModules = true; - ProtectKernelTunables = true; - ProtectKernelLogs = true; - ProtectControlGroups = true; - RestrictNamespaces = true; - RemoveIPC = true; - LockPersonality = true; - RestrictRealtime = true; - RestrictSUIDSGID = true; - NoNewPrivileges = true; - MemoryDenyWriteExecute = true; - SystemCallArchitectures = "native"; - RestrictAddressFamilies = [ - "AF_UNIX" - "AF_INET" - ]; - - User = cfg.user; - Group = cfg.group; - StateDirectory = "seafile"; - RuntimeDirectory = "seafile"; - LogsDirectory = "seafile"; - ConfigurationDirectory = "seafile"; - ReadWritePaths = lib.lists.optional (cfg.dataDir != "${seafRoot}/data") cfg.dataDir; - }; - in - { - seaf-server = { - description = "Seafile server"; - partOf = [ "seafile.target" ]; - unitConfig.RequiresMountsFor = lib.lists.optional (cfg.dataDir != "${seafRoot}/data") cfg.dataDir; - requires = [ "mysql.service" ]; - after = [ - "network.target" - "mysql.service" - ]; - wantedBy = [ "seafile.target" ]; - restartTriggers = [ - ccnetConf - seafileConf - ]; - serviceConfig = serviceOptions // { - ExecStart = '' - ${lib.getExe cfg.seahubPackage.seafile-server} \ - --foreground \ - -F /etc/seafile \ - -c ${ccnetDir} \ - -d ${cfg.dataDir} \ - -l /var/log/seafile/server.log \ - -P /run/seafile/server.pid \ - -p /run/seafile - ''; - }; - preStart = '' - if [ ! -f "${seafRoot}/server-setup" ]; then - mkdir -p ${cfg.dataDir}/library-template - # Load schema on first install - ${pkgs.mariadb.client}/bin/mysql --database=ccnet_db < ${cfg.seahubPackage.seafile-server}/share/seafile/sql/mysql/ccnet.sql - ${pkgs.mariadb.client}/bin/mysql --database=seafile_db < ${cfg.seahubPackage.seafile-server}/share/seafile/sql/mysql/seafile.sql - echo "${cfg.seahubPackage.seafile-server.version}-mysql" > "${seafRoot}"/server-setup - echo Loaded MySQL schemas for first install - fi - # checking for upgrades and handling them - installedMajor=$(cat "${seafRoot}/server-setup" | cut -d"-" -f1 | cut -d"." -f1) - installedMinor=$(cat "${seafRoot}/server-setup" | cut -d"-" -f1 | cut -d"." -f2) - pkgMajor=$(echo "${cfg.seahubPackage.seafile-server.version}" | cut -d"." -f1) - pkgMinor=$(echo "${cfg.seahubPackage.seafile-server.version}" | cut -d"." -f2) - - if [[ $installedMajor == $pkgMajor && $installedMinor == $pkgMinor ]]; then - : - elif [[ $installedMajor == 10 && $installedMinor == 0 && $pkgMajor == 11 && $pkgMinor == 0 ]]; then - # Upgrade from 10.0 to 11.0: migrate to mysql - echo Migrating from version 10 to 11 - - # From https://github.com/haiwen/seahub/blob/e12f941bfef7191795d8c72a7d339c01062964b2/scripts/sqlite2mysql.sh - - echo Migrating ccnet database to MySQL - ${lib.getExe pkgs.sqlite} ${ccnetDir}/PeerMgr/usermgr.db ".dump" | \ - ${lib.getExe cfg.seahubPackage.python3} ${cfg.seahubPackage}/scripts/sqlite2mysql.py > ${ccnetDir}/ccnet.sql - ${lib.getExe pkgs.sqlite} ${ccnetDir}/GroupMgr/groupmgr.db ".dump" | \ - ${lib.getExe cfg.seahubPackage.python3} ${cfg.seahubPackage}/scripts/sqlite2mysql.py >> ${ccnetDir}/ccnet.sql - sed 's/ctime INTEGER/ctime BIGINT/g' -i ${ccnetDir}/ccnet.sql - sed 's/email TEXT, role TEXT/email VARCHAR(255), role TEXT/g' -i ${ccnetDir}/ccnet.sql - ${pkgs.mariadb.client}/bin/mysql --database=ccnet_db < ${ccnetDir}/ccnet.sql - - echo Migrating seafile database to MySQL - ${lib.getExe pkgs.sqlite} ${cfg.dataDir}/seafile.db ".dump" | \ - ${lib.getExe cfg.seahubPackage.python3} ${cfg.seahubPackage}/scripts/sqlite2mysql.py > ${cfg.dataDir}/seafile.sql - sed 's/owner_id TEXT/owner_id VARCHAR(255)/g' -i ${cfg.dataDir}/seafile.sql - sed 's/user_name TEXT/user_name VARCHAR(255)/g' -i ${cfg.dataDir}/seafile.sql - ${pkgs.mariadb.client}/bin/mysql --database=seafile_db < ${cfg.dataDir}/seafile.sql - - echo Migrating seahub database to MySQL - echo 'SET FOREIGN_KEY_CHECKS=0;' > ${seahubDir}/seahub.sql - ${lib.getExe pkgs.sqlite} ${seahubDir}/seahub.db ".dump" | \ - ${lib.getExe cfg.seahubPackage.python3} ${cfg.seahubPackage}/scripts/sqlite2mysql.py >> ${seahubDir}/seahub.sql - sed 's/`permission` , `reporter` text NOT NULL/`permission` longtext NOT NULL/g' -i ${seahubDir}/seahub.sql - sed 's/varchar(256) NOT NULL UNIQUE/varchar(255) NOT NULL UNIQUE/g' -i ${seahubDir}/seahub.sql - sed 's/, UNIQUE (`user_email`, `contact_email`)//g' -i ${seahubDir}/seahub.sql - sed '/INSERT INTO `base_dirfileslastmodifiedinfo`/d' -i ${seahubDir}/seahub.sql - sed '/INSERT INTO `notifications_usernotification`/d' -i ${seahubDir}/seahub.sql - sed 's/DEFERRABLE INITIALLY DEFERRED//g' -i ${seahubDir}/seahub.sql - ${pkgs.mariadb.client}/bin/mysql --database=seahub_db < ${seahubDir}/seahub.sql - - echo "${cfg.seahubPackage.seafile-server.version}-mysql" > "${seafRoot}"/server-setup - echo Migration complete - else - echo "Unsupported upgrade: $installedMajor.$installedMinor to $pkgMajor.$pkgMinor" >&2 - exit 1 - fi - ''; - - # Fix unix socket permissions - postStart = ( - lib.strings.optionalString (lib.strings.hasPrefix "unix:" cfg.seafileSettings.fileserver.host) '' - while [[ ! -S "${lib.strings.removePrefix "unix:" cfg.seafileSettings.fileserver.host}" ]]; do - sleep 1 - done - chmod 666 "${lib.strings.removePrefix "unix:" cfg.seafileSettings.fileserver.host}" - '' - ); - }; - - seahub = { - description = "Seafile Server Web Frontend"; - wantedBy = [ "seafile.target" ]; - partOf = [ "seafile.target" ]; - unitConfig.RequiresMountsFor = lib.lists.optional (cfg.dataDir != "${seafRoot}/data") cfg.dataDir; - requires = [ - "mysql.service" - "seaf-server.service" - ]; - after = [ - "network.target" - "mysql.service" - "seaf-server.service" - ]; - restartTriggers = [ seahubSettings ]; - environment = { - PYTHONPATH = "${cfg.seahubPackage.pythonPath}:${cfg.seahubPackage}/thirdpart:${cfg.seahubPackage}"; - DJANGO_SETTINGS_MODULE = "seahub.settings"; - CCNET_CONF_DIR = ccnetDir; - SEAFILE_CONF_DIR = cfg.dataDir; - SEAFILE_CENTRAL_CONF_DIR = "/etc/seafile"; - SEAFILE_RPC_PIPE_PATH = "/run/seafile"; - SEAHUB_LOG_DIR = "/var/log/seafile"; - }; - serviceConfig = serviceOptions // { - RuntimeDirectory = "seahub"; - ExecStart = '' - ${lib.getExe cfg.seahubPackage.python3.pkgs.gunicorn} seahub.wsgi:application \ - --name seahub \ - --workers ${toString cfg.workers} \ - --log-level=info \ - --preload \ - --timeout=1200 \ - --limit-request-line=8190 \ - --bind ${cfg.seahubAddress} - ''; - }; - preStart = '' - mkdir -p ${seahubDir}/media - # Link all media except avatars - for m in `find ${cfg.seahubPackage}/media/ -maxdepth 1 -not -name "avatars"`; do - ln -sf $m ${seahubDir}/media/ - done - if [ ! -e "${seafRoot}/.seahubSecret" ]; then - ( - umask 377 && - ${lib.getExe cfg.seahubPackage.python3} ${cfg.seahubPackage}/tools/secret_key_generator.py > ${seafRoot}/.seahubSecret - ) - fi - if [ ! -f "${seafRoot}/seahub-setup" ]; then - # avatars directory should be writable - install -D -t ${seahubDir}/media/avatars/ ${cfg.seahubPackage}/media/avatars/default.png - install -D -t ${seahubDir}/media/avatars/groups ${cfg.seahubPackage}/media/avatars/groups/default.png - # init database - ${cfg.seahubPackage}/manage.py migrate - # create admin account - ${lib.getExe pkgs.expect} -c 'spawn ${cfg.seahubPackage}/manage.py createsuperuser --email=${cfg.adminEmail}; expect "Password: "; send "${cfg.initialAdminPassword}\r"; expect "Password (again): "; send "${cfg.initialAdminPassword}\r"; expect "Superuser created successfully."' - echo "${cfg.seahubPackage.version}-mysql" > "${seafRoot}/seahub-setup" - fi - if [ $(cat "${seafRoot}/seahub-setup" | cut -d"-" -f1) != "${pkgs.seahub.version}" ]; then - # run django migrations - ${cfg.seahubPackage}/manage.py migrate - echo "${cfg.seahubPackage.version}-mysql" > "${seafRoot}/seahub-setup" - fi - ''; - }; - - seaf-gc = { - description = "Seafile storage garbage collection"; - conflicts = [ - "seaf-server.service" - "seahub.service" - ]; - after = [ - "seaf-server.service" - "seahub.service" - ]; - unitConfig.RequiresMountsFor = lib.lists.optional (cfg.dataDir != "${seafRoot}/data") cfg.dataDir; - onSuccess = [ - "seaf-server.service" - "seahub.service" - ]; - onFailure = [ - "seaf-server.service" - "seahub.service" - ]; - startAt = lib.lists.optionals cfg.gc.enable cfg.gc.dates; - serviceConfig = serviceOptions // { - Type = "oneshot"; - }; - script = '' - if [ ! -f "${seafRoot}/server-setup" ]; then - echo "Server not setup yet, GC not needed" >&2 - exit - fi - - # checking for pending upgrades - installedMajor=$(cat "${seafRoot}/server-setup" | cut -d"-" -f1 | cut -d"." -f1) - installedMinor=$(cat "${seafRoot}/server-setup" | cut -d"-" -f1 | cut -d"." -f2) - pkgMajor=$(echo "${cfg.seahubPackage.seafile-server.version}" | cut -d"." -f1) - pkgMinor=$(echo "${cfg.seahubPackage.seafile-server.version}" | cut -d"." -f2) - - if [[ $installedMajor != $pkgMajor || $installedMinor != $pkgMinor ]]; then - echo "Server not upgraded yet" >&2 - exit - fi - - # Clean up user-deleted blocks and libraries - ${cfg.seahubPackage.seafile-server}/bin/seafserv-gc \ - -F /etc/seafile \ - -c ${ccnetDir} \ - -d ${cfg.dataDir} \ - --rm-fs - ''; - }; - }; - - systemd.timers.seaf-gc = lib.mkIf cfg.gc.enable { - timerConfig = { - RandomizedDelaySec = cfg.gc.randomizedDelaySec; - Persistent = cfg.gc.persistent; - }; - }; - }; - - meta.maintainers = with lib.maintainers; [ - schmittlauch - ]; -} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 526f5a7edce8..e4f1fb1614f9 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1330,7 +1330,6 @@ in scx = runTest ./scx/default.nix; sddm = import ./sddm.nix { inherit runTest; }; sdl3 = runTest ./sdl3.nix; - seafile = runTest ./seafile.nix; searx = runTest ./searx.nix; seatd = runTest ./seatd.nix; send = runTest ./send.nix; diff --git a/nixos/tests/seafile.nix b/nixos/tests/seafile.nix deleted file mode 100644 index c82c5cac3de8..000000000000 --- a/nixos/tests/seafile.nix +++ /dev/null @@ -1,128 +0,0 @@ -{ pkgs, ... }: -let - client = - { config, pkgs, ... }: - { - environment.systemPackages = [ - pkgs.seafile-shared - pkgs.curl - ]; - }; -in -{ - name = "seafile"; - meta = with pkgs.lib.maintainers; { - maintainers = [ - kampfschlaefer - ]; - }; - - nodes = { - server = - { config, pkgs, ... }: - { - services.seafile = { - enable = true; - ccnetSettings.General.SERVICE_URL = "http://server"; - seafileSettings.fileserver.host = "unix:/run/seafile/server.sock"; - adminEmail = "admin@example.com"; - initialAdminPassword = "seafile_password"; - }; - services.nginx = { - enable = true; - virtualHosts."server" = { - locations."/".proxyPass = "http://unix:/run/seahub/gunicorn.sock"; - locations."/seafhttp" = { - proxyPass = "http://unix:/run/seafile/server.sock"; - extraConfig = '' - rewrite ^/seafhttp(.*)$ $1 break; - client_max_body_size 0; - proxy_connect_timeout 36000s; - proxy_read_timeout 36000s; - proxy_send_timeout 36000s; - send_timeout 36000s; - proxy_http_version 1.1; - ''; - }; - }; - }; - networking.firewall = { - allowedTCPPorts = [ 80 ]; - }; - }; - client1 = client pkgs; - client2 = client pkgs; - }; - - testScript = '' - start_all() - - with subtest("start seaf-server"): - server.wait_for_unit("seaf-server.service") - server.wait_for_file("/run/seafile/seafile.sock") - - with subtest("start seahub"): - server.wait_for_unit("seahub.service") - server.wait_for_unit("nginx.service") - server.wait_for_file("/run/seahub/gunicorn.sock") - - with subtest("client1 fetch seahub page"): - client1.succeed("curl -L http://server | grep 'Log In' >&2") - - with subtest("client1 connect"): - client1.wait_for_unit("default.target") - client1.succeed("seaf-cli init -d . >&2") - client1.succeed("seaf-cli start >&2") - client1.succeed( - "seaf-cli list-remote -s http://server -u admin\@example.com -p seafile_password >&2" - ) - - libid = client1.succeed( - 'seaf-cli create -s http://server -n test01 -u admin\@example.com -p seafile_password -t "first test library"' - ).strip() - - client1.succeed( - "seaf-cli list-remote -s http://server -u admin\@example.com -p seafile_password |grep test01" - ) - client1.fail( - "seaf-cli list-remote -s http://server -u admin\@example.com -p seafile_password |grep test02" - ) - - client1.succeed( - f"seaf-cli download -l {libid} -s http://server -u admin\@example.com -p seafile_password -d . >&2" - ) - - client1.wait_until_succeeds("seaf-cli status |grep synchronized >&2") - - client1.succeed("ls -la >&2") - client1.succeed("ls -la test01 >&2") - - client1.execute("echo bla > test01/first_file") - - client1.wait_until_succeeds("seaf-cli status |grep synchronized >&2") - - with subtest("client2 sync"): - client2.wait_for_unit("default.target") - - client2.succeed("seaf-cli init -d . >&2") - client2.succeed("seaf-cli start >&2") - - client2.succeed( - "seaf-cli list-remote -s http://server -u admin\@example.com -p seafile_password >&2" - ) - - libid = client2.succeed( - "seaf-cli list-remote -s http://server -u admin\@example.com -p seafile_password |grep test01 |cut -d' ' -f 2" - ).strip() - - client2.succeed( - f"seaf-cli download -l {libid} -s http://server -u admin\@example.com -p seafile_password -d . >&2" - ) - - client2.wait_until_succeeds("seaf-cli status |grep synchronized >&2") - - client2.succeed("ls -la test01 >&2") - - client2.succeed('[ `cat test01/first_file` = "bla" ]') - ''; -} From ca4e6b47aa4ed1ae7a6f7272d2b76f44a609aa6d Mon Sep 17 00:00:00 2001 From: melvyn Date: Tue, 19 Aug 2025 11:03:21 -0700 Subject: [PATCH 72/96] seafile-server: drop --- pkgs/by-name/se/seafile-server/libevhtp.nix | 38 -------- pkgs/by-name/se/seafile-server/package.nix | 101 -------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 5 files changed, 2 insertions(+), 141 deletions(-) delete mode 100644 pkgs/by-name/se/seafile-server/libevhtp.nix delete mode 100644 pkgs/by-name/se/seafile-server/package.nix diff --git a/pkgs/by-name/se/seafile-server/libevhtp.nix b/pkgs/by-name/se/seafile-server/libevhtp.nix deleted file mode 100644 index 07f0df1cd8f6..000000000000 --- a/pkgs/by-name/se/seafile-server/libevhtp.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - libevent, -}: - -stdenv.mkDerivation { - pname = "libevhtp"; - version = "unstable-2021-04-28"; - - src = fetchFromGitHub { - owner = "haiwen"; - repo = "libevhtp"; - rev = "18c649203f009ef1d77d6f8301eba09af3777adf"; - sha256 = "1rf0jcy2lf8jbzpkhfgv289hc8zdy5zs6sn36k4vlqvilginxiid"; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ libevent ]; - - cmakeFlags = [ - "-DEVHTP_DISABLE_SSL=ON" - "-DEVHTP_BUILD_SHARED=ON" - ]; - - meta = with lib; { - description = "Create extremely-fast and secure embedded HTTP servers with ease"; - homepage = "https://github.com/criticalstack/libevhtp"; - license = licenses.bsd3; - maintainers = with maintainers; [ - schmittlauch - melvyn2 - ]; - }; -} diff --git a/pkgs/by-name/se/seafile-server/package.nix b/pkgs/by-name/se/seafile-server/package.nix deleted file mode 100644 index f6a0b61af28b..000000000000 --- a/pkgs/by-name/se/seafile-server/package.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - pkg-config, - python3, - autoreconfHook, - libuuid, - libmysqlclient, - sqlite, - glib, - libevent, - libsearpc, - openssl, - fuse, - libarchive, - libjwt, - curl, - which, - vala, - cmake, - oniguruma, - nixosTests, -}: - -let - # seafile-server relies on a specific version of libevhtp. - # It contains non upstreamed patches and is forked off an outdated version. - libevhtp = import ./libevhtp.nix { - inherit - stdenv - lib - fetchFromGitHub - cmake - libevent - ; - }; -in -stdenv.mkDerivation { - pname = "seafile-server"; - version = "11.0.12"; # Doc links match Seafile 11.0 in seafile.nix – update if version changes. - src = fetchFromGitHub { - owner = "haiwen"; - repo = "seafile-server"; - rev = "5e6c0974e6abe5d92b8ba1db41c6ddbc1029f2d5"; # using a fixed revision because upstream may re-tag releases :/ - hash = "sha256-BVa4QZiHPkqRB5FvDlCSbEVxdnyxVy2KuCDb2orRMuI="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - python3 - libsearpc # searpc-codegen.py - vala # valac - which - ]; - - buildInputs = [ - libuuid - libmysqlclient - sqlite - glib - libsearpc - libevent - python3 - fuse - libarchive - libjwt - libevhtp - oniguruma - ]; - - patches = [ - # https://github.com/haiwen/seafile-server/pull/658 - (fetchpatch { - url = "https://github.com/haiwen/seafile-server/commit/8029a11a731bfe142af43f230f47b93811ebaaaa.patch"; - hash = "sha256-AWNDXIyrKXgqgq3p0m8+s3YH8dKxWnf7uEMYzSsjmX4="; - }) - ]; - - postInstall = '' - mkdir -p $out/share/seafile/sql - cp -r scripts/sql $out/share/seafile - ''; - - passthru.tests = { - inherit (nixosTests) seafile; - }; - - meta = with lib; { - description = "File syncing and sharing software with file encryption and group sharing, emphasis on reliability and high performance"; - homepage = "https://github.com/haiwen/seafile-server"; - license = licenses.agpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ - melvyn2 - ]; - mainProgram = "seaf-server"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7155fddfd0d3..f98b92023e37 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2103,6 +2103,7 @@ mapAliases { scitoken-cpp = scitokens-cpp; # Added 2024-02-12 scry = throw "'scry' has been removed as it was archived upstream. Use 'crystalline' instead"; # Added 2025-02-12 scudcloud = throw "'scudcloud' has been removed as it was archived by upstream"; # Added 2025-07-24 + seafile-server = throw "'seafile-server' has been removed as it is unmaintained"; # Added 2025-08-21 semeru-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01 semeru-jre-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01 sensu = throw "sensu has been removed as the upstream project is deprecated. Consider using `sensu-go`"; # Added 2024-10-28 diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 074304ed4eaf..869086c0154a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -743,6 +743,7 @@ mapAliases ({ scikitlearn = scikit-learn; # added 2021-07-21 scikit-optimize = throw "scikit-optimize has been removed because it is abandoned"; # added 2024-09-30 scikits-samplerate = throw "scikits-samplerate has been removed, it was unsed and unmaintained since 2015"; # added 2024-05-23 + seaserv = throw "seaserv has been removed as it is unmaintained"; # Added 2025-08-21 selectors2 = throw "selectors2 has been removed: archived by upstream."; # added 2024-07-27 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10 sentry-sdk_2 = sentry-sdk; # added 2025-04-20 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ed489ffb2e3..3dbd3f5710ba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16395,8 +16395,6 @@ self: super: with self; { seabreeze = callPackage ../development/python-modules/seabreeze { }; - seaserv = toPythonModule (pkgs.seafile-server.override { python3 = self.python; }); - seasonal = callPackage ../development/python-modules/seasonal { }; seatconnect = callPackage ../development/python-modules/seatconnect { }; From 6465365d48a0dffa5ee4565c6d6723c70264baaa Mon Sep 17 00:00:00 2001 From: melvyn Date: Tue, 2 Sep 2025 09:10:09 -0400 Subject: [PATCH 73/96] seahub: drop --- pkgs/by-name/se/seahub/package.nix | 87 ------------------------------ pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 87 deletions(-) delete mode 100644 pkgs/by-name/se/seahub/package.nix diff --git a/pkgs/by-name/se/seahub/package.nix b/pkgs/by-name/se/seahub/package.nix deleted file mode 100644 index b3c8baf90114..000000000000 --- a/pkgs/by-name/se/seahub/package.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ - lib, - fetchFromGitHub, - python3, - makeWrapper, - nixosTests, - seafile-server, -}: -python3.pkgs.buildPythonApplication rec { - pname = "seahub"; - version = "11.0.12"; - pyproject = false; - - src = fetchFromGitHub { - owner = "haiwen"; - repo = "seahub"; - rev = "d998361dd890cac3f6d6ebec3af47a589e0332bc"; # using a fixed revision because upstream may re-tag releases :/ - hash = "sha256-n56sRZ9TVb37JA0+12ZoF2Mt7dADjaYk7V0PmdBY0EU="; - }; - - dontBuild = true; - - doCheck = false; # disabled because it requires a ccnet environment - - nativeBuildInputs = [ makeWrapper ]; - - propagatedBuildInputs = with python3.pkgs; [ - django - django-compressor - django-statici18n - django-webpack-loader - django-simple-captcha - django-picklefield - django-formtools - djangosaml2 - mysqlclient - pillow - python-dateutil - djangorestframework - openpyxl - requests - requests-oauthlib - chardet - pyjwt - pycryptodome - pyopenssl - python-ldap - qrcode - pysearpc - gunicorn - markdown - bleach - - (python3.pkgs.toPythonModule (seafile-server.override { inherit python3; })) - ]; - - postPatch = '' - substituteInPlace seahub/settings.py --replace-fail "SEAFILE_VERSION = '6.3.3'" "SEAFILE_VERSION = '${version}'" - substituteInPlace thirdpart/constance/management/commands/constance.py --replace-fail \ - "from __future__ import unicode_literals" "" - ''; - - installPhase = '' - cp -dr --no-preserve='ownership' . $out/ - wrapProgram $out/manage.py \ - --prefix PYTHONPATH : "$PYTHONPATH:$out/thirdpart:" - ''; - - passthru = { - inherit python3; - pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs; - tests = { - inherit (nixosTests) seafile; - }; - inherit seafile-server; - }; - - meta = { - description = "Web end of seafile server"; - homepage = "https://github.com/haiwen/seahub"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - melvyn2 - ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f98b92023e37..3de142070c1f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2104,6 +2104,7 @@ mapAliases { scry = throw "'scry' has been removed as it was archived upstream. Use 'crystalline' instead"; # Added 2025-02-12 scudcloud = throw "'scudcloud' has been removed as it was archived by upstream"; # Added 2025-07-24 seafile-server = throw "'seafile-server' has been removed as it is unmaintained"; # Added 2025-08-21 + seahub = throw "'seahub' has been removed as it is unmaintained"; # Added 2025-08-21 semeru-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01 semeru-jre-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01 sensu = throw "sensu has been removed as the upstream project is deprecated. Consider using `sensu-go`"; # Added 2024-10-28 From f7a13ac97282343e93b416c89e3c236e504fa228 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Aug 2025 00:49:58 +0000 Subject: [PATCH 74/96] faircamp: 1.5.0 -> 1.6.0 --- pkgs/by-name/fa/faircamp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fa/faircamp/package.nix b/pkgs/by-name/fa/faircamp/package.nix index 0fbc0db67727..9dadd70f89f8 100644 --- a/pkgs/by-name/fa/faircamp/package.nix +++ b/pkgs/by-name/fa/faircamp/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage rec { pname = "faircamp"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "simonrepp"; repo = "faircamp"; rev = version; - hash = "sha256-8UowDScjc/P0OX5zpLIOdbO+E5Yk6XX8rcVL5MBS2AM="; + hash = "sha256-J6OzbZbKT1ZnVG559JKLDh5R9xI3WUYx3pvvb15CAI8="; }; - cargoHash = "sha256-eCyj24WGVHxEfxX8MoKG5aLQ9UV4kWuYieTdcwQLr/c="; + cargoHash = "sha256-I5L+TKMKpUUvkh7tWw7hdCRK6CLj0PBzkfdJqPk3YJE="; buildFeatures = [ "libvips" ]; From 65f8190bb4a0e9530de6cdb396762b79c603eb65 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sun, 10 Aug 2025 13:59:13 +0300 Subject: [PATCH 75/96] bashplotlib: 2021-03-31 -> 0.6.5-unstable-2021-03-31 --- pkgs/by-name/ba/bashplotlib/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ba/bashplotlib/package.nix b/pkgs/by-name/ba/bashplotlib/package.nix index afac32b49113..891a04b773aa 100644 --- a/pkgs/by-name/ba/bashplotlib/package.nix +++ b/pkgs/by-name/ba/bashplotlib/package.nix @@ -2,11 +2,12 @@ lib, python3Packages, fetchFromGitHub, + nix-update-script, }: python3Packages.buildPythonApplication { pname = "bashplotlib"; - version = "2021-03-31"; + version = "0.6.5-unstable-2021-03-31"; format = "pyproject"; src = fetchFromGitHub { @@ -20,13 +21,15 @@ python3Packages.buildPythonApplication { setuptools ]; + passthru.updateScript = nix-update-script { }; + # No tests doCheck = false; - meta = with lib; { + meta = { homepage = "https://github.com/glamp/bashplotlib"; description = "Plotting in the terminal"; - maintainers = with maintainers; [ dtzWill ]; - license = licenses.mit; + maintainers = with lib.maintainers; [ dtzWill ]; + license = lib.licenses.mit; }; } From 6f6ed873f167bad874e4e1c267a9fe7384077ca4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Sep 2025 14:39:32 +0000 Subject: [PATCH 76/96] libretro.beetle-psx: 0-unstable-2025-08-06 -> 0-unstable-2025-08-29 --- 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 000bf36786c7..06afaea0bda9 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-08-06"; + version = "0-unstable-2025-08-29"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-psx-libretro"; - rev = "1e42a9076ab1ec5756d3f72e6d61923080fb2128"; - hash = "sha256-3k2qgAgyo3o/qwNQZsc0J1dKueZqM7jYvm9gzNkEShw="; + rev = "fe380f78ca0796fbe58901d80b125afaa8a2670b"; + hash = "sha256-MG8hrLkqTgMI/JQ0WZ68iI22xD/Qs2jWL+tle0brZ6g="; }; extraBuildInputs = lib.optionals withHw [ From a19e4649f8542b591750b79e59288c1cd5ebeefd Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 2 Sep 2025 16:41:20 +0200 Subject: [PATCH 77/96] spotify-player: 0.20.7 -> 0.21.0 Release Notes: https://github.com/aome510/spotify-player/releases/tag/v0.21.0 --- pkgs/by-name/sp/spotify-player/package.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix index 0f8b7ffd3cf2..62cbb42c21d0 100644 --- a/pkgs/by-name/sp/spotify-player/package.nix +++ b/pkgs/by-name/sp/spotify-player/package.nix @@ -2,6 +2,7 @@ lib, rustPlatform, fetchFromGitHub, + fetchpatch, pkg-config, openssl, cmake, @@ -49,16 +50,24 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [ rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.20.7"; + version = "0.21.0"; src = fetchFromGitHub { owner = "aome510"; repo = "spotify-player"; tag = "v${version}"; - hash = "sha256-g+SU6qDnafLiNOzZ75HUPgifuC8A+rb+KoqJoMHBJ04="; + hash = "sha256-nOswrYt9NrzJV6CFBWZCpj/wIJnIgmr3i2TreAKGGPI="; }; - cargoHash = "sha256-rwWSKJMI/4fY60m+vGqTqrTijJN6d0PfQH417Ku9+0E="; + cargoHash = "sha256-YarKRApcQHom3AQIirqGdmUOuy5B+BRehLijvF/GRPc="; + + patches = [ + (fetchpatch { + name = "fix-build-failure.patch"; + url = "https://github.com/aome510/spotify-player/commit/77af13b48b2a03e61fef1cffea899929057551dc.patch"; + hash = "sha256-5q8W0X49iZLYdwrBiZJTESb628VPamrm0zEYwDm8CVk="; + }) + ]; nativeBuildInputs = [ pkg-config From 75b4e096025f8eabae77e961366ff56f26398246 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Sep 2025 13:03:57 +0000 Subject: [PATCH 78/96] warp-terminal: 0.2025.08.27.08.11.stable_03 -> 0.2025.08.27.08.11.stable_04 --- pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 5d83b41522ba..5b82bf2517f7 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-A3D+rsbiz0Ai8w350em4jr8C8GJ0jHMrFEdPa0nobCM=", - "version": "0.2025.08.27.08.11.stable_03" + "hash": "sha256-RCe7St5HGDJS5+O5gmetu55/6F59pu4rs9JnYP7CUpQ=", + "version": "0.2025.08.27.08.11.stable_04" }, "linux_x86_64": { - "hash": "sha256-E45F+yhU/S+jbYxtTjtumfIaajQBWIGDTtV1b+KZVG8=", - "version": "0.2025.08.27.08.11.stable_03" + "hash": "sha256-HyjretExpf4mfhTFRP5iCbXtubHxnzjXOvnZkHPvRzY=", + "version": "0.2025.08.27.08.11.stable_04" }, "linux_aarch64": { - "hash": "sha256-x7HZeZVMrh5sayFghw47jLUO+5ks8U2xUh9eF136YkU=", - "version": "0.2025.08.27.08.11.stable_03" + "hash": "sha256-XujRlhETOrFv+EmwGFrtZnyfD68vuNRVb7qovmJEOxk=", + "version": "0.2025.08.27.08.11.stable_04" } } From d5cda477ca7b8ebbfc843164b734a6274d989b1a Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 29 Aug 2025 10:52:17 +0200 Subject: [PATCH 79/96] electron_37-bin: 37.3.1 -> 37.4.0 - Changelog: https://github.com/electron/electron/releases/tag/v37.4.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v37.3.1...v37.4.0 --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 450d5559f523..3eedc0856ee8 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -23,13 +23,13 @@ }, "37": { "hashes": { - "aarch64-darwin": "7f390efeca2d2153e29c5ea13305915fb3f853b2a4e9a00be07183c6e09ac6de", - "aarch64-linux": "c5c8ec46d9e291cd9dddb40c635d947d0f17873739f93b069e75b4bdadd75f5d", - "armv7l-linux": "0871625623efb0edbb4d93ec9e036e01837f9d9ffaf4f1c05ae95f30ff823987", - "headers": "1a5wfjjf68mcbsq2lxxsrhgni5ia4dcv1pfzmgw3wm10gbyb0wzi", - "x86_64-darwin": "0a6a55de6c49d6eb929f01632701bd25f7e515d7b4042614dd5a1ec6c079f3f3", - "x86_64-linux": "9c379b91f7ff65311f2b040299ee95c137fcb8e7e1bef87f9225d608cf579548" + "aarch64-darwin": "dade2ff2cadb0f7136c5c2808ac67768ca5430448aab75c1476c2d3442f7413e", + "aarch64-linux": "622c23c9bbc62226c7aea75e0f10d19776e4b03ff04b709c20eba8e14eecac7d", + "armv7l-linux": "161399f83f1e790ec7c9b404f81538afcde4466f17c644dfbc870db92003c27a", + "headers": "1zghwn2kfv5an37m0mnqqcv6hb0q376mj2zrqxqyrjz6fpb5rnqr", + "x86_64-darwin": "f111eedf4e0931c9caf396fc219487b124e2086be3ceaa77b541b0034c4beb8d", + "x86_64-linux": "83230e0fb8506da154e946579835cf468f05ec3f7ae0fb09a420c54ec129d7ce" }, - "version": "37.3.1" + "version": "37.4.0" } } From b9a145801d96c60077e016b9f0fd16ab3329b0d0 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 29 Aug 2025 10:52:20 +0200 Subject: [PATCH 80/96] electron-chromedriver_37: 37.3.1 -> 37.4.0 - Changelog: https://github.com/electron/electron/releases/tag/v37.4.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v37.3.1...v37.4.0 --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 6d2ec9a38cf5..f63f62d8df7c 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -23,13 +23,13 @@ }, "37": { "hashes": { - "aarch64-darwin": "f6e9c5bdf45d3e17ef90036265a190e55fb2c15c840c2f898f7b503882dcbdac", - "aarch64-linux": "db0b310b297cb3c38655ca2d91c892e463f6e73d45b1487aa5f7271dd5f54315", - "armv7l-linux": "e4cc211fc92da230acbf2139333051a105a97f7a6a52ace5b0f289bcffcf1ce4", - "headers": "1a5wfjjf68mcbsq2lxxsrhgni5ia4dcv1pfzmgw3wm10gbyb0wzi", - "x86_64-darwin": "473bae1c5226e2b1b7cebe71a2f983955e886d65683b00d302850071026e0bdb", - "x86_64-linux": "6f59f1b86c4538bdf7857fa90afd3f459a8f32bc600480774ae4dc50fc89208c" + "aarch64-darwin": "67546d1baf32b5db330ed6292e6bfa4c043d19c5aea2cdfc32f294b1bfef0670", + "aarch64-linux": "caad0c4a238555be7ffacdd36a34af3ad769dbdce3bd3ed79567cc08b2ae70f8", + "armv7l-linux": "d9188dbaa8e825a1ab025f652d8e558c68d1a6516bd5113c28fb25553e72a99a", + "headers": "1zghwn2kfv5an37m0mnqqcv6hb0q376mj2zrqxqyrjz6fpb5rnqr", + "x86_64-darwin": "2bab145390ce194f9fea82c421594f93b12b462e3b53a5115633f160345219f7", + "x86_64-linux": "8fc352ffa0bfcc7f977dce3ec066a4a77198c584292ff066b611b6259367bcf4" }, - "version": "37.3.1" + "version": "37.4.0" } } From e0ba6a5d2369774c663ef7d4efcd7838144b6724 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 29 Aug 2025 10:58:29 +0200 Subject: [PATCH 81/96] electron-source.electron_37: 37.3.1 -> 37.4.0 - Changelog: https://github.com/electron/electron/releases/tag/v37.4.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v37.3.1...v37.4.0 --- pkgs/development/tools/electron/info.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 1c35ab67aee3..f31093b339a7 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -2632,7 +2632,7 @@ "version": "36.8.1" }, "37": { - "chrome": "138.0.7204.235", + "chrome": "138.0.7204.243", "chromium": { "deps": { "gn": { @@ -2641,15 +2641,15 @@ "version": "0-unstable-2025-05-21" } }, - "version": "138.0.7204.235" + "version": "138.0.7204.243" }, "chromium_npm_hash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE=", "deps": { "src": { "args": { - "hash": "sha256-S3uarVWXVgo0xqWoLdbv/oe+iYdHUBZk1W4lhzQmI/I=", + "hash": "sha256-PJgyOygSYqGfKSwyDFaCfjAgcLmlWRx6foOmde/6SUw=", "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "tag": "138.0.7204.235", + "tag": "138.0.7204.243", "url": "https://chromium.googlesource.com/chromium/src.git" }, "fetcher": "fetchFromGitiles" @@ -2688,10 +2688,10 @@ }, "src/electron": { "args": { - "hash": "sha256-NkNq6jKC8NHi/PAV8zru5WCCZFO7XLMwishzURfP2mc=", + "hash": "sha256-+11/nuTJYMca/ERiY+twP3kDo+NtCm0uWYpCIyS45mE=", "owner": "electron", "repo": "electron", - "tag": "v37.3.1" + "tag": "v37.4.0" }, "fetcher": "fetchFromGitHub" }, @@ -3951,8 +3951,8 @@ }, "src/v8": { "args": { - "hash": "sha256-PBD43Kfv81iewn60pfpIQBqHVd8j+tcR+VHn35YwdNc=", - "rev": "82ea130494ea43ed0e1bba1ccf97e5db06668ba1", + "hash": "sha256-ZXqb08iYgh98JiiD3G9zufbhTMPnsJFtJxwuYBmx4Pg=", + "rev": "6e44441230795a613ddabb3b7e8a082c114a607e", "url": "https://chromium.googlesource.com/v8/v8.git" }, "fetcher": "fetchFromGitiles" @@ -3961,6 +3961,6 @@ "electron_yarn_hash": "1lqvsfr1w32n4as7g7ms49jjdfw7sl1fyvg2640cpdgjs4dd96ky", "modules": "136", "node": "22.18.0", - "version": "37.3.1" + "version": "37.4.0" } } From 3c4bd52c00b2e99c520b983a7802ca8d88a2cad5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Sep 2025 15:35:04 +0000 Subject: [PATCH 82/96] python3Packages.eve: 2.2.1 -> 2.2.3 --- pkgs/development/python-modules/eve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index 37b564a000bb..87b76bc6a068 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "eve"; - version = "2.2.1"; + version = "2.2.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pyeve"; repo = "eve"; tag = "v${version}"; - hash = "sha256-TZeRvuJflht36PvctkfuQL1hMPqjtWDUxqk06DRFfyM="; + hash = "sha256-SnypLhUGAw3e0KQ2CjP6NHTIypMJdN18zzzYAG14m7Y="; }; pythonRelaxDeps = [ "events" ]; From 1f6e56fb6357c2e29033f5262623c74e445f5777 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Sep 2025 15:49:32 +0000 Subject: [PATCH 83/96] faas-cli: 0.17.7 -> 0.17.8 --- pkgs/by-name/fa/faas-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/faas-cli/package.nix b/pkgs/by-name/fa/faas-cli/package.nix index a3329642d32d..e6ad4718a6ea 100644 --- a/pkgs/by-name/fa/faas-cli/package.nix +++ b/pkgs/by-name/fa/faas-cli/package.nix @@ -24,13 +24,13 @@ let in buildGoModule rec { pname = "faas-cli"; - version = "0.17.7"; + version = "0.17.8"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-9+IR6xSuKq3MXR51oHaKZKtdYLNPqykMx7aCz10kXIw="; + sha256 = "sha256-gyd9uX5i5nl7x476SGfBwWUL1hTLsPCCdsmwo783x5Q="; }; vendorHash = null; From b080025aa0054090b67b9e9517f805424e6a8845 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 2 Sep 2025 19:04:31 +0300 Subject: [PATCH 84/96] wireplumber: 0.5.10 -> 0.5.11 Diff: https://gitlab.freedesktop.org/pipewire/wireplumber/-/compare/0.5.10...0.5.11 --- 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 02d11112fc83..db3717eaaa31 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.10"; + version = "0.5.11"; outputs = [ "out" @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - hash = "sha256-CZjVCy9FKTBO7C5f+vOejJyVjo2a5YoOKgqzH+w2k3w="; + hash = "sha256-ZTduzHeEBqcranJxHhNnfZE5PV/by5ZUaale9W6AJrE="; }; nativeBuildInputs = [ From a6915dbedb2b14cfb08c401b07ca623fe08ce0a5 Mon Sep 17 00:00:00 2001 From: amusingimpala75 <69653100+amusingimpala75@users.noreply.github.com> Date: Mon, 18 Aug 2025 11:25:35 -0700 Subject: [PATCH 85/96] brogue-ce: add configuration options for terminal/graphics and macOS Exposes configuration options 'terminal' and 'graphics', with defaults (false, true respectively) to match existing behaviour Moves SDL2 deps behind the 'graphics' flag and adds ncurses dep behind 'terminal' flag. The respective make flags are applied to build for terminal/graphics. In addition, brogue-ce is bundled into a macOS application when on darwin and graphics are enabled. --- pkgs/by-name/br/brogue-ce/package.nix | 31 +++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/br/brogue-ce/package.nix b/pkgs/by-name/br/brogue-ce/package.nix index 72e06aab80be..fe1040e2b634 100644 --- a/pkgs/by-name/br/brogue-ce/package.nix +++ b/pkgs/by-name/br/brogue-ce/package.nix @@ -4,8 +4,13 @@ fetchFromGitHub, makeDesktopItem, copyDesktopItems, + + ncurses, SDL2, SDL2_image, + + terminal ? false, + graphics ? true, }: stdenv.mkDerivation (finalAttrs: { @@ -28,12 +33,25 @@ stdenv.mkDerivation (finalAttrs: { copyDesktopItems ]; - buildInputs = [ - SDL2 - SDL2_image + buildInputs = + (lib.optionals graphics [ + SDL2 + SDL2_image + ]) + ++ (lib.optionals terminal [ + ncurses + ]); + + makeFlags = [ + "DATADIR=$(out)/opt/brogue-ce" + "TERMINAL=${if terminal then "YES" else "NO"}" + "GRAPHICS=${if graphics then "YES" else "NO"}" + "MAC_APP=${if stdenv.isDarwin then "YES" else "NO"}" ]; - makeFlags = [ "DATADIR=$(out)/opt/brogue-ce" ]; + postBuild = lib.optionalString (stdenv.isDarwin && graphics) '' + make Brogue.app $makeFlags + ''; desktopItems = [ (makeDesktopItem { @@ -59,6 +77,11 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + postInstall = lib.optionalString (stdenv.isDarwin && graphics) '' + mkdir -p $out/Applications + mv Brogue.app "$out/Applications/Brogue CE.app" + ''; + meta = with lib; { description = "Community-lead fork of the minimalist roguelike game Brogue"; mainProgram = "brogue-ce"; From a28c98e867be6db4df891f1d2b880d5f40e271f3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Sep 2025 18:27:30 +0200 Subject: [PATCH 86/96] python313Packages.tencentcloud-sdk-python: 3.0.1453 -> 3.0.1454 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.0.1453...3.0.1454 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1454/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 6f7102714e27..c2d788fb1f63 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1453"; + version = "3.0.1454"; pyproject = true; src = fetchFromGitHub { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-KjnRpoRiZ1+BrBW4JANcRWTdMzl0Vds5p4x1hJBWh7s="; + hash = "sha256-VSBWWrNlQygXX9pW4T/eb3FpJNcOmx6DCHQbpLUmB/I="; }; build-system = [ setuptools ]; From f7a846a392413dd0e0d9115654c7018f4ac7b88f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Sep 2025 18:31:58 +0200 Subject: [PATCH 87/96] python313Packages.pyiskra: 0.1.22 -> 0.1.26 Diff: https://github.com/Iskramis/pyiskra/compare/v0.1.22...v0.1.26 Changelog: https://github.com/Iskramis/pyiskra/releases/tag/v0.1.26 --- pkgs/development/python-modules/pyiskra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyiskra/default.nix b/pkgs/development/python-modules/pyiskra/default.nix index 9b2b998846e8..2d2126f8076a 100644 --- a/pkgs/development/python-modules/pyiskra/default.nix +++ b/pkgs/development/python-modules/pyiskra/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyiskra"; - version = "0.1.22"; + version = "0.1.26"; pyproject = true; src = fetchFromGitHub { owner = "Iskramis"; repo = "pyiskra"; tag = "v${version}"; - hash = "sha256-feD4oqH7W0gJwPqdgAJEzmnadgXHkzFDc/NXY54aMXI="; + hash = "sha256-RUMMXlLdG4cqBrNOK5f1jv0jSU8n/P3XrvA7l1hij1g="; }; build-system = [ setuptools ]; @@ -35,7 +35,7 @@ buildPythonPackage rec { changelog = "https://github.com/Iskramis/pyiskra/releases/tag/${src.tag}"; description = "Python Iskra devices interface"; homepage = "https://github.com/Iskramis/pyiskra"; - license = lib.licenses.gpl3Only; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; } From 8f39a9831ab5cd9d60827b7853f5429b6b49ef13 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 2 Sep 2025 18:37:15 +0200 Subject: [PATCH 88/96] postgresqlPackages.pg_bigm: 1.2-20240606 -> 1.2-20250903 Release Notes: https://github.com/pgbigm/pg_bigm/releases/tag/v1.2-20250903 --- pkgs/servers/sql/postgresql/ext/pg_bigm.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix index f4ed12e2f902..1cf6ea0a1547 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix @@ -7,23 +7,18 @@ postgresqlBuildExtension (finalAttrs: { pname = "pg_bigm"; - version = "1.2-20240606"; + version = "1.2-20250903"; src = fetchFromGitHub { owner = "pgbigm"; repo = "pg_bigm"; tag = "v${finalAttrs.version}"; - hash = "sha256-5Uy1DmGZR4WdtRUvNdZ5b9zBHJUb9idcEzW20rkreBs="; + hash = "sha256-8V+sGebagYxXW1o2k2cNlGG4cFOObdRAvqCXKyR95hI="; }; makeFlags = [ "USE_PGXS=1" ]; meta = { - # PostgreSQL 18 support issue upstream: https://github.com/pgbigm/pg_bigm/issues/28 - # Check after next package update. - broken = lib.warnIf ( - finalAttrs.version != "1.2-20240606" - ) "Is postgresql18Packages.pg_bigm still broken?" (lib.versionAtLeast postgresql.version "18"); description = "Text similarity measurement and index searching based on bigrams"; homepage = "https://pgbigm.osdn.jp/"; maintainers = [ ]; From 1ba85dfb21aaa5ed2e0c87b7f6971532f5d310af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Sep 2025 18:38:27 +0200 Subject: [PATCH 89/96] python313Packages.aioautomower: 2.2.0 -> 2.2.2 Diff: https://github.com/Thomas55555/aioautomower/compare/v2.2.0...v2.2.2 Changelog: https://github.com/Thomas55555/aioautomower/releases/tag/v2.2.2 --- pkgs/development/python-modules/aioautomower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix index 4b01ab69d910..b612ede06c2c 100644 --- a/pkgs/development/python-modules/aioautomower/default.nix +++ b/pkgs/development/python-modules/aioautomower/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "aioautomower"; - version = "2.2.0"; + version = "2.2.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; tag = "v${version}"; - hash = "sha256-U7TXWKiVz7wnf/d75MWNG7FwTch8tV/XVowMV+U3qc8="; + hash = "sha256-ds/wNPaZYQ8Tk/GyqYrWYL99oU73JWc/3KBsMULBass="; }; postPatch = '' From cee03a545509bd94d38ac3f5bbd58fe89dd5539b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Sep 2025 16:38:30 +0000 Subject: [PATCH 90/96] home-assistant-custom-components.smartthinq-sensors: 0.41.1 -> 0.41.2 --- .../custom-components/smartthinq-sensors/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix b/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix index 89609238a092..20694c6dce63 100644 --- a/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix +++ b/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent rec { owner = "ollo69"; domain = "smartthinq_sensors"; - version = "0.41.1"; + version = "0.41.2"; src = fetchFromGitHub { inherit owner; repo = "ha-smartthinq-sensors"; rev = "v${version}"; - hash = "sha256-L0diABbUq/0wmwvhHeMOg6ieNrvM+LWZ/ynezEpBblk="; + hash = "sha256-HNhW72aoYu0Vosq8o0lyxDse8jcs3kVWEzDw/5VQn9g="; }; dependencies = [ From 84ec9ef65ad4ad48de2d59cce58d7622df777fc6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Sep 2025 18:39:00 +0200 Subject: [PATCH 91/96] python313Packages.aiomealie: 0.10.1 -> 0.10.2 Diff: https://github.com/joostlek/python-mealie/compare/v0.10.1...v0.10.2 Changelog: https://github.com/joostlek/python-mealie/releases/tag/v0.10.2 --- pkgs/development/python-modules/aiomealie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiomealie/default.nix b/pkgs/development/python-modules/aiomealie/default.nix index f0ea628b4ea1..13792ccd42de 100644 --- a/pkgs/development/python-modules/aiomealie/default.nix +++ b/pkgs/development/python-modules/aiomealie/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aiomealie"; - version = "0.10.1"; + version = "0.10.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-mealie"; tag = "v${version}"; - hash = "sha256-RFO/+sO6WJikqxP4MVJiYOiPC+qzOYWLzVAOjd4DkVA="; + hash = "sha256-VOUtSHxixGpfeP4G0puB1RPgaqvell1SBO7akEnLzrg="; }; build-system = [ poetry-core ]; From a570dc7016363b34f9eced9aac36e00dba8e4eb5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Sep 2025 18:39:33 +0200 Subject: [PATCH 92/96] python313Packages.volvocarsapi: 0.4.1 -> 0.4.2 Diff: https://github.com/thomasddn/volvo-cars-api/compare/v0.4.1...v0.4.2 Changelog: https://github.com/thomasddn/volvo-cars-api/releases/tag/v0.4.2 --- pkgs/development/python-modules/volvocarsapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/volvocarsapi/default.nix b/pkgs/development/python-modules/volvocarsapi/default.nix index 7d0dfc1fbb37..f63f3a7fcd79 100644 --- a/pkgs/development/python-modules/volvocarsapi/default.nix +++ b/pkgs/development/python-modules/volvocarsapi/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "volvocarsapi"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; disabled = pythonOlder "3.12"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "thomasddn"; repo = "volvo-cars-api"; tag = "v${version}"; - hash = "sha256-YMrhVxDm8Cp8vbMVtdq6yoaAu8nUB7L2YG+LSkvMdZs="; + hash = "sha256-mVr9bhWK4VWFnR6yfNVFYGMKRSv4XrYP2Wb3nlnDZ+E="; }; build-system = [ From a69c58b926f609e5b9c56b25b075d2af9a5b7dc5 Mon Sep 17 00:00:00 2001 From: Richie Bendall Date: Wed, 3 Sep 2025 04:55:15 +1200 Subject: [PATCH 93/96] README: update link to branding repo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 12585e9cc008..76c1c456d4ec 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Here are some of the main ones: * [Nix RFCs](https://github.com/NixOS/rfcs) - the formal process for making substantial changes to the community * [NixOS homepage](https://github.com/NixOS/nixos-homepage) - the [NixOS.org](https://nixos.org) website * [hydra](https://github.com/NixOS/hydra) - our continuous integration system -* [NixOS Artwork](https://github.com/NixOS/nixos-artwork) - NixOS artwork +* [NixOS Branding](https://github.com/NixOS/branding) - NixOS branding # Continuous Integration and Distribution From cc0770bda3b6cd09d6945be57e25aaeb2d356933 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Sep 2025 19:34:37 +0200 Subject: [PATCH 94/96] python313Packages.fnllm: add uv-dynamic-versioning --- pkgs/development/python-modules/fnllm/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/fnllm/default.nix b/pkgs/development/python-modules/fnllm/default.nix index d3368493a984..7cd6a90da670 100644 --- a/pkgs/development/python-modules/fnllm/default.nix +++ b/pkgs/development/python-modules/fnllm/default.nix @@ -17,6 +17,7 @@ pythonOlder, tenacity, tiktoken, + uv-dynamic-versioning, }: buildPythonPackage rec { @@ -31,7 +32,10 @@ buildPythonPackage rec { hash = "sha256-q7aeFXuXIrwjjXEHVpACohWommIxJZo9PRUgh4uLtfA="; }; - build-system = [ hatchling ]; + build-system = [ + hatchling + uv-dynamic-versioning + ]; dependencies = [ aiolimiter From 2d2099d657fc2255ed9c0868d5736320254da0f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Sep 2025 19:37:23 +0200 Subject: [PATCH 95/96] python313Packages.django-health-check: adjust build-system --- .../python-modules/django-health-check/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-health-check/default.nix b/pkgs/development/python-modules/django-health-check/default.nix index 229f31e1892e..6c20c23688e4 100644 --- a/pkgs/development/python-modules/django-health-check/default.nix +++ b/pkgs/development/python-modules/django-health-check/default.nix @@ -6,13 +6,14 @@ django-storages, django, fetchFromGitHub, + flit-core, + flit-scm, gitMinimal, mock, pytest-cov-stub, pytest-django, pytestCheckHook, redis, - setuptools-scm, sphinx, }: @@ -28,7 +29,10 @@ buildPythonPackage rec { hash = "sha256-qgABCDWKGYZ67sKvCozUQfmYcKWMpEVNLxInTnIaojk="; }; - build-system = [ setuptools-scm ]; + build-system = [ + flit-core + flit-scm + ]; buildInputs = [ sphinx From 49900f4180e0135618e666b5430e5fef509a5dc0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Sep 2025 19:40:09 +0200 Subject: [PATCH 96/96] python313Packages.odc-stac: adjust build-system - add missing dependency --- pkgs/development/python-modules/odc-stac/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/odc-stac/default.nix b/pkgs/development/python-modules/odc-stac/default.nix index 00ec04b1f674..99c06e80ed09 100644 --- a/pkgs/development/python-modules/odc-stac/default.nix +++ b/pkgs/development/python-modules/odc-stac/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - hatchling, + flit-core, # dependencies affine, @@ -16,6 +16,7 @@ pystac, rasterio, toolz, + typing-extensions, xarray, # optional-dependencies @@ -40,9 +41,7 @@ buildPythonPackage rec { hash = "sha256-Ekyavcin13B4DAxv0/XG5QTBuLE7PRospAXe40fHeX0="; }; - build-system = [ - hatchling - ]; + build-system = [ flit-core ]; dependencies = [ affine @@ -54,6 +53,7 @@ buildPythonPackage rec { pystac rasterio toolz + typing-extensions xarray ]; @@ -81,9 +81,7 @@ buildPythonPackage rec { "test_output_geobox" ]; - pythonImportsCheck = [ - "odc.stac" - ]; + pythonImportsCheck = [ "odc.stac" ]; meta = { description = "Load STAC items into xarray Datasets";