From 64f6840d5cc116032cd1b5f6254c66cad52f2dcb Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 22 Aug 2025 14:18:27 +0300 Subject: [PATCH 001/380] doc: remove old docs They have not been updated for more than 10 years --- doc/old/cross.txt | 329 ---------------------------------------------- 1 file changed, 329 deletions(-) delete mode 100644 doc/old/cross.txt diff --git a/doc/old/cross.txt b/doc/old/cross.txt deleted file mode 100644 index 0f958e772b78..000000000000 --- a/doc/old/cross.txt +++ /dev/null @@ -1,329 +0,0 @@ -Setting up a cross compiler with Nix - -"Cross compilation" means compiling a program on one machine for another -type of machine. A typical use of cross compilation is to compile programs -for embedded devices. These devices often don't have the computing power -and memory to compile programs natively. - -For a fully working cross compiler the following are needed: - -* cross binutils: assembler, archiver, linker, etcetera that understand -the format of the target system - -* cross compiler: a compiler that can generate binary code and object files -for the target platform - -* cross C library: a library to link object files with to create fully -functional programs - -Cross compilers are difficult to set up. A lot of people report that they -cannot succeed in building a cross toolchain successfully. The answers -usually consist of "download this pre-built toolchain", which is equally -unhelpful. - -A toolchain is set up in five steps: - -1. build binutils to that can run on the host platform, but generate code -for the target platform - -2. build Linux kernel headers for the target platform - -3. build a minimal C only version of GCC, that can run on the host platform -and generate code for the target platform - -4. build a C library for the target platform. This includes the dynamic -linker, C library, etc. - -5. build a full GCC - -**** -NB: - -Keep in mind that many programs are not very well suited for cross -compilation. Either they are not intended to run on other platforms, -because the code is highly platform specific, or the configuration process -is not written with cross compilation in mind. - -Nix will not solve these problems for you! -*** - -This document describes to set up a cross compiler to generate code for -arm-linux with uClibc and runs on i686-linux. The "stdenv" used is the -default from the standard Nix packages collection. - -Step 1: build binutils for arm-linux in the stdenv for i686-linux - ---- -{stdenv, fetchurl, noSysDirs}: - -stdenv.mkDerivation { - name = "binutils-2.16.1-arm"; - builder = ./builder.sh; - src = fetchurl { - url = "http://ftp.nluug.nl/gnu/binutils/binutils-2.16.1.tar.bz2"; - hash = "sha256-14pv+YKrL3NyFwbnv9MoWsZHgEZk5+pHhuZtAfkcVsU="; - }; - inherit noSysDirs; - configureFlags = [ "--target=arm-linux" ]; -} ---- - -This will compile binutils that will run on i686-linux, but knows the -format used by arm-linux. - -Step 2: build kernel headers for the target architecture - - default.nix for kernel-headers-arm: - ---- -{stdenv, fetchurl}: - -assert stdenv.buildPlatform.system == "i686-linux"; - -stdenv.mkDerivation { - name = "linux-headers-2.6.13.1-arm"; - builder = ./builder.sh; - src = fetchurl { - url = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.1.tar.bz2"; - hash = "sha256-qtICDjfiA1HxWBrHqtB5DCv9s9/HyznKV1C6IxCrHYs="; - }; -} ---- - - builder.sh for kernel-headers-arm: - ---- -source $stdenv/setup - - -buildPhase() { - make include/linux/version.h -} - -buildPhase=buildPhase - - -installPhase() { - mkdir $out - mkdir $out/include - #cd $out/include - #ln -s asm-arm asm - make include/asm ARCH=arm - cp -prvd include/linux include/asm include/asm-arm include/asm-generic $out/include - echo -n > $out/include/linux/autoconf.h -} - -installPhase=installPhase - - -genericBuild ---- - -Step 3: build a minimal GCC - -Extra/different parameters include the target platform and the kernel -headers argument (this needs a major cleanup, as well as the name, it -needs to be different!). Profiled compilers are disabled. The tarball -used here is just gcc-core. For some reason it doesn't install nicely -if the whole tarball is used (or is this some braino on my side? -- AH). - -Only C is used, because for other languages (such as C++) extra libraries -need to be compiled, for which libraries compiled for the target system -are needed. - -There is a bit of evilness going on. The cross compiled utilities need -to be either copied to or be linked from the output tree of the compiler. -(Is this really true? Back this up with arguments! -- AH) - -Symbolic links are not something we want inside the Nix store. - ---- -{ stdenv, fetchurl, noSysDirs -, langC ? true, langCC ? true, langF77 ? false -, profiledCompiler ? false -, binutilsArm -, kernelHeadersArm -}: - -assert langC; - -stdenv.mkDerivation { - name = "gcc-4.0.2-arm"; - builder = ./builder.sh; - src = fetchurl { - url = "ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-4.0.2/gcc-core-4.0.2.tar.bz2"; - hash = "sha256-LANmXRS7/fN2zF5JUJVd8OjNA5aCDsGLQKhSpxWA3Qk="; - }; - # !!! apply only if noSysDirs is set - patches = [./no-sys-dirs.patch ./gcc-inhibit.patch]; - inherit noSysDirs langC langCC langF77 profiledCompiler; - buildInputs = [binutilsArm]; - inherit kernelHeadersArm binutilsArm; - platform = "arm-linux"; -} ---- - -The builder.sh for a cross-compiler. Note that the binutils are prefixed -with the architecture name, so arm-linux-ld instead of ld, etc. This is -necessary because when we cross-compile a lot of programs look for these -tools with these specific names. The standard gcc-wrapper does not take this -into account yet. - ---- -source $stdenv/setup - - -export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy -mkdir $NIX_FIXINC_DUMMY - - -if test "$noSysDirs" = "1"; then - - if test "$noSysDirs" = "1"; then - # Figure out what extra flags to pass to the gcc compilers - # being generated to make sure that they use our glibc. - if test -e $NIX_CC/nix-support/orig-glibc; then - glibc=$(cat $NIX_CC/nix-support/orig-glibc) - # Ugh. Copied from gcc-wrapper/builder.sh. We can't just - # source in $NIX_CC/nix-support/add-flags, since that - # would cause *this* GCC to be linked against the - # *previous* GCC. Need some more modularity there. - extraCFlags="-B$glibc/lib -isystem $glibc/include" - extraLDFlags="-B$glibc/lib -L$glibc/lib -Wl,-s \ - -Wl,-dynamic-linker,$glibc/lib/ld-linux.so.2" - - # Oh, what a hack. I should be shot for this. - # In stage 1, we should link against the previous GCC, but - # not afterwards. Otherwise we retain a dependency. - # However, ld-wrapper, which adds the linker flags for the - # previous GCC, is also used in stage 2/3. We can prevent - # it from adding them by NIX_GLIBC_FLAGS_SET, but then - # gcc-wrapper will also not add them, thereby causing - # stage 1 to fail. So we use a trick to only set the - # flags in gcc-wrapper. - hook=$(pwd)/ld-wrapper-hook - echo "NIX_GLIBC_FLAGS_SET=1" > $hook - export NIX_LD_WRAPPER_START_HOOK=$hook - fi - - export NIX_EXTRA_CFLAGS=$extraCFlags - export NIX_EXTRA_LDFLAGS=$extraLDFlags - export CFLAGS=$extraCFlags - export CXXFLAGS=$extraCFlags - export LDFLAGS=$extraLDFlags - fi - -else - patches="" -fi - - -preConfigure=preConfigure -preConfigure() { - - # Determine the frontends to build. - langs="c" - if test -n "$langCC"; then - langs="$langs,c++" - fi - if test -n "$langF77"; then - langs="$langs,f77" - fi - - # Cross compiler evilness - mkdir -p $out - mkdir -p $out/arm-linux - mkdir -p $out/arm-linux/bin - ln -s $binutilsArm/arm-linux/bin/as $out/arm-linux/bin/as - ln -s $binutilsArm/arm-linux/bin/ld $out/arm-linux/bin/ld - ln -s $binutilsArm/arm-linux/bin/ar $out/arm-linux/bin/ar - ln -s $binutilsArm/arm-linux/bin/ranlib $out/arm-linux/bin/ranlib - - # Perform the build in a different directory. - mkdir ../build - cd ../build - - configureScript=../$sourceRoot/configure - configureFlags="--enable-languages=$langs --target=$platform --disable-threads --disable-libmudflap --disable-shared --with-headers=$kernelHeadersArm/include --disable-multilib" -} - - -postInstall=postInstall -postInstall() { - # Remove precompiled headers for now. They are very big and - # probably not very useful yet. - find $out/include -name "*.gch" -exec rm -rf {} \; -prune - - # Remove `fixincl' to prevent a retained dependency on the - # previous gcc. - rm -rf $out/libexec/gcc/*/*/install-tools -} - - -#if test -z "$profiledCompiler"; then - #makeFlags="bootstrap" -#else - #makeFlags="profiledbootstrap" -#fi - -genericBuild ---- - -Step 4: build a C library for the target platform. - -The previous steps are enough to compile a C library. In our case we take -uClibc. It's intended to be a small sized replacement for glibc. It is widely -used in embedded environments. - -... - -Step 5: Build a compiler to link with the newly built C library. - -... - -If we restrict the compiler to just C programs it is relatively easy, -since we only need to wrap the GCC we built in the previous step with all -the right tools and the right C library. Successfully compiled programs with -this compiler and verified to be working on a HP Jornada 820 running Linux -are "patch", "make" and "wget". - -If we want to build C++ programs it gets a lot more difficult. GCC has a -three step compilation process. In the first step a simple compiler, called -xgcc, that can compile only C programs is built. With that compiler it -compiles itself two more times: one time to build a full compiler, and another -time to build a full compiler once again with the freshly built compiler from -step 2. In the second and third step support for C++ is compiled, if this -is configured. - -One of the libraries that has to be built for C++ support step is libstdc++. -This library uses xgcc, even when cross compiling, since libstdc++ has to be -compiled for arm-linux. - -One of the compiler flags that GCC uses for this compiler is called X_CFLAGS. -This is used by the Nix build process to set the dynamic linker, glibc -in the case of i686-linux using the default Nix packages collection. - -Obviously, since we need to compile libstc++ for arm-linux with uClibc linking -will not be done correctly: you can't link object files built for arm-linux -with a glibc built for i686-linux. - -Setting X_CFLAGS to use the uClibc libraries and dynamic linker will fail -too. Earlier on in the build process these flags are used to compile important -files like libgcc.a by the host system gcc, which does need to be linked -to glibc. To make this work correctly you will need to carefully juggle -with compilation flags. This is still work in progress for Nix. - - ---- - -After successfully completing the whole toolchain you can start building -packages with the newly built tools. To make everything build correctly -you will need a stdenv for your target platform. Setting up this platform -will take some effort. Right now there is a very experimental setup for -arm-linux, which needs to be cleaned up before it is production ready. - -Please note that many packages are not well suited for cross-compilation. -Even though the package itself might be very well portable often the -buildscripts are not. One thing that we have seen that causes frequent -build failures is the use of the LD variable. This is often set to 'ld' -and not $(CROSS)-ld. From 5473ce1668247cf91501a20ab536f17e7c24cbd5 Mon Sep 17 00:00:00 2001 From: Armel Cloarec Date: Thu, 28 Aug 2025 01:09:57 +0200 Subject: [PATCH 002/380] xdg-desktop-portal-phosh: init at 0.0.4 --- .../cargo_lock_deps_version.patch | 30 +++++++ .../xd/xdg-desktop-portal-phosh/package.nix | 87 +++++++++++++++++++ 2 files changed, 117 insertions(+) create mode 100644 pkgs/by-name/xd/xdg-desktop-portal-phosh/cargo_lock_deps_version.patch create mode 100644 pkgs/by-name/xd/xdg-desktop-portal-phosh/package.nix diff --git a/pkgs/by-name/xd/xdg-desktop-portal-phosh/cargo_lock_deps_version.patch b/pkgs/by-name/xd/xdg-desktop-portal-phosh/cargo_lock_deps_version.patch new file mode 100644 index 000000000000..881a22dbcf82 --- /dev/null +++ b/pkgs/by-name/xd/xdg-desktop-portal-phosh/cargo_lock_deps_version.patch @@ -0,0 +1,30 @@ +diff --git a/subprojects/pfs/Cargo.lock b/subprojects/pfs/Cargo.lock +index efe74be..9b5f48e 100644 +--- a/subprojects/pfs/Cargo.lock ++++ b/subprojects/pfs/Cargo.lock +@@ -458,9 +458,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + + [[package]] + name = "libadwaita" +-version = "0.7.1" ++version = "0.7.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8611ee9fb85e7606c362b513afcaf5b59853f79e4d98caaaf581d99465014247" ++checksum = "500135d29c16aabf67baafd3e7741d48e8b8978ca98bac39e589165c8dc78191" + dependencies = [ + "gdk4", + "gio", +diff --git a/subprojects/pfs/Cargo.toml b/subprojects/pfs/Cargo.toml +index ae3b519..6cf25dd 100644 +--- a/subprojects/pfs/Cargo.toml ++++ b/subprojects/pfs/Cargo.toml +@@ -18,7 +18,7 @@ path = "src/examples/open/pfs_open.rs" + + [dependencies] + gettext-rs = { version = "0.7", features = ["gettext-system"] } +-glib-macros = "0.20.5" ++glib-macros = "0.20.12" + gtk = { version = "0.9", package = "gtk4", features = ["gnome_47"] } + + [dependencies.adw] + diff --git a/pkgs/by-name/xd/xdg-desktop-portal-phosh/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-phosh/package.nix new file mode 100644 index 000000000000..f65cfd986a98 --- /dev/null +++ b/pkgs/by-name/xd/xdg-desktop-portal-phosh/package.nix @@ -0,0 +1,87 @@ +{ + stdenv, + lib, + fetchFromGitLab, + gnome-desktop, + libadwaita, + meson, + ninja, + pkg-config, + xdg-desktop-portal, + rustc, + desktop-file-utils, + cargo, + rustPlatform, + gettext, +}: +let + # Derived from subprojects/pfs.wrap + pfs = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "guidog"; + repo = "pfs"; + tag = "v0.0.4"; + hash = "sha256-b0S/jNE03h26bGA76fb/qlyJ8/MifZeltTc16UX2h9w="; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "xdg-desktop-portal-phosh"; + version = "0.49.0"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "guidog"; + repo = "xdg-desktop-portal-phosh"; + tag = "v${finalAttrs.version}"; + hash = "sha256-VF+ZNUP5Y2xm2nlNN3QsLJh8yNRJH7d3k+kLJ+4eu9s="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-h+VQqtirReLIHlVByKSb6DpqR1FtCxSwQpjowHX1mcg="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + rustc + desktop-file-utils + cargo + rustPlatform.cargoSetupHook + gettext + ]; + + buildInputs = [ + libadwaita + gnome-desktop + xdg-desktop-portal + ]; + + strictDeps = true; + + prePatch = '' + cp -r ${pfs} subprojects/pfs + chmod +w -R subprojects/pfs # Allow patches for subprojects to work + ''; + + patches = [ + # Patch that fixes the issue with two Rust package versions. + # For reasons that I don't understand, rustPlatform.fetchCargoVendor seems to not fetch the version inside the Cargo.lock file. + # Like with libadwaita, fetchCargoVendor download the version 0.7.2 but in the lock file specified 0.7.1 and in the toml file specified 0.7. + ./cargo_lock_deps_version.patch + ]; + + passthru = { + updateScript = lib.updateScript { }; + }; + + meta = with lib; { + description = "A backend implementation for xdg-desktop-portal that is using GTK/GNOME/Phosh to provide interfaces that aren't provided by the GTK portal"; + homepage = "https://gitlab.gnome.org/guidog/xdg-desktop-portal-phosh"; + changelog = "https://gitlab.gnome.org/guidog/xdg-desktop-portal-phosh/-/blob/main/NEWS"; + maintainers = with maintainers; [ armelclo ]; + platforms = platforms.linux; + license = licenses.gpl3Only; + }; +}) From 02af430cb107b2f900843f7910c99cdcf718f72a Mon Sep 17 00:00:00 2001 From: Armel Cloarec Date: Thu, 28 Aug 2025 19:10:39 +0200 Subject: [PATCH 003/380] nixos/phosh: add xdg-desktop-portal-phosh add meta.maintainers --- .../services/x11/desktop-managers/phosh.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/phosh.nix b/nixos/modules/services/x11/desktop-managers/phosh.nix index 12118089a1f7..8937a1f8c2bd 100644 --- a/nixos/modules/services/x11/desktop-managers/phosh.nix +++ b/nixos/modules/services/x11/desktop-managers/phosh.nix @@ -145,6 +145,11 @@ let in { + + meta = { + maintainers = with lib.maintainers; [ armelclo ]; + }; + options = { services.xserver.desktopManager.phosh = { enable = lib.mkOption { @@ -224,6 +229,16 @@ in }; }; + xdg.portal = { + enable = true; + extraPortals = [ + pkgs.xdg-desktop-portal-phosh + pkgs.xdg-desktop-portal-gnome + pkgs.xdg-desktop-portal-gtk + ]; + configPackages = lib.mkDefault [ pkgs.phosh ]; + }; + environment.systemPackages = [ pkgs.phoc cfg.package From ee9f1c437d4a2c3667d0803646a0d7efd3198869 Mon Sep 17 00:00:00 2001 From: benaryorg Date: Fri, 29 Aug 2025 13:15:35 +0000 Subject: [PATCH 004/380] nixos/display-managers: phosh on tty1 As #428972 was merged this seems to be the correct setting for *phosh*. Specifically when using *mobile-nixos* this will fix issues of some devices (Lenovo Krane and Pinephone) not switching to *phosh* on startup (as they will remain on *tty1*). Signed-off-by: benaryorg --- nixos/modules/services/x11/desktop-managers/phosh.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/phosh.nix b/nixos/modules/services/x11/desktop-managers/phosh.nix index 12118089a1f7..2a05a37bea05 100644 --- a/nixos/modules/services/x11/desktop-managers/phosh.nix +++ b/nixos/modules/services/x11/desktop-managers/phosh.nix @@ -183,8 +183,11 @@ in config = lib.mkIf cfg.enable { # Inspired by https://gitlab.gnome.org/World/Phosh/phosh/-/blob/main/data/phosh.service + # Parts taken from nixos/modules/services/wayland/cage.nix systemd.services.phosh = { wantedBy = [ "graphical.target" ]; + after = [ "getty@tty1.service" ]; + conflicts = [ "getty@tty1.service" ]; serviceConfig = { ExecStart = "${cfg.package}/bin/phosh-session"; User = cfg.user; @@ -193,7 +196,7 @@ in WorkingDirectory = "~"; Restart = "always"; - TTYPath = "/dev/tty7"; + TTYPath = "/dev/tty1"; TTYReset = "yes"; TTYVHangup = "yes"; TTYVTDisallocate = "yes"; @@ -204,7 +207,7 @@ in StandardError = "journal"; # Log this user with utmp, letting it show up with commands 'w' and 'who'. - UtmpIdentifier = "tty7"; + UtmpIdentifier = "tty1"; UtmpMode = "user"; }; environment = { From 3b2a2eb1ce94241744d81efc98e75f8c2d8cc048 Mon Sep 17 00:00:00 2001 From: nat Date: Mon, 8 Sep 2025 19:15:28 +0200 Subject: [PATCH 005/380] limine: disable zerocallusedregs on loongarch64/riscv64 --- pkgs/by-name/li/limine/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 0307263a1e47..70e48f53de7e 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -23,6 +23,13 @@ let || (if targets == [ ] then stdenv.hostPlatform.isx86_64 else (builtins.elem "x86_64" targets)) || enableAll; + missingZerocallusedregs = + ( + if targets == [ ] then stdenv.hostPlatform.isLoongArch64 else (builtins.elem "loongarch64" targets) + ) + || (if targets == [ ] then stdenv.hostPlatform.isRiscV64 else (builtins.elem "riscv64" targets)) + || enableAll; + biosSupport' = biosSupport && hasX86; pxeSupport' = pxeSupport && hasX86; @@ -54,6 +61,10 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; + hardeningDisable = lib.optionals missingZerocallusedregs [ + "zerocallusedregs" + ]; + nativeBuildInputs = [ llvmPackages.libllvm llvmPackages.lld From b271bdef87f909ac437f3cc72aceed20198f23b3 Mon Sep 17 00:00:00 2001 From: nat Date: Mon, 8 Sep 2025 20:42:15 +0200 Subject: [PATCH 006/380] limine-full: init --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07f506fc4427..6de489a18584 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3329,6 +3329,8 @@ with pkgs; gtk3 = if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3; }; + limine-full = limine.override { enableAll = true; }; + liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { ffmpeg = ffmpeg_6-full; ocamlPackages = ocaml-ng.ocamlPackages_4_14; From d87ec61ac2f680e60a00118552e68d186ddf7081 Mon Sep 17 00:00:00 2001 From: Quozlet Date: Tue, 9 Sep 2025 03:54:14 +0000 Subject: [PATCH 007/380] bazel_7: fix bazelBootstrap hash mismatch from prior version bump --- pkgs/by-name/ba/bazel_7/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ba/bazel_7/package.nix b/pkgs/by-name/ba/bazel_7/package.nix index 539b563e10aa..7952a07757c8 100644 --- a/pkgs/by-name/ba/bazel_7/package.nix +++ b/pkgs/by-name/ba/bazel_7/package.nix @@ -108,23 +108,23 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-x86_64"; - hash = "sha256-CYL1paAtzTbfl7TfsqwJry/dkoTO/yZdHrX0NSA1+Ig="; + hash = "sha256-94KFvsS7fInXFTQZPzMq6DxnHQrRktljwACyAz8adSw="; } else if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-arm64"; - hash = "sha256-6DzTEx218/Qq38eMWvXOX/t9VJDyPczz6Edh4eHdOfg="; + hash = "sha256-wfuZLSHa77wr0A4ZLF5DqH7qyOljYNXM2a5imoS+nGQ"; } else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-x86_64"; - hash = "sha256-Ut00wXzJezqlvf49RcTjk4Im8j3Qv7R77t1iWpU/HwU="; + hash = "sha256-qAb9s6R5+EbqVfWHUT7sk1sOrbDEPv4EhgXH7nC46Zw="; } else fetchurl { # stdenv.hostPlatform.system == "aarch64-darwin" url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-arm64"; - hash = "sha256-ArEXuX0JIa5NT04R0n4sCTA4HfQW43NDXV0EGcaibyQ="; + hash = "sha256-4bRp4OvkRIvhpZ2r/eFJdwrByECHy3rncDEM1tClFYo="; }; nativeBuildInputs = defaultShellUtils; From e01473b65d80497b62abc9b05268420f32faea33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Sad=C5=82ocha?= Date: Sat, 13 Sep 2025 22:47:40 +0100 Subject: [PATCH 008/380] taskwarrior2: add Necior to maintainers --- pkgs/by-name/ta/taskwarrior2/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ta/taskwarrior2/package.nix b/pkgs/by-name/ta/taskwarrior2/package.nix index db6eed2e2081..7cfe1b650b40 100644 --- a/pkgs/by-name/ta/taskwarrior2/package.nix +++ b/pkgs/by-name/ta/taskwarrior2/package.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ marcweber oxalica + Necior ]; mainProgram = "task"; platforms = platforms.unix; From c5cb903e37dd55fdd406b2791ac64cff42d1adfa Mon Sep 17 00:00:00 2001 From: polyfloyd Date: Tue, 16 Sep 2025 18:07:35 +0200 Subject: [PATCH 009/380] ycm-cmake-modules: init at 0.18.4 --- pkgs/by-name/yc/ycm-cmake-modules/package.nix | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/yc/ycm-cmake-modules/package.nix diff --git a/pkgs/by-name/yc/ycm-cmake-modules/package.nix b/pkgs/by-name/yc/ycm-cmake-modules/package.nix new file mode 100644 index 000000000000..8c532b714969 --- /dev/null +++ b/pkgs/by-name/yc/ycm-cmake-modules/package.nix @@ -0,0 +1,30 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + nix-update-script, +}: + +stdenv.mkDerivation rec { + pname = "ycm-cmake-modules"; + version = "0.18.4"; + src = fetchFromGitHub { + owner = "robotology"; + repo = "ycm-cmake-modules"; + rev = "v${version}"; + hash = "sha256-Xmc23r3hmwg9v620KGfUV/s7feJUVVZD1OaT3TAQBBY="; + }; + + nativeBuildInputs = [ cmake ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Collection of various useful CMake modules"; + homepage = "https://robotology.github.io/ycm-cmake-modules/gh-pages/latest/index.html"; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = [ ]; + }; +} From 7e425ae380942647568280db688c645259d889ec Mon Sep 17 00:00:00 2001 From: polyfloyd Date: Tue, 16 Sep 2025 18:07:54 +0200 Subject: [PATCH 010/380] yarp: 2.3.70.2 -> 3.12.1 --- .../by-name/ya/yarp/0001-format-security.patch | 13 +++++++++++++ pkgs/by-name/ya/yarp/package.nix | 18 +++++++++++++++--- 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 pkgs/by-name/ya/yarp/0001-format-security.patch diff --git a/pkgs/by-name/ya/yarp/0001-format-security.patch b/pkgs/by-name/ya/yarp/0001-format-security.patch new file mode 100644 index 000000000000..dc5e55f8712e --- /dev/null +++ b/pkgs/by-name/ya/yarp/0001-format-security.patch @@ -0,0 +1,13 @@ +diff --git i/src/libYARP_companion/src/yarp/companion/impl/Companion.cmdSplit.cpp w/src/libYARP_companion/src/yarp/companion/impl/Companion.cmdSplit.cpp +index a9024cb03..f4860ac62 100644 +--- i/src/libYARP_companion/src/yarp/companion/impl/Companion.cmdSplit.cpp ++++ w/src/libYARP_companion/src/yarp/companion/impl/Companion.cmdSplit.cpp +@@ -111,7 +111,7 @@ int Companion::cmdSplit(int argc, char *argv[]) + inData->mutex.unlock(); + if (siz != 0) + { +- yCInfo(COMPANION, std::string("Received a Bottle of "+std::to_string(siz)+" elements.").c_str()); ++ yCInfo(COMPANION, "Received a Bottle of %z elements.", siz); + outPort = new BufferedPort [siz]; + for (size_t i = 0; i < siz; i++) + { diff --git a/pkgs/by-name/ya/yarp/package.nix b/pkgs/by-name/ya/yarp/package.nix index f14e40f931fa..71ef9b5dfc53 100644 --- a/pkgs/by-name/ya/yarp/package.nix +++ b/pkgs/by-name/ya/yarp/package.nix @@ -4,20 +4,30 @@ fetchFromGitHub, cmake, ace, + ycm-cmake-modules, + nix-update-script, }: stdenv.mkDerivation rec { pname = "yarp"; - version = "2.3.70.2"; + version = "3.12.1"; src = fetchFromGitHub { owner = "robotology"; repo = "yarp"; rev = "v${version}"; - sha256 = "0mphh899niy30xbjjwi9xpsliq8mladfldbbbjfngdrqfhiray1a"; + hash = "sha256-6PyXMEUh0ENsRjbsXbwDr4ZqAulw8rgY5G0l/RewWys="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ ace ]; + buildInputs = [ + ace + ycm-cmake-modules + ]; + + patches = [ + # Weird string interpolation causes compilation to fail due to -Wformat-security. + ./0001-format-security.patch + ]; cmakeFlags = [ "-DYARP_COMPILE_UNMAINTAINED:BOOL=ON" @@ -28,6 +38,8 @@ stdenv.mkDerivation rec { postInstall = "mv ./$out/lib/*.so $out/lib/"; + passthru.updateScript = nix-update-script { }; + meta = { description = "Yet Another Robot Platform"; homepage = "http://yarp.it"; From 0b24b2e6d9b47e09601485be7b9e2756421adbf6 Mon Sep 17 00:00:00 2001 From: griffi-gh Date: Wed, 25 Jun 2025 22:49:37 +0200 Subject: [PATCH 011/380] pixieditor: init at 2.0.1.14 --- pkgs/by-name/pi/pixieditor/deps.json | 937 ++++++++++++++++++++++++ pkgs/by-name/pi/pixieditor/mimeinfo.xml | 7 + pkgs/by-name/pi/pixieditor/package.nix | 182 +++++ 3 files changed, 1126 insertions(+) create mode 100644 pkgs/by-name/pi/pixieditor/deps.json create mode 100644 pkgs/by-name/pi/pixieditor/mimeinfo.xml create mode 100644 pkgs/by-name/pi/pixieditor/package.nix diff --git a/pkgs/by-name/pi/pixieditor/deps.json b/pkgs/by-name/pi/pixieditor/deps.json new file mode 100644 index 000000000000..70c2bca2941e --- /dev/null +++ b/pkgs/by-name/pi/pixieditor/deps.json @@ -0,0 +1,937 @@ +[ + { + "pname": "AsyncImageLoader.Avalonia", + "version": "3.3.0", + "hash": "sha256-blhfKI+vX+ojT2cOvSHu3Kp2CuxvhW/l+as88Dia4bA=" + }, + { + "pname": "Avalonia", + "version": "11.3.0", + "hash": "sha256-Hot4dWkrP5x+JzaP2/7E1QOOiXfPGhkvK1nzBacHvzg=" + }, + { + "pname": "Avalonia.Angle.Windows.Natives", + "version": "2.1.22045.20230930", + "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc=" + }, + { + "pname": "Avalonia.BuildServices", + "version": "0.0.31", + "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA=" + }, + { + "pname": "Avalonia.Controls.ColorPicker", + "version": "11.3.0", + "hash": "sha256-ee3iLrn8OdWH6Mg01p93wYMMCPXS25VM/uZeQWEr+k0=" + }, + { + "pname": "Avalonia.Desktop", + "version": "11.3.0", + "hash": "sha256-XZXmsKrYCOEWzFUbnwNKvEz5OCD/1lAPi+wM4BiMB7I=" + }, + { + "pname": "Avalonia.Diagnostics", + "version": "11.3.0", + "hash": "sha256-jO8Fs9kfNGsoZ87zQCxPdn0tyWHcEdgBRIpzkZ0ceM0=" + }, + { + "pname": "Avalonia.FreeDesktop", + "version": "11.3.0", + "hash": "sha256-nWIW3aDPI/00/k52BNU4n43sS3ymuw+e97EBSsjjtU4=" + }, + { + "pname": "Avalonia.Headless", + "version": "11.3.0", + "hash": "sha256-GMO3gnygbeHAwz21v9yIRGOq1Y8mRIPIQW0jeD0fNao=" + }, + { + "pname": "Avalonia.Labs.Lottie", + "version": "11.3.1", + "hash": "sha256-+f1jIirOw9DZSb2Y7ppXYBOuAkZ72MzD/+7rP4xaLAc=" + }, + { + "pname": "Avalonia.Native", + "version": "11.3.0", + "hash": "sha256-l6gcCeGd422mLQgVLp2sxh4/+vZxOPoMrxyfjGyhYLs=" + }, + { + "pname": "Avalonia.Remote.Protocol", + "version": "11.3.0", + "hash": "sha256-7ytabxzTbPLR3vBCCb7Z6dYRZZVvqiDpvxweOYAqi7I=" + }, + { + "pname": "Avalonia.Skia", + "version": "11.3.0", + "hash": "sha256-p+mWsyrYsC9PPhNjOxPZwarGuwmIjxaQ4Ml/2XiEuEc=" + }, + { + "pname": "Avalonia.Themes.Fluent", + "version": "11.3.0", + "hash": "sha256-o5scZcwaflLKXQD6VLGZYe4vvQ322Xzgh7F3IvriMfk=" + }, + { + "pname": "Avalonia.Themes.Simple", + "version": "11.3.0", + "hash": "sha256-F2DMHskmrJw/KqpYLHGEEuQMVP8T4fXgq5q3tfwFqG0=" + }, + { + "pname": "Avalonia.Win32", + "version": "11.3.0", + "hash": "sha256-Ltf6EuL6aIG+YSqOqD/ecdqUDsuwhNuh+XilIn7pmlE=" + }, + { + "pname": "Avalonia.X11", + "version": "11.3.0", + "hash": "sha256-QOprHb0HjsggEMWOW7/U8pqlD8M4m97FeTMWlriYHaU=" + }, + { + "pname": "Avalonia.Xaml.Behaviors", + "version": "11.0.5", + "hash": "sha256-wS0clXNKAG4uy539dUjbrRdzHrdHsloivpY5SEBCNtY=" + }, + { + "pname": "Avalonia.Xaml.Behaviors", + "version": "11.2.0", + "hash": "sha256-I9aELyXkzLGX6T4HUFbCQxn+eWqLLPK0xqEiF+6hi5k=" + }, + { + "pname": "Avalonia.Xaml.Behaviors", + "version": "11.2.0.14", + "hash": "sha256-Ep/IOiZyLDoIKrymqXtFPw2hrXQBpu8Dn+4YZ3/3Z4I=" + }, + { + "pname": "Avalonia.Xaml.Interactions", + "version": "11.0.5", + "hash": "sha256-s/o0416K/nZkVWcNPuKbqmwLKhWsMeEds/dT85QOp4c=" + }, + { + "pname": "Avalonia.Xaml.Interactions", + "version": "11.2.0", + "hash": "sha256-Wnt4xra+TPRiAJ5TIyefwkRxxA999THBstm8QuLXZlU=" + }, + { + "pname": "Avalonia.Xaml.Interactions", + "version": "11.2.0.14", + "hash": "sha256-7bk1zc2hZdTg+Y7LaDSb1CmL6yv0GeZAWKh3gf9bVm8=" + }, + { + "pname": "Avalonia.Xaml.Interactions.Custom", + "version": "11.0.5", + "hash": "sha256-0HVVQTHD+D4q4IYjMJ6H90mMefBLr5pSKDy7JMq10cE=" + }, + { + "pname": "Avalonia.Xaml.Interactions.Custom", + "version": "11.2.0", + "hash": "sha256-vLOTOHwy7RRrgrYFUetAIWSC+Pm6yxzb3Ko2BPtXGUo=" + }, + { + "pname": "Avalonia.Xaml.Interactions.Custom", + "version": "11.2.0.14", + "hash": "sha256-RSIczkm9V/fKoOavXJQd931b9r/GBvuz0hR4HD6Wgd4=" + }, + { + "pname": "Avalonia.Xaml.Interactions.DragAndDrop", + "version": "11.0.5", + "hash": "sha256-iwchyONRjTbSSNxaGROeM62RL964KCs0fWz6VIO4O/k=" + }, + { + "pname": "Avalonia.Xaml.Interactions.DragAndDrop", + "version": "11.2.0", + "hash": "sha256-rAHnjsMnaZCf+dMWe3fZAsnwY2LKFJuTVzsyNzWnh2Q=" + }, + { + "pname": "Avalonia.Xaml.Interactions.DragAndDrop", + "version": "11.2.0.14", + "hash": "sha256-kRx4GMzoHZULJoUUptt9Xa7+UFYoiirI+wE6JuBBklc=" + }, + { + "pname": "Avalonia.Xaml.Interactions.Draggable", + "version": "11.0.5", + "hash": "sha256-C8acIjqy8Akf1ZFVLBq+wKuGaP8YOlKEa+e2RaowKak=" + }, + { + "pname": "Avalonia.Xaml.Interactions.Draggable", + "version": "11.2.0", + "hash": "sha256-WI3JZm+IuKpdlhw1XpgPXJs+e9P97l0odSHPM8SSrqw=" + }, + { + "pname": "Avalonia.Xaml.Interactions.Draggable", + "version": "11.2.0.14", + "hash": "sha256-ywaaUhDqj+yHJjnRPCu3HXYr/sSPrrlwiqN30vYqRLk=" + }, + { + "pname": "Avalonia.Xaml.Interactions.Events", + "version": "11.0.5", + "hash": "sha256-NbG4wOT5d4z6OkGMLdB7pZrRcu0BOK5PBGZ098iE3IU=" + }, + { + "pname": "Avalonia.Xaml.Interactions.Events", + "version": "11.2.0", + "hash": "sha256-z1DGsetBjrzTP1pLWSqP748bl6tDWWOUlvuPc7WHb1k=" + }, + { + "pname": "Avalonia.Xaml.Interactions.Events", + "version": "11.2.0.14", + "hash": "sha256-CE7nh1ld747CGoPYiu4KlQxwP9yiG9/OMHwq8GpL0so=" + }, + { + "pname": "Avalonia.Xaml.Interactions.Reactive", + "version": "11.0.5", + "hash": "sha256-zrbr7MW+3LOyhIMi5VB8YRfr19vyWtcaxwqXjbkTDAA=" + }, + { + "pname": "Avalonia.Xaml.Interactions.Responsive", + "version": "11.0.5", + "hash": "sha256-TfcYEdLMxYffBcBzcyoKWESrQltozigJKx+CLNCMz08=" + }, + { + "pname": "Avalonia.Xaml.Interactions.Responsive", + "version": "11.2.0", + "hash": "sha256-V1YHBrPEKBgHYmEdhWmzz7NOSwExYMaz3J0N0s53Gl0=" + }, + { + "pname": "Avalonia.Xaml.Interactions.Responsive", + "version": "11.2.0.14", + "hash": "sha256-vyc/HXfDAEi1AbAwkphrlVpckrM5ykptXYp/l5ul8VQ=" + }, + { + "pname": "Avalonia.Xaml.Interactivity", + "version": "11.0.5", + "hash": "sha256-nNoI2rxJBFuYs1lg3O3rXeigJWoGjzGWdU8jsWGz7+4=" + }, + { + "pname": "Avalonia.Xaml.Interactivity", + "version": "11.2.0", + "hash": "sha256-N3maAwWG//4uHAEvux0/BwanQLviMm7uo6jxIj4kB8s=" + }, + { + "pname": "Avalonia.Xaml.Interactivity", + "version": "11.2.0.14", + "hash": "sha256-SZIVuXdT1PN3zBCpVv3F6Y5vaOp8CTsq0/HVHXrbc6Y=" + }, + { + "pname": "BmpSharp", + "version": "0.2.0", + "hash": "sha256-uUNpbOmeiOOkX5TQauqEF3yTo4puGh7/vgTTb7Eyg9s=" + }, + { + "pname": "ByteSize", + "version": "2.1.2", + "hash": "sha256-qAxJsWRRedraGr0VzvDEpzAWCZfwkMvcsC4WBEh+q6g=" + }, + { + "pname": "CLSEncoderDecoder", + "version": "1.0.0", + "hash": "sha256-RSfmfqUn+abzArefdWNT5pIS4hvMEa2abnrhnrKGiPk=" + }, + { + "pname": "CommunityToolkit.HighPerformance", + "version": "8.3.2", + "hash": "sha256-8wB8IwDi1u8WLxPHd+6cyAbhGUr1oSi1juULE1crSQc=" + }, + { + "pname": "CommunityToolkit.Mvvm", + "version": "8.4.0", + "hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI=" + }, + { + "pname": "DeviceId", + "version": "6.9.0", + "hash": "sha256-TZjWLotGLchmhvESXa4A0eUqKCPT89aXmqY7smc952I=" + }, + { + "pname": "DeviceId.Linux", + "version": "6.9.0", + "hash": "sha256-MwPAPFD/gs9WZ8gB5BQMEwYswd3EEIpLlvMN5vmz1Wc=" + }, + { + "pname": "DiscordRichPresence", + "version": "1.3.0.28", + "hash": "sha256-KdwSl5ysunAbC21cXRrSROO2XN/ZscIVdq6+IH+5Fbs=" + }, + { + "pname": "ExCSS", + "version": "4.3.0", + "hash": "sha256-7QGbwOlT1EEkgUULKWSJO3H8BzvV4KP/mUZE/9/3r6M=" + }, + { + "pname": "ExCSS", + "version": "4.3.1", + "hash": "sha256-nNn5+YEaqKSULhtDsImNEyndU/MHna7VpZNUExmo80o=" + }, + { + "pname": "FFMpegCore", + "version": "5.1.0", + "hash": "sha256-k6AOQjAAWiZI0g7wr32z+0kb48gfcQ1n2XhK4TL53xA=" + }, + { + "pname": "Hardware.Info", + "version": "101.0.1.1", + "hash": "sha256-Bjztcg1xtZFL+3BafHAS1PWelDLc1XTQjeyr69pO7dA=" + }, + { + "pname": "HarfBuzzSharp", + "version": "7.3.0.3", + "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM=" + }, + { + "pname": "HarfBuzzSharp", + "version": "8.3.0.1", + "hash": "sha256-ZQwyxpI6jB804Z3d1JAhLqyHIu42fo6mpmk5GVFbEzk=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Linux", + "version": "7.3.0.3", + "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.macOS", + "version": "7.3.0.3", + "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.macOS", + "version": "8.3.0.1", + "hash": "sha256-bpow26ydfzv9w6XCtZOcsGqMUVcfmvnIo5qPqtl9NQo=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", + "version": "7.3.0.3", + "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Win32", + "version": "7.3.0.3", + "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Win32", + "version": "8.3.0.1", + "hash": "sha256-2+FA4EfAQ68q1nJlXUuqDcETwIA+6OvD0DB/lMnbKVY=" + }, + { + "pname": "Humanizer.Core", + "version": "2.14.1", + "hash": "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o=" + }, + { + "pname": "Instances", + "version": "3.0.0", + "hash": "sha256-tqIbgABsgi8JgT5h+WkCehANUmCzK5/p0UZH5xjOy2Y=" + }, + { + "pname": "MessagePack", + "version": "2.5.192", + "hash": "sha256-M9QUEAIeSoSgO3whVkOou0F8kbKCNJ7HHAvTZgytkPU=" + }, + { + "pname": "MessagePack.Annotations", + "version": "2.5.192", + "hash": "sha256-DLtncnaQ9Sp5YmWm89+2w3InhdU1ZQxnJgbonAq/1aM=" + }, + { + "pname": "MessagePackAnalyzer", + "version": "2.5.192", + "hash": "sha256-4JU8K72WUCW26IcrustOCBotEGqjspnjgEZcJF3ZCl4=" + }, + { + "pname": "MicroCom.Runtime", + "version": "0.11.0", + "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=" + }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "6.0.0", + "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" + }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "8.0.0", + "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw=" + }, + { + "pname": "Microsoft.Bcl.HashCode", + "version": "6.0.0", + "hash": "sha256-87myurC/jMcX1f32167j7FTjbZ6FvUE0esrhYTGcvWs=" + }, + { + "pname": "Microsoft.CodeAnalysis.Analyzers", + "version": "3.11.0", + "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw=" + }, + { + "pname": "Microsoft.CodeAnalysis.Analyzers", + "version": "3.3.4", + "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE=" + }, + { + "pname": "Microsoft.CodeAnalysis.AnalyzerUtilities", + "version": "3.3.0", + "hash": "sha256-nzFs+H0FFEgZzjl/bcmWyQQVKS2PncS6kMYHOqrxXSw=" + }, + { + "pname": "Microsoft.CodeAnalysis.Common", + "version": "4.11.0", + "hash": "sha256-cX/xgM0VmS+Bsu63KZk2ofjFOOy1mzI+CCVEY6kI+Qk=" + }, + { + "pname": "Microsoft.CodeAnalysis.Common", + "version": "4.14.0", + "hash": "sha256-ne/zxH3GqoGB4OemnE8oJElG5mai+/67ASaKqwmL2BE=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp", + "version": "4.11.0", + "hash": "sha256-E9jEOjp9g/CFecsc5/QfRKOPXMRpSw0Tf79XsRgL+Mk=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp", + "version": "4.14.0", + "hash": "sha256-5Mzj3XkYYLkwDWh17r1NEXSbXwwWYQPiOmkSMlgo1JY=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp.Features", + "version": "4.11.0", + "hash": "sha256-/rQzc9HHR6h02Dm9rPsBlQyztgt4itmbTFOMV8rgWfc=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces", + "version": "4.11.0", + "hash": "sha256-A3hmUJzaqRcWndwGKCHXt3in9T5GeV6ypl/ka8dDQr0=" + }, + { + "pname": "Microsoft.CodeAnalysis.Elfie", + "version": "1.0.0", + "hash": "sha256-E/+PlegvWZ59e5Ti3TvKJBLa3qCnDKmi7+DcnOo1ufg=" + }, + { + "pname": "Microsoft.CodeAnalysis.Features", + "version": "4.11.0", + "hash": "sha256-W/R3JVuWfTTcW/GZjJzdTyxZVZpk1dAgaJPz+UGcgyU=" + }, + { + "pname": "Microsoft.CodeAnalysis.Scripting.Common", + "version": "4.11.0", + "hash": "sha256-2JC9TipfoAQ1ug4i+PexZemJHFhjnFNv/FqjBIsV6J0=" + }, + { + "pname": "Microsoft.CodeAnalysis.Workspaces.Common", + "version": "4.11.0", + "hash": "sha256-8+HxGPWrxOsvqFBnx4rrNQRDfeLbPU7DGcQYyNMq/pE=" + }, + { + "pname": "Microsoft.CSharp", + "version": "4.7.0", + "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" + }, + { + "pname": "Microsoft.DiaSymReader", + "version": "2.0.0", + "hash": "sha256-8hotZmh8Rb6Q6oD9Meb74SvAdbDo39Y/1m8h43HHjjw=" + }, + { + "pname": "Microsoft.DotNet.PlatformAbstractions", + "version": "3.1.6", + "hash": "sha256-RfM2qXiqdiamPkXr4IDkNc0IZSF9iTZv4uou/E7zNS0=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection", + "version": "9.0.0", + "hash": "sha256-dAH52PPlTLn7X+1aI/7npdrDzMEFPMXRv4isV1a+14k=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "9.0.0", + "hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c=" + }, + { + "pname": "Microsoft.Extensions.DependencyModel", + "version": "8.0.0", + "hash": "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo=" + }, + { + "pname": "Microsoft.NET.StringTools", + "version": "17.6.3", + "hash": "sha256-H2Qw8x47WyFOd/VmgRmGMc+uXySgUv68UISgK8Frsjw=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "2.0.0", + "hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "5.0.0", + "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" + }, + { + "pname": "Microsoft.Win32.Registry", + "version": "4.5.0", + "hash": "sha256-WMBXsIb0DgPFPaFkNVxY9b9vcMxPqtgFgijKYMJfV/0=" + }, + { + "pname": "Microsoft.Win32.Registry", + "version": "5.0.0", + "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" + }, + { + "pname": "NETStandard.Library", + "version": "2.0.3", + "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=" + }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.3", + "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" + }, + { + "pname": "OneOf", + "version": "3.0.271", + "hash": "sha256-tFWy8Jg/XVJfVOddjXeCAizq/AUljJrq6J8PF6ArYSU=" + }, + { + "pname": "protobuf-net", + "version": "3.2.52", + "hash": "sha256-phXeroBt5KbHYkApkkMa0mRCVkDY+dtOOXXNY+i50Ek=" + }, + { + "pname": "protobuf-net.Core", + "version": "3.2.52", + "hash": "sha256-/9Jj26tuSKeYJb9udwew5i5EVvaoeNu/vBCKS0VhSQQ=" + }, + { + "pname": "Qoi.NetStandard", + "version": "1.0.0", + "hash": "sha256-pjJUeRSKaU7NdFwi0gHfmRJUodzgUB4Amz8ERQso+nY=" + }, + { + "pname": "ShimSkiaSharp", + "version": "3.0.3", + "hash": "sha256-Nngzb1buTzSYvNBS5TUOiJcN71ySM8i6HrPskLEQttM=" + }, + { + "pname": "ShimSkiaSharp", + "version": "3.0.5", + "hash": "sha256-sjVmij064B96wC00JfTW9wsrK0/Uh1ewwvcw1qXxFMo=" + }, + { + "pname": "Silk.NET.Core", + "version": "2.22.0", + "hash": "sha256-1aBiBwifLel9aaGI97gxbvID/XKbFm1dpVv2zm0NSEc=" + }, + { + "pname": "Silk.NET.Maths", + "version": "2.22.0", + "hash": "sha256-wBydHf4R69A3dm8SnD82zjBd5QgwXbmipRqXtk+AjpE=" + }, + { + "pname": "Silk.NET.OpenGL", + "version": "2.22.0", + "hash": "sha256-1XWABfBzsSg1nJzbDJ/FH140WLzjpuNTxDHNZfV85xo=" + }, + { + "pname": "Silk.NET.Vulkan", + "version": "2.22.0", + "hash": "sha256-TxCjv6Q35PrJTs0SkiE1srJNZf1yh9k98Gfx8DWSWjY=" + }, + { + "pname": "Silk.NET.Vulkan.Extensions.EXT", + "version": "2.22.0", + "hash": "sha256-spbTFm5wHbVZqMNvAih6wexeZs61B8kbX4sKYSe5Syk=" + }, + { + "pname": "Silk.NET.Vulkan.Extensions.KHR", + "version": "2.22.0", + "hash": "sha256-aXgS8UxYlfBIrxmoAOuy6Z3NZuV+ruSibQPvLO1wL/U=" + }, + { + "pname": "SkiaSharp", + "version": "2.88.8", + "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A=" + }, + { + "pname": "SkiaSharp", + "version": "2.88.9", + "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24=" + }, + { + "pname": "SkiaSharp", + "version": "3.116.1", + "hash": "sha256-EQW/zjk+GsJbpJ3zqyGARh3oHep8XgneWXcSTNnYwuk=" + }, + { + "pname": "SkiaSharp", + "version": "3.118.0-preview.1.2", + "hash": "sha256-3vy6mQ11MqelRv6j1eGJKkNgLkr/geT99m75xiYrVbM=" + }, + { + "pname": "SkiaSharp", + "version": "3.119.0", + "hash": "sha256-G6T0E4Wl9NW9m/9HW1Rppuxs5icp04uvqkY+Ju/vvzM=" + }, + { + "pname": "SkiaSharp.HarfBuzz", + "version": "3.116.1", + "hash": "sha256-GYu9itkxAJUmj7Z4etHGUvPLdtdNr+y0mcUauArRnhE=" + }, + { + "pname": "SkiaSharp.NativeAssets.Linux", + "version": "2.88.9", + "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A=" + }, + { + "pname": "SkiaSharp.NativeAssets.Linux", + "version": "3.119.0", + "hash": "sha256-ysHXGJeui4uji6bSBIzpqMRfKJXqj/08Zd0MIBeQH3s=" + }, + { + "pname": "SkiaSharp.NativeAssets.macOS", + "version": "2.88.8", + "hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI=" + }, + { + "pname": "SkiaSharp.NativeAssets.macOS", + "version": "2.88.9", + "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g=" + }, + { + "pname": "SkiaSharp.NativeAssets.macOS", + "version": "3.116.1", + "hash": "sha256-GntlOA+Blrh43l97gHP7sZl4HY0+Hx84xId3+YTXLCE=" + }, + { + "pname": "SkiaSharp.NativeAssets.macOS", + "version": "3.118.0-preview.1.2", + "hash": "sha256-Cgf2xL9Zmib61u+IBDSivMiTr0QjB6t6nZp9npNS5f8=" + }, + { + "pname": "SkiaSharp.NativeAssets.macOS", + "version": "3.119.0", + "hash": "sha256-BPkQ5hSDK4Nal36+31AAApEbDH+FdwZik5W22vYmVDI=" + }, + { + "pname": "SkiaSharp.NativeAssets.WebAssembly", + "version": "2.88.9", + "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY=" + }, + { + "pname": "SkiaSharp.NativeAssets.WebAssembly", + "version": "3.119.0", + "hash": "sha256-bEWnEJJZ9E0MD688vOvEusJJRJbgpMCiG9u5Tj/BIkQ=" + }, + { + "pname": "SkiaSharp.NativeAssets.Win32", + "version": "2.88.8", + "hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM=" + }, + { + "pname": "SkiaSharp.NativeAssets.Win32", + "version": "2.88.9", + "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" + }, + { + "pname": "SkiaSharp.NativeAssets.Win32", + "version": "3.116.1", + "hash": "sha256-oraulwAja3vee2T2n9sEveSTVI8/Kvku7r09yXLENI4=" + }, + { + "pname": "SkiaSharp.NativeAssets.Win32", + "version": "3.118.0-preview.1.2", + "hash": "sha256-UWMf4l1D0Q+RkTIQ0Aslf4zsL3XrsbZ15cy4ou42+34=" + }, + { + "pname": "SkiaSharp.NativeAssets.Win32", + "version": "3.119.0", + "hash": "sha256-YltsBRADV7b3qL3/YrgG2GTwJr8PL1STeaimQagSADo=" + }, + { + "pname": "SkiaSharp.Skottie", + "version": "2.88.8", + "hash": "sha256-+ldOojWMQi51wK88msauHBnzNqyRW6RRokF6+yn4nwo=" + }, + { + "pname": "Svg.Controls.Skia.Avalonia", + "version": "11.3.0.1", + "hash": "sha256-e+GW+mFWFvw/Dzhf7xVQnZMCCn1e9Po6XKtHCd11GfY=" + }, + { + "pname": "Svg.Controls.Skia.Avalonia", + "version": "11.3.0.3", + "hash": "sha256-X0Plwm75PMMjlSLV+qr25ye5g9jc93Dv1J7bcNW1m+g=" + }, + { + "pname": "Svg.Custom", + "version": "3.0.3", + "hash": "sha256-faH73+8y0A7p+koyd3Y4CcYI8U/cAbH1X566bMd3dI4=" + }, + { + "pname": "Svg.Custom", + "version": "3.0.5", + "hash": "sha256-OY5wMjwk++n41cRDJIBvsfSjLqLCqU5lwkCWNbqrm9w=" + }, + { + "pname": "Svg.Model", + "version": "3.0.3", + "hash": "sha256-ncQwRRi51A12bpZKjG2ZhaLUJ7MD9ny1lwKUYwr63LE=" + }, + { + "pname": "Svg.Model", + "version": "3.0.5", + "hash": "sha256-QLghW+2QFzAzCLE52oqt+NT/M3LxWFX7GVG6t84Ilw8=" + }, + { + "pname": "Svg.Skia", + "version": "3.0.3", + "hash": "sha256-tQ8a1Gt92IPAXhEY9osBZXUZk2sXM19CWf4zt71mwk8=" + }, + { + "pname": "Svg.Skia", + "version": "3.0.5", + "hash": "sha256-zfmwCIfDJKfFuXAR/fdmdK3xsficRFTIMoaeaBKF2hU=" + }, + { + "pname": "System.Buffers", + "version": "4.5.1", + "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" + }, + { + "pname": "System.Buffers", + "version": "4.6.0", + "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc=" + }, + { + "pname": "System.CodeDom", + "version": "8.0.0", + "hash": "sha256-uwVhi3xcvX7eiOGQi7dRETk3Qx1EfHsUfchZsEto338=" + }, + { + "pname": "System.Collections.Immutable", + "version": "6.0.0", + "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs=" + }, + { + "pname": "System.Collections.Immutable", + "version": "8.0.0", + "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=" + }, + { + "pname": "System.Collections.Immutable", + "version": "9.0.0", + "hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac=" + }, + { + "pname": "System.Composition", + "version": "8.0.0", + "hash": "sha256-rA118MFj6soKN++BvD3y9gXAJf0lZJAtGARuznG5+Xg=" + }, + { + "pname": "System.Composition.AttributedModel", + "version": "8.0.0", + "hash": "sha256-n3aXiBAFIlQicSRLiNtLh++URSUxRBLggsjJ8OMNRpo=" + }, + { + "pname": "System.Composition.Convention", + "version": "8.0.0", + "hash": "sha256-Z9HOAnH1lt1qc38P3Y0qCf5gwBwiLXQD994okcy53IE=" + }, + { + "pname": "System.Composition.Hosting", + "version": "8.0.0", + "hash": "sha256-axKJC71oKiNWKy66TVF/c3yoC81k03XHAWab3mGNbr0=" + }, + { + "pname": "System.Composition.Runtime", + "version": "8.0.0", + "hash": "sha256-AxwZ29+GY0E35Pa255q8AcMnJU52Txr5pBy86t6V1Go=" + }, + { + "pname": "System.Composition.TypedParts", + "version": "8.0.0", + "hash": "sha256-+ZJawThmiYEUNJ+cB9uJK+u/sCAVZarGd5ShZoSifGo=" + }, + { + "pname": "System.Configuration.ConfigurationManager", + "version": "8.0.0", + "hash": "sha256-xhljqSkNQk8DMkEOBSYnn9lzCSEDDq4yO910itptqiE=" + }, + { + "pname": "System.Data.DataSetExtensions", + "version": "4.5.0", + "hash": "sha256-qppO0L8BpI7cgaStqBhn6YJYFjFdSwpXlRih0XFsaT4=" + }, + { + "pname": "System.Diagnostics.EventLog", + "version": "8.0.0", + "hash": "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y=" + }, + { + "pname": "System.Diagnostics.PerformanceCounter", + "version": "8.0.0", + "hash": "sha256-CbTL+orc5YcEJfKbBtr/9p/0rNVVOQPz/fOEaA6Pu5k=" + }, + { + "pname": "System.IO.Pipelines", + "version": "8.0.0", + "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" + }, + { + "pname": "System.IO.Pipelines", + "version": "9.0.3", + "hash": "sha256-JV50VXnofGfL8lB/vNIpJstoBJper9tsXcjNFwGqL68=" + }, + { + "pname": "System.Management", + "version": "8.0.0", + "hash": "sha256-HwpfDb++q7/vxR6q57mGFgl5U0vxy+oRJ6orFKORfP0=" + }, + { + "pname": "System.Memory", + "version": "4.5.5", + "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" + }, + { + "pname": "System.Numerics.Vectors", + "version": "4.4.0", + "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U=" + }, + { + "pname": "System.Numerics.Vectors", + "version": "4.5.0", + "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" + }, + { + "pname": "System.Reactive", + "version": "5.0.0", + "hash": "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE=" + }, + { + "pname": "System.Reactive", + "version": "6.0.0", + "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y=" + }, + { + "pname": "System.Reactive", + "version": "6.0.1", + "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q=" + }, + { + "pname": "System.Reflection.Emit", + "version": "4.7.0", + "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg=" + }, + { + "pname": "System.Reflection.Emit.ILGeneration", + "version": "4.7.0", + "hash": "sha256-GUnQeGo/DtvZVQpFnESGq7lJcjB30/KnDY7Kd2G/ElE=" + }, + { + "pname": "System.Reflection.Emit.Lightweight", + "version": "4.7.0", + "hash": "sha256-V0Wz/UUoNIHdTGS9e1TR89u58zJjo/wPUWw6VaVyclU=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "8.0.0", + "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "9.0.0", + "hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "4.5.3", + "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "6.0.0", + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" + }, + { + "pname": "System.Security.AccessControl", + "version": "4.5.0", + "hash": "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM=" + }, + { + "pname": "System.Security.AccessControl", + "version": "5.0.0", + "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" + }, + { + "pname": "System.Security.Cryptography.ProtectedData", + "version": "8.0.0", + "hash": "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "4.5.0", + "hash": "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "5.0.0", + "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" + }, + { + "pname": "System.Text.Encoding.CodePages", + "version": "7.0.0", + "hash": "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "7.0.0", + "hash": "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "8.0.0", + "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "9.0.3", + "hash": "sha256-ZGRcKnblIdt1fHZ4AehyyWCgM+/1FcZyxoGJFe4K3JE=" + }, + { + "pname": "System.Text.Json", + "version": "7.0.2", + "hash": "sha256-bkfxuc3XPxtYcOJTGRMc/AkJiyIU+fTLK7PxtbuN3sQ=" + }, + { + "pname": "System.Text.Json", + "version": "8.0.0", + "hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow=" + }, + { + "pname": "System.Text.Json", + "version": "9.0.3", + "hash": "sha256-I7z6sRb2XbbXNZ2MyNbn2wysh1P2cnk4v6BM0zucj1w=" + }, + { + "pname": "System.Threading.Channels", + "version": "7.0.0", + "hash": "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.5.4", + "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" + }, + { + "pname": "Tmds.DBus.Protocol", + "version": "0.21.2", + "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI=" + }, + { + "pname": "Wasmtime", + "version": "22.0.0", + "hash": "sha256-Q6NWraxWlVz5p/2rY6d9XZBv/VM6tRG2eCNRpMLAp6A=" + } +] diff --git a/pkgs/by-name/pi/pixieditor/mimeinfo.xml b/pkgs/by-name/pi/pixieditor/mimeinfo.xml new file mode 100644 index 000000000000..b1d0c9aece16 --- /dev/null +++ b/pkgs/by-name/pi/pixieditor/mimeinfo.xml @@ -0,0 +1,7 @@ + + + + PixiEditor project file + + + diff --git a/pkgs/by-name/pi/pixieditor/package.nix b/pkgs/by-name/pi/pixieditor/package.nix new file mode 100644 index 000000000000..a358771d1315 --- /dev/null +++ b/pkgs/by-name/pi/pixieditor/package.nix @@ -0,0 +1,182 @@ +{ + lib, + stdenv, + writeText, + + fetchFromGitHub, + + dotnetCorePackages, + buildDotnetModule, + + ffmpeg-headless, + + vulkan-loader, + openssl, + libGL, + libX11, + libICE, + libSM, + libXi, + libXcursor, + libXext, + libXrandr, + + makeDesktopItem, + copyDesktopItems, +}: +let + inherit (dotnetCorePackages) fetchNupkg; + + buildInfo = { + id = "NixOS"; + name = "for NixOS"; + }; + + appSettings = writeText "appsettings.json" ( + lib.strings.toJSON { + PixiEditorApiUrl = "https://auth.pixieditor.net"; + PixiEditorApiKey = "waIvElX0fPqaxnyD7Rh1SSEvdq8qfKUs"; + AnalyticsUrl = "https://api.pixieditor.net/analytics/"; + } + ); +in +buildDotnetModule (finalAttrs: { + pname = "pixieditor"; + version = "2.0.1.14"; + + src = fetchFromGitHub { + owner = "PixiEditor"; + repo = "PixiEditor"; + tag = finalAttrs.version; + hash = "sha256-wyqt5mpT4xmaTk7RidQOOZAgkgMfcKiz5/7Nle0/Tkg="; + fetchSubmodules = true; + }; + + postPatch = '' + substituteInPlace ./src/PixiEditor/Helpers/VersionHelpers.cs \ + --replace-fail 'builder.Append(" Release Build");' 'builder.Append(" ${buildInfo.name}");' \ + --replace-fail 'return "Release";' 'return "${buildInfo.id}";'; + + substituteInPlace ./src/PixiEditor/Models/ExceptionHandling/CrashReport.cs \ + --replace-fail 'ShellExecute(fileName,' 'ShellExecute("${placeholder "out"}/bin/pixieditor",'; + + rm -rf ./src/PixiEditor.AnimationRenderer.FFmpeg/ThirdParty/{Linux,Macos,Windows}/* + substituteInPlace ./src/PixiEditor.AnimationRenderer.FFmpeg/FFMpegRenderer.cs \ + --replace-fail 'new FFOptions() { BinaryFolder = binaryPath }' 'new FFOptions() { BinaryFolder = "${ffmpeg-headless}/bin" }' \ + --replace-fail 'MakeExecutableIfNeeded(binaryPath);' ' '; + ''; + + nativeBuildInputs = [ + copyDesktopItems + ]; + + buildInputs = [ + (fetchNupkg { + pname = "protobuf-net.protogen"; + version = "3.2.52"; + hash = "sha256-sKVCXtd5qD86D2FOgjMXh37P6IrcmqmaoJregAhLFGY="; + }) + ]; + + nugetDeps = ./deps.json; + linkNugetPackages = true; + + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; + dotnetFlags = + lib.optionals stdenv.hostPlatform.isx86_64 [ "-p:Runtimeidentifier=linux-x64" ] + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "-p:Runtimeidentifier=linux-arm64" ]; + + buildType = "ReleaseNoUpdate"; + projectFile = [ + "src/PixiEditor.Desktop/PixiEditor.Desktop.csproj" + "src/PixiEditor/PixiEditor.csproj" + "src/PixiEditor.Linux/PixiEditor.Linux.csproj" + "src/PixiEditor.Platform.Standalone/PixiEditor.Platform.Standalone.csproj" + ]; + executables = [ "PixiEditor.Desktop" ]; + + runtimeDeps = [ + vulkan-loader + openssl + libGL + libX11 + libICE + libSM + libXi + libXcursor + libXext + libXrandr + ]; + + desktopItems = [ + (makeDesktopItem { + name = "pixieditor"; + type = "Application"; + desktopName = "PixiEditor"; + genericName = "2D Editor"; + comment = finalAttrs.meta.description; + icon = "pixieditor"; + exec = "pixieditor %f"; + tryExec = "pixieditor"; + startupWMClass = "pixieditor"; + terminal = false; + categories = [ + "Graphics" + "2DGraphics" + "RasterGraphics" + "VectorGraphics" + ]; + keywords = [ + "editor" + "image" + "2d" + "graphics" + "design" + "vector" + "raster" + ]; + mimeTypes = [ + "application/x-pixieditor" + ]; + extraConfig.SingleMainWindow = "true"; + }) + ]; + + postConfigure = '' + dotnet build -t:InstallProtogen \ + src/PixiEditor.Extensions.CommonApi/PixiEditor.Extensions.CommonApi.csproj + ''; + + postInstall = '' + install -Dm644 ${appSettings} $out/lib/pixieditor/appsettings.json; + + install -Dm644 ${./mimeinfo.xml} $out/share/mime/packages/pixieditor.xml; + + install -Dm644 src/PixiEditor/Images/PixiEditorLogo.svg \ + $out/share/icons/hicolor/scalable/apps/pixieditor.svg; + ''; + + postFixup = '' + mv $out/bin/PixiEditor.Desktop $out/bin/pixieditor + ''; + + meta = { + description = "Universal editor for all your 2D needs"; + longDescription = '' + PixiEditor is a universal 2D platform that aims to provide you with tools and features for all your 2D needs. + Create beautiful sprites for your games, animations, edit images, create logos. All packed in an eye-friendly dark theme + ''; + homepage = "https://pixieditor.com"; + changelog = "https://github.com/PixiEditor/PixiEditor/releases/tag/${finalAttrs.version}"; + mainProgram = "pixieditor"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ + griffi-gh + ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + }; +}) From 6159eb1078a0f9e7140000f9013481431946132a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Sep 2025 22:42:48 +0000 Subject: [PATCH 012/380] python3Packages.harlequin-postgres: 1.2.0 -> 1.2.2 --- .../development/python-modules/harlequin-postgres/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/harlequin-postgres/default.nix b/pkgs/development/python-modules/harlequin-postgres/default.nix index 28e59ce21a18..baa1d0d4b343 100644 --- a/pkgs/development/python-modules/harlequin-postgres/default.nix +++ b/pkgs/development/python-modules/harlequin-postgres/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "harlequin-postgres"; - version = "1.2.0"; + version = "1.2.2"; pyproject = true; src = fetchPypi { pname = "harlequin_postgres"; inherit version; - hash = "sha256-9US0aaXP2F+UVM9pY43KpnB05KC0/uDxrpZAYOJ+RR0="; + hash = "sha256-u/x8Jx1yfUtFSYX6oyvOZJmdPWbaOkFn3OGQdqxyK8A="; }; build-system = [ From 12146213adac15f7afe9c69cb41e0a7e48c5aff0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Sep 2025 14:20:23 +0000 Subject: [PATCH 013/380] heroku: 10.13.1 -> 10.13.2 --- pkgs/by-name/he/heroku/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/he/heroku/package.nix b/pkgs/by-name/he/heroku/package.nix index 15210e20587f..d9e80ea96bcd 100644 --- a/pkgs/by-name/he/heroku/package.nix +++ b/pkgs/by-name/he/heroku/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation { pname = "heroku"; - version = "10.13.1"; + version = "10.13.2"; src = fetchzip { - url = "https://cli-assets.heroku.com/versions/10.13.1/cf943a6/heroku-v10.13.1-cf943a6-linux-x64.tar.xz"; - hash = "sha256-2nxM1XE+gvIUoA/AQLXt73V+ZM+WP245qAkGilnCqMk="; + url = "https://cli-assets.heroku.com/versions/10.13.2/82c0564/heroku-v10.13.2-82c0564-linux-x64.tar.xz"; + hash = "sha256-JfaOnVaN60MG4dDJ8IdmRucfCIb9EtWdJy+90fG6zuw="; }; nativeBuildInputs = [ makeWrapper ]; From 045280cef58e6e9765004392500fcca16c124bad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Sep 2025 19:38:14 +0000 Subject: [PATCH 014/380] manifest-tool: 2.2.0 -> 2.2.1 --- pkgs/by-name/ma/manifest-tool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/manifest-tool/package.nix b/pkgs/by-name/ma/manifest-tool/package.nix index a9ef6eb830b9..71190b146eba 100644 --- a/pkgs/by-name/ma/manifest-tool/package.nix +++ b/pkgs/by-name/ma/manifest-tool/package.nix @@ -10,14 +10,14 @@ buildGoModule rec { pname = "manifest-tool"; - version = "2.2.0"; + version = "2.2.1"; modRoot = "v2"; src = fetchFromGitHub { owner = "estesp"; repo = "manifest-tool"; tag = "v${version}"; - hash = "sha256-tEUsqrJGRhyirI8TEgG6r9crHX58webHO5v7JLLRQ30="; + hash = "sha256-3Vzeq81zLfJLV1XcnQLixL9+acjIegjspquvMsgtuXg="; leaveDotGit = true; postFetch = '' git -C $out rev-parse HEAD > $out/.git-revision From 6b7e5a5acac9d6a63dbc97e2fbadcea6545383cf Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Thu, 25 Sep 2025 16:28:46 +0200 Subject: [PATCH 015/380] nixos/nginx: remove deprecated vhost option enableSSL The option services.nginx.virtualHost.<...>.enableSSL is deprecated for 8 years [^1]. It causes confusion for people who guess the option and think it's the right one. I think it's time to remove it for good. ^1: https://github.com/NixOS/nixpkgs/commit/a912a6a291eaa5f6a2ad9143c9e276779c357a41 --- .../services/web-servers/nginx/default.nix | 16 ++-------------- .../services/web-servers/nginx/vhost-options.nix | 6 ------ nixos/tests/matrix/conduit.nix | 2 +- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 04495f81c165..3704634512eb 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -324,7 +324,7 @@ let mapAttrsToList ( vhostName: vhost: let - onlySSL = vhost.onlySSL || vhost.enableSSL; + onlySSL = vhost.onlySSL; hasSSL = onlySSL || vhost.addSSL || vhost.forceSSL; # First evaluation of defaultListen based on a set of listen lines. @@ -1324,18 +1324,6 @@ in ]; config = mkIf cfg.enable { - warnings = - let - deprecatedSSL = - name: config: - optional config.enableSSL '' - config.services.nginx.virtualHosts..enableSSL is deprecated, - use config.services.nginx.virtualHosts..onlySSL instead. - ''; - - in - flatten (mapAttrsToList deprecatedSSL virtualHosts); - assertions = let hostOrAliasIsNull = l: l.root == null || l.alias == null; @@ -1352,7 +1340,7 @@ in with host; count id [ addSSL - (onlySSL || enableSSL) + onlySSL forceSSL rejectSSL ] <= 1 diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index 169c443d759a..547a85f5f700 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -170,12 +170,6 @@ with lib; ''; }; - enableSSL = mkOption { - type = types.bool; - visible = false; - default = false; - }; - forceSSL = mkOption { type = types.bool; default = false; diff --git a/nixos/tests/matrix/conduit.nix b/nixos/tests/matrix/conduit.nix index 874e7672812b..02bf00886ba4 100644 --- a/nixos/tests/matrix/conduit.nix +++ b/nixos/tests/matrix/conduit.nix @@ -18,7 +18,7 @@ in virtualHosts.${name} = { enableACME = false; forceSSL = false; - enableSSL = false; + onlySSL = false; locations."/_matrix" = { proxyPass = "http://[::1]:6167"; From a27f1f492e8d02477130d864a2e2d466a3770d02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Sep 2025 20:59:15 +0000 Subject: [PATCH 016/380] vuetorrent: 2.29.0 -> 2.30.1 --- pkgs/by-name/vu/vuetorrent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vu/vuetorrent/package.nix b/pkgs/by-name/vu/vuetorrent/package.nix index b6c61902323d..3d0ba6b09ae5 100644 --- a/pkgs/by-name/vu/vuetorrent/package.nix +++ b/pkgs/by-name/vu/vuetorrent/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "vuetorrent"; - version = "2.29.0"; + version = "2.30.1"; src = fetchFromGitHub { owner = "VueTorrent"; repo = "VueTorrent"; tag = "v${version}"; - hash = "sha256-EnyLMaLElgGUjwxpkhTxV7aVa8l5B5wpBBzg5qyagIQ="; + hash = "sha256-sek5kiO1T7s+PIIa0mBGj+9CfF56eRB3En9tsOcEK5Y="; }; - npmDepsHash = "sha256-JA5nl+otuyloSi7JPRb8ZJe6PRAaYxuuEpqlmLE65yU="; + npmDepsHash = "sha256-vEgwEYVlyTJLOQ8j6hm1O4iTIXNPDZyrmvXyRBgEvQY="; installPhase = '' runHook preInstall From ca8e98d584fbe2365be69e9c693a97eb1defc3ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Sep 2025 00:35:02 +0000 Subject: [PATCH 017/380] mdk: 1.3.0 -> 1.3.1 --- pkgs/by-name/md/mdk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/md/mdk/package.nix b/pkgs/by-name/md/mdk/package.nix index 9f2acbcdf266..533d250b21d3 100644 --- a/pkgs/by-name/md/mdk/package.nix +++ b/pkgs/by-name/md/mdk/package.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { pname = "gnu-mdk"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "mirror://gnu/mdk/v${version}/mdk-${version}.tar.gz"; - sha256 = "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb"; + sha256 = "sha256-67ljk4xojBUP9qrtwp8w0JAgoeMdVbMMIQHwh3NRbRk="; }; nativeBuildInputs = [ pkg-config From 9cf2ff865b4648edf23ad13e320ecafaf2903efe Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Fri, 26 Sep 2025 12:54:09 +0200 Subject: [PATCH 018/380] kubernetes: don't hardcode kubeadm, make it an overridable component --- pkgs/by-name/ku/kubernetes/package.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ku/kubernetes/package.nix b/pkgs/by-name/ku/kubernetes/package.nix index 8e817bff3632..02287b57bd73 100644 --- a/pkgs/by-name/ku/kubernetes/package.nix +++ b/pkgs/by-name/ku/kubernetes/package.nix @@ -12,6 +12,7 @@ nix-update-script, components ? [ + "cmd/kubeadm" "cmd/kubelet" "cmd/kube-apiserver" "cmd/kube-controller-manager" @@ -50,12 +51,7 @@ buildGoModule (finalAttrs: { patches = [ ./fixup-addonmanager-lib-path.patch ]; - WHAT = lib.concatStringsSep " " ( - [ - "cmd/kubeadm" - ] - ++ components - ); + WHAT = lib.concatStringsSep " " components; buildPhase = '' runHook preBuild From f86b727ba6758e47a89a7600461a90a47aee3784 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Sep 2025 00:52:40 +0000 Subject: [PATCH 019/380] cytoscape: 3.10.3 -> 3.10.4 --- pkgs/by-name/cy/cytoscape/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cy/cytoscape/package.nix b/pkgs/by-name/cy/cytoscape/package.nix index 42b13f74000f..b255b3b03dbe 100644 --- a/pkgs/by-name/cy/cytoscape/package.nix +++ b/pkgs/by-name/cy/cytoscape/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "cytoscape"; - version = "3.10.3"; + version = "3.10.4"; src = fetchurl { url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-unix-${version}.tar.gz"; - sha256 = "sha256-62i3F6uGNoC8z55iUIYQDAimWcQocsZ52USdpruZRLQ="; + sha256 = "sha256-gHCU97AfBzo4r+F+Fc5lHd+kQtj/NsoCNipAhv5O7sE="; }; patches = [ From cc7fa78411e2797cde7642c8f56586f05d9cd842 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Sep 2025 14:48:07 +0000 Subject: [PATCH 020/380] clojure: 1.12.2.1565 -> 1.12.3.1577 --- pkgs/development/interpreters/clojure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 438331140b41..03e8086c4bc1 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "clojure"; - version = "1.12.2.1565"; + version = "1.12.3.1577"; src = fetchurl { # https://github.com/clojure/brew-install/releases url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz"; - hash = "sha256-qj0RqgIL+pgbqdMnG+vCfHirazBVA8ro2zCKOlDzYXk="; + hash = "sha256-u/hROuiLmHPpeBroaty1YLgSCcZv6Uy+ckKK85seusw="; }; nativeBuildInputs = [ From f74544ad9fdef30eb3665acd88c66c6e5317f1f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Sep 2025 20:18:29 +0000 Subject: [PATCH 021/380] vassal: 3.7.17 -> 3.7.18 --- pkgs/by-name/va/vassal/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/va/vassal/package.nix b/pkgs/by-name/va/vassal/package.nix index 89eda9592ad6..cc8effc37674 100644 --- a/pkgs/by-name/va/vassal/package.nix +++ b/pkgs/by-name/va/vassal/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.7.17"; + version = "3.7.18"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-UQ2Y6A1zPVqMSyNTWpfrqdeSLF4AbuAVm0A4jeZdsW8="; + sha256 = "sha256-Mf0zBXaATtk42W41LzOhT9TgqAEoQsE+QxndyRiV2dU="; }; buildInputs = [ From b61e00d75e12307b9ed23232ad51abe64c505feb Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sun, 28 Sep 2025 22:31:11 -0400 Subject: [PATCH 022/380] lizardfs: drop Has been marked broken for a full release cycle. Dropping per RFC 180. --- pkgs/by-name/li/lizardfs/package.nix | 70 ---------------------------- pkgs/top-level/aliases.nix | 2 + 2 files changed, 2 insertions(+), 70 deletions(-) delete mode 100644 pkgs/by-name/li/lizardfs/package.nix diff --git a/pkgs/by-name/li/lizardfs/package.nix b/pkgs/by-name/li/lizardfs/package.nix deleted file mode 100644 index a7aead761da0..000000000000 --- a/pkgs/by-name/li/lizardfs/package.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - makeWrapper, - python3, - db, - fuse, - asciidoc, - libxml2, - libxslt, - docbook_xml_dtd_412, - docbook_xsl, - boost, - pkg-config, - judy, - pam, - spdlog, - systemdMinimal, - zlib, # optional -}: - -stdenv.mkDerivation rec { - pname = "lizardfs"; - version = "3.13.0-rc3"; - - src = fetchFromGitHub { - owner = "lizardfs"; - repo = "lizardfs"; - rev = version; - sha256 = "sha256-rgaFhJvmA1RVDL4+vQLMC0GrdlgUlvJeZ5/JJ67C20Q="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - makeWrapper - ]; - - buildInputs = [ - db - fuse - asciidoc - libxml2 - libxslt - docbook_xml_dtd_412 - docbook_xsl - zlib - boost - judy - pam - spdlog - python3 - systemdMinimal - ]; - - meta = with lib; { - homepage = "https://lizardfs.com"; - description = "Highly reliable, scalable and efficient distributed file system"; - platforms = platforms.linux; - license = licenses.gpl3; - maintainers = with maintainers; [ - rushmorem - shamilton - ]; - # 'fprintf' was not declared in this scope - broken = true; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9be2aa75960a..14fb18c9ac9e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1488,6 +1488,8 @@ mapAliases { lixVersions = lixPackageSets.renamedDeprecatedLixVersions; # Added 2025-03-20, warning in ../tools/package-management/lix/default.nix + lizardfs = throw "lizardfs has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28 + llvmPackages_git = (callPackages ../development/compilers/llvm { }).git; # Added 2024-08-02 llvmPackages_9 = throw "llvmPackages_9 has been removed from nixpkgs"; # Added 2024-04-08 From ddb8d0c236180cbe0e1e03519361d0fb0478ae22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Sep 2025 02:42:53 +0000 Subject: [PATCH 023/380] wasabiwallet: 2.7.0 -> 2.7.1 --- pkgs/by-name/wa/wasabiwallet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/wasabiwallet/package.nix b/pkgs/by-name/wa/wasabiwallet/package.nix index ba186067ffb9..77795b1e3194 100644 --- a/pkgs/by-name/wa/wasabiwallet/package.nix +++ b/pkgs/by-name/wa/wasabiwallet/package.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "2.7.0"; + version = "2.7.1"; src = fetchurl { url = "https://github.com/WalletWasabi/WalletWasabi/releases/download/v${version}/Wasabi-${version}-linux-x64.tar.gz"; - sha256 = "sha256-w2xLahVxeCxwM6LVS5Mtr7IAXoZ7ju9aeXGjHMO2GPE="; + sha256 = "sha256-o2e2NDG2aMrEYc/7x5iFex9oRlrQXeKIINuW80ZwWcI="; }; dontBuild = true; From 9329f75aa91299620b4621f8cbdd0cd7257b66b8 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Wed, 1 Oct 2025 20:45:49 -0400 Subject: [PATCH 024/380] syncall: drop Has been marked broken for at least a full release cycle. Dropping per RFC 180. --- pkgs/by-name/sy/syncall/package.nix | 77 ----------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 77 deletions(-) delete mode 100644 pkgs/by-name/sy/syncall/package.nix diff --git a/pkgs/by-name/sy/syncall/package.nix b/pkgs/by-name/sy/syncall/package.nix deleted file mode 100644 index 9cfcd9599b05..000000000000 --- a/pkgs/by-name/sy/syncall/package.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - lib, - python3, - fetchFromGitHub, -}: - -python3.pkgs.buildPythonApplication rec { - pname = "syncall"; - version = "1.8.5"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "bergercookie"; - repo = "syncall"; - rev = "v${version}"; - hash = "sha256-f9WVZ1gpVG0wvIqoAkeaYBE4QsGXSqrYS4KyHy6S+0Q="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail 'loguru = "^0.5.3"' 'loguru = "^0.7"' \ - --replace-fail 'PyYAML = "~5.3.1"' 'PyYAML = "^6.0"' \ - --replace-fail 'bidict = "^0.21.2"' 'bidict = "^0.23"' \ - --replace-fail 'typing = "^3.7.4"' ''' - ''; - - nativeBuildInputs = [ - python3.pkgs.poetry-core - python3.pkgs.poetry-dynamic-versioning - ]; - - propagatedBuildInputs = with python3.pkgs; [ - bidict - bubop - click - item-synchronizer - loguru - python-dateutil - pyyaml - rfc3339 - typing - - # asana optional-dep - asana - # caldav optional-dep - caldav - icalendar - # fs optional-dep - xattr - # gkeep optional-dep - # gkeepapi is unavailable in nixpkgs - # google optional-dep - google-api-python-client - google-auth-oauthlib - # notion optional-dep - # FIXME: notion-client -- broken, doesn't build. - # taskwarrior optional-dep - taskw-ng - ]; - - postInstall = '' - # We do not support gkeep - rm $out/bin/tw_gkeep_sync - ''; - - pythonImportsCheck = [ "syncall" ]; - - meta = with lib; { - description = "Bi-directional synchronization between services such as Taskwarrior, Google Calendar, Notion, Asana, and more"; - homepage = "https://github.com/bergercookie/syncall"; - license = licenses.mit; - maintainers = with maintainers; [ raitobezarius ]; - # Upstream issue making it practically unusable: - # https://github.com/bergercookie/syncall/issues/99 - broken = true; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1911c58b7e7c..0bdbfeda8d6d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2449,6 +2449,7 @@ mapAliases { symbiyosys = sby; # Added 2024-08-18 syn2mas = throw "'syn2mas' has been removed. It has been integrated into the main matrix-authentication-service CLI as a subcommand: 'mas-cli syn2mas'."; # Added 2025-07-07 sync = taler-sync; # Added 2024-09-04 + syncall = "'syncall' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01 syncthing-cli = throw "'syncthing-cli' has been renamed to/replaced by 'syncthing'"; # Converted to throw 2024-10-17 syncthingtray-qt6 = syncthingtray; # Added 2024-03-06 syncthing-tray = throw "syncthing-tray has been removed because it is broken and unmaintained"; # Added 2025-05-18 From 9d8455e23154927cd99c85fdf3f22ce045af83d8 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Wed, 1 Oct 2025 20:32:43 -0400 Subject: [PATCH 025/380] shadered: drop Has been marked broken for at least a full release cycle. Dropping per RFC 180. --- .../sh/shadered/install_path_fix.patch | 13 ----- pkgs/by-name/sh/shadered/package.nix | 52 ------------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 pkgs/by-name/sh/shadered/install_path_fix.patch delete mode 100644 pkgs/by-name/sh/shadered/package.nix diff --git a/pkgs/by-name/sh/shadered/install_path_fix.patch b/pkgs/by-name/sh/shadered/install_path_fix.patch deleted file mode 100644 index 6b39ca696b90..000000000000 --- a/pkgs/by-name/sh/shadered/install_path_fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 55eb05c..18f7fc3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -234,7 +234,7 @@ endif() - - set(BINARY_INST_DESTINATION "bin") - set(RESOURCE_INST_DESTINATION "share/shadered") --install(PROGRAMS bin/SHADERed DESTINATION "${BINARY_INST_DESTINATION}" RENAME shadered) -+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bin/SHADERed DESTINATION "${BINARY_INST_DESTINATION}" RENAME shadered) - install(DIRECTORY bin/data bin/templates bin/themes bin/plugins DESTINATION "${RESOURCE_INST_DESTINATION}") - - if (UNIX AND NOT APPLE) diff --git a/pkgs/by-name/sh/shadered/package.nix b/pkgs/by-name/sh/shadered/package.nix deleted file mode 100644 index 032b363ddf7e..000000000000 --- a/pkgs/by-name/sh/shadered/package.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - sfml, - glm, - python3, - glew, - pkg-config, - SDL2, -}: - -stdenv.mkDerivation rec { - pname = "SHADERed"; - version = "1.5.6"; - - src = fetchFromGitHub { - owner = "dfranx"; - repo = "SHADERed"; - tag = "v${version}"; - fetchSubmodules = true; - sha256 = "0drf8wwx0gcmi22jq2yyjy7ppxynfq172wqakchscm313j248fjr"; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - SDL2 - glew - glm - python3 - sfml - ]; - - patches = [ - ./install_path_fix.patch - ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; - - meta = with lib; { - description = "Lightweight, cross-platform & full-featured shader IDE"; - homepage = "https://github.com/dfranx/SHADERed"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ Scriptkiddi ]; - broken = true; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1ad33906f1d2..556fdfd64b75 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2341,6 +2341,7 @@ mapAliases { siproxd = throw "'siproxd' has been removed as it was unmaintained and incompatible with newer libosip versions"; # Added 2025-05-18 sisco.lv2 = throw "'sisco.lv2' has been removed as it was unmaintained and broken"; # Added 2025-08-26 sipwitch = throw "'sipwitch' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01 + shadered = throw "shadered has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01 sheesy-cli = throw "'sheesy-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-26 shout = nodePackages.shout; # Added unknown; moved 2024-10-19 sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21 From 27881cdb9be21e0f9d5d4ecb4b2c4be867bd88a4 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Fri, 3 Oct 2025 08:39:20 -0400 Subject: [PATCH 026/380] python3Packages.amazon-kclpy: drop Has been marked broken for at least a full release cycle. Dropping per RFC 180. --- .../python-modules/amazon-kclpy/default.nix | 50 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 pkgs/development/python-modules/amazon-kclpy/default.nix diff --git a/pkgs/development/python-modules/amazon-kclpy/default.nix b/pkgs/development/python-modules/amazon-kclpy/default.nix deleted file mode 100644 index 3c039de4dbab..000000000000 --- a/pkgs/development/python-modules/amazon-kclpy/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - fetchpatch, - setuptools, - mock, - boto3, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "amazon-kclpy"; - version = "3.1.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "awslabs"; - repo = "amazon-kinesis-client-python"; - tag = "v${version}"; - hash = "sha256-nboEZwRlhbr176H4b6ESm3LfVZCoKz3yKrQptERsLgg="; - }; - - patches = [ - (fetchpatch { - name = "remove-deprecated-boto.patch"; - url = "https://github.com/awslabs/amazon-kinesis-client-python/commit/bd2c442cdd1b0e2c99d3471c1d3ffcc9161a7c42.patch"; - hash = "sha256-5W0qItDGjx1F6IllzLH57XCpToKrAu9mTbzv/1wMXuY="; - }) - ]; - - build-system = [ setuptools ]; - - dependencies = [ - mock - boto3 - ]; - - pythonImportsCheck = [ "amazon_kclpy" ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - meta = with lib; { - description = "Amazon Kinesis Client Library for Python"; - homepage = "https://github.com/awslabs/amazon-kinesis-client-python"; - license = licenses.asl20; - maintainers = with maintainers; [ psyanticy ]; - broken = true; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f17434b17512..567736c2b08c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -73,6 +73,7 @@ mapAliases ({ aiosenseme = throw "aiosenseme has been removed, because it does no longer work with the latest firmware and has become unmaintained"; # Added 2023-07-05 aioquic-mitmproxy = throw "aioquic-mitmproxy has been removed because mitmproxy no longer uses it"; # Added 2024-01-16 amazon_kclpy = amazon-kclpy; # added 2023-08-08 + amazon-kclpy = throw "amazon-kclpy has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03 ambiclimate = throw "ambiclimate has been removed, because the service has been terminated after 2024-03-31."; # Added 2024-06-07 ambee = throw "ambee has been removed because the upstream repository was archived in 2022"; # Added 2024-10-04 amiibo-py = throw "amiibo-py has been removed because the upstream repository was removed"; # Added 2025-01-13 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1dd003ebee66..73ecf522b38d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -651,8 +651,6 @@ self: super: with self; { amazon-ion = callPackage ../development/python-modules/amazon-ion { }; - amazon-kclpy = callPackage ../development/python-modules/amazon-kclpy { }; - amberelectric = callPackage ../development/python-modules/amberelectric { }; amcrest = callPackage ../development/python-modules/amcrest { }; From ba9c67999d7ce0a4c85a5cbf335d27becab80683 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 3 Oct 2025 22:47:06 +0200 Subject: [PATCH 027/380] awf: drop --- pkgs/by-name/aw/awf/package.nix | 52 --------------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 pkgs/by-name/aw/awf/package.nix diff --git a/pkgs/by-name/aw/awf/package.nix b/pkgs/by-name/aw/awf/package.nix deleted file mode 100644 index 9423dda218c6..000000000000 --- a/pkgs/by-name/aw/awf/package.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - autoreconfHook, - gtk2, - gtk3, - pkg-config, - wrapGAppsHook3, -}: - -stdenv.mkDerivation rec { - pname = "awf"; - version = "1.4.0"; - - src = fetchFromGitHub { - owner = "valr"; - repo = "awf"; - rev = "v${version}"; - sha256 = "0jl2kxwpvf2n8974zzyp69mqhsbjnjcqm39y0jvijvjb1iy8iman"; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - wrapGAppsHook3 - ]; - - buildInputs = [ - gtk2 - gtk3 - ]; - - autoreconfPhase = '' - patchShebangs ./autogen.sh - ./autogen.sh - ''; - - meta = with lib; { - description = "Widget Factory"; - longDescription = '' - A widget factory is a theme preview application for gtk2 and - gtk3. It displays the various widget types provided by gtk2/gtk3 - in a single window allowing to see the visual effect of the - applied theme. - ''; - homepage = "https://github.com/valr/awf"; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ michalrus ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5b26bca0c40d..9aec1ed62831 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -493,6 +493,7 @@ mapAliases { avr-sim = throw "'avr-sim' has been removed as it was broken and unmaintained. Possible alternatives are 'simavr', SimulAVR and AVRStudio."; # Added 2025-05-31 axmldec = throw "'axmldec' has been removed as it was broken and unmaintained for 8 years"; # Added 2025-05-17 awesome-4-0 = awesome; # Added 2022-05-05 + awf = throw "'awf' has been removed as the upstream project was archived in 2021"; # Added 2025-10-03 aws-env = throw "aws-env has been removed as the upstream project was unmaintained"; # Added 2024-06-11 aws-google-auth = throw "aws-google-auth has been removed as the upstream project was unmaintained"; # Added 2024-07-31 From d580f9d1475db223aa628f901180f8991662e27e Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Fri, 3 Oct 2025 21:25:32 +0000 Subject: [PATCH 028/380] tree-sitter-grammars.tree-sitter-todotxt: init at 2024-01-15 --- .../tools/parsing/tree-sitter/grammars/default.nix | 1 + .../tree-sitter/grammars/tree-sitter-todotxt.json | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-todotxt.json diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index b16e98289a50..ed605f2436b2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -109,6 +109,7 @@ tree-sitter-tera = lib.importJSON ./tree-sitter-tera.json; tree-sitter-tiger = lib.importJSON ./tree-sitter-tiger.json; tree-sitter-tlaplus = lib.importJSON ./tree-sitter-tlaplus.json; + tree-sitter-todotxt = lib.importJSON ./tree-sitter-todotxt.json; tree-sitter-toml = lib.importJSON ./tree-sitter-toml.json; tree-sitter-tsq = lib.importJSON ./tree-sitter-tsq.json; tree-sitter-turtle = lib.importJSON ./tree-sitter-turtle.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-todotxt.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-todotxt.json new file mode 100644 index 000000000000..39541800305f --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-todotxt.json @@ -0,0 +1,12 @@ +{ + "url": "https://github.com/arnarg/tree-sitter-todotxt", + "rev": "3937c5cd105ec4127448651a21aef45f52d19609", + "date": "2024-01-15T09:45:57+01:00", + "path": "/nix/store/37nxnr79ylm1g1myx2zvhzrymy5z0pw4-tree-sitter-todotxt", + "sha256": "0551fdv77bdrxsc04gsi3zrc07si34r4gnhaqjg3h5fwbbkj3q1r", + "hash": "sha256-OeAh51rcFTiexAraRzIZUR/A8h9RPwKY7rmtc3ZzoRQ=", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} From ec255bbab1ad631c3c25348d05bd4dc0d41163ec Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 4 Oct 2025 00:18:22 -0400 Subject: [PATCH 029/380] {worldengine-cli,python3Packages.worldengine}: drop Has been marked broken for at least a full release cycle. Dropping per RFC 180. --- .../python-modules/worldengine/default.nix | 77 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 5 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 pkgs/development/python-modules/worldengine/default.nix diff --git a/pkgs/development/python-modules/worldengine/default.nix b/pkgs/development/python-modules/worldengine/default.nix deleted file mode 100644 index f1d47ef83cb8..000000000000 --- a/pkgs/development/python-modules/worldengine/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - gdal, - h5py, - noise, - numpy, - protobuf, - purepng, - pyplatec, - six, - isPy27, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "worldengine"; - version = "0.19.0"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "Mindwerks"; - repo = "worldengine"; - rev = "v${version}"; - sha256 = "1xrckb0dn2841gvp32n18gib14bpi77hmjw3r9jiyhg402iip7ry"; - }; - - src-data = fetchFromGitHub { - owner = "Mindwerks"; - repo = "worldengine-data"; - rev = "029051e707f4702cb2af1a23b8222cca7dc88930"; - sha256 = "06xbf8gj3ljgr11v1n8jbs2q8pdf9wz53xdgkhpm8hdnjahgdxdm"; - }; - - postUnpack = '' - ln -s ${src-data} worldengine-data - ''; - - propagatedBuildInputs = [ - gdal - h5py - noise - numpy - protobuf - purepng - pyplatec - six - ]; - - prePatch = '' - substituteInPlace setup.py \ - --replace pypng>=0.0.18 purepng \ - --replace 'numpy>=1.9.2, <= 1.10.0.post2' 'numpy' \ - --replace 'argparse==1.2.1' "" \ - --replace 'protobuf==3.0.0a3' 'protobuf' \ - --replace 'noise==1.2.2' 'noise' \ - --replace 'PyPlatec==1.4.0' 'PyPlatec' \ - - substituteInPlace \ - worldengine/{draw.py,hdf5_serialization.py} \ - --replace numpy.float float - ''; - - doCheck = !isPy27; # google namespace clash - nativeCheckInputs = [ pytestCheckHook ]; - - disabledTests = [ "TestSerialization" ]; - - meta = with lib; { - broken = true; - homepage = "https://github.com/mindwerks/worldengine"; - description = "World generator using simulation of plates, rain shadow, erosion, etc"; - license = licenses.mit; - maintainers = with maintainers; [ rardiol ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1ad33906f1d2..2b08c2f30edf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2693,6 +2693,7 @@ mapAliases { wordpress6_5 = wordpress_6_5; # Added 2024-08-03 wordpress_6_5 = throw "'wordpress_6_5' has been removed in favor of the latest version"; # Added 2024-11-11 wordpress_6_6 = throw "'wordpress_6_6' has been removed in favor of the latest version"; # Added 2024-11-17 + worldengine-cli = throw "'worldengine-cli' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04 wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name wpa_supplicant_ro_ssids = lib.warnOnInstantiate "Deprecated package: Please use wpa_supplicant instead. Read-only SSID patches are now upstream!" wpa_supplicant; wrapLisp_old = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f7965364e78..006f3e3ea494 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13219,8 +13219,6 @@ with pkgs; wofi-pass = callPackage ../../pkgs/tools/security/pass/wofi-pass.nix { }; - worldengine-cli = python3Packages.worldengine; - wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { }; wrapThunderbird = callPackage ../applications/networking/mailreaders/thunderbird/wrapper.nix { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f17434b17512..e55c4925eb01 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -870,6 +870,7 @@ mapAliases ({ webhelpers = throw "webhelpers has been removed because it is unmaintained and upstream is gone"; # added 2024-07-27 websocket_client = websocket-client; # added 2021-06-15 word2vec = throw "word2vec has been removed because it is abandoned"; # added 2023-05-22 + worldengine = throw "worldengine has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04 wsnsimpy = throw "wsnsimpy has been removed, it was unmaintained and no more compatible with Python 3.12"; # added 2025-04-01 wxPython_4_0 = throw "wxPython_4_0 has been removed, use wxpython instead"; # added 2023-03-19 wxPython_4_1 = throw "wxPython_4_1 has been removed, use wxpython instead"; # added 2023-03-19 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1dd003ebee66..74c02dfb9a90 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20156,8 +20156,6 @@ self: super: with self; { world-bank-data = callPackage ../development/python-modules/world-bank-data { }; - worldengine = callPackage ../development/python-modules/worldengine { }; - wrapcco = callPackage ../development/python-modules/wrapcco { }; wrapio = callPackage ../development/python-modules/wrapio { }; From 923dd5a6b52c28bf89fa330efb2cd33b4dc08f16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Oct 2025 17:26:28 +0000 Subject: [PATCH 030/380] slumber: 4.0.1 -> 4.1.0 --- pkgs/by-name/sl/slumber/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix index ccd231a3a3c3..79d12bfbe85c 100644 --- a/pkgs/by-name/sl/slumber/package.nix +++ b/pkgs/by-name/sl/slumber/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "slumber"; - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "LucasPickering"; repo = "slumber"; tag = "v${version}"; - hash = "sha256-Xr4jAQ3G5El9FU6qOJJARjkZmTZly8pb//ElQizOHSg="; + hash = "sha256-JPKzubGwtXV7CmuPqEIvFKPoug17Z4Jeg+dgIBMTOU4="; }; - cargoHash = "sha256-Di3Kqwa63AWwZE1VOal+mqmYe/nzPFqis1MnawW9uZo="; + cargoHash = "sha256-1ReNwfV1M8k5pGeXBvd28UEKfys0ylraP4Q0AoL/L5Y="; meta = { description = "Terminal-based HTTP/REST client"; From 57be8089acfeaaec8ea2d164e9830bc78d0b38ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Oct 2025 18:26:52 +0000 Subject: [PATCH 031/380] kent: 486 -> 488 --- pkgs/by-name/ke/kent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/kent/package.nix b/pkgs/by-name/ke/kent/package.nix index 8c0c9d8bf0f8..ed04394e21a1 100644 --- a/pkgs/by-name/ke/kent/package.nix +++ b/pkgs/by-name/ke/kent/package.nix @@ -19,13 +19,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "kent"; - version = "486"; + version = "488"; src = fetchFromGitHub { owner = "ucscGenomeBrowser"; repo = "kent"; tag = "v${finalAttrs.version}_base"; - hash = "sha256-NffQ04+5rMtG/VI7YFK4Ff39DDhdh9Wlc0i1iVbg8Js="; + hash = "sha256-7iapTrQBq0VvbSe+lEdf9lISRJ/uPGdnfjJiSA0NLN8="; }; nativeBuildInputs = [ writableTmpDirAsHomeHook ]; From 2965af4b5b40e7e2cc55605673674fece856dc62 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Oct 2025 19:19:54 +0000 Subject: [PATCH 032/380] lilypond-unstable: 2.25.27 -> 2.25.29 --- pkgs/misc/lilypond/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix index 748b3fd81e76..f8e7c2ecc1d7 100644 --- a/pkgs/misc/lilypond/unstable.nix +++ b/pkgs/misc/lilypond/unstable.nix @@ -5,10 +5,10 @@ }: lilypond.overrideAttrs (oldAttrs: rec { - version = "2.25.27"; + version = "2.25.29"; src = fetchzip { url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - hash = "sha256-cZ6XZt1y646Kke3wdJ5Jo9ieOejbojsEBSkAvLDXNPw="; + hash = "sha256-t6EnGCD0QMARK1/yJBjtLFzVaBWiiut8KWrtzmzHgCM="; }; passthru.updateScript = { From 4813fb439b9727c02ee5c9ac640bfd1f0938ddef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Oct 2025 07:51:30 +0000 Subject: [PATCH 033/380] otto-matic: 4.0.1-unstable-2025-04-27 -> 4.0.1-unstable-2025-09-28 --- pkgs/by-name/ot/otto-matic/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ot/otto-matic/package.nix b/pkgs/by-name/ot/otto-matic/package.nix index f58ce12e8bd4..5f0718b2b430 100644 --- a/pkgs/by-name/ot/otto-matic/package.nix +++ b/pkgs/by-name/ot/otto-matic/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "OttoMatic"; - version = "4.0.1-unstable-2025-04-27"; + version = "4.0.1-unstable-2025-09-28"; src = fetchFromGitHub { owner = "jorio"; repo = "OttoMatic"; - rev = "69f0111d1768abe56498bf8121f0f9cbc85aedd3"; - hash = "sha256-7RpEVL3tNhEhkZYVjgsI6S+CQfyiz/ukroldrtohA4k="; + rev = "636056a92c1f276a5af5c3dc7df5c3cb952fd47a"; + hash = "sha256-nSLa/g1irZY9uU7lZkeT9C0iNPgBuD5wm1AxIrIzG54="; fetchSubmodules = true; }; From 372b1b3f23c9c522c22a7d890982c7d1020f945e Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Sat, 4 Oct 2025 22:20:48 +0200 Subject: [PATCH 034/380] python3Packages.rendercanvas: init at 2.2.1 --- .../python-modules/rendercanvas/default.nix | 71 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/development/python-modules/rendercanvas/default.nix diff --git a/pkgs/development/python-modules/rendercanvas/default.nix b/pkgs/development/python-modules/rendercanvas/default.nix new file mode 100644 index 000000000000..336bac33a7d8 --- /dev/null +++ b/pkgs/development/python-modules/rendercanvas/default.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + fetchFromGitHub, + buildPythonPackage, + + # build-system + flit-core, + + # dependencies + sniffio, + + # nativeCheckInputs + pytestCheckHook, + imageio, + glfw, + numpy, + trio, + wgpu-py, + + nix-update-script, +}: +buildPythonPackage rec { + pname = "rendercanvas"; + version = "2.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pygfx"; + repo = "rendercanvas"; + tag = "v${version}"; + hash = "sha256-6vvPIu+Zi+9ndcWHP43X0Qd+XCO7+tr8XCFm+bwCazE="; + }; + + postPatch = '' + rm -r rendercanvas/__pyinstaller + ''; + + build-system = [ flit-core ]; + + dependencies = [ sniffio ]; + + nativeCheckInputs = [ + pytestCheckHook + glfw + imageio + numpy + trio + # break circular dependency cycle + (wgpu-py.overrideAttrs { doInstallCheck = false; }) + ]; + + # flaky timing and / or interrupt based tests + disabledTests = [ "test_offscreen_event_loop" ]; + disabledTestPaths = [ + "tests/test_loop.py" + "tests/test_scheduling.py" + ]; + + pythonImportsCheck = [ "rendercanvas" ]; + + meta = { + description = "One canvas API, multiple backends"; + homepage = "https://github.com/pygfx/rendercanvas"; + changelog = "https://github.com/pygfx/rendercanvas/releases/tag/${src.tag}"; + + platforms = lib.platforms.all; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.bengsparks ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e3aefcf48cf..32d6293de63a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15841,6 +15841,8 @@ self: super: with self; { rencode = callPackage ../development/python-modules/rencode { }; + rendercanvas = callPackage ../development/python-modules/rendercanvas { }; + rendercv-fonts = callPackage ../development/python-modules/rendercv-fonts { }; reno = callPackage ../development/python-modules/reno { }; From 0f184e75b2d48084b8094cc888c10ced87fe0de8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Oct 2025 16:57:31 +0000 Subject: [PATCH 035/380] altair: 8.2.5 -> 8.3.0 --- pkgs/by-name/al/altair/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/altair/package.nix b/pkgs/by-name/al/altair/package.nix index e36add0cc407..42fa7a0d2381 100644 --- a/pkgs/by-name/al/altair/package.nix +++ b/pkgs/by-name/al/altair/package.nix @@ -7,11 +7,11 @@ let pname = "altair"; - version = "8.2.5"; + version = "8.3.0"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-P0CVJFafrsvWzDWyJZEds812m3yUDpo4eocysEIQqrw="; + sha256 = "sha256-uLqtrF5WWJ5+6bN/h4u/vdvTlbQtZID1osujfuJad4U="; }; appimageContents = appimageTools.extract { inherit pname version src; }; From 55c1dc7eb4464b948f63131f47d30941b6c2a8f7 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 6 Oct 2025 03:49:09 +0000 Subject: [PATCH 036/380] wvkbd: remove unnecessary `PKG_CONFIG` patch upstream Makefile reads `PKG_CONFIG` from the environment, we don't need any extra patching for it to be found. --- pkgs/by-name/wv/wvkbd/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/wv/wvkbd/package.nix b/pkgs/by-name/wv/wvkbd/package.nix index 8977315072c0..98b86183f38e 100644 --- a/pkgs/by-name/wv/wvkbd/package.nix +++ b/pkgs/by-name/wv/wvkbd/package.nix @@ -24,11 +24,6 @@ stdenv.mkDerivation rec { hash = "sha256-RfZbPAaf8UB4scUZ9XSL12QZ4UkYMzXqfmNt9ObOgQ0="; }; - postPatch = '' - substituteInPlace Makefile \ - --replace-fail "pkg-config" "$PKG_CONFIG" - ''; - nativeBuildInputs = [ pkg-config scdoc From 732ed2c2b8e36bc88c30e5c3120c2b3c50d3e22b Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 6 Oct 2025 03:55:33 +0000 Subject: [PATCH 037/380] wvkbd: add colinsane as maintainer --- pkgs/by-name/wv/wvkbd/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/wv/wvkbd/package.nix b/pkgs/by-name/wv/wvkbd/package.nix index 98b86183f38e..91701392b304 100644 --- a/pkgs/by-name/wv/wvkbd/package.nix +++ b/pkgs/by-name/wv/wvkbd/package.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl3Plus; mainProgram = "wvkbd-mobintl"; + maintainers = with lib.maintainers; [ colinsane ]; }; } From d5db8235741ed4aae160f405e152243c907166d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Oct 2025 05:01:08 +0000 Subject: [PATCH 038/380] ogen: 1.14.0 -> 1.16.0 --- pkgs/by-name/og/ogen/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/og/ogen/package.nix b/pkgs/by-name/og/ogen/package.nix index e31e52fe3db8..d467070f7ec6 100644 --- a/pkgs/by-name/og/ogen/package.nix +++ b/pkgs/by-name/og/ogen/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "ogen"; - version = "1.14.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "ogen-go"; repo = "ogen"; tag = "v${version}"; - hash = "sha256-w3h65MNXBgsH8PCHfoPqY+XNI6TMbLUAMI4Y3WWLEJM="; + hash = "sha256-rZO6jdOzdayXnEEWxNE9gKkt0coi8pNfq+LT8JC8LiQ="; }; - vendorHash = "sha256-PQ2ZrigS9jZY1oL3Dsuc2RZwedZLzLKUqhMYfWiZ854="; + vendorHash = "sha256-mL3xw0huTyLz33ja59/mJ+R2+KRIFOfKRUPrk5txJtA="; patches = [ ./modify-version-handling.patch ]; From 4fa721ac4e789e5b5dcd8df75318738443e96017 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Oct 2025 08:19:37 +0000 Subject: [PATCH 039/380] hayagriva: 0.8.1 -> 0.9.1 --- pkgs/by-name/ha/hayagriva/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/hayagriva/package.nix b/pkgs/by-name/ha/hayagriva/package.nix index 527f274affa1..3a7bad181bcf 100644 --- a/pkgs/by-name/ha/hayagriva/package.nix +++ b/pkgs/by-name/ha/hayagriva/package.nix @@ -6,14 +6,14 @@ rustPlatform.buildRustPackage rec { pname = "hayagriva"; - version = "0.8.1"; + version = "0.9.1"; src = fetchCrate { inherit pname version; - hash = "sha256-JZfkYrb4Gn6oP+kcFj7kC10r1aSddigGZPRx18pr5Gg="; + hash = "sha256-9PGo/TPk5QuiVoa5wUGyHufW/VaxqhinxS+u2JMPZBY="; }; - cargoHash = "sha256-2KlZTOp78HITJMRLNzw1bTUQSYeg5SmquRJWwwG3Xfw="; + cargoHash = "sha256-Ectd93B2yn/fn+N86LxGbUvtENsgjXTSCg06lHM8Xi0="; buildFeatures = [ "cli" ]; From 26512729f6d7484b4442c474f1434d3fa12b1ff6 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 11 Oct 2025 00:15:35 -0400 Subject: [PATCH 040/380] khoj: drop Has been marked broken for at least a full release cycle. Dropping per RFC 180. --- pkgs/by-name/kh/khoj/package.nix | 145 ------------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 145 deletions(-) delete mode 100644 pkgs/by-name/kh/khoj/package.nix diff --git a/pkgs/by-name/kh/khoj/package.nix b/pkgs/by-name/kh/khoj/package.nix deleted file mode 100644 index ec9e03b13835..000000000000 --- a/pkgs/by-name/kh/khoj/package.nix +++ /dev/null @@ -1,145 +0,0 @@ -{ - lib, - fetchFromGitHub, - python3, - postgresql, - postgresqlTestHook, -}: - -python3.pkgs.buildPythonApplication rec { - pname = "khoj"; - version = "1.0.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "debanjum"; - repo = "khoj"; - tag = version; - hash = "sha256-lvOeYTrvW5MfhuJ3lj9n9TRlvpRwVP2vFeaEeJdqIec="; - }; - - env = { - DJANGO_SETTINGS_MODULE = "khoj.app.settings"; - postgresqlEnableTCP = 1; - }; - - nativeBuildInputs = with python3.pkgs; [ - hatch-vcs - hatchling - ]; - - propagatedBuildInputs = with python3.pkgs; [ - aiohttp - anyio - authlib - beautifulsoup4 - dateparser - defusedxml - django - fastapi - google-auth - # gpt4all - gunicorn - httpx - itsdangerous - jinja2 - langchain - lxml - openai - openai-whisper - pgvector - pillow - psycopg2 - pydantic - pymupdf - python-multipart - pyyaml - # rapidocr-onnxruntime - requests - rich - schedule - sentence-transformers - stripe - tenacity - tiktoken - torch - transformers - tzdata - uvicorn - ]; - - nativeCheckInputs = - with python3.pkgs; - [ - freezegun - factory-boy - pytest-xdist - trio - psutil - pytest-django - pytestCheckHook - ] - ++ [ - (postgresql.withPackages (p: with p; [ pgvector ])) - postgresqlTestHook - ]; - - preCheck = '' - export HOME=$(mktemp -d) - ''; - - pythonImportsCheck = [ - "khoj" - ]; - - disabledTests = [ - # Tests require network access - "test_different_user_data_not_accessed" - "test_get_api_config_types" - "test_get_configured_types_via_api" - "test_image_metadata" - "test_image_search" - "test_image_search_by_filepath" - "test_image_search_query_truncated" - "test_index_update" - "test_index_update_with_no_auth_key" - "test_notes_search" - "test_notes_search_with_exclude_filter" - "test_notes_search_with_include_filter" - "test_parse_html_plaintext_file" - "test_regenerate_index_with_new_entry" - "test_regenerate_with_github_fails_without_pat" - "test_regenerate_with_invalid_content_type" - "test_regenerate_with_valid_content_type" - "test_search_for_user2_returns_empty" - "test_search_with_invalid_auth_key" - "test_search_with_invalid_content_type" - "test_search_with_no_auth_key" - "test_search_with_valid_content_type" - "test_text_index_same_if_content_unchanged" - "test_text_indexer_deletes_embedding_before_regenerate" - "test_text_search" - "test_text_search_setup_batch_processes" - "test_update_with_invalid_content_type" - "test_user_no_data_returns_empty" - - # Tests require rapidocr-onnxruntime - "test_multi_page_pdf_to_jsonl" - "test_single_page_pdf_to_jsonl" - "test_ocr_page_pdf_to_jsonl" - ]; - - disabledTestPaths = [ - # Tests require network access - "tests/test_conversation_utils.py" - ]; - - meta = { - description = "Natural Language Search Assistant for your Org-Mode and Markdown notes, Beancount transactions and Photos"; - homepage = "https://github.com/debanjum/khoj"; - changelog = "https://github.com/debanjum/khoj/releases/tag/${version}"; - license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ dit7ya ]; - broken = true; # last successful build 2024-01-10 - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8880d26a6e64..618d8058503b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1295,6 +1295,7 @@ mapAliases { keyfinger = throw "keyfinder has been removed as it was abandoned upstream and did not build; consider using mixxx or keyfinder-cli"; # Addd 2024-08-25 keysmith = throw "'keysmith' has been renamed to/replaced by 'libsForQt5.kdeGear.keysmith'"; # Converted to throw 2024-10-17 kgx = gnome-console; # Added 2022-02-19 + khoj = throw "khoj has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11 kibana7 = throw "Kibana 7.x has been removed from nixpkgs as it depends on an end of life Node.js version and received no maintenance in time."; # Added 2023-10-30 kibana = kibana7; # Added 2023-10-30 kio-admin = makePlasma5Throw "kio-admin"; # Added 2023-03-18 From da41efc0e310e19cbbca1e223b0261c3ddc2666e Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 11 Oct 2025 10:01:23 -0400 Subject: [PATCH 041/380] opae: drop Corresponding package has been marked broken for at least a full release cycle. Dropping per RFC 180. --- pkgs/by-name/op/opae/package.nix | 67 -------------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 pkgs/by-name/op/opae/package.nix diff --git a/pkgs/by-name/op/opae/package.nix b/pkgs/by-name/op/opae/package.nix deleted file mode 100644 index 1606a77b60d8..000000000000 --- a/pkgs/by-name/op/opae/package.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - libuuid, - json_c, - doxygen, - perl, - python3, -}: - -stdenv.mkDerivation rec { - pname = "opae"; - version = "1.0.0"; - - # the tag has a silly name for some reason. drop this in the future if - # possible - tver = "${version}-5"; - - src = fetchFromGitHub { - owner = "opae"; - repo = "opae-sdk"; - tag = tver; - sha256 = "1dmkpnr9dqxwjhbdzx2r3fdfylvinda421yyg319am5gzlysxwi8"; - }; - - doCheck = false; - - env.NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=format-truncation" - "-Wno-error=address-of-packed-member" - "-Wno-array-bounds" - ]; - - nativeBuildInputs = [ - cmake - doxygen - perl - python3.pkgs.sphinx - ]; - buildInputs = [ - libuuid - json_c - python3 - ]; - - # Set the Epoch to 1980; otherwise the Python wheel/zip code - # gets very angry - preConfigure = '' - find . -type f | while read file; do - touch -d @315532800 $file; - done - ''; - - cmakeFlags = [ "-DBUILD_ASE=1" ]; - - meta = with lib; { - description = "Open Programmable Acceleration Engine SDK"; - homepage = "https://01.org/opae"; - license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ thoughtpolice ]; - # Needs a major update, not compatible with gcc-11. - broken = true; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8880d26a6e64..39f7e0163407 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1981,6 +1981,7 @@ mapAliases { oneDNN_2 = throw "oneDNN_2 has been removed as it was only used by rocmPackages.migraphx"; # added 2025-07-18 onevpl-intel-gpu = lib.warnOnInstantiate "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04 onthespot = throw "onethespot has been removed due to lack of upstream maintenance"; # Added 2025-09-26 + opae = throw "opae has been removed because it has been marked as broken since June 2023."; # Added 2025-10-11 openai-triton-llvm = triton-llvm; # added 2024-07-18 openai-whisper-cpp = whisper-cpp; # Added 2024-12-13 openbabel2 = throw "openbabel2 has been removed, as it was unused and unmaintained upstream; please use openbabel"; # Added 2025-09-17 From 4b86bd8064d50e6479cc4890b7fb4134b25b4db9 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 11 Oct 2025 12:58:33 -0400 Subject: [PATCH 042/380] python3Packages.pyvoro: drop Has been marked broken for at least a full release cycle. Dropping per RFC 180. --- .../python-modules/pyvoro/default.nix | 36 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 pkgs/development/python-modules/pyvoro/default.nix diff --git a/pkgs/development/python-modules/pyvoro/default.nix b/pkgs/development/python-modules/pyvoro/default.nix deleted file mode 100644 index 403f61571b46..000000000000 --- a/pkgs/development/python-modules/pyvoro/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, -}: - -buildPythonPackage rec { - version = "1.3.2"; - format = "setuptools"; - pname = "pyvoro"; - - src = fetchPypi { - inherit pname version; - sha256 = "f31c047f6e4fc5f66eb0ab43afd046ba82ce247e18071141791364c4998716fc"; - }; - - # No tests in package - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/joe-jordan/pyvoro"; - description = "2D and 3D Voronoi tessellations: a python entry point for the voro++ library"; - license = licenses.mit; - maintainers = [ ]; - - # Cython generated code is vendored directly and no longer compatible with - # newer versions of the CPython C API. - # - # Upstream explicitly removed the Cython source files from the source - # distribution, making it impossible for us to force-compile them: - # https://github.com/joe-jordan/pyvoro/commit/922bba6db32d44c2e1825228627a25aa891f9bc1 - # - # No upstream activity since 2014. - broken = true; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0521f9bc947b..8b86eb6f6f78 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -706,6 +706,7 @@ mapAliases { pyvicare-neo = pyvicare; # Added 2024-11-06 pyvcf = throw "pyvcf has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-05-19 PyVirtualDisplay = pyvirtualdisplay; # added 2023-02-19 + pyvoro = throw "pyvoro has been removed because it is unmaintained upstream and has been marked as broken since 2023."; # Added 2025-10-11 pywick = throw "pywick has been removed, since it is no longer maintained"; # added 2023-07-01 pyxb = throw "pyxb has been removed, its last release was in 2017 and it has finally been archived in April 2023."; # added 2024-01-05 pyzufall = throw "pyzufall was removed, because it is no longer maintained"; # added 2024-05-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ffc11747bd0..ade9930b20b7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15398,8 +15398,6 @@ self: super: with self; { pyvolumio = callPackage ../development/python-modules/pyvolumio { }; - pyvoro = callPackage ../development/python-modules/pyvoro { }; - pyvows = callPackage ../development/python-modules/pyvows { }; pyw215 = callPackage ../development/python-modules/pyw215 { }; From c2a221e0191031f6076fe8c80b16c36ec4e1653f Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 11 Oct 2025 13:12:14 -0400 Subject: [PATCH 043/380] python3Packages.schemainspect: drop Has transitively been marked broken for at least a full release cycle. Dropping per RFC 180. --- .../python-modules/schemainspect/default.nix | 117 ------------------ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 119 deletions(-) delete mode 100644 pkgs/development/python-modules/schemainspect/default.nix diff --git a/pkgs/development/python-modules/schemainspect/default.nix b/pkgs/development/python-modules/schemainspect/default.nix deleted file mode 100644 index 7a3c322168f0..000000000000 --- a/pkgs/development/python-modules/schemainspect/default.nix +++ /dev/null @@ -1,117 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - fetchpatch, - pythonOlder, - sqlalchemy, - sqlbag, - setuptools, - poetry-core, - pytestCheckHook, - pytest-xdist, - pytest-sugar, - postgresql, - postgresqlTestHook, -}: -buildPythonPackage { - pname = "schemainspect"; - version = "3.1.1663587362"; - format = "pyproject"; - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "djrobstep"; - repo = "schemainspect"; - # no tags on github, version patch number is unix time. - rev = "066262d6fb4668f874925305a0b7dbb3ac866882"; - hash = "sha256-SYpQQhlvexNc/xEgSIk8L8J+Ta+3OZycGLeZGQ6DWzk="; - }; - - patches = [ - # https://github.com/djrobstep/schemainspect/pull/87 - (fetchpatch { - name = "specify_poetry.patch"; - url = "https://github.com/djrobstep/schemainspect/commit/bdcd001ef7798236fe0ff35cef52f34f388bfe68.patch"; - hash = "sha256-/SEmcV9GjjvzfbszeGPkfd2DvYenl7bZyWdC0aI3M4M="; - }) - ]; - - nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ - setuptools # needed for 'pkg_resources' - sqlalchemy - ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-xdist - pytest-sugar - - postgresql - postgresqlTestHook - - sqlbag - ]; - - preCheck = '' - export PGUSER="nixbld"; - export postgresqlEnableTCP=1; - ''; - disabledTests = [ - # These all fail with "List argument must consist only of tuples or dictionaries": - # Related issue: https://github.com/djrobstep/schemainspect/issues/88 - "test_can_replace" - "test_collations" - "test_constraints" - "test_dep_order" - "test_enum_deps" - "test_exclusion_constraint" - "test_fk_col_order" - "test_fk_info" - "test_generated_columns" - "test_identity_columns" - "test_indexes" - "test_inherit" - "test_kinds" - "test_lineendings" - "test_long_identifiers" - "test_partitions" - "test_postgres_inspect" - "test_postgres_inspect_excludeschema" - "test_postgres_inspect_sigleschema" - "test_raw_connection" - "test_relationship" - "test_replica_trigger" - "test_rls" - "test_separate_validate" - "test_sequences" - "test_table_dependency_order" - "test_types_and_domains" - "test_view_trigger" - "test_weird_names" - ]; - - pytestFlags = [ - "-x" - "-svv" - ]; - - enabledTestPaths = [ - "tests" - ]; - - pythonImportsCheck = [ "schemainspect" ]; - - postUnpack = '' - # this dir is used to bump the version number, having it here fails the build - rm -r ./source/deploy - ''; - - meta = with lib; { - description = "Schema inspection for PostgreSQL, and potentially others"; - homepage = "https://github.com/djrobstep/schemainspect"; - license = with licenses; [ unlicense ]; - maintainers = with maintainers; [ bpeetz ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0521f9bc947b..4eddced45fea 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -761,6 +761,7 @@ mapAliases { sabyenc = throw "sabyenc has been removed, due to no updates since June 2019 and being superseded by sabyenc3"; # added 2025-05-03 sampledata = throw "sampledata has been removed, it was unmaintained since 2017"; # added 2024-07-27 sapi-python-client = kbcstorage; # added 2022-04-20 + schemainspect = throw "schemainspect has been removed because it has transitively been marked broken since May 2024, and is unmaintained upstream."; # Added 2025-10-11 scikitimage = scikit-image; # added 2023-05-14 scikitlearn = scikit-learn; # added 2021-07-21 scikit-optimize = throw "scikit-optimize has been removed because it is abandoned"; # added 2024-09-30 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5f5db002b880..6c7753ea9a20 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16430,8 +16430,6 @@ self: super: with self; { schema-salad = callPackage ../development/python-modules/schema-salad { }; - schemainspect = callPackage ../development/python-modules/schemainspect { }; - schemdraw = callPackage ../development/python-modules/schemdraw { }; schiene = callPackage ../development/python-modules/schiene { }; From f36935002e6676d3a2eeef13731d62e7e515a0a8 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 11 Oct 2025 13:16:41 -0400 Subject: [PATCH 044/380] migra: drop Has transitively been marked broken for at least a full release cycle. Dropping per RFC 180. --- pkgs/by-name/mi/migra/package.nix | 62 ------------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 pkgs/by-name/mi/migra/package.nix diff --git a/pkgs/by-name/mi/migra/package.nix b/pkgs/by-name/mi/migra/package.nix deleted file mode 100644 index 0829c79e0493..000000000000 --- a/pkgs/by-name/mi/migra/package.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - lib, - python3, - fetchFromGitHub, - postgresql, - postgresqlTestHook, -}: -python3.pkgs.buildPythonApplication rec { - pname = "migra"; - version = "3.0.1647431138"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "djrobstep"; - repo = "migra"; - rev = version; - hash = "sha256-LSCJA5Ym1LuV3EZl6gnl9jTHGc8A1LXmR1fj0ZZc+po="; - }; - - nativeBuildInputs = [ - python3.pkgs.poetry-core - ]; - - propagatedBuildInputs = with python3.pkgs; [ - schemainspect - six - sqlbag - ]; - - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - postgresql - postgresqlTestHook - ]; - preCheck = '' - export PGUSER="nixbld"; - ''; - disabledTests = [ - # These all fail with "List argument must consist only of tuples or dictionaries": - # See this issue: https://github.com/djrobstep/migra/issues/232 - "test_excludeschema" - "test_fixtures" - "test_rls" - "test_singleschema" - ]; - - pytestFlags = [ - "-x" - "-svv" - ]; - - enabledTestPaths = [ - "tests" - ]; - - meta = with lib; { - description = "Like diff but for PostgreSQL schemas"; - homepage = "https://github.com/djrobstep/migra"; - license = with licenses; [ unlicense ]; - maintainers = with maintainers; [ bpeetz ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8880d26a6e64..e4c1eb9ed5ae 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1743,6 +1743,7 @@ mapAliases { midori = throw "'midori' original project has been abandonned upstream and the package was broken for a while in nixpkgs"; # Added 2025-05-19 midori-unwrapped = midori; # Added 2025-05-19 MIDIVisualizer = midivisualizer; # Added 2024-06-12 + migra = throw "migra has been removed because it has transitively been marked as broken since May 2024, and is unmaintained upstream."; # Added 2025-10-11 mihomo-party = throw "'mihomo-party' has been removed due to upstream license violation"; # Added 2025-08-20 mikutter = throw "'mikutter' has been removed because the package was broken and had no maintainers"; # Added 2024-10-01 mime-types = mailcap; # Added 2022-01-21 From de619debe565a43f49a42501b6dabe734bc291e2 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 11 Oct 2025 13:19:58 -0400 Subject: [PATCH 045/380] python3Packages.sqlbag: drop Has been marked broken for at least a full release cycle. Dropping per RFC 180. --- .../python-modules/sqlbag/default.nix | 92 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 pkgs/development/python-modules/sqlbag/default.nix diff --git a/pkgs/development/python-modules/sqlbag/default.nix b/pkgs/development/python-modules/sqlbag/default.nix deleted file mode 100644 index f3cf77bbb993..000000000000 --- a/pkgs/development/python-modules/sqlbag/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - psycopg2, - pymysql, - sqlalchemy, - six, - flask, - pendulum, - packaging, - setuptools, - poetry-core, - pytestCheckHook, - pytest-xdist, - pytest-sugar, - postgresql, - postgresqlTestHook, -}: -buildPythonPackage { - pname = "sqlbag"; - version = "0.1.1617247075"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "djrobstep"; - repo = "sqlbag"; - # no tags on github, version patch number is unix time. - rev = "eaaeec4158ffa139fba1ec30d7887f4d836f4120"; - hash = "sha256-lipgnkqrzjzqwbhtVcWDQypBNzq6Dct/qoM8y/FNiNs="; - }; - - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ - sqlalchemy - six - packaging - - psycopg2 - pymysql - - setuptools # needed for 'pkg_resources' - ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-xdist - pytest-sugar - - postgresql - postgresqlTestHook - - flask - pendulum - ]; - - preCheck = '' - export PGUSER="nixbld"; - ''; - - enabledTestPaths = [ - "tests" - ]; - - disabledTests = [ - # These all fail with "List argument must consist only of tuples or dictionaries": - # Related issue: https://github.com/djrobstep/sqlbag/issues/14 - "test_basic" - "test_createdrop" - "test_errors_and_messages" - "test_flask_integration" - "test_orm_stuff" - "test_pendulum_for_time_types" - "test_transaction_separation" - ]; - - pytestFlags = [ - "-x" - "-svv" - ]; - - pythonImportsCheck = [ "sqlbag" ]; - - meta = with lib; { - description = "Handy python code for doing database things"; - homepage = "https://github.com/djrobstep/sqlbag"; - license = with licenses; [ unlicense ]; - maintainers = with maintainers; [ bpeetz ]; - broken = true; # Fails to build against the current flask version - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e4c1eb9ed5ae..c9d0816d57b7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2489,6 +2489,7 @@ mapAliases { spring = throw "spring has been removed, as it had been broken since 2023 (it was a game; maybe you’re thinking of spring-boot-cli?)"; # Added 2025-09-16 springLobby = throw "springLobby has been removed, as it had been broken since 2023"; # Added 2025-09-16 spring-boot = throw "'spring-boot' has been renamed to/replaced by 'spring-boot-cli'"; # Converted to throw 2024-10-17 + sqlbag = throw "sqlbag has been removed because it has been marked as broken since May 2024."; # Added 2025-10-11 sqldeveloper = throw "sqldeveloper was dropped due to being severely out-of-date and having a dependency on JavaFX for Java 8, which we do not support"; # Added 2024-11-02 srvc = throw "'srvc' has been removed, as it was broken and unmaintained"; # Added 2024-09-09 ssm-agent = amazon-ssm-agent; # Added 2023-10-17 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6c7753ea9a20..07252b28a3b7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17512,8 +17512,6 @@ self: super: with self; { sqlalchemy_1_4 = callPackage ../development/python-modules/sqlalchemy/1_4.nix { }; - sqlbag = callPackage ../development/python-modules/sqlbag { }; - sqlcipher3 = callPackage ../development/python-modules/sqlcipher3 { }; sqlcipher3-binary = callPackage ../development/python-modules/sqlcipher3-binary { }; From 5708c68c25842413066e679dd1aad34569b46315 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 11 Oct 2025 15:15:50 -0400 Subject: [PATCH 046/380] python3Packages.elegy: drop Has been marked broken for at least a full release cycle. Dropping per RFC 180. --- .../python-modules/elegy/default.nix | 100 ------------------ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 102 deletions(-) delete mode 100644 pkgs/development/python-modules/elegy/default.nix diff --git a/pkgs/development/python-modules/elegy/default.nix b/pkgs/development/python-modules/elegy/default.nix deleted file mode 100644 index 08e93d47802d..000000000000 --- a/pkgs/development/python-modules/elegy/default.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ - lib, - buildPythonPackage, - cloudpickle, - deepdish, - deepmerge, - dm-haiku, - fetchFromGitHub, - fetchpatch, - jaxlib, - poetry-core, - pytestCheckHook, - pythonOlder, - pyyaml, - sh, - tables, - tabulate, - tensorboardx, - tensorflow, - toolz, - torch, - treex, - typing-extensions, -}: - -buildPythonPackage rec { - pname = "elegy"; - version = "0.8.6"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "poets-ai"; - repo = "elegy"; - tag = version; - hash = "sha256-FZmLriYhsX+zyQKCtCjbOy6MH+AvjzHRNUyaDSXGlLI="; - }; - - patches = [ - (fetchpatch { - name = "use-poetry-core.patch"; - url = "https://github.com/poets-ai/elegy/commit/0ed472882f470ed9eb7a63b8a537ffabe7e19aa7.patch"; - hash = "sha256-nO/imHo7tEsiZh+64CF/M4eXQ1so3IunVhv8CvYP1ks="; - }) - ]; - - # The cloudpickle constraint is too strict. wandb is marked as an optional - # dependency but `buildPythonPackage` doesn't seem to respect that setting. - # Python constraint: https://github.com/poets-ai/elegy/issues/244 - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'python = ">=3.7,<3.10"' 'python = ">=3.7"' \ - --replace 'cloudpickle = "^1.5.0"' 'cloudpickle = "*"' \ - --replace 'wandb = { version = "^0.12.10", optional = true }' "" - ''; - - nativeBuildInputs = [ poetry-core ]; - - buildInputs = [ jaxlib ]; - - propagatedBuildInputs = [ - cloudpickle - deepdish - deepmerge - dm-haiku - pyyaml - tables - tabulate - tensorboardx - toolz - treex - typing-extensions - ]; - - pythonImportsCheck = [ "elegy" ]; - - nativeCheckInputs = [ - pytestCheckHook - sh - tensorflow - torch - ]; - - disabledTests = [ - # Fails with `Could not find compiler for platform Host: NOT_FOUND: could not find registered compiler for platform Host -- check target linkage`. - # Runs fine in docker with Ubuntu 22.04. I suspect the issue is the sandboxing in `nixpkgs` but not sure. - "test_saved_model_poly" - # AttributeError: module 'jax' has no attribute 'tree_multimap' - "DataLoaderTestCase" - ]; - - meta = with lib; { - description = "Neural Networks framework based on Jax inspired by Keras and Haiku"; - homepage = "https://github.com/poets-ai/elegy"; - changelog = "https://github.com/poets-ai/elegy/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ ndl ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0521f9bc947b..ef1478fcfe39 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -247,6 +247,7 @@ mapAliases { enhancements = throw "enhancements is unmaintained upstream and has therefore been removed"; # added 2023-10-27 enum-compat = throw "enum-compat is a virtual package providing enum34, which does not do anything since Python 3.4"; # added 2025-02-15 enum34 = throw "enum34 is no longer needed since Python 3.4"; # added 2025-03-06 + elegy = throw "elegy has been removed because it has transitively been marked as broken since 2023."; # Added 2025-10-11 eris = throw "eris has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01 et_xmlfile = et-xmlfile; # added 2023-10-16 etebase-server = throw "pkgs.python3.etebase-server has been removed, use pkgs.etebase-server"; # added 2024-07-16 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5f5db002b880..e7d1eb23f942 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4665,8 +4665,6 @@ self: super: with self; { electrum-ecc = callPackage ../development/python-modules/electrum-ecc { }; - elegy = callPackage ../development/python-modules/elegy { }; - elementpath = callPackage ../development/python-modules/elementpath { }; elevate = callPackage ../development/python-modules/elevate { }; From 70b22d92d5edd35682571e078961727f1aabda24 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 11 Oct 2025 15:17:55 -0400 Subject: [PATCH 047/380] python3Packages.treex: drop Has transitively been marked broken for at least a full release cycle. Dropping per RFC 180. --- .../python-modules/treex/default.nix | 77 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 pkgs/development/python-modules/treex/default.nix diff --git a/pkgs/development/python-modules/treex/default.nix b/pkgs/development/python-modules/treex/default.nix deleted file mode 100644 index 3f76b078f17f..000000000000 --- a/pkgs/development/python-modules/treex/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - buildPythonPackage, - cloudpickle, - dm-haiku, - einops, - fetchFromGitHub, - flax, - hypothesis, - jaxlib, - keras, - lib, - poetry-core, - pytestCheckHook, - pyyaml, - rich, - tensorflow, - treeo, - torchmetrics, - torch, -}: - -buildPythonPackage rec { - pname = "treex"; - version = "0.6.11"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "cgarciae"; - repo = "treex"; - tag = version; - hash = "sha256-ObOnbtAT4SlrwOms1jtn7/XKZorGISGY6VuhQlC3DaQ="; - }; - - # At the time of writing (2022-03-29), rich is currently at version 11.0.0. - # The treeo dependency is compatible with a patch, but not marked as such in - # treex. See https://github.com/cgarciae/treex/issues/68. - pythonRelaxDeps = [ - "certifi" - "flax" - "rich" - "treeo" - ]; - - nativeBuildInputs = [ - poetry-core - ]; - - buildInputs = [ jaxlib ]; - - propagatedBuildInputs = [ - einops - flax - pyyaml - rich - treeo - torch - ]; - - nativeCheckInputs = [ - cloudpickle - dm-haiku - hypothesis - keras - pytestCheckHook - tensorflow - torchmetrics - ]; - - pythonImportsCheck = [ "treex" ]; - - meta = with lib; { - description = "Pytree Module system for Deep Learning in JAX"; - homepage = "https://github.com/cgarciae/treex"; - license = licenses.mit; - maintainers = with maintainers; [ ndl ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ef1478fcfe39..c171810b57bf 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -838,6 +838,7 @@ mapAliases { transip = throw "transip has been removed because it is no longer maintained. TransIP SOAP V5 API was marked as deprecated"; # added 2023-02-27 py-tree-sitter = throw "Was merged with tree-sitter."; # added 2024-03-20 transmissionrpc = throw "transmissionrpc has been removed because it no longer builds and is unmaintained"; # added 2024-10-12 + treex = throw "treex has been removed because it has transitively been marked as broken since 2023."; # Added 2025-10-11 trezor_agent = trezor-agent; # Added 2024-01-07 tumpa = throw "tumpa was promoted to a top-level attribute"; # added 2022-11-19 tvdb_api = tvdb-api; # added 2023-10-20 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e7d1eb23f942..e0b79cbcf6c0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18751,8 +18751,6 @@ self: super: with self; { treescope = callPackage ../development/python-modules/treescope { }; - treex = callPackage ../development/python-modules/treex { }; - treq = callPackage ../development/python-modules/treq { }; trevorproxy = callPackage ../development/python-modules/trevorproxy { }; From f320beeea56ae02fc9a85b95504d151a4c19db4f Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 11 Oct 2025 15:19:12 -0400 Subject: [PATCH 048/380] python3Packages.treeo: drop Has been marked broken for at least a full release cycle. Dropping per RFC 180. --- .../python-modules/treeo/default.nix | 54 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 pkgs/development/python-modules/treeo/default.nix diff --git a/pkgs/development/python-modules/treeo/default.nix b/pkgs/development/python-modules/treeo/default.nix deleted file mode 100644 index 27716b9fd31e..000000000000 --- a/pkgs/development/python-modules/treeo/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - buildPythonPackage, - fetchFromGitHub, - fetchpatch, - jax, - jaxlib, - lib, - poetry-core, -}: - -buildPythonPackage rec { - pname = "treeo"; - # Note that there is a version 0.4.0, but it was released in error. At the - # time of writing (2022-03-29), v0.0.11 is the latest as reported on GitHub - # and PyPI. - version = "0.4.0"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "cgarciae"; - repo = "treeo"; - tag = version; - hash = "sha256-0py7sKjq6WqdsZwTq61jqaIbULTfwtpz29TTpt8M2Zw="; - }; - - # See https://github.com/cgarciae/treex/issues/68. - patches = [ - (fetchpatch { - url = "https://github.com/cgarciae/treeo/pull/14/commits/022915da2b3bf76406a7c79d1b4593bee7956f16.patch"; - hash = "sha256-WGxJqqrf2g0yZe30RyG1xxbloiqj1awuf1Y4eh5y+z0="; - }) - (fetchpatch { - url = "https://github.com/cgarciae/treeo/pull/14/commits/99f9488bd0c977780844fd79743167b0010d359b.patch"; - hash = "sha256-oKDYs+Ah0QXkhiJysIudQ6VLIiUiIcnQisxYp6GJuTc="; - }) - ]; - - nativeBuildInputs = [ poetry-core ]; - - # jax is not declared in the dependencies, but is necessary. - propagatedBuildInputs = [ jax ]; - - nativeCheckInputs = [ jaxlib ]; - pythonImportsCheck = [ "treeo" ]; - - meta = with lib; { - description = "Small library for creating and manipulating custom JAX Pytree classes"; - homepage = "https://github.com/cgarciae/treeo"; - license = licenses.mit; - maintainers = with maintainers; [ ndl ]; - # obsolete as of 2023-02-27 and not updated for more than a year as of 2023-08 - broken = true; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index c171810b57bf..bc295da5d9e6 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -838,6 +838,7 @@ mapAliases { transip = throw "transip has been removed because it is no longer maintained. TransIP SOAP V5 API was marked as deprecated"; # added 2023-02-27 py-tree-sitter = throw "Was merged with tree-sitter."; # added 2024-03-20 transmissionrpc = throw "transmissionrpc has been removed because it no longer builds and is unmaintained"; # added 2024-10-12 + treeo = throw "treeo has been removed because it has been marked as broken since 2023."; # Added 2025-10-11 treex = throw "treex has been removed because it has transitively been marked as broken since 2023."; # Added 2025-10-11 trezor_agent = trezor-agent; # Added 2024-01-07 tumpa = throw "tumpa was promoted to a top-level attribute"; # added 2022-11-19 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e0b79cbcf6c0..d5c763515b94 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18747,8 +18747,6 @@ self: super: with self; { treelog = callPackage ../development/python-modules/treelog { }; - treeo = callPackage ../development/python-modules/treeo { }; - treescope = callPackage ../development/python-modules/treescope { }; treq = callPackage ../development/python-modules/treq { }; From 9322fb64c601bee770e894b49c5ac2c4cac69ff9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Oct 2025 09:49:20 +0000 Subject: [PATCH 049/380] svelte-language-server: 0.17.19 -> 0.17.21 --- .../svelte-language-server/package-lock.json | 102 +++++++----------- .../sv/svelte-language-server/package.nix | 6 +- 2 files changed, 41 insertions(+), 67 deletions(-) diff --git a/pkgs/by-name/sv/svelte-language-server/package-lock.json b/pkgs/by-name/sv/svelte-language-server/package-lock.json index 14e6cbbb2e17..803047ea156f 100644 --- a/pkgs/by-name/sv/svelte-language-server/package-lock.json +++ b/pkgs/by-name/sv/svelte-language-server/package-lock.json @@ -1,12 +1,12 @@ { "name": "svelte-language-server", - "version": "0.17.19", + "version": "0.17.21", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "svelte-language-server", - "version": "0.17.19", + "version": "0.17.21", "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "^0.3.25", @@ -19,7 +19,7 @@ "prettier": "~3.3.3", "prettier-plugin-svelte": "^3.4.0", "svelte": "^4.2.19", - "svelte2tsx": "~0.7.35", + "svelte2tsx": "~0.7.45", "typescript": "^5.9.2", "typescript-auto-import-cache": "^0.3.6", "vscode-css-languageservice": "~6.3.5", @@ -135,9 +135,9 @@ "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.30", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.30.tgz", - "integrity": "sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==", + "version": "0.3.31", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", + "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", @@ -240,9 +240,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "18.19.122", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.122.tgz", - "integrity": "sha512-yzegtT82dwTNEe/9y+CM8cgb42WrUfMMCg2QqSddzO1J6uPmBD7qKCZ7dOHZP2Yrpm/kb0eqdNMn2MUyEiqBmA==", + "version": "18.19.130", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.130.tgz", + "integrity": "sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg==", "dev": true, "license": "MIT", "dependencies": { @@ -733,10 +733,13 @@ "license": "MIT" }, "node_modules/fdir": { - "version": "6.4.6", - "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz", - "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", + "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", "license": "MIT", + "engines": { + "node": ">=12.0.0" + }, "peerDependencies": { "picomatch": "^3 || ^4" }, @@ -1101,22 +1104,13 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/lower-case": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", - "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", - "license": "MIT", - "dependencies": { - "tslib": "^2.0.3" - } - }, "node_modules/magic-string": { - "version": "0.30.17", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz", - "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==", + "version": "0.30.19", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.19.tgz", + "integrity": "sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw==", "license": "MIT", "dependencies": { - "@jridgewell/sourcemap-codec": "^1.5.0" + "@jridgewell/sourcemap-codec": "^1.5.5" } }, "node_modules/make-error": { @@ -1284,16 +1278,6 @@ "@sinonjs/commons": "^3.0.1" } }, - "node_modules/no-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", - "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", - "license": "MIT", - "dependencies": { - "lower-case": "^2.0.2", - "tslib": "^2.0.3" - } - }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -1346,16 +1330,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/pascal-case": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", - "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", - "license": "MIT", - "dependencies": { - "no-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -1511,10 +1485,16 @@ ], "license": "MIT" }, + "node_modules/scule": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/scule/-/scule-1.3.0.tgz", + "integrity": "sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==", + "license": "MIT" + }, "node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "version": "7.7.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", + "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -1696,13 +1676,13 @@ } }, "node_modules/svelte2tsx": { - "version": "0.7.42", - "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.42.tgz", - "integrity": "sha512-PSNrKS16aVdAajoFjpF5M0t6TA7ha7GcKbBajD9RG3M+vooAuvLnWAGUSC6eJL4zEOVbOWKtcS2BuY4rxPljoA==", + "version": "0.7.45", + "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.45.tgz", + "integrity": "sha512-cSci+mYGygYBHIZLHlm/jYlEc1acjAHqaQaDFHdEBpUueM9kSTnPpvPtSl5VkJOU1qSJ7h1K+6F/LIUYiqC8VA==", "license": "MIT", "dependencies": { "dedent-js": "^1.0.1", - "pascal-case": "^3.1.1" + "scule": "^1.3.0" }, "peerDependencies": { "svelte": "^3.55 || ^4.0.0-next.0 || ^4.0 || ^5.0.0-next.0", @@ -1776,12 +1756,6 @@ "node": ">=0.3.1" } }, - "node_modules/tslib": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", - "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "license": "0BSD" - }, "node_modules/type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", @@ -1793,9 +1767,9 @@ } }, "node_modules/typescript": { - "version": "5.9.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz", - "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==", + "version": "5.9.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", + "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", @@ -1829,9 +1803,9 @@ "license": "MIT" }, "node_modules/vscode-css-languageservice": { - "version": "6.3.7", - "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.7.tgz", - "integrity": "sha512-5TmXHKllPzfkPhW4UE9sODV3E0bIOJPOk+EERKllf2SmAczjfTmYeq5txco+N3jpF8KIZ6loj/JptpHBQuVQRA==", + "version": "6.3.8", + "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.8.tgz", + "integrity": "sha512-dBk/9ullEjIMbfSYAohGpDOisOVU1x2MQHOeU12ohGJQI7+r0PCimBwaa/pWpxl/vH4f7ibrBfxIZY3anGmHKQ==", "license": "MIT", "dependencies": { "@vscode/l10n": "^0.0.18", diff --git a/pkgs/by-name/sv/svelte-language-server/package.nix b/pkgs/by-name/sv/svelte-language-server/package.nix index 7ed2dfa682b1..fd6f70afe676 100644 --- a/pkgs/by-name/sv/svelte-language-server/package.nix +++ b/pkgs/by-name/sv/svelte-language-server/package.nix @@ -4,7 +4,7 @@ fetchurl, }: let - version = "0.17.19"; + version = "0.17.21"; in buildNpmPackage { pname = "svelte-language-server"; @@ -12,10 +12,10 @@ buildNpmPackage { src = fetchurl { url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-${version}.tgz"; - hash = "sha256-5Jap4dZzVWZxrIQSWUnTXG63re4T2mjcSvSilM7EReI="; + hash = "sha256-zRUeAocuEyoaBUrCDkqxJhMY7ryv9y7hYQC5/CsL2NM="; }; - npmDepsHash = "sha256-stE8uno/Oc/LvEWvD8KqoQ/mfNJHWa4PatGDwE+ix7E="; + npmDepsHash = "sha256-0nad0gdQhl3nwHbmDyLCfnIfgn4ixBbZn/oy3THDniw="; postPatch = '' ln -s ${./package-lock.json} package-lock.json From 013db3d8ada2ba9a909ebff12d98e79212ecd64d Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sun, 12 Oct 2025 20:37:10 -0400 Subject: [PATCH 050/380] hyprlandPlugins.hycov: drop Has been marked broken for at least a full release cycle. Dropping per RFC 180. --- .../hyprwm/hyprland-plugins/default.nix | 2 +- .../hyprwm/hyprland-plugins/hycov.nix | 32 ------------------- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix index 1219059e4aad..64d49a770e5e 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix @@ -37,7 +37,6 @@ let plugins = lib.mergeAttrsList [ { hy3 = import ./hy3.nix; } - { hycov = import ./hycov.nix; } { hypr-dynamic-cursors = import ./hypr-dynamic-cursors.nix; } { hyprfocus = import ./hyprfocus.nix; } { hyprgrass = import ./hyprgrass.nix; } @@ -45,6 +44,7 @@ let { hyprsplit = import ./hyprsplit.nix; } (import ./hyprland-plugins.nix) (lib.optionalAttrs config.allowAliases { + hycov = throw "hyprlandPlugins.hycov has been removed because it has been marked as broken since September 2024."; # Added 2025-10-12 hyprscroller = throw "hyprlandPlugins.hyprscroller has been removed as the upstream project is deprecated. Consider using `hyprlandPlugins.hyprscrolling`."; # Added 2025-05-09 }) ]; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix deleted file mode 100644 index 51da0e82573e..000000000000 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - lib, - mkHyprlandPlugin, - cmake, - fetchFromGitHub, - nix-update-script, -}: - -mkHyprlandPlugin (finalAttrs: { - pluginName = "hycov"; - version = "0.41.2.1"; - - src = fetchFromGitHub { - owner = "DreamMaoMao"; - repo = "hycov"; - tag = finalAttrs.version; - hash = "sha256-NRnxbkuiq1rQ+uauo7D+CEe73iGqxsWxTQa+1SEPnXQ="; - }; - - nativeBuildInputs = [ cmake ]; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Clients overview for Hyprland plugin"; - homepage = "https://github.com/DreamMaoMao/hycov"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ donovanglover ]; - platforms = lib.platforms.linux; - broken = true; # Doesn't work after Hyprland v0.41.2 https://gitee.com/DreamMaoMao/hycov/issues/IANYC8#note_31512295_link - }; -}) From f994581e1007dc1549260112a757463bde437fb7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Oct 2025 07:37:56 +0000 Subject: [PATCH 051/380] gearlever: 3.4.2 -> 3.4.5 --- pkgs/by-name/ge/gearlever/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ge/gearlever/package.nix b/pkgs/by-name/ge/gearlever/package.nix index 4ca18b384bf7..48c3a2765706 100644 --- a/pkgs/by-name/ge/gearlever/package.nix +++ b/pkgs/by-name/ge/gearlever/package.nix @@ -23,14 +23,14 @@ python3Packages.buildPythonApplication rec { pname = "gearlever"; - version = "3.4.2"; + version = "3.4.5"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "mijorus"; repo = "gearlever"; tag = version; - hash = "sha256-IC3ueAplQc5McGoJkHjjCAGvnLCH9+DUrB3cuKfwMno="; + hash = "sha256-C/YNnpLlA+5xzgLRLWEWAhDGLZP42N/uCbCPg3owgBk="; }; postPatch = From d146a5b5aaee611bad91028603d9bb6e5812dcab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Oct 2025 22:41:48 +0000 Subject: [PATCH 052/380] python3Packages.livekit-api: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/livekit-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/livekit-api/default.nix b/pkgs/development/python-modules/livekit-api/default.nix index 601095a58b82..e7f406ac979f 100644 --- a/pkgs/development/python-modules/livekit-api/default.nix +++ b/pkgs/development/python-modules/livekit-api/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "livekit-api"; - version = "1.0.6"; + version = "1.0.7"; pyproject = true; src = fetchFromGitHub { owner = "livekit"; repo = "python-sdks"; tag = "api-v${version}"; - hash = "sha256-AsTJC0j8dztua7B6JvAYQlHGsE1RCIGoCzfGgbHSnGU="; + hash = "sha256-yS7Nzzrgyo3Q/O4z9acIfPXzS/SRv27BEiO4cMP11Z0="; }; pypaBuildFlags = [ "livekit-api" ]; From b9a31d8862e82ca142074045958c0ac7c665575f Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Tue, 14 Oct 2025 12:00:00 +0000 Subject: [PATCH 053/380] nixseparatedebuginfod2: 0.1.0 -> 1.0.0 --- pkgs/by-name/ni/nixseparatedebuginfod2/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix b/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix index 2cffac191eef..548618f311a5 100644 --- a/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix +++ b/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "nixseparatedebuginfod2"; - version = "0.1.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "symphorien"; repo = "nixseparatedebuginfod2"; tag = "v${version}"; - hash = "sha256-bk+l/oWAPuWV6mnh9Pr/mru3BZjos08IfzEGUEFSW1E="; + hash = "sha256-r/lmnYdnqyc0Mx1ZVzebiz8V04bmKb8lJBv/ndIzQYM="; }; - cargoHash = "sha256-HmtFso6uF2GsjIA0FPVL4S3S+lwQUrg7N576UaekXpU="; + cargoHash = "sha256-bj5OOj/PpoBU745hbhN1YqiVBikNIzT6/WrNGklRqy4="; buildInputs = [ libarchive From 09ac18fbd346dac4b14a29102b69eed3f195f59e Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Tue, 14 Oct 2025 12:00:00 +0000 Subject: [PATCH 054/380] nixos/nixseparatedebuginfod2: adapt to v1 several substituters are supported at the same time --- .../development/nixseparatedebuginfod2.nix | 39 ++++++++++++------- nixos/tests/nixseparatedebuginfod2.nix | 2 +- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/development/nixseparatedebuginfod2.nix b/nixos/modules/services/development/nixseparatedebuginfod2.nix index 3cea2261ca1a..3fb49cea4f67 100644 --- a/nixos/modules/services/development/nixseparatedebuginfod2.nix +++ b/nixos/modules/services/development/nixseparatedebuginfod2.nix @@ -10,6 +10,11 @@ let url = "127.0.0.1:${toString cfg.port}"; in { + imports = [ + (lib.mkRemovedOptionModule [ "services" "nixseparatedebuginfod2" "substituter" ] '' + Instead of `services.nixseparatedebuginfod2.substituter = "foo"`, set `services.nixseparatedebuginfod2.substituters = [ "foo" ]` (possibly with mkForce to override the default value). + '') + ]; options = { services.nixseparatedebuginfod2 = { enable = lib.mkEnableOption "nixseparatedebuginfod2, a debuginfod server providing source and debuginfo for nix packages"; @@ -19,11 +24,13 @@ in type = lib.types.port; }; package = lib.mkPackageOption pkgs "nixseparatedebuginfod2" { }; - substituter = lib.mkOption { - description = "nix substituter to fetch debuginfo from. Either http/https substituters, or `local:` to use debuginfo present in the local store."; - default = "https://cache.nixos.org"; - example = "local:"; - type = lib.types.str; + substituters = lib.mkOption { + description = "nix substituter to fetch debuginfo from. Either http/https/file substituters, or `local:` to use debuginfo present in the local store."; + default = [ + "local:" + "https://cache.nixos.org" + ]; + type = lib.types.listOf lib.types.str; }; cacheExpirationDelay = lib.mkOption { description = "keep unused cache entries for this long. A number followed by a unit"; @@ -38,15 +45,19 @@ in path = [ config.nix.package ]; serviceConfig = { ExecStart = [ - (utils.escapeSystemdExecArgs [ - (lib.getExe cfg.package) - "--listen-address" - url - "--substituter" - cfg.substituter - "--expiration" - cfg.cacheExpirationDelay - ]) + (utils.escapeSystemdExecArgs ( + [ + (lib.getExe cfg.package) + "--listen-address" + url + "--expiration" + cfg.cacheExpirationDelay + ] + ++ (lib.lists.concatMap (s: [ + "--substituter" + s + ]) cfg.substituters) + )) ]; Restart = "on-failure"; CacheDirectory = "nixseparatedebuginfod2"; diff --git a/nixos/tests/nixseparatedebuginfod2.nix b/nixos/tests/nixseparatedebuginfod2.nix index 34741ac2fa71..a74f24bf2f22 100644 --- a/nixos/tests/nixseparatedebuginfod2.nix +++ b/nixos/tests/nixseparatedebuginfod2.nix @@ -32,7 +32,7 @@ nodes.machine = { services.nixseparatedebuginfod2 = { enable = true; - substituter = "http://cache"; + substituters = [ "http://cache" ]; }; environment.systemPackages = [ pkgs.valgrind From 7a131bebe7a54143739fbb717a31ed3353b96d45 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Tue, 14 Oct 2025 12:00:00 +0000 Subject: [PATCH 055/380] nixseparatedebuginfod: remove in favor of nixseparatedebuginfod2 Reuse the same port so that rebuilding to the new module does not need a reboot to update the env var. --- nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 3 + .../development/nixseparatedebuginfod.nix | 106 ------------------ .../development/nixseparatedebuginfod2.nix | 2 +- nixos/tests/nixseparatedebuginfod.nix | 83 -------------- nixos/tests/nixseparatedebuginfod2.nix | 2 +- .../ni/nixseparatedebuginfod/package.nix | 52 --------- 7 files changed, 5 insertions(+), 244 deletions(-) delete mode 100644 nixos/modules/services/development/nixseparatedebuginfod.nix delete mode 100644 nixos/tests/nixseparatedebuginfod.nix delete mode 100644 pkgs/by-name/ni/nixseparatedebuginfod/package.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8f7f8ea44854..63f3fc1f67fc 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -598,7 +598,6 @@ ./services/development/livebook.nix ./services/development/lorri.nix ./services/development/nixseparatedebuginfod2.nix - ./services/development/nixseparatedebuginfod.nix ./services/development/rstudio-server/default.nix ./services/development/vsmartcard-vpcd.nix ./services/development/zammad.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index a4ed680bd552..8db787e826c5 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -228,6 +228,9 @@ in "services.morty has been removed from NixOS. As the morty package was unmaintained and removed and searxng, its main consumer, dropped support for it." ) (mkRemovedOptionModule [ "services" "mwlib" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "nixseparatedebuginfod" ] + "Use `services.nixseparatedebuginfod2.enable = true;` instead. If you only use the official binary cache, no additional configuration should be needed." + ) (mkRemovedOptionModule [ "services" "pantheon" "files" ] '' This module was removed, please add pkgs.pantheon.elementary-files to environment.systemPackages directly. '') diff --git a/nixos/modules/services/development/nixseparatedebuginfod.nix b/nixos/modules/services/development/nixseparatedebuginfod.nix deleted file mode 100644 index db16b052c65f..000000000000 --- a/nixos/modules/services/development/nixseparatedebuginfod.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: -let - cfg = config.services.nixseparatedebuginfod; - url = "127.0.0.1:${toString cfg.port}"; -in -{ - options = { - services.nixseparatedebuginfod = { - enable = lib.mkEnableOption "separatedebuginfod, a debuginfod server providing source and debuginfo for nix packages"; - port = lib.mkOption { - description = "port to listen"; - default = 1949; - type = lib.types.port; - }; - nixPackage = lib.mkOption { - type = lib.types.package; - default = pkgs.nix; - defaultText = lib.literalExpression "pkgs.nix"; - description = '' - The version of nix that nixseparatedebuginfod should use as client for the nix daemon. It is strongly advised to use nix version >= 2.18, otherwise some debug info may go missing. - ''; - }; - allowOldNix = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Do not fail evaluation when {option}`services.nixseparatedebuginfod.nixPackage` is older than nix 2.18. - ''; - }; - }; - }; - config = lib.mkIf cfg.enable { - assertions = [ - { - assertion = cfg.allowOldNix || (lib.versionAtLeast cfg.nixPackage.version "2.18"); - message = "nixseparatedebuginfod works better when `services.nixseparatedebuginfod.nixPackage` is set to nix >= 2.18 (instead of ${cfg.nixPackage.name}). Set `services.nixseparatedebuginfod.allowOldNix` to bypass."; - } - ]; - - systemd.services.nixseparatedebuginfod = { - wantedBy = [ "multi-user.target" ]; - wants = [ "nix-daemon.service" ]; - after = [ "nix-daemon.service" ]; - path = [ cfg.nixPackage ]; - serviceConfig = { - ExecStart = [ "${pkgs.nixseparatedebuginfod}/bin/nixseparatedebuginfod -l ${url}" ]; - Restart = "on-failure"; - CacheDirectory = "nixseparatedebuginfod"; - # nix does not like DynamicUsers in allowed-users - User = "nixseparatedebuginfod"; - Group = "nixseparatedebuginfod"; - - # hardening - # Filesystem stuff - ProtectSystem = "strict"; # Prevent writing to most of / - ProtectHome = true; # Prevent accessing /home and /root - PrivateTmp = true; # Give an own directory under /tmp - PrivateDevices = true; # Deny access to most of /dev - ProtectKernelTunables = true; # Protect some parts of /sys - ProtectControlGroups = true; # Remount cgroups read-only - RestrictSUIDSGID = true; # Prevent creating SETUID/SETGID files - PrivateMounts = true; # Give an own mount namespace - RemoveIPC = true; - UMask = "0077"; - - # Capabilities - CapabilityBoundingSet = ""; # Allow no capabilities at all - NoNewPrivileges = true; # Disallow getting more capabilities. This is also implied by other options. - - # Kernel stuff - ProtectKernelModules = true; # Prevent loading of kernel modules - SystemCallArchitectures = "native"; # Usually no need to disable this - ProtectKernelLogs = true; # Prevent access to kernel logs - ProtectClock = true; # Prevent setting the RTC - - # Networking - RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6"; - - # Misc - LockPersonality = true; # Prevent change of the personality - ProtectHostname = true; # Give an own UTS namespace - RestrictRealtime = true; # Prevent switching to RT scheduling - MemoryDenyWriteExecute = true; # Maybe disable this for interpreters like python - RestrictNamespaces = true; - }; - }; - - users.users.nixseparatedebuginfod = { - isSystemUser = true; - group = "nixseparatedebuginfod"; - }; - - users.groups.nixseparatedebuginfod = { }; - - nix.settings = lib.optionalAttrs (lib.versionAtLeast config.nix.package.version "2.4") { - extra-allowed-users = [ "nixseparatedebuginfod" ]; - }; - - environment.debuginfodServers = [ "http://${url}" ]; - }; -} diff --git a/nixos/modules/services/development/nixseparatedebuginfod2.nix b/nixos/modules/services/development/nixseparatedebuginfod2.nix index 3fb49cea4f67..c9174f61b1be 100644 --- a/nixos/modules/services/development/nixseparatedebuginfod2.nix +++ b/nixos/modules/services/development/nixseparatedebuginfod2.nix @@ -20,7 +20,7 @@ in enable = lib.mkEnableOption "nixseparatedebuginfod2, a debuginfod server providing source and debuginfo for nix packages"; port = lib.mkOption { description = "port to listen"; - default = 1950; + default = 1949; type = lib.types.port; }; package = lib.mkPackageOption pkgs "nixseparatedebuginfod2" { }; diff --git a/nixos/tests/nixseparatedebuginfod.nix b/nixos/tests/nixseparatedebuginfod.nix deleted file mode 100644 index 7399cb405c07..000000000000 --- a/nixos/tests/nixseparatedebuginfod.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ pkgs, lib, ... }: -let - secret-key = "key-name:/COlMSRbehSh6YSruJWjL+R0JXQUKuPEn96fIb+pLokEJUjcK/2Gv8Ai96D7JGay5gDeUTx5wdpPgNvum9YtwA=="; - public-key = "key-name:BCVI3Cv9hr/AIveg+yRmsuYA3lE8ecHaT4Db7pvWLcA="; -in -{ - name = "nixseparatedebuginfod"; - # A binary cache with debug info and source for gnumake - nodes.cache = - { pkgs, ... }: - { - services.nix-serve = { - enable = true; - secretKeyFile = builtins.toFile "secret-key" secret-key; - openFirewall = true; - }; - system.extraDependencies = [ - pkgs.gnumake.debug - pkgs.gnumake.src - pkgs.sl - ]; - }; - # the machine where we need the debuginfo - nodes.machine = { - imports = [ - ../modules/installer/cd-dvd/channel.nix - ]; - services.nixseparatedebuginfod.enable = true; - nix.settings = { - substituters = lib.mkForce [ "http://cache:5000" ]; - trusted-public-keys = [ public-key ]; - }; - environment.systemPackages = [ - pkgs.valgrind - pkgs.gdb - pkgs.gnumake - (pkgs.writeShellScriptBin "wait_for_indexation" '' - set -x - while debuginfod-find debuginfo /run/current-system/sw/bin/make |& grep 'File too large'; do - sleep 1; - done - '') - ]; - }; - testScript = '' - start_all() - cache.wait_for_unit("nix-serve.service") - cache.wait_for_open_port(5000) - machine.wait_for_unit("nixseparatedebuginfod.service") - machine.wait_for_open_port(1949) - - with subtest("show the config to debug the test"): - machine.succeed("nix --extra-experimental-features nix-command show-config |& logger") - machine.succeed("cat /etc/nix/nix.conf |& logger") - with subtest("check that the binary cache works"): - machine.succeed("nix-store -r ${pkgs.sl}") - - # nixseparatedebuginfod needs .drv to associate executable -> source - # on regular systems this would be provided by nixos-rebuild - machine.succeed("nix-instantiate '' -A gnumake") - - machine.succeed("timeout 600 wait_for_indexation") - - # test debuginfod-find - machine.succeed("debuginfod-find debuginfo /run/current-system/sw/bin/make") - - # test that gdb can fetch source - out = machine.succeed("gdb /run/current-system/sw/bin/make --batch -x ${builtins.toFile "commands" '' - start - l - ''}") - print(out) - assert 'main (int argc, char **argv, char **envp)' in out - - # test that valgrind can display location information - # this relies on the fact that valgrind complains about gnumake - # because we also ask valgrind to show leak kinds - # which are usually false positives. - out = machine.succeed("valgrind --leak-check=full --show-leak-kinds=all make --version 2>&1") - print(out) - assert 'main.c' in out - ''; -} diff --git a/nixos/tests/nixseparatedebuginfod2.nix b/nixos/tests/nixseparatedebuginfod2.nix index a74f24bf2f22..aa35a91971e8 100644 --- a/nixos/tests/nixseparatedebuginfod2.nix +++ b/nixos/tests/nixseparatedebuginfod2.nix @@ -45,7 +45,7 @@ cache.wait_for_unit("nginx.service") cache.wait_for_open_port(80) machine.wait_for_unit("nixseparatedebuginfod2.service") - machine.wait_for_open_port(1950) + machine.wait_for_open_port(1949) with subtest("check that the binary cache works"): machine.succeed("nix-store --extra-substituters http://cache --option require-sigs false -r ${pkgs.sl}") diff --git a/pkgs/by-name/ni/nixseparatedebuginfod/package.nix b/pkgs/by-name/ni/nixseparatedebuginfod/package.nix deleted file mode 100644 index 6d518ff985f4..000000000000 --- a/pkgs/by-name/ni/nixseparatedebuginfod/package.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, - libarchive, - openssl, - rust-jemalloc-sys, - sqlite, - pkg-config, - nixosTests, -}: - -rustPlatform.buildRustPackage rec { - pname = "nixseparatedebuginfod"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "symphorien"; - repo = "nixseparatedebuginfod"; - rev = "v${version}"; - hash = "sha256-sVQ6UgQvSTEIxXPxISeTI9tqAdJlxQpLxq1h4I31r6k="; - }; - - cargoHash = "sha256-vaCmRr1hXF0BSg/dl3LYyd7c1MdPKIv6KgDgGEzqqJQ="; - - # tests need a working nix install with access to the internet - doCheck = false; - - buildInputs = [ - libarchive - openssl - rust-jemalloc-sys - sqlite - ]; - - nativeBuildInputs = [ pkg-config ]; - - passthru = { - tests = { - inherit (nixosTests) nixseparatedebuginfod; - }; - }; - - meta = with lib; { - description = "Downloads and provides debug symbols and source code for nix derivations to gdb and other debuginfod-capable debuggers as needed"; - homepage = "https://github.com/symphorien/nixseparatedebuginfod"; - license = licenses.gpl3Only; - maintainers = [ maintainers.symphorien ]; - platforms = platforms.linux; - mainProgram = "nixseparatedebuginfod"; - }; -} From de8de87be2596a05803360f4ca9db86920651c7c Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Tue, 14 Oct 2025 12:00:00 +0000 Subject: [PATCH 056/380] add release notes for the migration nixseparatedebuginfod{,2} --- nixos/doc/manual/release-notes/rl-2511.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index c652b9f2b6ab..d98862b37b6c 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -228,6 +228,8 @@ - The `yeahwm` package and `services.xserver.windowManager.yeahwm` module were removed due to the package being broken and unmaintained upstream. +- `services.nixseparatedebuginfod.enable = true;` has been replaced by `services.nixseparatedebuginfod2.enable = true`. If you only use the official binary cache `https://cache.nixos.org` then no further configuration should be needed. If you have other https substituters, you can add them to `services.nixseparatedebuginfod2.subsituters`. SSH substituters are not supported by nixseparatedebuginfod2. Consider running nixseparatedebuginfod2 on the substituter instead, and pointing to it with the new option `environment.debuginfodServers`. + - The `services.snapserver` module has been migrated to use the settings option and render a configuration file instead of passing every option over the command line. - The `services.meilisearch` module now always defaults to the latest version of meilisearch, as the previous `meilisearch_1_11` package was removed. This is only an issue if you were using the old version. From 9daa17df884ec37a4ce843084c55e49ca08418b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Oct 2025 22:03:04 +0000 Subject: [PATCH 057/380] python3Packages.livekit-protocol: 1.0.6 -> 1.0.8 --- pkgs/development/python-modules/livekit-protocol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/livekit-protocol/default.nix b/pkgs/development/python-modules/livekit-protocol/default.nix index 744f9fe7dc49..3b2f521e066d 100644 --- a/pkgs/development/python-modules/livekit-protocol/default.nix +++ b/pkgs/development/python-modules/livekit-protocol/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "livekit-protocol"; - version = "1.0.6"; + version = "1.0.8"; pyproject = true; src = fetchFromGitHub { owner = "livekit"; repo = "python-sdks"; tag = "protocol-v${version}"; - hash = "sha256-Sl/pAwiCS7sAY8VHJzSqm/Mj92NsO5NLuxQ/Y5GnaAw="; + hash = "sha256-3RdUvxGOopgakwkoWc+IMW2QUZuZLF908KtFo1f0Nqo="; }; pypaBuildFlags = [ "livekit-protocol" ]; From 6dc29424d0c136e0ec921864d8800e360f630d1f Mon Sep 17 00:00:00 2001 From: jasonxue Date: Wed, 15 Oct 2025 22:20:04 +0800 Subject: [PATCH 058/380] cargo-binstall: 1.15.6 -> 1.15.7 --- pkgs/by-name/ca/cargo-binstall/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index 2802095cff1d..5d4da28fb530 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.15.6"; + version = "1.15.7"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-TzO7xz58nvuT6r8SN0cUKdW0x1yR1FlpsnGhU67SNOA="; + hash = "sha256-EQhEI4MqYNwjqb8awROTLfxjGsoPKeT7VHt642uSgCc="; }; - cargoHash = "sha256-cYjsSPHcWYobosSlB2tLda3NSGUTxE5DyA4AxAF8C/8="; + cargoHash = "sha256-a9X8L4AZWhlcQ5lVo0I1GL2wpCjOClNuZLy+GwHJDcA="; nativeBuildInputs = [ pkg-config From 86e6d056b681e45557825e3137831a495b57ed83 Mon Sep 17 00:00:00 2001 From: Hendrik Sokolowski Date: Tue, 30 Sep 2025 15:15:27 +0200 Subject: [PATCH 059/380] owntone: 28.12 -> 29.0 --- pkgs/by-name/ow/owntone/gettext-0.25.patch | 13 +++++++++++++ pkgs/by-name/ow/owntone/package.nix | 8 ++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/ow/owntone/gettext-0.25.patch diff --git a/pkgs/by-name/ow/owntone/gettext-0.25.patch b/pkgs/by-name/ow/owntone/gettext-0.25.patch new file mode 100644 index 000000000000..7df3cbdd2204 --- /dev/null +++ b/pkgs/by-name/ow/owntone/gettext-0.25.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 66d92954..05e81c52 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -10,6 +10,9 @@ AC_CONFIG_HEADERS([config.h]) + AM_INIT_AUTOMAKE([foreign subdir-objects 1.11]) + AM_SILENT_RULES([yes]) + ++AM_GNU_GETTEXT_VERSION([0.25]) ++AM_GNU_GETTEXT([external]) ++ + dnl Requires autoconf 2.60 + AC_USE_SYSTEM_EXTENSIONS diff --git a/pkgs/by-name/ow/owntone/package.nix b/pkgs/by-name/ow/owntone/package.nix index 7e755a54a027..49a4df588b4a 100644 --- a/pkgs/by-name/ow/owntone/package.nix +++ b/pkgs/by-name/ow/owntone/package.nix @@ -37,14 +37,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "28.12"; + version = "29.0"; pname = "owntone"; src = fetchFromGitHub { owner = "owntone"; repo = "owntone-server"; tag = finalAttrs.version; - hash = "sha256-Mj3G1+Hwa/zl0AM4SO6TcB4W3WJkpIDzrSPEFx0vaEk="; + hash = "sha256-Z9u5clC6m5gDAKkvyvrQs9muNK/P0ipHgQUmTHLRumE="; }; nativeBuildInputs = [ @@ -83,6 +83,10 @@ stdenv.mkDerivation (finalAttrs: { lib.optionals chromecastSupport [ "--enable-chromecast" ] ++ lib.optionals pulseSupport [ "--with-pulseaudio" ]; + patches = [ + ./gettext-0.25.patch + ]; + passthru.updateScript = nix-update-script { }; meta = { From cffd64b94f4c8c7969d6316e62b3f6bb635d11e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Oct 2025 19:19:24 +0000 Subject: [PATCH 060/380] mattermostLatest: 10.12.0 -> 10.12.1 --- pkgs/by-name/ma/mattermostLatest/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix index 72f9a283389f..726da1dfb70c 100644 --- a/pkgs/by-name/ma/mattermostLatest/package.nix +++ b/pkgs/by-name/ma/mattermostLatest/package.nix @@ -11,9 +11,9 @@ mattermost.override { # and make sure the version regex is up to date here. # Ensure you also check ../mattermost/package.nix for ESR releases. regex = "^v(10\\.[0-9]+\\.[0-9]+)$"; - version = "10.12.0"; - srcHash = "sha256-oVZlXprw0NddHrtx1g2WRoGm1ATq/pqncD0mewN12nw="; - vendorHash = "sha256-Lqa463LLy41aaRbrtJFclfOj55vLjK4pWFAFLzX3TJE="; + version = "10.12.1"; + srcHash = "sha256-PL55NKypsLA+H19cS99iIsMI3IBb6vLvAbAVLZyg+sE="; + vendorHash = "sha256-DS4OC3eQffD/8yLE01gnTJXwV77G7rWk4kqA/rTCtJw="; npmDepsHash = "sha256-O9iX6hnwkEHK0kkHqWD6RYXqoSEW6zs+utiYHnt54JY="; lockfileOverlay = '' unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react") From 632d7f7d02e52b2920adeb839833d56b346f8985 Mon Sep 17 00:00:00 2001 From: Minionflo Date: Thu, 16 Oct 2025 18:52:30 +0200 Subject: [PATCH 061/380] mjpg-streamer: fix for CMake 4 --- pkgs/by-name/mj/mjpg-streamer/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/mj/mjpg-streamer/package.nix b/pkgs/by-name/mj/mjpg-streamer/package.nix index 27addc586a7f..d94775bf61dc 100644 --- a/pkgs/by-name/mj/mjpg-streamer/package.nix +++ b/pkgs/by-name/mj/mjpg-streamer/package.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { prePatch = '' cd mjpg-streamer-experimental + substituteInPlace ./CMakeLists.txt --replace-fail "cmake_minimum_required(VERSION 2.8.3)" "cmake_minimum_required(VERSION 2.8.3...3.10)" ''; nativeBuildInputs = [ cmake ]; From 84ad49bfa2d62b26c83772bfa6266ec2d014ddfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Thu, 16 Oct 2025 12:02:56 -0700 Subject: [PATCH 062/380] blitz: fix build failure with cmake 4 - CMake 4 is no longer retro compatible with versions < 3.5 cmake_minimum_required was already to an upper version, but not cmake_policy --- pkgs/by-name/bl/blitz/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/bl/blitz/package.nix b/pkgs/by-name/bl/blitz/package.nix index e5e44fddc2f2..4929a9ac66e3 100644 --- a/pkgs/by-name/bl/blitz/package.nix +++ b/pkgs/by-name/bl/blitz/package.nix @@ -44,6 +44,14 @@ stdenv.mkDerivation rec { }) ]; + # CMake 4 is no longer retro compatible with versions < 3.5 + # cmake_minimum_required was already to an upper version, but not cmake_policy + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + "cmake_policy(VERSION 3.1)" \ + "" + ''; + nativeBuildInputs = [ cmake pkg-config From 9475509014b30e7e11e18a62c938db63f5b630d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Wed, 15 Oct 2025 18:23:12 -0700 Subject: [PATCH 063/380] leatherman: fix build failure with cmake 4 - CMake 4 is no longer retro compatible with versions < 3.5 --- pkgs/by-name/le/leatherman/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/le/leatherman/package.nix b/pkgs/by-name/le/leatherman/package.nix index b73192f0b788..f4171ddfa62a 100644 --- a/pkgs/by-name/le/leatherman/package.nix +++ b/pkgs/by-name/le/leatherman/package.nix @@ -21,6 +21,14 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DLEATHERMAN_ENABLE_TESTING=OFF" ]; + # CMake4 3.2.2 is deprecated and no longer supported by CMake > 4 + # https://github.com/NixOS/nixpkgs/issues/445447 + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + "cmake_minimum_required(VERSION 3.2.2)" \ + "cmake_minimum_required(VERSION 3.10)" + ''; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ cmake ]; From 6ce88cf89ffbf4ebebdb287876376fe224d817d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Wed, 15 Oct 2025 18:41:29 -0700 Subject: [PATCH 064/380] cpp-hocon: fix build failure with cmake 4 - CMake 4 is no longer retro compatible with versions < 3.5 --- pkgs/by-name/cp/cpp-hocon/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/cp/cpp-hocon/package.nix b/pkgs/by-name/cp/cpp-hocon/package.nix index 7d6a65aa61c9..dcaab234db10 100644 --- a/pkgs/by-name/cp/cpp-hocon/package.nix +++ b/pkgs/by-name/cp/cpp-hocon/package.nix @@ -21,6 +21,12 @@ stdenv.mkDerivation rec { postPatch = '' sed -i -e '/add_subdirectory(tests)/d' lib/CMakeLists.txt + + # CMake 3.2.2 is deprecated and no longer supported by CMake > 4 + # https://github.com/NixOS/nixpkgs/issues/445447 + substituteInPlace CMakeLists.txt --replace-fail \ + "cmake_minimum_required(VERSION 3.2.2)" \ + "cmake_minimum_required(VERSION 3.10)" ''; env.NIX_CFLAGS_COMPILE = "-Wno-error"; From e0e6288837dca9720dfdcbd9ab516ab02e8c14ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Wed, 15 Oct 2025 18:43:57 -0700 Subject: [PATCH 065/380] libwhereami: fix build failure with cmake 4 - CMake 4 is no longer retro compatible with versions < 3.5 --- pkgs/by-name/li/libwhereami/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/li/libwhereami/package.nix b/pkgs/by-name/li/libwhereami/package.nix index f21551ca0242..84774a19f4f4 100644 --- a/pkgs/by-name/li/libwhereami/package.nix +++ b/pkgs/by-name/li/libwhereami/package.nix @@ -19,6 +19,14 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; + # CMake 2.2.2 is deprecated and no longer supported by CMake > 4 + # https://github.com/NixOS/nixpkgs/issues/445447 + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + "cmake_minimum_required(VERSION 3.2.2)" \ + "cmake_minimum_required(VERSION 3.10)" + ''; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ cmake ]; From 5bb16a45aca523a45ff5c7c879ec26d7591ab5ca Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 16 Oct 2025 23:10:47 +0200 Subject: [PATCH 066/380] xautoclick: fix build with cmake4 --- pkgs/by-name/xa/xautoclick/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/xa/xautoclick/package.nix b/pkgs/by-name/xa/xautoclick/package.nix index be79532cef07..f79f0f95aea2 100644 --- a/pkgs/by-name/xa/xautoclick/package.nix +++ b/pkgs/by-name/xa/xautoclick/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, xorg, pkg-config, cmake, @@ -28,6 +29,14 @@ stdenv.mkDerivation rec { sha256 = "GN3zI5LQnVmRC0KWffzUTHKrxcqnstiL55hopwTTwpE="; }; + patches = [ + (fetchpatch { + name = "bump-cmake-required-version.patch"; + url = "https://github.com/qarkai/xautoclick/commit/a6cd4058fa7d8579bf4ada3f48441f333fca9dab.patch?full_index=1"; + hash = "sha256-4ovcaVrXQqFZX85SnewtfjZpipcGTw52ZrTkT6iWZQM="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config From 2c198eddd602e141962c4d3e98729092821d738c Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 16 Oct 2025 23:58:59 +0200 Subject: [PATCH 067/380] udpreplay: fix build with cmake4 --- pkgs/by-name/ud/udpreplay/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/ud/udpreplay/package.nix b/pkgs/by-name/ud/udpreplay/package.nix index 3367597e688c..766b180082f8 100644 --- a/pkgs/by-name/ud/udpreplay/package.nix +++ b/pkgs/by-name/ud/udpreplay/package.nix @@ -3,6 +3,7 @@ cmake, libpcap, fetchFromGitHub, + fetchpatch, lib, }: stdenv.mkDerivation rec { @@ -17,6 +18,14 @@ stdenv.mkDerivation rec { hash = "sha256-kF9a3pjQbFKf25NKyK7uSq0AAO6JK7QeChLhm9Z3wEA="; }; + patches = [ + # Increase minimum CMake required to 3.5 + (fetchpatch { + url = "https://github.com/rigtorp/udpreplay/commit/52bd71d6c004cd69899dbe8d529f3ce0a8154e7f.patch?full_index=1"; + hash = "sha256-nWtC77SNpNDDkEli5loc8eVJ1ll0AdgEKQ4pV84JoSk="; + }) + ]; + meta = with lib; { description = "Replay UDP packets from a pcap file"; longDescription = '' From 1c0ce51b141dcffac818d3e53a3c145f1326bce2 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 17 Oct 2025 01:26:54 +0200 Subject: [PATCH 068/380] pn: drop --- pkgs/by-name/pn/pn/package.nix | 37 ---------------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 pkgs/by-name/pn/pn/package.nix diff --git a/pkgs/by-name/pn/pn/package.nix b/pkgs/by-name/pn/pn/package.nix deleted file mode 100644 index 91adda540acf..000000000000 --- a/pkgs/by-name/pn/pn/package.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - libphonenumber, - icu, - protobuf, -}: - -stdenv.mkDerivation rec { - pname = "pn"; - version = "0.9.0"; - - src = fetchFromGitHub { - owner = "Orange-OpenSource"; - repo = "pn"; - rev = "v${version}"; - sha256 = "sha256-vRF9MPcw/hCreHVLD6QB7g1r0wQiZv1xrfzIHj1Yf9M="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ - libphonenumber - icu - protobuf - ]; - - meta = with lib; { - description = "Libphonenumber command-line wrapper"; - mainProgram = "pn"; - homepage = "https://github.com/Orange-OpenSource/pn"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = [ maintainers.McSinyx ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f7633dfb2ee1..adf73d978d67 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2100,6 +2100,7 @@ mapAliases { platypus = throw "platypus is unmaintained and has not merged Python3 support"; # Added 2025-03-20 pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2024-10-17 plex-media-player = throw "'plex-media-player' has been discontinued, the new official client is available as 'plex-desktop'"; # Added 2025-05-28 + pn = throw "'pn' has been removed as upstream was archived in 2020"; # Added 2025-10-17 plots = throw "'plots' has been replaced by 'gnome-graphs'"; # Added 2025-02-05 pltScheme = racket; # Added 2013-02-24 poac = cabinpkg; # Added 2025-01-22 From 98a73f380288893341099991a4c4885e2b5caddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Thu, 16 Oct 2025 18:32:18 -0700 Subject: [PATCH 069/380] capstone_4: fix build failure with cmake 4 - CMake 4 is no longer retro compatible with versions < 3.5 --- pkgs/development/libraries/capstone/4.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/libraries/capstone/4.nix b/pkgs/development/libraries/capstone/4.nix index a6e0b2a6a738..adb245c9b40e 100644 --- a/pkgs/development/libraries/capstone/4.nix +++ b/pkgs/development/libraries/capstone/4.nix @@ -26,6 +26,17 @@ stdenv.mkDerivation rec { doCheck = true; + # CMake 2.6 is deprecated and is no longer supported by CMake > 4 + # https://github.com/NixOS/nixpkgs/issues/445447 + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + "cmake_minimum_required(VERSION 2.6)" \ + "cmake_minimum_required(VERSION 3.10)" \ + --replace-fail \ + "cmake_policy (SET CMP0048 OLD)" \ + "cmake_policy (SET CMP0048 NEW)" + ''; + meta = { description = "Advanced disassembly library"; homepage = "http://www.capstone-engine.org"; From 936aa39307a68f70b824d4807736986139767451 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Tue, 14 Oct 2025 13:33:39 +0200 Subject: [PATCH 070/380] signal-desktop: 7.73.0 -> 7.74.0 Co-authored-by: Marcin Serwin --- pkgs/by-name/si/signal-desktop/package.nix | 16 +-- .../replace-apple-emoji-with-noto-emoji.patch | 80 ++++++----- pkgs/by-name/si/signal-desktop/ringrtc.nix | 11 +- .../si/signal-desktop/webrtc-sources.json | 132 ++++++++---------- pkgs/by-name/si/signal-desktop/webrtc.nix | 3 +- 5 files changed, 122 insertions(+), 120 deletions(-) diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index 27295d8335fb..2ce968f1c577 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -52,13 +52,13 @@ let ''; }); - version = "7.73.0"; + version = "7.74.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-5cwGV0WPOS7O/xnQZ38t/hiQppqFFtVQmGuniGsD6H8="; + hash = "sha256-ahFc/AOBfgW34S1zcLZYj9pie/2aAK/tdZzC7An4lNU="; }; sticker-creator = stdenv.mkDerivation (finalAttrs: { @@ -69,7 +69,7 @@ let pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname src version; fetcherVersion = 1; - hash = "sha256-cT7Ixl/V/mesPHvJUsG63Y/wXwKjbjkjdjP3S7uEOa0="; + hash = "sha256-WUwclz7dJl+s5zRjWu/HTJ5eZroAFA6vR8mZzwib6Po="; }; strictDeps = true; @@ -134,15 +134,15 @@ stdenv.mkDerivation (finalAttrs: { fetcherVersion = 1; hash = if withAppleEmojis then - "sha256-9YvNs925xBUYEpF429rHfMXIGPapVYd8j1jZa/yBuhA=" + "sha256-h1F9/lKtcT8Gce+EVj8RrPzHtjqp11ycHAkf7xldHeM=" else - "sha256-lcr8EeL+wd6VihKcBgfXNRny8VskX8g7I7WTAkLuBss="; + "sha256-tDlQTOSUkCjRXtA7NIUgI+ax+GCPFXK+eZLe0fXVhJY="; }; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1759413120; + SOURCE_DATE_EPOCH = 1759960657; }; preBuild = '' @@ -218,12 +218,10 @@ stdenv.mkDerivation (finalAttrs: { install -Dm644 $icon $out/share/icons/hicolor/`basename ''${icon%.png}`/apps/signal-desktop.png done - # TODO: Remove --ozone-platform=wayland after next electron update, - # see https://github.com/electron/electron/pull/48309 makeWrapper '${lib.getExe electron}' "$out/bin/signal-desktop" \ --add-flags "$out/share/signal-desktop/app.asar" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} runHook postInstall diff --git a/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch b/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch index 5d235dc80041..4f7f0bebcf26 100644 --- a/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch +++ b/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch @@ -49,11 +49,11 @@ diff --git a/package.json b/package.json index 5755fec..86125ba 100644 --- a/package.json +++ b/package.json -@@ -137,7 +137,6 @@ +@@ -154,7 +154,6 @@ "dashdash": "2.0.0", "direction": "1.0.4", - "emoji-datasource": "15.1.2", -- "emoji-datasource-apple": "15.1.2", + "emoji-datasource": "16.0.0", +- "emoji-datasource-apple": "16.0.0", "emoji-regex": "10.4.0", "encoding": "0.1.13", "fabric": "4.6.0", @@ -64,46 +64,46 @@ index 5755fec..86125ba 100644 -} +} \ No newline at end of file -diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml -index f04b2b1..070fa0f 100644 ---- a/pnpm-lock.yaml -+++ b/pnpm-lock.yaml -@@ -184,9 +184,6 @@ importers: +diff --git i/pnpm-lock.yaml w/pnpm-lock.yaml +index b162101a8..82ee9d67e 100644 +--- i/pnpm-lock.yaml ++++ w/pnpm-lock.yaml +@@ -197,9 +197,6 @@ importers: emoji-datasource: - specifier: 15.1.2 - version: 15.1.2 + specifier: 16.0.0 + version: 16.0.0 - emoji-datasource-apple: -- specifier: 15.1.2 -- version: 15.1.2 +- specifier: 16.0.0 +- version: 16.0.0 emoji-regex: specifier: 10.4.0 version: 10.4.0 -@@ -4817,9 +4814,6 @@ packages: +@@ -5814,9 +5811,6 @@ packages: resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==} engines: {node: '>=12'} - -- emoji-datasource-apple@15.1.2: -- resolution: {integrity: sha512-32UZTK36x4DlvgD1smkmBlKmmJH7qUr5Qut4U/on2uQLGqNXGbZiheq6/LEA8xRQEUrmNrGEy25wpEI6wvYmTg==} + +- emoji-datasource-apple@16.0.0: +- resolution: {integrity: sha512-dVYjsK0FnCry9F+PBtnivhG2K0xdwlmqYaSgiUtztUdAGPYiHYhZcVKvNBqC791g2qyEcFNTBO6utg4eQ3uLTw==} - - emoji-datasource@15.1.2: - resolution: {integrity: sha512-tXAqGsrDVhgCRpFePtaD9P4Z8Ro2SUQSL/4MIJBG0SxqQJaMslEbin8J53OaFwEBu6e7JxFaIF6s4mw9+8acAQ==} - -@@ -14990,8 +14984,6 @@ snapshots: - + emoji-datasource@16.0.0: + resolution: {integrity: sha512-/qHKqK5Nr3+8zhgO6kHmF43Fm5C8HNn0AaFRIpgw8HF3+uF0Vfc8jgLI1ZQS5ba1vBzksS8NBCjHejwLb2D/Sg==} + +@@ -17037,8 +17031,6 @@ snapshots: + emittery@0.13.1: {} - -- emoji-datasource-apple@15.1.2: {} + +- emoji-datasource-apple@16.0.0: {} - - emoji-datasource@15.1.2: {} - + emoji-datasource@16.0.0: {} + emoji-regex@10.4.0: {} diff --git a/stylesheets/components/fun/FunEmoji.scss b/stylesheets/components/fun/FunEmoji.scss -index 78c7563..83d196c 100644 ---- a/stylesheets/components/fun/FunEmoji.scss -+++ b/stylesheets/components/fun/FunEmoji.scss +index ea029fd5b..0e3563b4f 100644 +--- i/stylesheets/components/fun/FunEmoji.scss ++++ w/stylesheets/components/fun/FunEmoji.scss @@ -5,19 +5,9 @@ $emoji-sprite-sheet-grid-item-count: 62; - + @mixin emoji-sprite($sheet, $margin, $scale) { - $size: calc($sheet * 1px * $scale); - $margin-start: calc($margin * $scale); @@ -123,16 +123,22 @@ index 78c7563..83d196c 100644 + background-position: center; background-repeat: no-repeat; } - + diff --git a/ts/components/fun/FunEmoji.tsx b/ts/components/fun/FunEmoji.tsx -index 08785e8..d25b868 100644 +index ddb30bf6d..5fc39339b 100644 --- a/ts/components/fun/FunEmoji.tsx +++ b/ts/components/fun/FunEmoji.tsx -@@ -10,7 +10,14 @@ export const FUN_STATIC_EMOJI_CLASS = 'FunStaticEmoji'; - export const FUN_INLINE_EMOJI_CLASS = 'FunInlineEmoji'; - - function getEmojiJumboUrl(emoji: EmojiVariantData): string { -- return `emoji://jumbo?emoji=${encodeURIComponent(emoji.value)}`; +@@ -20,13 +20,14 @@ function getEmojiJumboBackground( + emoji: EmojiVariantData, + size: number | undefined + ): string | null { +- if (size != null && size < MIN_JUMBOMOJI_SIZE) { +- return null; +- } +- if (KNOWN_JUMBOMOJI.has(emoji.value)) { +- return `url(emoji://jumbo?emoji=${encodeURIComponent(emoji.value)})`; +- } +- return null; + const emojiToNotoName = (emoji: string): string => + `emoji_u${ + [...emoji] @@ -140,7 +146,7 @@ index 08785e8..d25b868 100644 + .map(c => c.codePointAt(0)?.toString(16).padStart(4, "0")) + .join("_") + }.png`; -+ return `file://@noto-emoji-pngs@/${emojiToNotoName(emoji.value)}`; ++ return `url(file://@noto-emoji-pngs@/${emojiToNotoName(emoji.value)})`; } export type FunStaticEmojiSize = diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix index b1cf5cbe4644..bd81befd9330 100644 --- a/pkgs/by-name/si/signal-desktop/ringrtc.nix +++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix @@ -19,16 +19,21 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "ringrtc"; - version = "2.58.1"; + version = "2.59.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "ringrtc"; tag = "v${finalAttrs.version}"; - hash = "sha256-HI+HVDv+nuJp2BPIAVY+PI6Pof1pnB8L6CIAgBT+tJA="; + hash = "sha256-zgDXkkKJrcD357DxbPq/sL/c4AG8xyMPY5IpcBtvATY="; }; - cargoHash = "sha256-n+1pe202U2lljisSRBWeVvuBLyp7jhXG+ovDDi5WV8Q="; + cargoHash = "sha256-uwMNJ+PQa/Q7XZ9QONo+vm2wMqGwOEB97Kl/RFQkdhU="; + + preConfigure = '' + # Check for matching webrtc version + grep 'webrtc.version=${webrtc.version}' config/version.properties + ''; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json index d9b28f488ad7..80abcfd66ea1 100644 --- a/pkgs/by-name/si/signal-desktop/webrtc-sources.json +++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json @@ -1,33 +1,25 @@ { "src": { "args": { - "hash": "sha256-Qj0UFRWfZrBG9WUX4zkyiatIekNSYXsneP5aLvufNh4=", + "hash": "sha256-mNj4Sw7EROc2Cn4nPSm789h1je7EOjNAg2s6fQ19Dcc=", "owner": "signalapp", "repo": "webrtc", - "tag": "7204c" + "tag": "7339c" }, "fetcher": "fetchFromGitHub" }, - "src/base": { - "args": { - "hash": "sha256-wKFvb28LeB7/YVGmWKhcvXCEeNB6HaxMgZJLpC5a1Zk=", - "rev": "4ba67f727a84a10e32a417dc7e194f4fc6a23390", - "url": "https://chromium.googlesource.com/chromium/src/base" - }, - "fetcher": "fetchFromGitiles" - }, "src/build": { "args": { - "hash": "sha256-Bfd3paXVGon4p85V2UO6vEHG/t1g8EAxvYQ+DdPcuI8=", - "rev": "7adbc7e3263f3ab427ba7c5ac7839a69082ff7fb", + "hash": "sha256-BFKseH/tEQcQ1UF2YPBcfMLY54qBmM7OboC15NFO9e0=", + "rev": "66d076c7ab192991f67891b062b35404f3cb0739", "url": "https://chromium.googlesource.com/chromium/src/build" }, "fetcher": "fetchFromGitiles" }, "src/buildtools": { "args": { - "hash": "sha256-adtGyo+wm8+keR0um1fOdChABdBYboGBawD0LfcY00w=", - "rev": "1fc7350e65e9d7848c083b83aaf67611e74a5654", + "hash": "sha256-c1I0yBRDb9JUkywmJJy0IZp802qJRsoQV72ydinzxVs=", + "rev": "0c4bbb0f8a874de0a2a15d196031c7303d04fbb3", "url": "https://chromium.googlesource.com/chromium/src/buildtools" }, "fetcher": "fetchFromGitiles" @@ -43,40 +35,40 @@ }, "src/testing": { "args": { - "hash": "sha256-CQg6fxDz0dk4fD+X53stTwJJ25feYoU9KdsgjTAzbp8=", - "rev": "44b0a8d794b28dbd74614e5f5e7da2b407030647", + "hash": "sha256-PkTTET3CB1pQLipi0e6m+fVhf7S3MSEqiYeLFg9Pbjs=", + "rev": "305de9533d3ee2840af0b3f2c8ed0b32802b0a5d", "url": "https://chromium.googlesource.com/chromium/src/testing" }, "fetcher": "fetchFromGitiles" }, "src/third_party": { "args": { - "hash": "sha256-KfIQS+FrzFDAS0B3yfzPj4PqD16H0dBE6z1JgFag/20=", - "rev": "8a150db896356cd9b47f8c1a6d916347393f90f2", + "hash": "sha256-P0fhs0vabiD7+C2ILX6gE62RKXfXbLmHRjbWLpqY48g=", + "rev": "e30091e8987ee0bb0cd30bc467250a96a7614762", "url": "https://chromium.googlesource.com/chromium/src/third_party" }, "fetcher": "fetchFromGitiles" }, "src/third_party/boringssl/src": { "args": { - "hash": "sha256-+Gs+efB1ZizjMYRSRTQrMDPZsDC+dgNJ9+yHXkzm/ZM=", - "rev": "9295969e1dad2c31d0d99481734c1c68dcbc6403", + "hash": "sha256-bpsZTEQ2/TE7xxhOtDz5PKzkOClImHtCTgOaINzg8Vk=", + "rev": "ddb2ca4b48fca9a1c468d83dc513b837331843ac", "url": "https://boringssl.googlesource.com/boringssl.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/breakpad/breakpad": { "args": { - "hash": "sha256-+Z7KphmQYCeN0aJkqyMrJ4tIi3BhqN16KoPNLb/bMGo=", - "rev": "2625edb085169e92cf036c236ac79ab594a7b1cc", + "hash": "sha256-8OfbSe+ly/5FFYk8NubAV39ACMr5S4wbLBVdiQHWeok=", + "rev": "ff252ff6faf5e3a52dc4955aab0d84831697dc94", "url": "https://chromium.googlesource.com/breakpad/breakpad.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/catapult": { "args": { - "hash": "sha256-xHe9WoAq1FElMSnu5mlEzrH+EzKiwWXeXMCH69KL5a0=", - "rev": "5477c6dfde1132b685c73edc16e1bc71449a691d", + "hash": "sha256-khxdFV6fxbTazz195MlxktLlihXytpNYCykLrI8nftM=", + "rev": "0fd1415f0cf3219ba097d37336141897fab7c5e9", "url": "https://chromium.googlesource.com/catapult.git" }, "fetcher": "fetchFromGitiles" @@ -107,8 +99,8 @@ }, "src/third_party/compiler-rt/src": { "args": { - "hash": "sha256-FVdcKGwRuno3AzS6FUvI8OTj3mBMRfFR2A8GzYcwIU4=", - "rev": "57196dd146582915c955f6d388e31aea93220c51", + "hash": "sha256-TANkUmIqP+MirWFmegENuJEFK+Ve/o0A0azuxTzeAo8=", + "rev": "dc425afb37a69b60c8c02fef815af29e91b61773", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git" }, "fetcher": "fetchFromGitiles" @@ -123,24 +115,24 @@ }, "src/third_party/dav1d/libdav1d": { "args": { - "hash": "sha256-+DY4p41VuAlx7NvOfXjWzgEhvtpebjkjbFwSYOzSjv4=", - "rev": "8d956180934f16244bdb58b39175824775125e55", + "hash": "sha256-2J4M6EkfVtPLUpRWwzXdLkvJio4gskC0ihZnM5H3qYc=", + "rev": "716164239ad6e6b11c5dcdaa3fb540309d499833", "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/depot_tools": { "args": { - "hash": "sha256-1avxBlK0WLHTru5wUecbiGpSEYv8Epobsl4EfCaWX9A=", - "rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490", + "hash": "sha256-+jbfCtruv6MR+A/uzw5WaSj2u92W6bB/vmLBCzL39mM=", + "rev": "d85491b0a1dcb82dd8e124a876ecd7e3d50dc5e8", "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/ffmpeg": { "args": { - "hash": "sha256-noc3iZ1yCEgkwWyznx48rXC8JuKxla9QgC/CIjRL/y8=", - "rev": "dcdd0fa51b65a0b1688ff6b8f0cc81908f09ded2", + "hash": "sha256-c5w8CuyE1J0g79lrNq1stdqc1JaAkMbtscdcywmAEMY=", + "rev": "d2d06b12c22d27af58114e779270521074ff1f85", "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" }, "fetcher": "fetchFromGitiles" @@ -155,24 +147,24 @@ }, "src/third_party/fontconfig/src": { "args": { - "hash": "sha256-Kz7KY+evfOciKFHIBLG1JxIRgHRTzuBLgxXHv3m/Y1Y=", - "rev": "8cf0ce700a8abe0d97ace4bf7efc7f9534b729ba", + "hash": "sha256-6HLV0U/MA1XprKJ70TKvwUBdkGQPwgqP4Oj5dINsKp0=", + "rev": "86b48ec01ece451d5270d0c5181a43151e45a042", "url": "https://chromium.googlesource.com/external/fontconfig.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/freetype/src": { "args": { - "hash": "sha256-Mt6uJGGHiGYNNLx2xrooYirynL9DW0s05G1GJiqzhi8=", - "rev": "e07e56c7f106b600262ab653d696b7b57f320127", + "hash": "sha256-oiezGGrPlHVGi24IpLr6UfUs7gT+Epzw37TtAkEixek=", + "rev": "08805be530d6820d2bf8a1b7685826de40f06812", "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/fuzztest/src": { "args": { - "hash": "sha256-MHli8sadgC3OMesBGhkjPM/yW49KFOtdFuBII1bcFas=", - "rev": "f03aafb7516050ea73f617bf969f03eac641aefc", + "hash": "sha256-uWPhInzuidI4smFRjRF95aaVNTsehKd/1y4uRzr12mk=", + "rev": "7bab06ff5fbbf8b8cce05a8661369dc2e11cde66", "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" }, "fetcher": "fetchFromGitiles" @@ -187,24 +179,24 @@ }, "src/third_party/googletest/src": { "args": { - "hash": "sha256-md/jPkFrs/0p0BYGyquh57Zxh+1dKaK26PDtUN1+Ce0=", - "rev": "09ffd0015395354774c059a17d9f5bee36177ff9", + "hash": "sha256-07pEo2gj3n/IOipqz7UpZkBOywZt7FkfZFCnVyp3xYw=", + "rev": "373af2e3df71599b87a40ce0e37164523849166b", "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/grpc/src": { "args": { - "hash": "sha256-z96goSSgBUvTjNse/LO88zNIzg+SWEYgVDaoA/elkLU=", - "rev": "cadf3c8329377e93b1f5e2d6a43d91f7a4becc28", + "hash": "sha256-5vv8V/hEKalfHa2Qo8QIxLvXoamcLxNQ/bcqY8vCvjk=", + "rev": "806e186735cc3bf4375f43d2d6a9483c607e4278", "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/gtest-parallel": { "args": { - "hash": "sha256-VUuk5tBTh+aU2dxVWUF1FePWlKUJaWSiGSXk/J5zgHw=", - "rev": "96f4f904922f9bf66689e749c40f314845baaac8", + "hash": "sha256-uVq+oDrue4sf1JPoeymIIDe79Fv7rcJAVOjxUF42Xo0=", + "rev": "cd488bdedc1d2cffb98201a17afc1b298b0b90f1", "url": "https://chromium.googlesource.com/external/github.com/google/gtest-parallel" }, "fetcher": "fetchFromGitiles" @@ -219,8 +211,8 @@ }, "src/third_party/icu": { "args": { - "hash": "sha256-/T7uyzwTCDaamLwSvutvbn6BJuoG1RqeR+xhXI5jmJw=", - "rev": "b929596baebf0ab4ac7ec07f38365db4c50a559d", + "hash": "sha256-k3z31DhDPoqjcZdUL4vjyUMVpUiNk44+7rCMTDVPH8Q=", + "rev": "1b2e3e8a421efae36141a7b932b41e315b089af8", "url": "https://chromium.googlesource.com/chromium/deps/icu.git" }, "fetcher": "fetchFromGitiles" @@ -243,32 +235,32 @@ }, "src/third_party/libFuzzer/src": { "args": { - "hash": "sha256-Lb+HczYax0T7qvC0/Nwhc5l2szQTUYDouWRMD/Qz7sA=", - "rev": "e31b99917861f891308269c36a32363b120126bb", + "hash": "sha256-TDi1OvYClJKmEDikanKVTmy8uxUXJ95nuVKo5u+uFPM=", + "rev": "bea408a6e01f0f7e6c82a43121fe3af4506c932e", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/libaom/source/libaom": { "args": { - "hash": "sha256-pyLKjLG83Jlx6I+0M8Ah94ku4NIFcrHNYswfVHMvdrc=", - "rev": "2cca4aba034f99842c2e6cdc173f83801d289764", + "hash": "sha256-cER77Q9cM5rh+oeh1LDyKDZyQK5VbtE/ANNTN2cYzMo=", + "rev": "e91b7aa26d6d0979bba2bee5e1c27a7a695e0226", "url": "https://aomedia.googlesource.com/aom.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/libc++/src": { "args": { - "hash": "sha256-36ulJk/YTfP5k1sDeA/WQyIO8xaplRKK4cQhfTZdpko=", - "rev": "a01c02c9d4acbdae3b7e8a2f3ee58579a9c29f96", + "hash": "sha256-34+xTZqWpm+1aks2b4nPD3WRJTkTxNj6ZjTuMveiQ+M=", + "rev": "adbb4a5210ae2a8a4e27fa6199221156c02a9b1a", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/libc++abi/src": { "args": { - "hash": "sha256-DkCvfFjMztFTzKf081XyiefW6tMBSZ1AdzcPzXAVPnk=", - "rev": "9810fb23f6ba666f017c2b67c67de2bcac2b44bd", + "hash": "sha256-wO64dyP1O3mCBh/iiRkSzaWMkiDkb7B98Avd4SpnY70=", + "rev": "a6c815c69d55ec59d020abde636754d120b402ad", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" }, "fetcher": "fetchFromGitiles" @@ -291,32 +283,32 @@ }, "src/third_party/libunwind/src": { "args": { - "hash": "sha256-O1S3ijnoVrTHmZDGmgQQe0MVGsSZL7usXAPflGFmMXY=", - "rev": "8575f4ae4fcf8892938bd9766cf1a5c90a0ed04e", + "hash": "sha256-GmLreEtoyHMXr6mZgZ7NS1ZaS9leB9eMbISeN7qmfqw=", + "rev": "84c5262b57147e9934c0a8f2302d989b44ec7093", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/libvpx/source/libvpx": { "args": { - "hash": "sha256-SFdYF8vnwNHQbZ1N/ZHr4kxfi9o+BAtuqbak80m9uP4=", - "rev": "b84ca9b63730e7d4563573a56a66317eb0087ebf", + "hash": "sha256-BbXiBbnGwdsbZCZIpurfTzYvDUCysdt+ocRh6xvuUI8=", + "rev": "a985e5e847a2fe69bef3e547cf25088132194e39", "url": "https://chromium.googlesource.com/webm/libvpx.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/libyuv": { "args": { - "hash": "sha256-J9Wi3aCc6OjtQCP8JnrY7PYrY587dKLaa1KGAMWmE0c=", - "rev": "61bdaee13a701d2b52c6dc943ccc5c888077a591", + "hash": "sha256-ievGlutmOuuEEhWS82vMqxwqXCq8PF3508N0MCMPQus=", + "rev": "cdd3bae84818e78466fec1ce954eead8f403d10c", "url": "https://chromium.googlesource.com/libyuv/libyuv.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/llvm-libc/src": { "args": { - "hash": "sha256-BsoHIvdqgYzBUkd23++enEHIhq5GeVWrWdVdhXrHh9A=", - "rev": "9c3ae3120fe83b998d0498dcc9ad3a56c29fad0c", + "hash": "sha256-MgOyCveySgpUoIj6jJGbDjzMVpPDbeKtvpFUC+ocdsY=", + "rev": "8ec6b26421b5fa7aa876fdab486fa1decc558326", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git" }, "fetcher": "fetchFromGitiles" @@ -331,8 +323,8 @@ }, "src/third_party/nasm": { "args": { - "hash": "sha256-neYrS4kQ76ihUh22Q3uPR67Ld8+yerA922YSZU1KxJs=", - "rev": "9f916e90e6fc34ec302573f6ce147e43e33d68ca", + "hash": "sha256-TxzAcp+CoKnnM0lCGjm+L3h6M30vYHjM07vW6zUe/vY=", + "rev": "e2c93c34982b286b27ce8b56dd7159e0b90869a2", "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" }, "fetcher": "fetchFromGitiles" @@ -347,8 +339,8 @@ }, "src/third_party/perfetto": { "args": { - "hash": "sha256-kzVsti2tygOMgT61TmCz26AByMd3gIXA6xz8RE0iCz4=", - "rev": "dd35b295cd359ba094404218414955f961a0d6ae", + "hash": "sha256-JwoqF2VWrkwcokaGY6bo73YJWtO7lDnvOqFCBmIEBXY=", + "rev": "0c893ed6bf6b42e3fee58daf3380d301c72550ed", "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git" }, "fetcher": "fetchFromGitiles" @@ -363,16 +355,16 @@ }, "src/third_party/re2/src": { "args": { - "hash": "sha256-f/k2rloV2Nwb0KuJGUX4SijFxAx69EXcsXOG4vo+Kis=", - "rev": "c84a140c93352cdabbfb547c531be34515b12228", + "hash": "sha256-vjh4HI4JKCMAf5SZeqstb0M01w8ssaTwwrLAUsrFkkQ=", + "rev": "8451125897dd7816a5c118925e8e42309d598ecc", "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" }, "fetcher": "fetchFromGitiles" }, "src/tools": { "args": { - "hash": "sha256-j95oiK5+hhKC+NNQ27EVZugZI/n2QZJNRyz2QE4pVXc=", - "rev": "901b847deda65d44f1bba16a9f47e2ea68a805be", + "hash": "sha256-9CYGP9LI/fSHUAjqvXxyNZZVwxkr5TdEZME4l/7fizM=", + "rev": "ec8f1c6113753a31c55b6d6bddfbe198046029a8", "url": "https://chromium.googlesource.com/chromium/src/tools" }, "fetcher": "fetchFromGitiles" diff --git a/pkgs/by-name/si/signal-desktop/webrtc.nix b/pkgs/by-name/si/signal-desktop/webrtc.nix index 2e586d52cbf7..b0f3968145b0 100644 --- a/pkgs/by-name/si/signal-desktop/webrtc.nix +++ b/pkgs/by-name/si/signal-desktop/webrtc.nix @@ -34,7 +34,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "signal-webrtc"; - version = finalAttrs.gclientDeps."src".path.rev; + version = finalAttrs.gclientDeps."src".path.tag; gclientDeps = gclient2nix.importGclientDeps ./webrtc-sources.json; sourceRoot = "src"; @@ -87,6 +87,7 @@ stdenv.mkDerivation (finalAttrs: { "is_clang=false" "treat_warnings_as_errors=false" "use_llvm_libatomic=false" + "use_custom_libcxx=false" # https://github.com/signalapp/ringrtc/blob/main/bin/build-desktop "rtc_build_examples=false" From 8f53ef33326c5e98d779be598bcaa85ee99fbe42 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 16 Oct 2025 13:33:52 +0200 Subject: [PATCH 071/380] signal-desktop: 7.74.0 -> 7.75.0 --- .../signal-desktop/dont-strip-absolute-paths.patch | 14 +++++++------- pkgs/by-name/si/signal-desktop/libsignal-node.nix | 8 ++++---- pkgs/by-name/si/signal-desktop/package.nix | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch b/pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch index 103ee8af45b6..ddbc406aa7cc 100644 --- a/pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch +++ b/pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch @@ -1,14 +1,14 @@ diff --git a/node/build_node_bridge.py b/node/build_node_bridge.py -index c983fc3..2ab06dc 100755 ---- a/node/build_node_bridge.py -+++ b/node/build_node_bridge.py -@@ -138,9 +138,6 @@ def main(args: Optional[List[str]] = None) -> int: - cargo_env['CARGO_PROFILE_RELEASE_LTO'] = 'thin' - # Enable ARMv8 cryptography acceleration when available +index a2da3c8b..cb5d475f 100755 +--- i/node/build_node_bridge.py ++++ w/node/build_node_bridge.py +@@ -154,9 +154,6 @@ def main(args: Optional[List[str]] = None) -> int: cargo_env['RUSTFLAGS'] += ' --cfg aes_armv8' + # Access tokio's unstable metrics + cargo_env['RUSTFLAGS'] += ' --cfg tokio_unstable' - # Strip absolute paths - for path in build_helpers.rust_paths_to_remap(): - cargo_env['RUSTFLAGS'] += f' --remap-path-prefix {path}=' - + # If set (below), will post-process the build library using this instead of just `cp`-ing it. objcopy = None diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix index 326ea8906e86..599530664cb3 100644 --- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix +++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix @@ -24,23 +24,23 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "libsignal-node"; - version = "0.81.1"; + version = "0.83.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "libsignal"; tag = "v${finalAttrs.version}"; - hash = "sha256-uhxfVFsoB+c1R5MUOgpJFm8ZD3vgU8BIn35QSfbEp5w="; + hash = "sha256-lSk9C2RIRsAlSUr8folhdHkHkpAfPM+vwJ/rZ6mys3Q="; }; - cargoHash = "sha256-Q3GSeaW3YveLxLeJPpPXUVwlJ0QLRkAmRGSJetxKl4Y="; + cargoHash = "sha256-0P89+p0WlQaa48wpgsaapIhEzlAnWVPl9qD+jnBw9mM="; npmRoot = "node"; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-npm-deps"; inherit (finalAttrs) version src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}"; - hash = "sha256-6Mr3SJn4pO0p6PISXvEOhN9uPk1TIEU03ssclNUg2No="; + hash = "sha256-4sd8JVQfCC4dAkksICbb3e4JjNcgplOW26TyRkAFWp0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index 2ce968f1c577..96ae5d2a1cb1 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -52,13 +52,13 @@ let ''; }); - version = "7.74.0"; + version = "7.75.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-ahFc/AOBfgW34S1zcLZYj9pie/2aAK/tdZzC7An4lNU="; + hash = "sha256-Abt0Rh+6hDLIfHtiTZZCZuKf4SCBLu917wopV6H7n+I="; }; sticker-creator = stdenv.mkDerivation (finalAttrs: { @@ -134,15 +134,15 @@ stdenv.mkDerivation (finalAttrs: { fetcherVersion = 1; hash = if withAppleEmojis then - "sha256-h1F9/lKtcT8Gce+EVj8RrPzHtjqp11ycHAkf7xldHeM=" + "sha256-b13di3TdaS6CT8gAZfBqlu4WheIHL+X8LvAo148H8kI=" else - "sha256-tDlQTOSUkCjRXtA7NIUgI+ax+GCPFXK+eZLe0fXVhJY="; + "sha256-/Yy9R+MRN5e5vGU0XgwJa7oFpHn8bi8B0y89aaT2LQI="; }; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1759960657; + SOURCE_DATE_EPOCH = 1760562217; }; preBuild = '' From faa0cd70272f3a2f76d88647fee53892e05d8329 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 11:49:19 +0000 Subject: [PATCH 072/380] zpaqfranz: 63.1 -> 63.5 --- pkgs/by-name/zp/zpaqfranz/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix index 7e833921b438..d9e449a4e57f 100644 --- a/pkgs/by-name/zp/zpaqfranz/package.nix +++ b/pkgs/by-name/zp/zpaqfranz/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zpaqfranz"; - version = "63.1"; + version = "63.5"; src = fetchFromGitHub { owner = "fcorbelli"; repo = "zpaqfranz"; rev = finalAttrs.version; - hash = "sha256-j8UmKCiwlFPmrlBA7rr9qlejxYKkXrH1i3Qd0MhO3YU="; + hash = "sha256-hgT11teZQOzaJ89zg0dOLcEgJRrdSUpKpEwyQwULhPg="; }; nativeBuildInputs = [ From 7af9db4c34027d128c7646bfab94507166a417bd Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Fri, 17 Oct 2025 12:00:00 +0000 Subject: [PATCH 073/380] dsniff: 2.4b1+debian-34 -> 2.4b1+debian-35 Fixes: https://github.com/NixOS/nixpkgs/issues/444046 --- pkgs/by-name/ds/dsniff/package.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ds/dsniff/package.nix b/pkgs/by-name/ds/dsniff/package.nix index 316b728868d3..a37d81216eaf 100644 --- a/pkgs/by-name/ds/dsniff/package.nix +++ b/pkgs/by-name/ds/dsniff/package.nix @@ -34,11 +34,23 @@ let }; pcap = symlinkJoin { inherit (libpcap) name; - paths = [ (libpcap.overrideAttrs { dontDisableStatic = true; }) ]; + paths = + let + staticlibpcap = libpcap.overrideAttrs { dontDisableStatic = true; }; + in + [ + (lib.getInclude staticlibpcap) + (lib.getLib staticlibpcap) + ]; postBuild = '' cp -rs $out/include/pcap $out/include/net - # prevent references to libpcap - rm $out/lib/*.so* + # check the presence of the files that ./configure expects + for i in $out/lib/libpcap.a $out/include/pcap.h $out/include/net/bpf.h; do + if ! test -f $i; then + echo $i is missing from output + exit 1 + fi + done ''; }; net = symlinkJoin { @@ -71,8 +83,8 @@ stdenv.mkDerivation rec { domain = "salsa.debian.org"; owner = "pkg-security-team"; repo = "dsniff"; - rev = "debian/${version}+debian-34"; - sha256 = "sha256-CY0+G09KZXtAwKuaYh5/qcmZjuNhdGis3zCG14hWtqw="; + tag = "debian/${version}+debian-35"; + hash = "sha256-RVv9USAHTVYnGgKygIPgfXpfjCYigJvScuzc2+1Uzfw="; name = "dsniff.tar.gz"; }; From cdeec81a567f40c5842ac241285231d47fc71c4f Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 17 Oct 2025 14:16:20 +0200 Subject: [PATCH 074/380] signal-desktop: 7.75.0 -> 7.75.1 Changelog: https://github.com/signalapp/Signal-Desktop/releases/tag/v7.75.1 --- pkgs/by-name/si/signal-desktop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index 96ae5d2a1cb1..e4f94e63f7c7 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -52,13 +52,13 @@ let ''; }); - version = "7.75.0"; + version = "7.75.1"; src = fetchFromGitHub { owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-Abt0Rh+6hDLIfHtiTZZCZuKf4SCBLu917wopV6H7n+I="; + hash = "sha256-l5fMVXwuXHaGcBuemkwzUcEuktTseGL2k13oxoo81+0="; }; sticker-creator = stdenv.mkDerivation (finalAttrs: { @@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: { env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1760562217; + SOURCE_DATE_EPOCH = 1760633959; }; preBuild = '' From 300ee06a95ba04db85d2591b5e1a4d5ac97d5335 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 12:30:37 +0000 Subject: [PATCH 075/380] livekit: 1.9.1 -> 1.9.2 --- pkgs/by-name/li/livekit/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix index c9b1672d534c..182dc31997ef 100644 --- a/pkgs/by-name/li/livekit/package.nix +++ b/pkgs/by-name/li/livekit/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "livekit"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "livekit"; repo = "livekit"; rev = "v${version}"; - hash = "sha256-seh7LXxHGsdXZFy1I/XukvOS9XTO+OxGycPNxJmaIm0="; + hash = "sha256-a0WaF9myP0xjTjfum+K7Wk86HOZP00kvjOYLmeEQdxk="; }; - vendorHash = "sha256-EbxiiCpl/txIrnKpqP8EI4UZGZMyUt9bcTIAiUl64sk="; + vendorHash = "sha256-hYetTszLS/zYQ39wOv+sP8HlIiyBoKI3Z7XpOrffHa8="; subPackages = [ "cmd/server" ]; From d3cbbf7007e0c590b3c1059b37c4625b5447b6be Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 16 Oct 2025 22:36:10 +0200 Subject: [PATCH 076/380] xkb-switch-i3: fix build with cmake4 --- pkgs/by-name/xk/xkb-switch-i3/package.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/by-name/xk/xkb-switch-i3/package.nix b/pkgs/by-name/xk/xkb-switch-i3/package.nix index 2b65df932864..d7746e165c85 100644 --- a/pkgs/by-name/xk/xkb-switch-i3/package.nix +++ b/pkgs/by-name/xk/xkb-switch-i3/package.nix @@ -9,6 +9,7 @@ libX11, libxkbfile, pkg-config, + fetchpatch, }: stdenv.mkDerivation rec { @@ -23,6 +24,20 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + (fetchpatch { + name = "bump-cmake-required-version.patch"; + url = "https://github.com/Zebradil/xkb-switch-i3/commit/95f6ff96c77fc17891d57332f6d3a014500396eb.patch?full_index=1"; + hash = "sha256-J8EITYxi5EpYwROmFrAXgqFgbnFh8/fy9nxEKNhBvek="; + }) + ]; + + postPatch = '' + substituteInPlace i3ipc++/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.0 FATAL_ERROR)" \ + "cmake_minimum_required(VERSION 3.10)" + ''; + nativeBuildInputs = [ cmake pkg-config From f202d28478ffe433d099c89a1726c95ede659380 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 14:52:40 +0000 Subject: [PATCH 077/380] art: 1.25.9 -> 1.25.10 --- pkgs/by-name/ar/art/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix index f2965d965d20..e3f226194dcc 100644 --- a/pkgs/by-name/ar/art/package.nix +++ b/pkgs/by-name/ar/art/package.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "art"; - version = "1.25.9"; + version = "1.25.10"; src = fetchFromGitHub { owner = "artpixls"; repo = "ART"; tag = version; - hash = "sha256-dg0msZ0aeyl4L7RqqGur9Lalu1QtE0igEc54WT5F+SQ="; + hash = "sha256-qGrkRsdQppfIolxAhxWnJrbYotELKga6X7CFY55xCKk="; }; # Fix the build with CMake 4. From 6c1296c39c35de29d741e735b611218e92d33125 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 16:23:04 +0000 Subject: [PATCH 078/380] crush: 0.9.2 -> 0.11.2 --- pkgs/by-name/cr/crush/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix index 10165ff07454..24285d6948df 100644 --- a/pkgs/by-name/cr/crush/package.nix +++ b/pkgs/by-name/cr/crush/package.nix @@ -9,16 +9,16 @@ buildGo125Module (finalAttrs: { pname = "crush"; - version = "0.9.2"; + version = "0.11.2"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "crush"; tag = "v${finalAttrs.version}"; - hash = "sha256-VFAGjNtXKNjkv8Ryi28oFN/uLomXXdw6NFtyjT3pMEY="; + hash = "sha256-vBjyykNSQ6Mq7OMRS0cCSHa8LUrIcfk9cr66ViU9z54="; }; - vendorHash = "sha256-ktF3kIr143uPwiEbgafladZRqIsmG6jI2BeumGSu82U="; + vendorHash = "sha256-KaEPF4h5XqCjh91/KmB+AoiQK+fUmGEP0Lnyfe2qEZc="; # rename TestMain to prevent it from running, as it panics in the sandbox. postPatch = '' From 32398d846eeff9288917348b7b39dc4a06fdecb7 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 17 Oct 2025 19:18:55 +0200 Subject: [PATCH 079/380] httraqt: fix build with cmake4 --- pkgs/tools/backup/httrack/qt.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/backup/httrack/qt.nix b/pkgs/tools/backup/httrack/qt.nix index bc9eba0b923b..389ef9ad734d 100644 --- a/pkgs/tools/backup/httrack/qt.nix +++ b/pkgs/tools/backup/httrack/qt.nix @@ -33,6 +33,12 @@ mkDerivation rec { ]; prePatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)" \ + "CMAKE_MINIMUM_REQUIRED(VERSION 3.10 FATAL_ERROR)" \ + --replace-fail "CMAKE_POLICY(SET CMP0003 OLD)" "" \ + --replace-fail "CMAKE_POLICY(SET CMP0015 OLD)" "" + substituteInPlace cmake/HTTRAQTFindHttrack.cmake \ --replace /usr/include/httrack/ ${httrack}/include/httrack/ From fd0c349b37922b6a37be60775b9b5e4119362218 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 18:14:54 +0000 Subject: [PATCH 080/380] feishu: 7.50.13 -> 7.50.14 --- pkgs/by-name/fe/feishu/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/fe/feishu/package.nix b/pkgs/by-name/fe/feishu/package.nix index acc5593e92a1..a4a945fa3b67 100644 --- a/pkgs/by-name/fe/feishu/package.nix +++ b/pkgs/by-name/fe/feishu/package.nix @@ -65,12 +65,12 @@ let sources = { x86_64-linux = fetchurl { - url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/1d078929/Feishu-linux_x64-7.50.13.deb"; - sha256 = "sha256-wP3Uyz3KiWLADzUhZnPJori2gqdzEm5azUcGv8w1BXM="; + url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/e91d15e2/Feishu-linux_x64-7.50.14.deb"; + sha256 = "sha256-Ywlf3qi4q5nT3gC9r4ymtFYIrg8xmxapIfO2oQoBdC8="; }; aarch64-linux = fetchurl { - url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/05ade0ea/Feishu-linux_arm64-7.50.13.deb"; - sha256 = "sha256-9YTk3Jx1Ap5ym2N/GiN8YcB6XfyVElSWZV3/O6gJWNE="; + url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/f247fca9/Feishu-linux_arm64-7.50.14.deb"; + sha256 = "sha256-ecpaw0n6jRq1hdDY3rTzRiN8Ck3BTLt+K1DcxrPI4TE="; }; }; @@ -133,7 +133,7 @@ let ]; in stdenv.mkDerivation { - version = "7.50.13"; + version = "7.50.14"; pname = "feishu"; src = From 71e744cf162d10219e2105a4856bf96d0545614a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 18:22:06 +0000 Subject: [PATCH 081/380] xlights: 2025.10.2 -> 2025.11 --- pkgs/by-name/xl/xlights/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix index b70bb479b640..98d31d1a47c1 100644 --- a/pkgs/by-name/xl/xlights/package.nix +++ b/pkgs/by-name/xl/xlights/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "xlights"; - version = "2025.10.2"; + version = "2025.11"; src = fetchurl { url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage"; - hash = "sha256-LfT1AQktBklN1IUiJdqxFY4bM/CQEBg/5sxEvWUQkGQ="; + hash = "sha256-k5HGk5t/ujPuOU/GlxhA+yKKXy0lq8YkxcQkTUVBYXM="; }; meta = { From 7f2565b48b570b224081b5cf3f70c6025b0e2bba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 18:52:43 +0000 Subject: [PATCH 082/380] spacectl: 1.16.1 -> 1.17.0 --- pkgs/by-name/sp/spacectl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spacectl/package.nix b/pkgs/by-name/sp/spacectl/package.nix index e80d27277d94..19ad551ca32d 100644 --- a/pkgs/by-name/sp/spacectl/package.nix +++ b/pkgs/by-name/sp/spacectl/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "spacectl"; - version = "1.16.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "spacelift-io"; repo = "spacectl"; rev = "v${version}"; - hash = "sha256-elr7SG8naxz5w15Advr2tcQxPJ1tBL4G7Do7LNT4kqY="; + hash = "sha256-j9c8RZfm5RWcXAy8LUtIZrztfVhXiAWmCJ/Rwq5IiKo="; }; vendorHash = "sha256-g5Y6NuG8z2Pnh3Ng690FcwOrEU2EOhftZbM8oUFj4B4="; From 000b7bd881b3387c412d549d2f389f483a6b560e Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 17 Oct 2025 22:51:16 +0200 Subject: [PATCH 083/380] amule-gui: fix build with cmake4 --- pkgs/by-name/am/amule/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/am/amule/package.nix b/pkgs/by-name/am/amule/package.nix index c75658b642e2..efb0627dc95a 100644 --- a/pkgs/by-name/am/amule/package.nix +++ b/pkgs/by-name/am/amule/package.nix @@ -79,6 +79,9 @@ stdenv.mkDerivation rec { postPatch = '' echo "find_package(Threads)" >> cmake/options.cmake + + substituteInPlace src/libs/ec/abstracts/CMakeLists.txt \ + --replace-fail "CMAKE_MINIMUM_REQUIRED (VERSION 2.8)" "CMAKE_MINIMUM_REQUIRED (VERSION 3.10)" ''; # aMule will try to `dlopen' libupnp and libixml, so help it From 68f71ff8f5c49222b34d5f460ffa1bb5e242d5a8 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 18 Oct 2025 02:28:14 +0100 Subject: [PATCH 084/380] darwin.mkAppleDerivation: drop support for `noCC` and `noBootstrap` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was only used by `darwin.AvailabilityVersions` setting `noCC`, and is fundamentally incompatible with `finalAttrs.finalPackage`. Better would be to specify `stdenv` outside the derivation attributes, or ideally move this stuff into hooks and helper functions, I think, but for just the one package it doesn’t seem worthwhile. --- .../AvailabilityVersions/package.nix | 2 -- .../apple-source-releases/mkAppleDerivation.nix | 11 +---------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix b/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix index 2625f276923e..dadafd43edcb 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix @@ -19,8 +19,6 @@ mkAppleDerivation (finalAttrs: { ./patches/0001-Support-setting-an-upper-bound-on-versions.patch ]; - noCC = true; - nativeBuildInputs = [ unifdef ]; buildPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix b/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix index d42357f6b245..538b92d32637 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix @@ -8,8 +8,6 @@ in fetchFromGitHub, meson, ninja, - stdenv, - stdenvNoCC, xcodeProjectCheckHook, }: @@ -21,15 +19,8 @@ lib.makeOverridable ( let attrs' = if lib.isFunction attrs then attrs else _: attrs; attrsFixed = lib.fix attrs'; - stdenv' = - if attrsFixed.noCC or false then - stdenvNoCC - else if attrsFixed.noBootstrap or false then - stdenv - else - bootstrapStdenv; in - stdenv'.mkDerivation ( + bootstrapStdenv.mkDerivation ( lib.extends ( self: super: assert super ? releaseName; From 442ded4e97ced8442f1154e6151267864e5f7cfe Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 17 Oct 2025 21:48:40 +0100 Subject: [PATCH 085/380] darwin.mkAppleDerivation: use `lib.extendMkDerivation` --- .../mkAppleDerivation.nix | 109 ++++++++---------- 1 file changed, 51 insertions(+), 58 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix b/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix index 538b92d32637..35131914f120 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix @@ -14,68 +14,61 @@ in let hasBasenamePrefix = prefix: file: lib.hasPrefix prefix (baseNameOf file); in -lib.makeOverridable ( - attrs: - let - attrs' = if lib.isFunction attrs then attrs else _: attrs; - attrsFixed = lib.fix attrs'; - in - bootstrapStdenv.mkDerivation ( - lib.extends ( - self: super: - assert super ? releaseName; - let - inherit (super) releaseName; - info = versions.${releaseName}; - files = lib.filesystem.listFilesRecursive (lib.path.append ./. releaseName); - mesonFiles = lib.filter (hasBasenamePrefix "meson") files; - in - # You have to have at least `meson.build.in` when using xcodeHash to trigger the Meson - # build support in `mkAppleDerivation`. - assert super ? xcodeHash -> lib.length mesonFiles > 0; - { - pname = super.pname or releaseName; - inherit (info) version; +lib.extendMkDerivation { + constructDrv = bootstrapStdenv.mkDerivation; + extendDrvArgs = + self: super: + assert super ? releaseName; + let + inherit (super) releaseName; + info = versions.${releaseName}; + files = lib.filesystem.listFilesRecursive (lib.path.append ./. releaseName); + mesonFiles = lib.filter (hasBasenamePrefix "meson") files; + in + # You have to have at least `meson.build.in` when using xcodeHash to trigger the Meson + # build support in `mkAppleDerivation`. + assert super ? xcodeHash -> lib.length mesonFiles > 0; + { + pname = super.pname or releaseName; + inherit (info) version; - src = super.src or fetchFromGitHub { - owner = "apple-oss-distributions"; - repo = releaseName; - rev = info.rev or "${releaseName}-${info.version}"; - inherit (info) hash; - }; + src = super.src or fetchFromGitHub { + owner = "apple-oss-distributions"; + repo = releaseName; + rev = info.rev or "${releaseName}-${info.version}"; + inherit (info) hash; + }; - strictDeps = true; - __structuredAttrs = true; + strictDeps = true; + __structuredAttrs = true; - meta = { - homepage = "https://opensource.apple.com/releases/"; - license = lib.licenses.apple-psl20; - teams = [ lib.teams.darwin ]; - platforms = lib.platforms.darwin; - } - // super.meta or { }; + meta = { + homepage = "https://opensource.apple.com/releases/"; + license = lib.licenses.apple-psl20; + teams = [ lib.teams.darwin ]; + platforms = lib.platforms.darwin; } - // lib.optionalAttrs (super ? xcodeHash) { - postUnpack = - super.postUnpack or "" - + lib.concatMapStrings ( - file: - if baseNameOf file == "meson.build.in" then - "substitute ${lib.escapeShellArg "${file}"} \"$sourceRoot/meson.build\" --subst-var version\n" - else - "cp ${lib.escapeShellArg "${file}"} \"$sourceRoot/\"${lib.escapeShellArg (baseNameOf file)}\n" - ) mesonFiles; + // super.meta or { }; + } + // lib.optionalAttrs (super ? xcodeHash) { + postUnpack = + super.postUnpack or "" + + lib.concatMapStrings ( + file: + if baseNameOf file == "meson.build.in" then + "substitute ${lib.escapeShellArg "${file}"} \"$sourceRoot/meson.build\" --subst-var version\n" + else + "cp ${lib.escapeShellArg "${file}"} \"$sourceRoot/\"${lib.escapeShellArg (baseNameOf file)}\n" + ) mesonFiles; - xcodeProject = super.xcodeProject or "${releaseName}.xcodeproj"; + xcodeProject = super.xcodeProject or "${releaseName}.xcodeproj"; - nativeBuildInputs = super.nativeBuildInputs or [ ] ++ [ - meson - ninja - xcodeProjectCheckHook - ]; + nativeBuildInputs = super.nativeBuildInputs or [ ] ++ [ + meson + ninja + xcodeProjectCheckHook + ]; - mesonBuildType = "release"; - } - ) attrs' - ) -) + mesonBuildType = "release"; + }; +} From a7f89aca060a6f96359be62f9fa7b44ae85e4e9f Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 18 Oct 2025 02:11:47 +0100 Subject: [PATCH 086/380] darwin.mkAppleDerivation: use conventional argument names --- .../mkAppleDerivation.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix b/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix index 35131914f120..9feabef5265d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix @@ -17,22 +17,22 @@ in lib.extendMkDerivation { constructDrv = bootstrapStdenv.mkDerivation; extendDrvArgs = - self: super: - assert super ? releaseName; + finalAttrs: args: + assert args ? releaseName; let - inherit (super) releaseName; + inherit (args) releaseName; info = versions.${releaseName}; files = lib.filesystem.listFilesRecursive (lib.path.append ./. releaseName); mesonFiles = lib.filter (hasBasenamePrefix "meson") files; in # You have to have at least `meson.build.in` when using xcodeHash to trigger the Meson # build support in `mkAppleDerivation`. - assert super ? xcodeHash -> lib.length mesonFiles > 0; + assert args ? xcodeHash -> lib.length mesonFiles > 0; { - pname = super.pname or releaseName; + pname = args.pname or releaseName; inherit (info) version; - src = super.src or fetchFromGitHub { + src = args.src or fetchFromGitHub { owner = "apple-oss-distributions"; repo = releaseName; rev = info.rev or "${releaseName}-${info.version}"; @@ -48,11 +48,11 @@ lib.extendMkDerivation { teams = [ lib.teams.darwin ]; platforms = lib.platforms.darwin; } - // super.meta or { }; + // args.meta or { }; } - // lib.optionalAttrs (super ? xcodeHash) { + // lib.optionalAttrs (args ? xcodeHash) { postUnpack = - super.postUnpack or "" + args.postUnpack or "" + lib.concatMapStrings ( file: if baseNameOf file == "meson.build.in" then @@ -61,9 +61,9 @@ lib.extendMkDerivation { "cp ${lib.escapeShellArg "${file}"} \"$sourceRoot/\"${lib.escapeShellArg (baseNameOf file)}\n" ) mesonFiles; - xcodeProject = super.xcodeProject or "${releaseName}.xcodeproj"; + xcodeProject = args.xcodeProject or "${releaseName}.xcodeproj"; - nativeBuildInputs = super.nativeBuildInputs or [ ] ++ [ + nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ meson ninja xcodeProjectCheckHook From 00d247dcfc683f0b10db0de8ee009ff6998d8b5e Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Sat, 18 Oct 2025 01:24:53 -0400 Subject: [PATCH 087/380] vangers: fix build for cmake 4 Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/va/vangers/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/va/vangers/package.nix b/pkgs/by-name/va/vangers/package.nix index 0143ae4261b9..eb17bb7618c9 100644 --- a/pkgs/by-name/va/vangers/package.nix +++ b/pkgs/by-name/va/vangers/package.nix @@ -26,6 +26,12 @@ stdenv.mkDerivation { hash = "sha256-IhCQh60wBzaRsj72Y8NUHrv9lvss0fmgHjzrO/subOI="; }; + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + "CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)" \ + "CMAKE_MINIMUM_REQUIRED(VERSION 4.0)" + ''; + buildInputs = [ SDL2 SDL2_net From 9b4585dea5e5d96fb818bb3f3caec24033e9c0db Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Sat, 18 Oct 2025 01:27:55 -0400 Subject: [PATCH 088/380] vangers: modernize Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/va/vangers/package.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/va/vangers/package.nix b/pkgs/by-name/va/vangers/package.nix index eb17bb7618c9..b4a06d427bca 100644 --- a/pkgs/by-name/va/vangers/package.nix +++ b/pkgs/by-name/va/vangers/package.nix @@ -4,6 +4,7 @@ callPackage, stdenv, cmake, + installShellFiles, SDL2, SDL2_net, libogg, @@ -32,6 +33,8 @@ stdenv.mkDerivation { "CMAKE_MINIMUM_REQUIRED(VERSION 4.0)" ''; + strictDeps = true; + buildInputs = [ SDL2 SDL2_net @@ -41,13 +44,20 @@ stdenv.mkDerivation { clunk zlib ]; - nativeBuildInputs = [ cmake ]; + + nativeBuildInputs = [ + cmake + installShellFiles + ]; installPhase = '' - mkdir -p $out/bin - install -T -m755 server/vangers_server $out/bin/vangers_server - install -T -m755 src/vangers $out/bin/vangers - install -T -m755 surmap/surmap $out/bin/surmap + runHook preInstall + + installBin server/vangers_server + installBin src/vangers + installBin surmap/surmap + + runHook postInstall ''; meta = { From 17496ddbb7529f57f06fa6ee1487dde87c54a24d Mon Sep 17 00:00:00 2001 From: Andrew Zah Date: Sat, 18 Oct 2025 17:29:06 +0900 Subject: [PATCH 089/380] enyo-launcher: 2.0.6 -> 2.0.7 * This also fixes the build issue with cmake 4, as noted in https://github.com/nixos/nixpkgs/issues/445447. --- .../doom-ports/enyo-launcher/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/games/doom-ports/enyo-launcher/default.nix b/pkgs/games/doom-ports/enyo-launcher/default.nix index b8e38af270aa..7db29bca5f6a 100644 --- a/pkgs/games/doom-ports/enyo-launcher/default.nix +++ b/pkgs/games/doom-ports/enyo-launcher/default.nix @@ -1,25 +1,26 @@ { - mkDerivation, + stdenv, lib, fetchFromGitLab, cmake, - qtbase, + qt6, }: - -mkDerivation rec { +stdenv.mkDerivation rec { pname = "enyo-launcher"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitLab { owner = "sdcofer70"; repo = "enyo-launcher"; rev = version; - hash = "sha256-k6Stc1tQOcdS//j+bFUNfnOUlwuhIPKxf9DHU+ng164="; + hash = "sha256-Ig1b+JylRlxhl5k5ys9SOGMYw3eUxXyoVXt3YNeWNqI="; }; - nativeBuildInputs = [ cmake ]; - - buildInputs = [ qtbase ]; + nativeBuildInputs = [ + cmake + qt6.wrapQtAppsHook + ]; + buildInputs = [ qt6.qtbase ]; meta = { homepage = "https://gitlab.com/sdcofer70/enyo-launcher"; From aa6072f8a6f0dee0a36be7b3bedf010be2ea35f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Oct 2025 09:59:36 +0000 Subject: [PATCH 090/380] albert: 0.32.1 -> 33.0.1 --- pkgs/by-name/al/albert/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/albert/package.nix b/pkgs/by-name/al/albert/package.nix index 3ad42236da59..e6a9f06ee7eb 100644 --- a/pkgs/by-name/al/albert/package.nix +++ b/pkgs/by-name/al/albert/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "albert"; - version = "0.32.1"; + version = "33.0.1"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; tag = "v${finalAttrs.version}"; - hash = "sha256-v2SMY0KGFwwybsiMu1W1wBWdyoDEFF3hWd4LeaT8Nts="; + hash = "sha256-zHLyvFzLR7Ryk6eoD+Lp+w4bIj7MAeREK0YzRXYnx6c="; fetchSubmodules = true; }; From 49249eceb500b7688f6fd07287780572e3eb6438 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Oct 2025 12:25:01 +0000 Subject: [PATCH 091/380] cloudlog: 2.7.1 -> 2.7.5 --- pkgs/by-name/cl/cloudlog/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/cloudlog/package.nix b/pkgs/by-name/cl/cloudlog/package.nix index e930b812b59a..ac2d3346ef86 100644 --- a/pkgs/by-name/cl/cloudlog/package.nix +++ b/pkgs/by-name/cl/cloudlog/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.7.1"; + version = "2.7.5"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - hash = "sha256-My0z4MW/9O0+ErIh7SEWU3KGJ4UQDmhwJICtBgQ4+q8="; + hash = "sha256-Lb20SrwFQybMNmxgmztAm2/9PBcukgt03W93C743oM8="; }; postPatch = '' From 6f4b5b0b0915c03ea913b6c58b50b3acaed5d680 Mon Sep 17 00:00:00 2001 From: jasonxue Date: Sat, 18 Oct 2025 19:37:06 +0800 Subject: [PATCH 092/380] yaml-language-server: 1.18.0 -> 1.19.2 --- .../ya/yaml-language-server/package.nix | 29 ++++--------------- 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/ya/yaml-language-server/package.nix b/pkgs/by-name/ya/yaml-language-server/package.nix index b597cd02b5ad..8445ab4f7421 100644 --- a/pkgs/by-name/ya/yaml-language-server/package.nix +++ b/pkgs/by-name/ya/yaml-language-server/package.nix @@ -1,39 +1,20 @@ { lib, - stdenv, fetchFromGitHub, - fetchYarnDeps, - nodejs, - yarnConfigHook, - yarnBuildHook, - yarnInstallHook, + buildNpmPackage, }: - -stdenv.mkDerivation (finalAttrs: { +buildNpmPackage (finalAttrs: { pname = "yaml-language-server"; - version = "1.18.0"; + version = "1.19.2"; src = fetchFromGitHub { owner = "redhat-developer"; repo = "yaml-language-server"; tag = finalAttrs.version; - hash = "sha256-HBhoadWIebeuHZXSdnFiPMSmDla77yhrTNMdz8si88c="; + hash = "sha256-wy6+aOtDaWnIU4vyzrOxCZnFWtrn58+zkeU/1Kt6SLs="; }; - offlineCache = fetchYarnDeps { - yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-2OVxvvijnfB8Bytgoaybyx4p66nD/aahtyjxLf8womE="; - }; - - nativeBuildInputs = [ - nodejs - yarnConfigHook - yarnBuildHook - yarnInstallHook - ]; - - # NodeJS is also needed here so that script interpreter get patched - buildInputs = [ nodejs ]; + npmDepsHash = "sha256-8PBVVgVghZvEpxj6E2imfNbAe8f4//43oioaLnlKOE0="; strictDeps = true; From 45024cb1c160ef5b5b8e4df2c9b73ddef1b311dd Mon Sep 17 00:00:00 2001 From: jasonxue Date: Sat, 18 Oct 2025 19:51:57 +0800 Subject: [PATCH 093/380] mermaid-cli: 11.6.0 -> 11.12.0 --- pkgs/by-name/me/mermaid-cli/package.nix | 8 ++++---- .../me/mermaid-cli/remove-puppeteer-from-dev-deps.patch | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/me/mermaid-cli/package.nix b/pkgs/by-name/me/mermaid-cli/package.nix index 00f4667861ae..b1f24fc59e28 100644 --- a/pkgs/by-name/me/mermaid-cli/package.nix +++ b/pkgs/by-name/me/mermaid-cli/package.nix @@ -7,24 +7,24 @@ nix-update-script, }: let - version = "11.6.0"; + version = "11.12.0"; in buildNpmPackage { pname = "mermaid-cli"; - version = version; + inherit version; src = fetchFromGitHub { owner = "mermaid-js"; repo = "mermaid-cli"; rev = version; - hash = "sha256-9Ozi5mAeFVdwGMjvlLG4hMWnCGi552SsT5RuvRiF9ww="; + hash = "sha256-OpYq0nOYCGTorzDxybsEjJmhL646wMBbQw3eHVxTuqU="; }; patches = [ ./remove-puppeteer-from-dev-deps.patch # https://github.com/mermaid-js/mermaid-cli/issues/830 ]; - npmDepsHash = "sha256-SHGYv/IwrCB02M8w5HsEsB7BwWVRFYNDYJFRDgG3a14="; + npmDepsHash = "sha256-Ex+tEm13feR/Vru0CHlvM3xS5wgGlYyqANeIquvRHwM="; env = { PUPPETEER_SKIP_DOWNLOAD = true; diff --git a/pkgs/by-name/me/mermaid-cli/remove-puppeteer-from-dev-deps.patch b/pkgs/by-name/me/mermaid-cli/remove-puppeteer-from-dev-deps.patch index 30f751fc7b4c..7c58948b97f6 100644 --- a/pkgs/by-name/me/mermaid-cli/remove-puppeteer-from-dev-deps.patch +++ b/pkgs/by-name/me/mermaid-cli/remove-puppeteer-from-dev-deps.patch @@ -9,7 +9,7 @@ diff --git a/package.json b/package.json @@ -45,7 +45,6 @@ "@tsconfig/node18": "^18.2.4", "@types/node": "~18.19.31", - "jest": "^29.0.1", + "jest": "^30.0.5", - "puppeteer": "^23.1.1", "standard": "^17.0.0", "typescript": "^5.0.1-rc", From 59c63d279f2a37aa9d8ea2a552715dbdfb9bde05 Mon Sep 17 00:00:00 2001 From: jasonxue Date: Sat, 18 Oct 2025 22:23:47 +0800 Subject: [PATCH 094/380] eas-cli: 16.4.0 -> 16.23.1 --- pkgs/by-name/ea/eas-cli/package.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ea/eas-cli/package.nix b/pkgs/by-name/ea/eas-cli/package.nix index 2221fae577e6..42b49c8c0576 100644 --- a/pkgs/by-name/ea/eas-cli/package.nix +++ b/pkgs/by-name/ea/eas-cli/package.nix @@ -10,18 +10,18 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "eas-cli"; - version = "16.4.0"; + version = "16.23.1"; src = fetchFromGitHub { owner = "expo"; repo = "eas-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-cHayMBhqiLY//t/ljjwJm4qMuVn531z7x2cqJE4z6hQ="; + hash = "sha256-hMUDtl5lMAZzlvPdzO7J3JTw0B5/fjssuqQlg1MUO3w="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; # Point to the root lockfile - hash = "sha256-qDUwAdShpKjIUyYvtA6/hgGdO1z1xLqdsJkL3oqkMSw="; + hash = "sha256-ybctj6TgW9JluDIsSaNm18wUXSBPuIT45te5HoQuz5s="; }; nativeBuildInputs = [ @@ -31,6 +31,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { jq ]; + postPatch = '' + # Disable Nx integration in Lerna to avoid the native pseudo terminal panic in the sandbox. + tmpfile="$(mktemp)" + jq '.useNx = false' lerna.json > "$tmpfile" + mv "$tmpfile" lerna.json + ''; + # yarnInstallHook strips out build outputs within packages/eas-cli resulting in most commands missing from eas-cli. installPhase = '' runHook preInstall From ef6525467d291b962e8c47b5d640c94e3cb73ec4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Oct 2025 15:42:13 +0000 Subject: [PATCH 095/380] mmctl: 10.5.11 -> 10.5.12 --- pkgs/by-name/ma/mattermost/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix index 2447cb920604..1b8e7e4ab3a6 100644 --- a/pkgs/by-name/ma/mattermost/package.nix +++ b/pkgs/by-name/ma/mattermost/package.nix @@ -19,9 +19,9 @@ # # Ensure you also check ../mattermostLatest/package.nix. regex = "^v(10\\.5\\.[0-9]+)$"; - version = "10.5.11"; - srcHash = "sha256-2XX6SNWlu+2Kh0rJodp0Ipzu8/gdjygCxeD2BVYDcTc="; - vendorHash = "sha256-uryErnXPVd/gmiAk0F2DVaqz368H6j97nBn0eNW7DFk="; + version = "10.5.12"; + srcHash = "sha256-VaW+rA0UeIZhGU9BlYZgyznAOtLN+JI7UPbMRPCwTww="; + vendorHash = "sha256-vxUxSkj1EwgMtPpCGJSA9jCDBeLrWhecdwq4KBThhj4="; npmDepsHash = "sha256-tIeuDUZbqgqooDm5TRfViiTT5OIyN0BPwvJdI+wf7p0="; lockfileOverlay = '' unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react") From f9bbb5f0d8885ca9b67ce537082c2a1f7643c094 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Oct 2025 17:37:09 +0000 Subject: [PATCH 096/380] venera: 1.5.0 -> 1.5.3 --- pkgs/by-name/ve/venera/package.nix | 4 ++-- pkgs/by-name/ve/venera/pubspec.lock.json | 26 +++++++++++++++++++++--- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ve/venera/package.nix b/pkgs/by-name/ve/venera/package.nix index d2ffcedfd8e4..99de216280d7 100644 --- a/pkgs/by-name/ve/venera/package.nix +++ b/pkgs/by-name/ve/venera/package.nix @@ -12,13 +12,13 @@ }: let - version = "1.5.0"; + version = "1.5.3"; src = fetchFromGitHub { owner = "venera-app"; repo = "venera"; tag = "v${version}"; - hash = "sha256-LhPtoMD7IjxbTFTSzP+vtflDUixUoN9eqE1AQyWhJzg="; + hash = "sha256-yjO7nQ3F+DLudjqXUp0N13lhBZSAKwAeKXRAKxPxDVQ="; }; in flutter335.buildFlutterApplication { diff --git a/pkgs/by-name/ve/venera/pubspec.lock.json b/pkgs/by-name/ve/venera/pubspec.lock.json index 5891ffafb0f0..d170ac3807a2 100644 --- a/pkgs/by-name/ve/venera/pubspec.lock.json +++ b/pkgs/by-name/ve/venera/pubspec.lock.json @@ -40,6 +40,16 @@ "source": "hosted", "version": "1.0.4" }, + "archive": { + "dependency": "direct dev", + "description": { + "name": "archive", + "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.7" + }, "args": { "dependency": "transitive", "description": { @@ -505,11 +515,11 @@ "dependency": "direct main", "description": { "name": "flutter_memory_info", - "sha256": "1f112f1d7503aa1681fc8e923f6cd0e847bb2fbeec3753ed021cf1e5f7e9cd74", + "sha256": "eacfd0dd01ff596b4e5bf022442769a1807a73f2af43d62802436f0a5de99137", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.0.1" + "version": "0.0.3" }, "flutter_plugin_android_lifecycle": { "dependency": "transitive", @@ -957,6 +967,16 @@ "source": "hosted", "version": "4.0.0" }, + "posix": { + "dependency": "transitive", + "description": { + "name": "posix", + "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.3" + }, "rhttp": { "dependency": "direct main", "description": { @@ -1389,6 +1409,6 @@ }, "sdks": { "dart": ">=3.8.0 <4.0.0", - "flutter": ">=3.35.2" + "flutter": ">=3.35.5" } } From cea3bdb9c4b96b4d04a1832a9cffa1004ed31780 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Oct 2025 18:33:19 +0000 Subject: [PATCH 097/380] metabase: 0.56.6 -> 0.56.10 --- pkgs/by-name/me/metabase/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/metabase/package.nix b/pkgs/by-name/me/metabase/package.nix index f1102925c3bc..96805b04df27 100644 --- a/pkgs/by-name/me/metabase/package.nix +++ b/pkgs/by-name/me/metabase/package.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "metabase"; - version = "0.56.6"; + version = "0.56.10"; src = fetchurl { url = "https://downloads.metabase.com/v${finalAttrs.version}/metabase.jar"; - hash = "sha256-OQ9B1KpuYrtTL46cKJtKyuiHEwGSkF+PlAjb8FOv4zo="; + hash = "sha256-otpNh9TJnUoHjAVVCkrsJO93nIeEfaNC8amZdTvreIE="; }; nativeBuildInputs = [ makeWrapper ]; From 4d8e8a4c91ef3791d18163bc65290d2e6f0d7170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Sat, 18 Oct 2025 12:36:38 -0700 Subject: [PATCH 098/380] edb: fix build failure with cmake 4 - CMake 4 is no longer retro compatible with versions < 3.5 --- pkgs/development/tools/misc/edb/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/tools/misc/edb/default.nix b/pkgs/development/tools/misc/edb/default.nix index 786209cb74f4..f41b4324d6e9 100644 --- a/pkgs/development/tools/misc/edb/default.nix +++ b/pkgs/development/tools/misc/edb/default.nix @@ -53,6 +53,18 @@ stdenv.mkDerivation (finalAttrs: { # submodules were fetched and will throw an error if it's not there. # Avoid using leaveDotGit in the fetchFromGitHub options as it is non-deterministic. mkdir -p src/qhexview/.git lib/gdtoa-desktop/.git + + # CMake 3.1 is deprecated and is no longer supported by CMake > 4 + # https://github.com/NixOS/nixpkgs/issues/445447 + substituteInPlace CMakeLists.txt src/CMakeLists.txt src/test/CMakeLists.txt plugins/CMakeLists.txt plugins/*/CMakeLists.txt --replace-fail \ + "cmake_minimum_required (VERSION 3.1)" \ + "cmake_minimum_required(VERSION 3.10)" + substituteInPlace lib/CMakeLists.txt lib/libELF/CMakeLists.txt lib/libPE/CMakeLists.txt --replace-fail \ + "cmake_minimum_required(VERSION 3.1)" \ + "cmake_minimum_required(VERSION 3.10)" + substituteInPlace lib/gdtoa-desktop/CMakeLists.txt --replace-fail \ + "cmake_minimum_required (VERSION 3.0)" \ + "cmake_minimum_required (VERSION 3.10)" ''; passthru = { From 988ff8bbfbf8c429a73b0872e5158d08bedc4822 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Oct 2025 20:42:49 +0000 Subject: [PATCH 099/380] ngtcp2-gnutls: 1.16.0 -> 1.17.0 --- pkgs/development/libraries/ngtcp2/gnutls.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix index ce17fcefade6..fce288b44b58 100644 --- a/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - hash = "sha256-01Z2PyQDY0L38jsTjIIMcghALMyL/it0lAweKTZ5e0k="; + hash = "sha256-+mSVhUF1ZZJqm2HEp99BevY1yKm2jPIkkTcx7akyfro="; }; outputs = [ From 932e4fee6474e2cd152d180f105a868acb9b6c6c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 18 Oct 2025 22:36:30 +0100 Subject: [PATCH 100/380] isl_0_24: remove unused Latest version is `isl_0_27`. Let's drop intermediate unused version. --- pkgs/development/libraries/isl/0.24.0.nix | 11 ----------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 pkgs/development/libraries/isl/0.24.0.nix diff --git a/pkgs/development/libraries/isl/0.24.0.nix b/pkgs/development/libraries/isl/0.24.0.nix deleted file mode 100644 index 90eb5ec0fac2..000000000000 --- a/pkgs/development/libraries/isl/0.24.0.nix +++ /dev/null @@ -1,11 +0,0 @@ -import ./generic.nix rec { - version = "0.24"; - urls = [ - "mirror://sourceforge/libisl/isl-${version}.tar.xz" - "https://libisl.sourceforge.io/isl-${version}.tar.xz" - ]; - sha256 = "1bgbk6n93qqn7w8v21kxf4x6dc3z0ypqrzvgfd46nhagak60ac84"; - configureFlags = [ - "--with-gcc-arch=generic" # don't guess -march=/mtune= - ]; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 41e17ec60aff..61b6b840967d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1242,6 +1242,7 @@ mapAliases { isl_0_11 = throw "isl_0_11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 isl_0_14 = throw "isl_0_14 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 isl_0_17 = throw "isl_0_17 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20 + isl_0_24 = throw "isl_0_24 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-10-18 istatmenus = throw "istatmenus has beend renamed to istat-menus"; # Added 2025-05-05 iso-flags-png-320x420 = lib.warnOnInstantiate "iso-flags-png-320x420 has been renamed to iso-flags-png-320x240" iso-flags-png-320x240; # Added 2024-07-17 itktcl = tclPackages.itktcl; # Added 2024-10-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73835d9e9cd7..522b7fd2bede 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3138,13 +3138,11 @@ with pkgs; isl = isl_0_20; isl_0_20 = callPackage ../development/libraries/isl/0.20.0.nix { }; isl_0_23 = callPackage ../development/libraries/isl/0.23.0.nix { }; - isl_0_24 = callPackage ../development/libraries/isl/0.24.0.nix { }; isl_0_27 = callPackage ../development/libraries/isl/0.27.0.nix { }; }) isl isl_0_20 isl_0_23 - isl_0_24 isl_0_27 ; From 9b7a288947451982c405279f0a78474cc5cc85ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Sat, 18 Oct 2025 15:41:57 -0700 Subject: [PATCH 101/380] cpp-redis: fix build failure with cmake 4 - CMake 4 is no longer retro compatible with versions < 3.5 --- pkgs/by-name/cp/cpp-redis/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/cp/cpp-redis/package.nix b/pkgs/by-name/cp/cpp-redis/package.nix index 0d99b8069179..88b099eb0f0e 100644 --- a/pkgs/by-name/cp/cpp-redis/package.nix +++ b/pkgs/by-name/cp/cpp-redis/package.nix @@ -27,6 +27,14 @@ stdenv.mkDerivation rec { ./01-fix-sleep_for.patch ]; + # CMake 2.8.7 is deprecated and is no longer supported by CMake > 4 + # https://github.com/NixOS/nixpkgs/issues/445447 + postPatch = '' + substituteInPlace CMakeLists.txt tacopie/CMakeLists.txt --replace-fail \ + "cmake_minimum_required(VERSION 2.8.7)" \ + "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "C++11 Lightweight Redis client: async, thread-safe, no dependency, pipelining, multi-platform"; homepage = "https://github.com/cpp-redis/cpp_redis"; From 05bb626476e6bc0661302c0a58da293fe77deacf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Oct 2025 23:12:44 +0000 Subject: [PATCH 102/380] codebuff: 1.0.501 -> 1.0.502 --- pkgs/by-name/co/codebuff/package-lock.json | 8 ++++---- pkgs/by-name/co/codebuff/package.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/co/codebuff/package-lock.json b/pkgs/by-name/co/codebuff/package-lock.json index 28635eaee437..583fda7eb3e0 100644 --- a/pkgs/by-name/co/codebuff/package-lock.json +++ b/pkgs/by-name/co/codebuff/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "codebuff": "^1.0.501" + "codebuff": "^1.0.502" } }, "node_modules/chownr": { @@ -18,9 +18,9 @@ } }, "node_modules/codebuff": { - "version": "1.0.501", - "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.501.tgz", - "integrity": "sha512-ZTvQce7Qj5tjWt63AJujjGkCDLLWAXm3vrKOKlfUKXPXJQfbM8TYljB2+fnMEkjgShZ3Fg+nSEIb1q7hcuBTbQ==", + "version": "1.0.502", + "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.502.tgz", + "integrity": "sha512-gI1e7Hf+gnZux9O+NjhkGrR9kXltycLEvwMmULJ+2t72mk1bvDrCjRuzIZ5AFWxUeZsCj/rVtBpoJail9Qz7Og==", "cpu": [ "x64", "arm64" diff --git a/pkgs/by-name/co/codebuff/package.nix b/pkgs/by-name/co/codebuff/package.nix index 63eb9948803e..8cb7214c6d23 100644 --- a/pkgs/by-name/co/codebuff/package.nix +++ b/pkgs/by-name/co/codebuff/package.nix @@ -6,14 +6,14 @@ buildNpmPackage rec { pname = "codebuff"; - version = "1.0.501"; + version = "1.0.502"; src = fetchzip { url = "https://registry.npmjs.org/codebuff/-/codebuff-${version}.tgz"; - hash = "sha256-WW599dxu7LdL2pU0nb4zZb3ek67MlTpJ/H9aa7SWhi8="; + hash = "sha256-2bskaDG7T/27Re1X4ZXsUrcu1WBb1+iuVcAOqWBRw8w="; }; - npmDepsHash = "sha256-M8BD9XMnn6ETifLl0j4fe2+UDaAGOA9mN2SsmXSfMPM="; + npmDepsHash = "sha256-zqtV6AB2N8M9WqVc1JpfEOIoAyxoVEY3zO7WQiwwpQc="; postPatch = '' cp ${./package-lock.json} package-lock.json From d89867c8e7bb611cbab37a91960f2bfc1dc1f88e Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 19 Oct 2025 02:45:54 +0200 Subject: [PATCH 103/380] osmid: fix build with cmake4 --- pkgs/by-name/os/osmid/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/os/osmid/package.nix b/pkgs/by-name/os/osmid/package.nix index 57257882b810..8cd51e0149fe 100644 --- a/pkgs/by-name/os/osmid/package.nix +++ b/pkgs/by-name/os/osmid/package.nix @@ -18,6 +18,16 @@ stdenv.mkDerivation rec { sha256 = "1s1wsrp6g6wb0y61xzxvaj59mwycrgy52r4h456086zkz10ls6hw"; }; + postPatch = '' + # replace deprecated cmake version that are no longer supported by CMake > 4 + # https://github.com/NixOS/nixpkgs/issues/445447 + + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 3.0)" "cmake_minimum_required (VERSION 3.10)" + substituteInPlace external_libs/oscpack_1_1_0/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required (VERSION 3.10)" + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ From 4b6da520f711f9680536c3bd0b5a22738a25577e Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 19 Oct 2025 03:04:04 +0200 Subject: [PATCH 104/380] opentracing-cpp: drop --- pkgs/by-name/op/opentracing-cpp/package.nix | 26 --------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 pkgs/by-name/op/opentracing-cpp/package.nix diff --git a/pkgs/by-name/op/opentracing-cpp/package.nix b/pkgs/by-name/op/opentracing-cpp/package.nix deleted file mode 100644 index 8f125e2bcbf4..000000000000 --- a/pkgs/by-name/op/opentracing-cpp/package.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, -}: -stdenv.mkDerivation rec { - pname = "opentracing-cpp"; - version = "1.6.0"; - src = fetchFromGitHub { - owner = "opentracing"; - repo = "opentracing-cpp"; - rev = "v${version}"; - sha256 = "09wdwbz8gbjgyqi764cyb6aw72wng6hwk44xpl432gl7whrrysvi"; - }; - - nativeBuildInputs = [ cmake ]; - - meta = { - description = "C++ implementation of the OpenTracing API"; - homepage = "https://opentracing.io"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ rob ]; - }; - -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 909f5afde9a1..98a9577a799b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2004,6 +2004,7 @@ mapAliases { opensyclWithRocm = lib.warnOnInstantiate "'opensyclWithRocm' has been renamed to 'adaptivecppWithRocm'" adaptivecppWithRocm; # Added 2024-12-04 open-timeline-io = lib.warnOnInstantiate "'open-timeline-io' has been renamed to 'opentimelineio'" opentimelineio; # Added 2025-08-10 opentofu-ls = lib.warnOnInstantiate "'opentofu-ls' has been renamed to 'tofu-ls'" tofu-ls; # Added 2025-06-10 + opentracing-cpp = throw "'opentracingc-cpp' has been removed as it was archived upstream in 2024"; # Added 2025-10-19 openvdb_11 = throw "'openvdb_11' has been removed in favor of the latest version'"; # Added 2025-05-03 opera = throw "'opera' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-05-19 orchis = throw "'orchis' has been renamed to/replaced by 'orchis-theme'"; # Converted to throw 2024-10-17 From 37f7e563507226c6875152de5eb06d96bab00b71 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 19 Oct 2025 03:29:09 +0200 Subject: [PATCH 105/380] nginxModules.opentracing: drop --- pkgs/servers/http/nginx/modules.nix | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 45e7740ad8de..ded98d770493 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -28,7 +28,6 @@ luajit_openresty, msgpuck, openssl, - opentracing-cpp, pam, psol, which, @@ -559,30 +558,6 @@ let }; }; - opentracing = { - name = "opentracing"; - src = - let - src' = fetchFromGitHub { - name = "opentracing"; - owner = "opentracing-contrib"; - repo = "nginx-opentracing"; - rev = "v0.10.0"; - sha256 = "1q234s3p55xv820207dnh4fcxkqikjcq5rs02ai31ylpmfsf0kkb"; - }; - in - "${src'}/opentracing"; - - inputs = [ opentracing-cpp ]; - - meta = with lib; { - description = "Enable requests served by nginx for distributed tracing via The OpenTracing Project"; - homepage = "https://github.com/opentracing-contrib/nginx-opentracing"; - license = with licenses; [ asl20 ]; - maintainers = [ ]; - }; - }; - pagespeed = { name = "pagespeed"; src = @@ -1115,4 +1090,5 @@ self modsecurity-nginx = self.modsecurity; fastcgi-cache-purge = throw "fastcgi-cache-purge was renamed to cache-purge"; ngx_aws_auth = throw "ngx_aws_auth was renamed to aws-auth"; + opentracing = throw "opentracing-cpp was removed because opentracing as been archived upstream"; # Added 2025-10-19 } From 7997be85a28f51c8fc295238625ce9e5d3eddad6 Mon Sep 17 00:00:00 2001 From: qbisi Date: Sat, 18 Oct 2025 03:48:20 +0800 Subject: [PATCH 106/380] mmg: 5.7.3-unstable-2024-05-31 -> 5.8.0 --- pkgs/by-name/mm/mmg/package.nix | 59 +++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/mm/mmg/package.nix b/pkgs/by-name/mm/mmg/package.nix index f9587f9670f5..5ee5814cfd14 100644 --- a/pkgs/by-name/mm/mmg/package.nix +++ b/pkgs/by-name/mm/mmg/package.nix @@ -1,43 +1,66 @@ { - stdenv, lib, + stdenv, fetchFromGitHub, - unstableGitUpdater, cmake, perl, + scotch, + vtk, + withVtk ? false, + testers, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "mmg"; - version = "5.7.3-unstable-2024-05-31"; + version = "5.8.0"; src = fetchFromGitHub { owner = "MmgTools"; repo = "mmg"; - rev = "5a73683f84fe422031921bef4ced8905d8b9eb7e"; - hash = "sha256-8m4iDsJdjlzuXatfIIZCY8RgrEp4BQihhmQfytu8aaU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-jiOScvzyO+bN2wYwcQmWhLkLSkTWVplMrXKRFttGisw="; }; - passthru.updateScript = unstableGitUpdater { }; + outputs = [ + "out" + "dev" + "man" + ]; + + postPatch = '' + patchShebangs --build scripts + ''; nativeBuildInputs = [ cmake - perl + perl # required for generating fortran headers ]; - preConfigure = '' - patchShebangs ./ - ''; + propagatedBuildInputs = [ + scotch + ] + ++ lib.optional withVtk vtk; cmakeFlags = [ - "-DBUILD_SHARED_LIBS:BOOL=TRUE" - "-DMMG_INSTALL_PRIVATE_HEADERS=ON" + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + (lib.cmakeBool "MMG_INSTALL_PRIVATE_HEADERS" true) # required by downstream parmmg + (lib.cmakeBool "USE_ELAS" false) + (lib.cmakeBool "USE_SCOTCH" true) + (lib.cmakeBool "USE_VTK" withVtk) + (lib.cmakeBool "PMMG_CALL" vtk.mpiSupport) ]; - meta = with lib; { + passthru.tests = { + cmake-config = testers.hasCmakeConfigModules { + moduleNames = [ "mmg" ]; + package = finalAttrs.finalPackage; + }; + }; + + meta = { description = "Open source software for bidimensional and tridimensional remeshing"; homepage = "http://www.mmgtools.org/"; - platforms = platforms.unix; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ mkez ]; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ mkez ]; }; -} +}) From 7c75b858fba0c2f5e1947da87affe0d10e1678e3 Mon Sep 17 00:00:00 2001 From: qbisi Date: Sat, 18 Oct 2025 04:37:24 +0800 Subject: [PATCH 107/380] parmmg: 1.4.0-unstable-2024-04-22 -> 1.5.0 --- pkgs/by-name/pa/parmmg/package.nix | 75 ++++++++++++++++++++---------- 1 file changed, 50 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/pa/parmmg/package.nix b/pkgs/by-name/pa/parmmg/package.nix index 529acf6828a9..0d1681c04f2c 100644 --- a/pkgs/by-name/pa/parmmg/package.nix +++ b/pkgs/by-name/pa/parmmg/package.nix @@ -1,59 +1,84 @@ { - stdenv, lib, + stdenv, + fetchpatch2, fetchFromGitHub, - unstableGitUpdater, cmake, gfortran, perl, mpi, metis, mmg, + scotch, + vtk-full, + withVtk ? true, + testers, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "parmmg"; - version = "1.4.0-unstable-2024-04-22"; + version = "1.5.0"; src = fetchFromGitHub { owner = "MmgTools"; repo = "ParMmg"; - rev = "f8a5338ea1bb2c778bfb4559c2c3974ba15b4730"; - hash = "sha256-ieFHREAVeD7IwDUCtsMG5UKxahxM+wzNCAqCOHIHwu8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-LDbfGuTRd2wzmNHxXd381qVuOlWqqDdP8+Y/v1H68uM="; }; - passthru.updateScript = unstableGitUpdater { }; + outputs = [ + "out" + "dev" + ]; + + patches = [ + (fetchpatch2 { + url = "https://github.com/MmgTools/ParMmg/commit/a9551c502c58a1f8a109fb17d8f45cb9370f8fc6.patch?full_index=1"; + hash = "sha256-i0KwzseffeI9UYIYuyNYmdF9eTZ+nQQfSI6ukSowIYs="; + }) + ]; + + postPatch = '' + patchShebangs --build scripts + ''; nativeBuildInputs = [ cmake gfortran - mpi perl ]; buildInputs = [ mpi metis - mmg - ]; - - strictDeps = true; - - preConfigure = '' - patchShebangs --build ./ - ''; + scotch + (mmg.override { + inherit withVtk; + vtk = vtk-full; + }) + ] + ++ lib.optional withVtk vtk-full; cmakeFlags = [ - "-DBUILD_SHARED_LIBS:BOOL=TRUE" - "-DDOWNLOAD_MMG=OFF" - "-DDOWNLOAD_METIS=OFF" - "-Wno-dev" + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + (lib.cmakeBool "DOWNLOAD_MMG" false) + (lib.cmakeBool "DOWNLOAD_METIS" false) + (lib.cmakeBool "USE_ELAS" false) + (lib.cmakeBool "USE_SCOTCH" true) + (lib.cmakeBool "USE_VTK" withVtk) ]; - meta = with lib; { + passthru.tests = { + cmake-config = testers.hasCmakeConfigModules { + moduleNames = [ "ParMmg" ]; + package = finalAttrs.finalPackage; + }; + }; + + meta = { description = "Distributed parallelization of 3D volume mesh adaptation"; homepage = "http://www.mmgtools.org/"; - platforms = platforms.unix; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ mkez ]; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ mkez ]; }; -} +}) From 6a5410fd1cf18318a2261866eef3f25c64957ce2 Mon Sep 17 00:00:00 2001 From: Andrew Zah Date: Sun, 19 Oct 2025 17:44:45 +0900 Subject: [PATCH 108/380] foma: 0.10.0alpha-unstable-2024-03-13 -> 0.10.0alpha-unstable-2025-09-10 * As noted in https://github.com/NixOS/nixpkgs/issues/445447. --- pkgs/by-name/fo/foma/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fo/foma/package.nix b/pkgs/by-name/fo/foma/package.nix index 54a756a21b5e..12b0823e703b 100644 --- a/pkgs/by-name/fo/foma/package.nix +++ b/pkgs/by-name/fo/foma/package.nix @@ -9,16 +9,15 @@ readline, zlib, }: - stdenv.mkDerivation rec { pname = "foma"; - version = "0.10.0alpha-unstable-2024-03-13"; + version = "0.10.0alpha-unstable-2025-09-10"; src = fetchFromGitHub { owner = "mhulden"; repo = "foma"; - rev = "e0d8122bda4bbd56f18510bdfe840617f9736ae7"; - hash = "sha256-UbwuHTilKWo4sVD3igcSlTqH78N6JQFvRD35QwfoX10="; + rev = "91f91866af843aec487313d028dbd1f76b5fb1a5"; + hash = "sha256-CXRZNcEgsjD/9PowNynPyfLVbk8KDe3T52UetYMwC6w="; }; sourceRoot = "${src.name}/foma"; From 117bf34d44f73d005a48405ba404db2b36a6ad93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Oct 2025 09:24:14 +0000 Subject: [PATCH 109/380] terragrunt: 0.90.0 -> 0.91.1 --- pkgs/by-name/te/terragrunt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index 43e53782e93c..569231fc8773 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -7,13 +7,13 @@ }: buildGo125Module (finalAttrs: { pname = "terragrunt"; - version = "0.90.0"; + version = "0.91.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "terragrunt"; tag = "v${finalAttrs.version}"; - hash = "sha256-tc+3+H/u/6IpkmvlwObzVjUnJzBzElme0tT+zktGfkw="; + hash = "sha256-GbPPBEl41p3sI31WuGquvnI+pVQ5zXpGey7zHjsKfw8="; }; nativeBuildInputs = [ @@ -25,7 +25,7 @@ buildGo125Module (finalAttrs: { make generate-mocks ''; - vendorHash = "sha256-+4mDmC1B4YmExOJqS/vlTxBiI5/rKcn3Vyw53BfvAxA="; + vendorHash = "sha256-iMzoee3MkOgU0Or0F+FVxNs1g5+306W4vC5wOh61mzw="; doCheck = false; From a3dbd9ed85e397212d49819e6722769e622e4304 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sun, 19 Oct 2025 08:27:23 -0300 Subject: [PATCH 110/380] cutecom: move to by-name --- .../cutecom/default.nix => by-name/cu/cutecom/package.nix} | 7 +++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) rename pkgs/{tools/misc/cutecom/default.nix => by-name/cu/cutecom/package.nix} (92%) diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/by-name/cu/cutecom/package.nix similarity index 92% rename from pkgs/tools/misc/cutecom/default.nix rename to pkgs/by-name/cu/cutecom/package.nix index 2ef00647be52..ce246c196ce0 100644 --- a/pkgs/tools/misc/cutecom/default.nix +++ b/pkgs/by-name/cu/cutecom/package.nix @@ -2,9 +2,8 @@ stdenv, lib, fetchFromGitLab, - qtserialport, + qt5, cmake, - wrapQtAppsHook, }: stdenv.mkDerivation { @@ -23,10 +22,10 @@ stdenv.mkDerivation { --replace "/Applications" "$out/Applications" ''; - buildInputs = [ qtserialport ]; + buildInputs = [ qt5.qtserialport ]; nativeBuildInputs = [ cmake - wrapQtAppsHook + qt5.wrapQtAppsHook ]; postInstall = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 486b519307ce..50de8068e28a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10920,8 +10920,6 @@ with pkgs; hamlib = hamlib_4; }; - cutecom = libsForQt5.callPackage ../tools/misc/cutecom { }; - darcs = haskell.lib.compose.disableCabalFlag "library" ( haskell.lib.compose.justStaticExecutables haskellPackages.darcs ); From 0611726bb387ca000fa24134901f4fa6ef9fdd63 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sun, 19 Oct 2025 08:29:55 -0300 Subject: [PATCH 111/380] cutecom: 0.51.0+patch -> 0.60.0-RC1 --- pkgs/by-name/cu/cutecom/package.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/cu/cutecom/package.nix b/pkgs/by-name/cu/cutecom/package.nix index ce246c196ce0..969ab97b2451 100644 --- a/pkgs/by-name/cu/cutecom/package.nix +++ b/pkgs/by-name/cu/cutecom/package.nix @@ -2,19 +2,19 @@ stdenv, lib, fetchFromGitLab, - qt5, + qt6, cmake, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "cutecom"; - version = "0.51.0+patch"; + version = "0.60.0-RC1"; src = fetchFromGitLab { owner = "cutecom"; repo = "cutecom"; - rev = "70d0c497acf8f298374052b2956bcf142ed5f6ca"; - sha256 = "X8jeESt+x5PxK3rTNC1h1Tpvue2WH09QRnG2g1eMoEE="; + tag = "v${finalAttrs.version}"; + sha256 = "sha256-Co0bUW7klSPf1VfBt7oT2DlQmf6CLELS0oapIyjpx8w="; }; postPatch = '' @@ -22,10 +22,11 @@ stdenv.mkDerivation { --replace "/Applications" "$out/Applications" ''; - buildInputs = [ qt5.qtserialport ]; + buildInputs = [ qt6.qtserialport ]; + nativeBuildInputs = [ cmake - qt5.wrapQtAppsHook + qt6.wrapQtAppsHook ]; postInstall = @@ -42,12 +43,12 @@ stdenv.mkDerivation { cp cutecom.1 "$out/share/man/man1" ''; - meta = with lib; { + meta = { description = "Graphical serial terminal"; homepage = "https://gitlab.com/cutecom/cutecom/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ bennofs ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ bennofs ]; + platforms = lib.platforms.unix; mainProgram = "cutecom"; }; -} +}) From 8b7154e4a5b80bcd2809afde658cf43764de8424 Mon Sep 17 00:00:00 2001 From: winston Date: Sun, 19 Oct 2025 14:29:42 +0200 Subject: [PATCH 112/380] swiftshader: fix CMake 4.0 build --- pkgs/by-name/sw/swiftshader/package.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sw/swiftshader/package.nix b/pkgs/by-name/sw/swiftshader/package.nix index 238e214c382f..ef288e5aae0d 100644 --- a/pkgs/by-name/sw/swiftshader/package.nix +++ b/pkgs/by-name/sw/swiftshader/package.nix @@ -24,6 +24,17 @@ stdenv.mkDerivation { ''; }; + postPatch = '' + substituteInPlace third_party/googletest/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.5)" + substituteInPlace third_party/googletest/googlemock/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.5)" + substituteInPlace third_party/googletest/googletest/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.5)" + substituteInPlace third_party/marl/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.5)" + ''; + nativeBuildInputs = [ cmake python3 @@ -49,13 +60,13 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { + meta = { description = "High-performance CPU-based implementation of the Vulkan 1.3 graphics API"; homepage = "https://opensource.google/projects/swiftshader"; - license = licenses.asl20; + license = lib.licenses.asl20; # Should be possible to support Darwin by changing the install phase with # 's/Linux/Darwin/' and 's/so/dylib/' or something similar. - platforms = with platforms; linux; + platforms = lib.platforms.linux; maintainers = [ ]; }; } From d62d487e8861624ea9281d704952721d959f06fa Mon Sep 17 00:00:00 2001 From: winston Date: Sun, 19 Oct 2025 14:34:08 +0200 Subject: [PATCH 113/380] swiftshader: 2023-09-11 -> 2025-10-15 --- pkgs/by-name/sw/swiftshader/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sw/swiftshader/package.nix b/pkgs/by-name/sw/swiftshader/package.nix index ef288e5aae0d..2add2ab01753 100644 --- a/pkgs/by-name/sw/swiftshader/package.nix +++ b/pkgs/by-name/sw/swiftshader/package.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation { pname = "swiftshader"; - version = "2023-09-11"; + version = "2025-10-15"; src = fetchgit { url = "https://swiftshader.googlesource.com/SwiftShader"; - rev = "4e40d502c440cc59b25fa3a5fee0eadbab7442aa"; - hash = "sha256-YtbTaOkFhVMKdu3jiRHQsPmoEu3KDzIQXLZ5HFBSmWI="; + rev = "3d536c0fc62b1cdea0f78c3c38d79be559855b88"; + hash = "sha256-RLc9ZJeq/97mi4/5vRnPPOPBHK2lc9/6Y7p1YVwxWkc="; # Remove 1GB of test files to get under Hydra output limit postFetch = '' rm -r $out/third_party/llvm-project/llvm/test From c77cae84d119886fb24a5747776a0e5b6b8d8a2e Mon Sep 17 00:00:00 2001 From: Andrew Zah Date: Sun, 19 Oct 2025 23:03:55 +0900 Subject: [PATCH 114/380] mydumper: fix build issue due to cmake 4 --- pkgs/by-name/my/mydumper/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/my/mydumper/package.nix b/pkgs/by-name/my/mydumper/package.nix index b283d864ecbc..f9edcc2c83a8 100644 --- a/pkgs/by-name/my/mydumper/package.nix +++ b/pkgs/by-name/my/mydumper/package.nix @@ -20,7 +20,6 @@ versionCheckHook, mydumper, }: - stdenv.mkDerivation rec { pname = "mydumper"; version = "0.20.1-2"; @@ -82,7 +81,8 @@ stdenv.mkDerivation rec { postPatch = '' # as of mydumper v0.14.5-1, mydumper tries to install its config to /etc substituteInPlace CMakeLists.txt\ - --replace-fail "/etc" "$out/etc" + --replace-fail "/etc" "$out/etc" \ + --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)" ''; # copy man files & docs over From 99efb27fc1db2d29603df182e8dbf35bd281b779 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Oct 2025 16:44:26 +0200 Subject: [PATCH 115/380] sunvox: 2.1.2b -> 2.1.3 Co-authored-by: OPNA2608 --- pkgs/by-name/su/sunvox/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/sunvox/package.nix b/pkgs/by-name/su/sunvox/package.nix index 5759285e91d7..41d80a042a91 100644 --- a/pkgs/by-name/su/sunvox/package.nix +++ b/pkgs/by-name/su/sunvox/package.nix @@ -27,15 +27,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "sunvox"; - version = "2.1.2b"; + version = "2.1.3"; src = fetchzip { urls = [ "https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip" # Upstream removes downloads of older versions, please save bumped versions to archive.org - "https://web.archive.org/web/20250831231045/https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip" + "https://web.archive.org/web/20251019141206/https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip" ]; - hash = "sha256-4GcSNu6ikAGNcPWz5ghrL78U6xrcIUqjFabs26LACRM="; + hash = "sha256-egOaIZEyI5x2VV660qbO+pan22BFRaa4d+8sOpJhpBM="; }; nativeBuildInputs = From 36a6c1d35ca52799db829dec24973cddb47aed82 Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Sun, 19 Oct 2025 18:09:46 +0100 Subject: [PATCH 116/380] rkdeveloptool: fix build on darwin --- pkgs/by-name/rk/rkdeveloptool/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/rk/rkdeveloptool/package.nix b/pkgs/by-name/rk/rkdeveloptool/package.nix index 9b319231ad05..4b9047484665 100644 --- a/pkgs/by-name/rk/rkdeveloptool/package.nix +++ b/pkgs/by-name/rk/rkdeveloptool/package.nix @@ -26,7 +26,9 @@ stdenv.mkDerivation { buildInputs = [ libusb1 ]; # main.cpp:1568:36: error: '%s' directive output may be truncated writing up to 557 bytes into a region of size 5 - CPPFLAGS = lib.optionals stdenv.cc.isGNU [ "-Wno-error=format-truncation" ]; + CPPFLAGS = + lib.optionals stdenv.cc.isGNU [ "-Wno-error=format-truncation" ] + ++ lib.optionals stdenv.isDarwin [ "-Wno-error=vla-cxx-extension" ]; meta = with lib; { homepage = "https://github.com/rockchip-linux/rkdeveloptool"; From 1e08e699f04769aebdd31a1a1eaee20ac97a6784 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Oct 2025 20:50:35 +0000 Subject: [PATCH 117/380] airwindows: 0-unstable-2025-10-05 -> 0-unstable-2025-10-18 --- pkgs/by-name/ai/airwindows/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix index 767d6522c18d..9cc03af3642f 100644 --- a/pkgs/by-name/ai/airwindows/package.nix +++ b/pkgs/by-name/ai/airwindows/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation { pname = "airwindows"; - version = "0-unstable-2025-10-05"; + version = "0-unstable-2025-10-18"; src = fetchFromGitHub { owner = "airwindows"; repo = "airwindows"; - rev = "5889ed48beefd556adca76ed3e4b1b4982531dbd"; - hash = "sha256-zpuzKpuYGe0xpUrBeWpaCYEBy9mGOX5R3LAeiWPCQ3s="; + rev = "1b0b4d56623e464db038e88cb87d1703b5aa0c63"; + hash = "sha256-u83unbD3qf3OudMeOq20Iw2K3SOsKrGLekYCiVZTzF8="; }; # we patch helpers because honestly im spooked out by where those variables From 97fd0fa611d550b3aed15cf06c80347001af394a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Oct 2025 21:29:01 +0000 Subject: [PATCH 118/380] vcpkg-tool: 2025-10-10 -> 2025-10-16 --- pkgs/by-name/vc/vcpkg-tool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix index 9e8059e3c2ad..66f16a27dd51 100644 --- a/pkgs/by-name/vc/vcpkg-tool/package.nix +++ b/pkgs/by-name/vc/vcpkg-tool/package.nix @@ -24,13 +24,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vcpkg-tool"; - version = "2025-10-10"; + version = "2025-10-16"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg-tool"; rev = finalAttrs.version; - hash = "sha256-u88yjYhBKo8uX/jVQypYzOqWeE6PSM+GJD5v5qZyjC4="; + hash = "sha256-Qu7e2cb4fDAiJ4PXRzgdsvTMM8eo6dwRCNpd/w3vWLw="; }; nativeBuildInputs = [ From 43f03d0f95370a6ed99946c1640d693578802d68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 19 Oct 2025 17:16:38 -0700 Subject: [PATCH 119/380] python3Packages.python-bsblan: don't depend on async-timeout --- pkgs/development/python-modules/python-bsblan/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index 4e654bbbc2c4..754df9394172 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -14,7 +14,6 @@ pytest-cov-stub, pytest-mock, pytestCheckHook, - pythonOlder, yarl, }: @@ -23,8 +22,6 @@ buildPythonPackage rec { version = "2.2.5"; pyproject = true; - disabled = pythonOlder "3.12"; - src = fetchFromGitHub { owner = "liudger"; repo = "python-bsblan"; @@ -32,10 +29,6 @@ buildPythonPackage rec { hash = "sha256-kPkKgjze3ohaIaDax3h66JWw5tY+3S0N+lPqXSFFcRY="; }; - postPatch = '' - sed -i "/ruff/d" pyproject.toml - ''; - env.PACKAGE_VERSION = version; build-system = [ hatchling ]; @@ -44,7 +37,6 @@ buildPythonPackage rec { dependencies = [ aiohttp - async-timeout backoff mashumaro orjson From fc11c525369f5c4c23d00ad18613b3f7a6f32d1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 19 Oct 2025 17:21:07 -0700 Subject: [PATCH 120/380] python3Packages.python-bsblan: fix version metadata --- pkgs/development/python-modules/python-bsblan/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index 754df9394172..572447f69c36 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -29,7 +29,10 @@ buildPythonPackage rec { hash = "sha256-kPkKgjze3ohaIaDax3h66JWw5tY+3S0N+lPqXSFFcRY="; }; - env.PACKAGE_VERSION = version; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0.0.0"' 'version = "${version}"' + ''; build-system = [ hatchling ]; From a0a29aaac4ffaba555ddc7f13ff15dbc56372213 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sun, 19 Oct 2025 22:08:55 -0300 Subject: [PATCH 121/380] xsuspender: fix build with cmake4 --- pkgs/by-name/xs/xsuspender/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/xs/xsuspender/package.nix b/pkgs/by-name/xs/xsuspender/package.nix index 2d4c230ee712..3084617a5522 100644 --- a/pkgs/by-name/xs/xsuspender/package.nix +++ b/pkgs/by-name/xs/xsuspender/package.nix @@ -37,6 +37,11 @@ stdenv.mkDerivation rec { libwnck ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 2.8 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" + ''; + postInstall = '' wrapProgram $out/bin/xsuspender \ --prefix PATH : "${lib.makeBinPath [ procps ]}" From bfa8487e98c4f70ed354f3c914d0544594ece905 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Sun, 19 Oct 2025 23:05:44 -0400 Subject: [PATCH 122/380] localproxy: fix build with cmake 4 Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/lo/localproxy/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/lo/localproxy/package.nix b/pkgs/by-name/lo/localproxy/package.nix index 2a46d8501291..94aac1acb208 100644 --- a/pkgs/by-name/lo/localproxy/package.nix +++ b/pkgs/by-name/lo/localproxy/package.nix @@ -51,6 +51,9 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' sed -i '/set(OPENSSL_USE_STATIC_LIBS TRUE)/d' CMakeLists.txt + substituteInPlace ./CMakeLists.txt --replace-fail \ + "cmake_minimum_required(VERSION 3.2 FATAL_ERROR)" \ + "cmake_minimum_required(VERSION 4.0)" ''; # causes redefinition of _FORTIFY_SOURCE From 921f8747bc33569976bca5d3858e0d1720270fa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 19 Oct 2025 20:50:54 -0700 Subject: [PATCH 123/380] python3Packages.pysmhi: 1.0.2 -> 1.1.0 Diff: https://github.com/gjohansson-ST/pysmhi/compare/v1.0.2...v1.1.0 Changelog: https://github.com/gjohansson-ST/pysmhi/releases/tag/v1.1.0 --- pkgs/development/python-modules/pysmhi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysmhi/default.nix b/pkgs/development/python-modules/pysmhi/default.nix index 067c290f0d3f..da449ca28eaa 100644 --- a/pkgs/development/python-modules/pysmhi/default.nix +++ b/pkgs/development/python-modules/pysmhi/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pysmhi"; - version = "1.0.2"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "gjohansson-ST"; repo = "pysmhi"; tag = "v${version}"; - hash = "sha256-9jsSvitxcjH2oFCdSm1203UwG5xjOwQDTaU4Z9Cqs+A="; + hash = "sha256-n2eDQ9fbELGvO/SYqdrwT+lZNIZs5GgihmrimvI3a1w="; }; build-system = [ poetry-core ]; From e916df2d972f270b27903245030653f59d617bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 19 Oct 2025 20:57:26 -0700 Subject: [PATCH 124/380] python3Packages.colorlog: 6.9.0 -> 6.10.1 Diff: https://github.com/borntyping/python-colorlog/compare/v6.9.0...v6.10.1 Changelog: https://github.com/borntyping/python-colorlog/releases/tag/v6.10.1 --- .../python-modules/colorlog/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index ab09f5896b4a..83397f73215d 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -1,19 +1,21 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "colorlog"; - version = "6.9.0"; + version = "6.10.1"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-v7pUobk7lPVOH0/kg5VyWj2S/SpK9wL2vXCUa9wMasI="; + src = fetchFromGitHub { + owner = "borntyping"; + repo = "python-colorlog"; + tag = "v${version}"; + hash = "sha256-vb7OzIVcEIfnhJGpO0DgeEdhL6NCKlrynoNMxNp8Yg4="; }; build-system = [ setuptools ]; @@ -22,10 +24,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - meta = with lib; { + meta = { + changelog = "https://github.com/borntyping/python-colorlog/releases/tag/${src.tag}"; description = "Log formatting with colors"; homepage = "https://github.com/borntyping/python-colorlog"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; }; } From c340d451df28b68ef0bb036d1e686fe017456755 Mon Sep 17 00:00:00 2001 From: PhiliPdB Date: Mon, 20 Oct 2025 07:59:47 +0200 Subject: [PATCH 125/380] digikam: 8.7.0 -> 8.8.0 --- pkgs/by-name/di/digikam/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix index d322d8b807bf..122288e15f51 100644 --- a/pkgs/by-name/di/digikam/package.nix +++ b/pkgs/by-name/di/digikam/package.nix @@ -62,14 +62,14 @@ in stdenv.mkDerivation (finalAttrs: { pname = "digikam"; - version = "8.7.0"; + version = "8.8.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "graphics"; repo = "digikam"; tag = "v${finalAttrs.version}"; - hash = "sha256-9t6tXrege3A5x5caUEfho23Pin7dON+e6x94rXC8XYE="; + hash = "sha256-yUrB0FXUcm+6QtlB7HMqdPpdhrV2iAo1oRkjgsHJiCU="; }; patches = [ From 42c080834788083b60f1399b52de944f2564e998 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Mon, 20 Oct 2025 08:47:05 +0200 Subject: [PATCH 126/380] jellyfin-web: 10.10.7 -> 10.11.0 --- pkgs/by-name/je/jellyfin-web/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix index 326745272fd5..9b2adf43eef9 100644 --- a/pkgs/by-name/je/jellyfin-web/package.nix +++ b/pkgs/by-name/je/jellyfin-web/package.nix @@ -13,7 +13,7 @@ }: buildNpmPackage rec { pname = "jellyfin-web"; - version = "10.10.7"; + version = "10.11.0"; src = assert version == jellyfin.version; @@ -21,7 +21,7 @@ buildNpmPackage rec { owner = "jellyfin"; repo = "jellyfin-web"; rev = "v${version}"; - hash = "sha256-jX9Qut8YsJRyKI2L7Aww4+6G8z741WzN37CUx3KWQfY="; + hash = "sha256-LcZNfFXM2dFHeUheSnri1t4eBYvlCfF2wlaqWlh+U7A="; }; nodejs = nodejs_20; # does not build with 22 @@ -31,7 +31,7 @@ buildNpmPackage rec { --replace-fail "git describe --always --dirty" "echo ${src.rev}" \ ''; - npmDepsHash = "sha256-nfvqVByD3Kweq+nFJQY4R2uRX3mx/qJvGFiKiOyMUdw="; + npmDepsHash = "sha256-w3xMbkxNGFEBR2K1PhJW6pr943DfJvyQvILiF0VuLlw="; preBuild = '' # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart From 4957a9976f96ff95e4adad5c693433cefb361d3e Mon Sep 17 00:00:00 2001 From: Minijackson Date: Mon, 20 Oct 2025 09:54:16 +0200 Subject: [PATCH 127/380] jellyfin: 10.10.7 -> 10.11.0 adapt the test due to slower start and small API change --- doc/release-notes/rl-2511.section.md | 4 + nixos/tests/jellyfin.nix | 15 +- pkgs/by-name/je/jellyfin/nuget-deps.json | 620 +++++++++++++---------- pkgs/by-name/je/jellyfin/package.nix | 8 +- 4 files changed, 376 insertions(+), 271 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 658135c92af7..94d617907142 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -271,6 +271,10 @@ - `searx` was updated to use `envsubst` instead of `sed` for parsing secrets from environment variables. If your previous configuration included a secret reference like `server.secret_key = "@SEARX_SECRET_KEY@"`, you must migrate to the new envsubst syntax: `server.secret_key = "$SEARX_SECRET_KEY"`. +- `jellyfin` was updated to `10.11.x`, which includes heavy backend changes. + Make sure to backup your data and configuration directories + and read the [Jellyfin 10.11.0 release announcement](https://jellyfin.org/posts/jellyfin-release-10.11.0/). + - A new hardening flag, `glibcxxassertions` was made available, corresponding to the glibc `_GLIBCXX_ASSERTIONS` option. - `versionCheckHook`: Packages that previously relied solely on `pname` to locate the program used to version check, but have a differing `meta.mainProgram` entry, might now fail. diff --git a/nixos/tests/jellyfin.nix b/nixos/tests/jellyfin.nix index 6b4a962e029f..e8fb233bccd5 100644 --- a/nixos/tests/jellyfin.nix +++ b/nixos/tests/jellyfin.nix @@ -4,12 +4,12 @@ name = "jellyfin"; meta.maintainers = with lib.maintainers; [ minijackson ]; - nodes.machine = - { ... }: - { - services.jellyfin.enable = true; - environment.systemPackages = with pkgs; [ ffmpeg ]; - }; + nodes.machine = { + services.jellyfin.enable = true; + environment.systemPackages = with pkgs; [ ffmpeg ]; + # Jellyfin fails to start if the data dir doesn't have at least 2GiB of free space + virtualisation.diskSize = 3 * 1024; + }; # Documentation of the Jellyfin API: https://api.jellyfin.org/ # Beware, this link can be resource intensive @@ -30,6 +30,7 @@ machine.wait_for_unit("jellyfin.service") machine.wait_for_open_port(8096) + machine.wait_until_succeeds("journalctl --since -1m --unit jellyfin --grep 'Startup complete'") machine.succeed("curl --fail http://localhost:8096/") machine.wait_until_succeeds("curl --fail http://localhost:8096/health | grep Healthy") @@ -105,7 +106,7 @@ folders_str = machine.succeed(api_get("/Library/VirtualFolders")) folders = json.loads(folders_str) print(folders) - return all(folder["RefreshStatus"] == "Idle" for folder in folders) + return all(folder.get("RefreshStatus") == "Idle" for folder in folders) retry(is_refreshed) diff --git a/pkgs/by-name/je/jellyfin/nuget-deps.json b/pkgs/by-name/je/jellyfin/nuget-deps.json index 36a1b036aea9..c82b74619fea 100644 --- a/pkgs/by-name/je/jellyfin/nuget-deps.json +++ b/pkgs/by-name/je/jellyfin/nuget-deps.json @@ -1,23 +1,28 @@ [ { "pname": "AsyncKeyedLock", - "version": "7.0.2", - "hash": "sha256-UFPta8yWtuFhpfy7OpBkUDQnyO8TODXEE0zA6ubz1QM=" + "version": "7.1.7", + "hash": "sha256-gXITMqewgmts75I2SHzZ/AyihFihQ0Vo/JSletxz+r4=" }, { "pname": "BDInfo", "version": "0.8.0", "hash": "sha256-r6Q+rRTbHyFqiWeaUDfw0eS8D/U1FZckNzAaU4ibLhQ=" }, + { + "pname": "BitFaster.Caching", + "version": "2.5.4", + "hash": "sha256-PWuVT1kKjL8ulMtv9hWmg0nMChFh8skr34xUl3mQ0Y8=" + }, { "pname": "BlurHashSharp", - "version": "1.3.4", - "hash": "sha256-xBTjBMTrN8M4gsPJSW3YIuu6Zi44xBkDHJF4FudOIts=" + "version": "1.4.0-pre.1", + "hash": "sha256-QNx5Ix+a5DWNrJegpH3Qj56aaoAct0W2pBWMPda7zyI=" }, { "pname": "BlurHashSharp.SkiaSharp", - "version": "1.3.4", - "hash": "sha256-P0ObHZ6/lSwLjG7+uTgzmTcwCfDGisz8GFzlnDjctgY=" + "version": "1.4.0-pre.1", + "hash": "sha256-NmulKfYfa/dupnOweGUoLxf8Jba/ThW615vi4IDNc90=" }, { "pname": "CommandLineParser", @@ -26,8 +31,8 @@ }, { "pname": "Diacritics", - "version": "3.3.29", - "hash": "sha256-sIbdJ3yMthnmJHly3WheUdYjtwPakcczTJx9ycxtgrY=" + "version": "4.0.17", + "hash": "sha256-O1pOeOV7c+dfD/EjwiOmqYhP5RDZyosVOk0OjVuK5Eg=" }, { "pname": "DiscUtils.Core", @@ -51,8 +56,8 @@ }, { "pname": "dotnet-ef", - "version": "8.0.11", - "hash": "sha256-LxLA79aQCxhNPU3fTw6w2aFCo5S2vqmkCeaGdMY3c9Y=" + "version": "9.0.10", + "hash": "sha256-ySEiSCUsZnosL/aHA4zCWW0YEdUjHhluMzwDmYNDsj4=" }, { "pname": "DotNet.Glob", @@ -61,28 +66,28 @@ }, { "pname": "ExCSS", - "version": "4.2.3", - "hash": "sha256-M/H6P5p7qqdFz/fgAI2MMBWQ7neN/GIieYSSxxjsM9I=" + "version": "4.3.1", + "hash": "sha256-nNn5+YEaqKSULhtDsImNEyndU/MHna7VpZNUExmo80o=" }, { "pname": "HarfBuzzSharp", - "version": "7.3.0.3", - "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM=" + "version": "8.3.0.1", + "hash": "sha256-ZQwyxpI6jB804Z3d1JAhLqyHIu42fo6mpmk5GVFbEzk=" }, { "pname": "HarfBuzzSharp.NativeAssets.Linux", - "version": "7.3.0.3", - "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM=" + "version": "8.3.1.1", + "hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU=" }, { "pname": "HarfBuzzSharp.NativeAssets.macOS", - "version": "7.3.0.3", - "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w=" + "version": "8.3.0.1", + "hash": "sha256-bpow26ydfzv9w6XCtZOcsGqMUVcfmvnIo5qPqtl9NQo=" }, { "pname": "HarfBuzzSharp.NativeAssets.Win32", - "version": "7.3.0.3", - "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" + "version": "8.3.0.1", + "hash": "sha256-2+FA4EfAQ68q1nJlXUuqDcETwIA+6OvD0DB/lMnbKVY=" }, { "pname": "Humanizer.Core", @@ -104,6 +109,11 @@ "version": "4.0.8", "hash": "sha256-OikeX+tNhbMoYDUYZl5YeSWaODgLLzR0S1xcwjpmmOg=" }, + { + "pname": "Ignore", + "version": "0.2.1", + "hash": "sha256-VHlsd3Va9IN5EbAHFiEHDvJXWhbyUXxZnGrMmh/1kPU=" + }, { "pname": "J2N", "version": "2.0.0", @@ -116,13 +126,13 @@ }, { "pname": "libse", - "version": "4.0.8", - "hash": "sha256-A17k5GpMtY3RSqZADeP4Ri9LKXkVa9jHo4+Tipn7Bs8=" + "version": "4.0.12", + "hash": "sha256-l7ai5a+1BD4LMU5X7f4ZcLZA2QUjpTCCP8XCrRQ0fhk=" }, { "pname": "LrcParser", - "version": "2025.228.1", - "hash": "sha256-1p471WX25rYpb0P/q3sEj35vLLa8QvokAbLO47D7wTM=" + "version": "2025.623.0", + "hash": "sha256-f3+6qpPxQOdwAX1OuNiHoobk38lY+9Udyvubhg989MQ=" }, { "pname": "MetaBrainz.Common", @@ -141,98 +151,133 @@ }, { "pname": "Microsoft.AspNetCore.Authorization", - "version": "8.0.11", - "hash": "sha256-LHkaXHgK1aHl6sk+6fZralNRsY0GEoALkyRspJP0nyE=" + "version": "9.0.10", + "hash": "sha256-jhjTkNSo7vFuPMit1jun/QJ1+Yb6o5XdYCaUelX1g/M=" }, { "pname": "Microsoft.AspNetCore.Metadata", - "version": "8.0.11", - "hash": "sha256-P7U4DkTNjG8m2s/tVqWLJ6hm9LJhThBRi1hsp4JPecc=" + "version": "9.0.10", + "hash": "sha256-lrCmI+moPjThyWVX6xtQvRZZ+b5pCLUSpQmm8Q47pM0=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "6.0.0", - "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" + "version": "7.0.0", + "hash": "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE=" + }, + { + "pname": "Microsoft.Build.Framework", + "version": "16.10.0", + "hash": "sha256-Sj41LE1YQ/NfOdiDf5YnZgWSwGOzQ2uVvP1LgF/HSJ0=" + }, + { + "pname": "Microsoft.Build.Framework", + "version": "17.8.3", + "hash": "sha256-Rp4dN8ejOXqclIKMUXYvIliM6IYB7WMckMLwdCbVZ34=" + }, + { + "pname": "Microsoft.Build.Locator", + "version": "1.7.8", + "hash": "sha256-VhZ4jiJi17Cd5AkENXL1tjG9dV/oGj0aY67IGYd7vNs=" }, { "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "3.3.3", - "hash": "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY=" + "version": "3.11.0", + "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw=" + }, + { + "pname": "Microsoft.CodeAnalysis.Analyzers", + "version": "3.3.4", + "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE=" }, { "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers", - "version": "3.3.4", - "hash": "sha256-YPTHTZ8xRPMLADdcVYRO/eq3O9uZjsD+OsGRZE+0+e8=" + "version": "4.14.0", + "hash": "sha256-f7svtnkq4xLTjGVj6kNZ1ZGFCV/RESsM+GJZmEpezh4=" }, { "pname": "Microsoft.CodeAnalysis.Common", - "version": "4.5.0", - "hash": "sha256-qo1oVNTB9JIMEPoiIZ+02qvF/O8PshQ/5gTjsY9iX0I=" + "version": "4.14.0", + "hash": "sha256-ne/zxH3GqoGB4OemnE8oJElG5mai+/67ASaKqwmL2BE=" + }, + { + "pname": "Microsoft.CodeAnalysis.Common", + "version": "4.8.0", + "hash": "sha256-3IEinVTZq6/aajMVA8XTRO3LTIEt0PuhGyITGJLtqz4=" }, { "pname": "Microsoft.CodeAnalysis.CSharp", - "version": "4.5.0", - "hash": "sha256-5dZTS9PYtY83vyVa5bdNG3XKV5EjcnmddfUqWmIE29A=" + "version": "4.14.0", + "hash": "sha256-5Mzj3XkYYLkwDWh17r1NEXSbXwwWYQPiOmkSMlgo1JY=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp", + "version": "4.8.0", + "hash": "sha256-MmOnXJvd/ezs5UPcqyGLnbZz5m+VedpRfB+kFZeeqkU=" }, { "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces", - "version": "4.5.0", - "hash": "sha256-Kmyt1Xfcs0rSZHvN9PH94CKAooqMS9abZQY7EpEqb2o=" + "version": "4.8.0", + "hash": "sha256-WNzc+6mKqzPviOI0WMdhKyrWs8u32bfGj2XwmfL7bwE=" }, { "pname": "Microsoft.CodeAnalysis.Workspaces.Common", - "version": "4.5.0", - "hash": "sha256-WM7AXJYHagaPx2waj2E32gG0qXq6Kx4Zhiq7Ym3WXPI=" + "version": "4.8.0", + "hash": "sha256-X8R4SpWVO/gpip5erVZf5jCCx8EX3VzIRtNrQiLDIoM=" + }, + { + "pname": "Microsoft.CodeAnalysis.Workspaces.MSBuild", + "version": "4.8.0", + "hash": "sha256-hxpMKC6OF8OaIiSZhAgJ+Rw7M8nqS6xHdUURnRRxJmU=" }, { "pname": "Microsoft.Data.Sqlite", - "version": "8.0.11", - "hash": "sha256-55TQhpJDkL7I4GH1cWYNEr1gNJ7pqHhmXzPGoseWsFg=" + "version": "9.0.10", + "hash": "sha256-53z+zRrlVxzwELr9C+VSHcqGK/cjKvuilaD/2BJA28Y=" }, { "pname": "Microsoft.Data.Sqlite.Core", - "version": "8.0.11", - "hash": "sha256-bYyxOTss74EVz+3ybmgl11fzX0Co3CVZbCDxv24y0/E=" + "version": "9.0.10", + "hash": "sha256-prsCR2WzQAhbhdZ30xk+/wvLt6rDj0M3k1tvyoD6uYM=" }, { "pname": "Microsoft.EntityFrameworkCore", - "version": "8.0.11", - "hash": "sha256-uvcAmj7ob2X/JKLleNwanpNs0X3PkJl3je6ZsHeWooE=" + "version": "9.0.10", + "hash": "sha256-Zm4oMVeloK2WmPskzg4l3SXjJuC+sRg3O5aiTK5rHvw=" }, { "pname": "Microsoft.EntityFrameworkCore.Abstractions", - "version": "8.0.11", - "hash": "sha256-qKe+WBIlyZ1CS2H9JGWsYiWxkUzGjwIHtx/q3FPCDr8=" + "version": "9.0.10", + "hash": "sha256-FB+8WtFYKn1PH9R3pgKw7dNJiJDCcS78UkeRkxdOuCk=" }, { "pname": "Microsoft.EntityFrameworkCore.Analyzers", - "version": "8.0.11", - "hash": "sha256-eKhcGqCN34F2i7/FeKSq1gyMjNq3ikq+UpE/1SbXecY=" + "version": "9.0.10", + "hash": "sha256-q6w0uQ4qMAe2EuA65a3rk18rhGXuGVYMrdrIzD5Z+tw=" }, { "pname": "Microsoft.EntityFrameworkCore.Design", - "version": "8.0.11", - "hash": "sha256-in7Ppl/tEEM/2r+l+uuSjWLXk7fHbJRVmLzskYfAhMQ=" + "version": "9.0.10", + "hash": "sha256-Zb5u2PySq+VuISn4bSTTDp6sN05ml94eK5O3dZAGO9g=" }, { "pname": "Microsoft.EntityFrameworkCore.Relational", - "version": "8.0.11", - "hash": "sha256-st6V0S7j+FyK7r9X6uObpuhSoac/z5QOF1DUPnhffgE=" + "version": "9.0.10", + "hash": "sha256-2XHQOKvs4mAXwl8vEZpdi6ZtDFhK2hPusRMFemu3Shw=" }, { "pname": "Microsoft.EntityFrameworkCore.Sqlite", - "version": "8.0.11", - "hash": "sha256-DFAJxCxJeJghYL1Zl4d78i7/o8RFhLeCS+QFXvZulV4=" + "version": "9.0.10", + "hash": "sha256-LunzXQSLdZZL1aTlg8E8Jj58oKXniJwYx9zQasPbM2I=" }, { "pname": "Microsoft.EntityFrameworkCore.Sqlite.Core", - "version": "8.0.11", - "hash": "sha256-GUWuE0ZycKiOha8wq7qklol9KfiSB4WSCF3/OwiSiAQ=" + "version": "9.0.10", + "hash": "sha256-3uBgFul0W3+7MaxwRjZoowQ9iSw58jYPUChyWG/3UF4=" }, { "pname": "Microsoft.EntityFrameworkCore.Tools", - "version": "8.0.11", - "hash": "sha256-i5BbbWFUTQmPRGhof/4DbwzKGFHmZaNAJhGZf6+2PpI=" + "version": "9.0.10", + "hash": "sha256-qZhy83X+adNfhJwJcDoxn1R9pfU4Iq8PP+JB9anqArA=" }, { "pname": "Microsoft.Extensions.ApiDescription.Server", @@ -246,8 +291,8 @@ }, { "pname": "Microsoft.Extensions.Caching.Abstractions", - "version": "8.0.0", - "hash": "sha256-xGpKrywQvU1Wm/WolYIxgHYEFfgkNGeJ+GGc5DT3phI=" + "version": "9.0.10", + "hash": "sha256-W/9WhAG5t/hWPZxIL5+ILMsPKO/DjprHRymZUmU5YOA=" }, { "pname": "Microsoft.Extensions.Caching.Memory", @@ -256,73 +301,58 @@ }, { "pname": "Microsoft.Extensions.Caching.Memory", - "version": "8.0.1", - "hash": "sha256-5Q0vzHo3ZvGs4nPBc/XlBF4wAwYO8pxq6EGdYjjXZps=" + "version": "9.0.10", + "hash": "sha256-HIXNiUnBJaYN+QGzpTlHzkvkBwYmcU0QUlIgQDhVG5g=" }, { "pname": "Microsoft.Extensions.Configuration", - "version": "3.1.0", - "hash": "sha256-KI1WXvnF/Xe9cKTdDjzm0vd5h9bmM+3KinuWlsF/X+c=" - }, - { - "pname": "Microsoft.Extensions.Configuration", - "version": "8.0.0", - "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA=" + "version": "9.0.10", + "hash": "sha256-K16pSHfb71WhGqD7mzjrYaNBihU4tga90c6IOHsgRxw=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "3.1.0", - "hash": "sha256-GMxvf0iAiWUWo0awlDczzcxNo8+MITBLp0/SqqYo8Lg=" + "version": "9.0.0", + "hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "8.0.0", - "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o=" + "version": "9.0.10", + "hash": "sha256-sRv0yS2sbyli7eejtnpmd7UIAz4PwSt5/Po5Irc1j98=" }, { "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "3.1.0", - "hash": "sha256-/B7WjPZPvRM+CPgfaCQunSi2mpclH4orrFxHGLs8Uo4=" + "version": "9.0.0", + "hash": "sha256-6ajYWcNOQX2WqftgnoUmVtyvC1kkPOtTCif4AiKEffU=" }, { "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "8.0.0", - "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q=" - }, - { - "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "8.0.2", - "hash": "sha256-aGB0VuoC34YadAEqrwoaXLc5qla55pswDV2xLSmR7SE=" + "version": "9.0.10", + "hash": "sha256-4NEBx28byvjjIzo0wQPIUUymk9AzSgPS4fu5IRxkIt4=" }, { "pname": "Microsoft.Extensions.Configuration.EnvironmentVariables", - "version": "8.0.0", - "hash": "sha256-+bjFZvqCsMf2FRM2olqx/fub+QwfM1kBhjGVOT5HC48=" + "version": "9.0.10", + "hash": "sha256-D4Myt5rp8jxOvuQ4zwo/1bfNfLDZHrBYx7+UDOnhWgA=" }, { "pname": "Microsoft.Extensions.Configuration.FileExtensions", - "version": "8.0.1", - "hash": "sha256-iRA8L7BX/fe5LHCVOhzBSk30GfshP7V2Qj2nxpEvStA=" + "version": "9.0.10", + "hash": "sha256-I8ywPAfg7GPQgOuA5TPXuseurWKk7BmXsnaowF80XEQ=" }, { "pname": "Microsoft.Extensions.Configuration.Json", - "version": "8.0.1", - "hash": "sha256-J8EK/yhsfTpeSUY8F81ZTBV9APHiPUliN7d+n2OX9Ig=" + "version": "9.0.10", + "hash": "sha256-ykcnGdvnx19q3dpwZ9A09k+6iIGNurVebe4nUaOBtng=" }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "3.1.0", - "hash": "sha256-S72hzDAYWzrfCH5JLJBRtwPEM/Xjh17HwcKuA3wLhvU=" + "version": "3.0.0", + "hash": "sha256-RyT+m4OsHb1csXt5OYtjdx8LIsRlOKEWzSbAm4jfCzM=" }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "8.0.0", - "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ=" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection", - "version": "8.0.1", - "hash": "sha256-O9g0jWS+jfGoT3yqKwZYJGL+jGSIeSbwmvomKDC3hTU=" + "version": "9.0.10", + "hash": "sha256-f3r2msA/oV9gGdFn9OEr5bPAfINR17P+sS6/2/NnCuk=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", @@ -336,73 +366,73 @@ }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "8.0.0", - "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8=" + "version": "9.0.0", + "hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "8.0.2", - "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY=" + "version": "9.0.10", + "hash": "sha256-5rwFXG+Wjbf+TkXeWrkGVKV4wfvOryTPadEkEyPyKj4=" }, { "pname": "Microsoft.Extensions.DependencyModel", - "version": "8.0.2", - "hash": "sha256-PyuO/MyCR9JtYqpA1l/nXGh+WLKCq34QuAXN9qNza9Q=" + "version": "9.0.0", + "hash": "sha256-xirwlMWM0hBqgTneQOGkZ8l45mHT08XuSSRIbprgq94=" + }, + { + "pname": "Microsoft.Extensions.DependencyModel", + "version": "9.0.10", + "hash": "sha256-isJHVIKcWkwi+CqwNBVlz2ISKzZj+TilVpmVNOonNWo=" }, { "pname": "Microsoft.Extensions.Diagnostics", - "version": "8.0.1", - "hash": "sha256-CraHNCaVlMiYx6ff9afT6U7RC/MoOCXM3pn2KrXkiLc=" + "version": "9.0.10", + "hash": "sha256-QOjI52VFJne2OpvSPeoep/AcPXvwtr9AtvU0xdCIWog=" }, { "pname": "Microsoft.Extensions.Diagnostics.Abstractions", - "version": "8.0.0", - "hash": "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY=" - }, - { - "pname": "Microsoft.Extensions.Diagnostics.Abstractions", - "version": "8.0.1", - "hash": "sha256-d5DVXhA8qJFY9YbhZjsTqs5w5kDuxF5v+GD/WZR1QL0=" + "version": "9.0.10", + "hash": "sha256-FXJrBpG4UieCn9MLcNX25WbPycfZWdPg38/ZLckmAI0=" }, { "pname": "Microsoft.Extensions.Diagnostics.HealthChecks", - "version": "8.0.11", - "hash": "sha256-wS+5kN0lREre+gv7//VuVb9oVkEzWHxKGiZJukj4Z30=" + "version": "9.0.10", + "hash": "sha256-mp8r8G8V/Fu+SoZ2a1/cyFTfIF0x+HXeg7++5m3aRE4=" }, { "pname": "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions", - "version": "8.0.11", - "hash": "sha256-JjWYaK5c+w8GUkNudYQKf2m3NwOQLYEeSFwL8kgTWC0=" + "version": "9.0.10", + "hash": "sha256-7EHvrP6i4Wm0xPkp4S8O2dSHgnYEvU086irf6EzK8Xw=" }, { "pname": "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore", - "version": "8.0.11", - "hash": "sha256-4fON6hI6uBeb/AWROYLgbbfxce1wazIt9WQbTUqwfi0=" + "version": "9.0.10", + "hash": "sha256-E2+7dq0TvGcGuiJChyB4EsDEe8yySIvdB4XAH0q1zFQ=" }, { "pname": "Microsoft.Extensions.FileProviders.Abstractions", - "version": "8.0.0", - "hash": "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU=" + "version": "9.0.10", + "hash": "sha256-NJUg0fFe+djIUkdYhJDCG5A1JU9hhQ5GXGsz+gBEaFo=" }, { "pname": "Microsoft.Extensions.FileProviders.Physical", - "version": "8.0.0", - "hash": "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc=" + "version": "9.0.10", + "hash": "sha256-fqh0OzyoSouNpJkVp/stjqD2NInnBKX9n6JPx+HD5Q0=" }, { "pname": "Microsoft.Extensions.FileSystemGlobbing", - "version": "8.0.0", - "hash": "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU=" + "version": "9.0.10", + "hash": "sha256-m3gjvbPKl36XlrOzCjNHEhWjQcG8agZ5REc/EIOExmQ=" }, { "pname": "Microsoft.Extensions.Hosting.Abstractions", - "version": "8.0.0", - "hash": "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE=" + "version": "9.0.0", + "hash": "sha256-NhEDqZGnwCDFyK/NKn1dwLQExYE82j1YVFcrhXVczqY=" }, { "pname": "Microsoft.Extensions.Hosting.Abstractions", - "version": "8.0.1", - "hash": "sha256-/bIVL9uvBQhV/KQmjA1ZjR74sMfaAlBb15sVXsGDEVA=" + "version": "9.0.10", + "hash": "sha256-CrysJ8NO0kx9smoGIk0Oz05RnISTUcPVjTLpRKeVBgQ=" }, { "pname": "Microsoft.Extensions.Http", @@ -411,8 +441,8 @@ }, { "pname": "Microsoft.Extensions.Http", - "version": "8.0.1", - "hash": "sha256-ScPwhBvD3Jd4S0E7JQ18+DqY3PtQvdFLbkohUBbFd3o=" + "version": "9.0.10", + "hash": "sha256-cDC63R943sHVw34V64A3weVY1KgrjhE3dCtDJfGLaQA=" }, { "pname": "Microsoft.Extensions.Logging", @@ -421,28 +451,23 @@ }, { "pname": "Microsoft.Extensions.Logging", - "version": "8.0.0", - "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o=" + "version": "9.0.0", + "hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM=" }, { "pname": "Microsoft.Extensions.Logging", - "version": "8.0.1", - "hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU=" + "version": "9.0.10", + "hash": "sha256-/Et36NBhpMoxQzI+p/moW7knwYDfjI7Ma7DF7KIYn+Q=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "3.1.0", - "hash": "sha256-D3GHIGN0r6zLHHP2/5jt6hB0oMvRyl5ysvVrPVmmyv8=" + "version": "9.0.0", + "hash": "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "8.0.0", - "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4=" - }, - { - "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "8.0.2", - "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc=" + "version": "9.0.10", + "hash": "sha256-PtYXXHi+mbdQMh2QtA57NbWlt+JEpXiey36zLzbKTmo=" }, { "pname": "Microsoft.Extensions.ObjectPool", @@ -461,18 +486,13 @@ }, { "pname": "Microsoft.Extensions.Options", - "version": "8.0.0", - "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw=" - }, - { - "pname": "Microsoft.Extensions.Options", - "version": "8.0.2", - "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys=" + "version": "9.0.10", + "hash": "sha256-QTNhi83xhjJuIQ/3QffzQs/KY7avNyBMvnkuuSr3pBo=" }, { "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", - "version": "8.0.0", - "hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI=" + "version": "9.0.10", + "hash": "sha256-4YxwQH66IhJiJP53/Fy/lGBIEkVo4k+o/5QxzFQLhfQ=" }, { "pname": "Microsoft.Extensions.Primitives", @@ -481,13 +501,8 @@ }, { "pname": "Microsoft.Extensions.Primitives", - "version": "3.1.0", - "hash": "sha256-K/cDq+LMfK4cBCvKWkmWAC+IB6pEWolR1J5zL60QPvA=" - }, - { - "pname": "Microsoft.Extensions.Primitives", - "version": "8.0.0", - "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" + "version": "9.0.10", + "hash": "sha256-It7NQ+Ap/hrqFX3LXDVJqVz1Xl3j8QIapYDcG2MQ/7w=" }, { "pname": "Microsoft.NETCore.Platforms", @@ -526,39 +541,59 @@ }, { "pname": "Microsoft.Win32.SystemEvents", - "version": "8.0.0", - "hash": "sha256-UcxurEamYD+Bua0PbPNMYAZaRulMrov8CfbJGIgTaRQ=" + "version": "9.0.2", + "hash": "sha256-WXgu8y2LT8OtQSVRojumtlTkJVjfvXeZ8N9iRKIW/lI=" }, { "pname": "MimeTypes", - "version": "2.4.0", - "hash": "sha256-M35eTCoLiWv7PlBgsTltTvW7TOROf2AYB9nSl2NAsQA=" - }, - { - "pname": "Mono.Nat", - "version": "3.0.4", - "hash": "sha256-NdOquU2NaKtCv0p1+eY6awjOBwwzf92CwAJ4Dgz2+4M=" + "version": "2.5.2", + "hash": "sha256-S3aYTBXc/7Qi75CO9+2iBrI5tRFkdM5Q3VB5q6MthQo=" }, { "pname": "Mono.TextTemplating", - "version": "2.2.1", - "hash": "sha256-4TYsfc8q74P8FuDwkIWPO+VYY0mh4Hs4ZL8v0lMaBsY=" + "version": "3.0.0", + "hash": "sha256-VlgGDvgNZb7MeBbIZ4DE2Nn/j2aD9k6XqNHnASUSDr0=" + }, + { + "pname": "Morestachio", + "version": "5.0.1.631", + "hash": "sha256-L7ZA1l+61nZEj49DOTSp0bHsfCOBTYNmPJMv1mTIIvM=" }, { "pname": "NEbml", - "version": "0.12.0", - "hash": "sha256-Ij6p0bfCagTCxcKBppCQAqZMmxARJMCGsktyPSDGoFc=" + "version": "1.1.0.5", + "hash": "sha256-MrQLekP6z5y6rfqnCbLefkYv4Fm8di4HqZ/AiYTzBQ4=" + }, + { + "pname": "NETStandard.Library", + "version": "2.0.3", + "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=" }, { "pname": "Newtonsoft.Json", "version": "13.0.3", "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.4", + "hash": "sha256-8JCB1FdAW681qXP6DFDWvycu1oPyVoxaYgpJ2pUvZSk=" + }, { "pname": "PlaylistsNET", "version": "1.4.1", "hash": "sha256-Hei2R5S4p0jWhmUNtjL8qbTR1X120GlBeEQBj3tRHH4=" }, + { + "pname": "Polly", + "version": "8.6.4", + "hash": "sha256-Z+ZbhnHWMu55qgQkxvw3yMiMd+zIMzzQiFhvn/PeQ3I=" + }, + { + "pname": "Polly.Core", + "version": "8.6.4", + "hash": "sha256-4Xrg/H481Y/WOHk1sGvFNEOfgaGrdKi+4U54PTXhh9I=" + }, { "pname": "prometheus-net", "version": "3.1.2", @@ -679,6 +714,11 @@ "version": "4.3.0", "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" }, + { + "pname": "runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" + }, { "pname": "runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", @@ -754,11 +794,6 @@ "version": "4.3.0", "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" }, - { - "pname": "Serilog", - "version": "3.1.1", - "hash": "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI=" - }, { "pname": "Serilog", "version": "4.0.0", @@ -769,35 +804,45 @@ "version": "4.1.0", "hash": "sha256-r89nJ5JE5uZlsRrfB8QJQ1byVVfCWQbySKQ/m9PYj0k=" }, + { + "pname": "Serilog", + "version": "4.2.0", + "hash": "sha256-7f3EpCsEbDxXgsuhE430KVI14p7oDUuCtwRpOCqtnbs=" + }, { "pname": "Serilog.AspNetCore", - "version": "8.0.3", - "hash": "sha256-ZyBlauyG/7CLTqrbhRalmayFd99d7bimNTMw4hXDR2I=" + "version": "9.0.0", + "hash": "sha256-h58CFtXBRvwhTCrhQPHQMKbp98YiK02o+cOyOmktVpQ=" }, { "pname": "Serilog.Enrichers.Thread", "version": "4.0.0", "hash": "sha256-lo+3ohNHKe/hTq9vGbk29p/OWcNlcyJToGL6EpCJQm8=" }, + { + "pname": "Serilog.Expressions", + "version": "5.0.0", + "hash": "sha256-xpAT8U0pzTvRGa/qBd2M3YOQDD1xgAHCMVN9NEz0L4E=" + }, { "pname": "Serilog.Extensions.Hosting", - "version": "8.0.0", - "hash": "sha256-OEVkEQoONawJF+SXeyqqgU0OGp9ubtt9aXT+rC25j4E=" + "version": "9.0.0", + "hash": "sha256-bidr2foe7Dp4BJOlkc7ko0q6vt9ITG3IZ8b2BKRa0pw=" }, { "pname": "Serilog.Extensions.Logging", - "version": "8.0.0", - "hash": "sha256-GoWxCpkdahMvYd7ZrhwBxxTyjHGcs9ENNHJCp0la6iA=" + "version": "9.0.0", + "hash": "sha256-aGkz1V4HVl0rWC1BkcnLhG1EC7WLBoT3tdLdUUTFXaw=" }, { "pname": "Serilog.Formatting.Compact", - "version": "2.0.0", - "hash": "sha256-c3STGleyMijY4QnxPuAz/NkJs1r+TZAPjlmAKLF4+3g=" + "version": "3.0.0", + "hash": "sha256-nejEYqJEMG9P2iFZvbsCUPr5LZRtxbdUTLCI9N71jHY=" }, { "pname": "Serilog.Settings.Configuration", - "version": "8.0.4", - "hash": "sha256-00abT3H5COh5/A/tMYJwAZ37Mwa6jafVvW/nysLIbNQ=" + "version": "9.0.0", + "hash": "sha256-Q/q5UiSrcxoy5a/orod20E2RfiRtHDhxjjGMe1dW35I=" }, { "pname": "Serilog.Sinks.Async", @@ -811,13 +856,13 @@ }, { "pname": "Serilog.Sinks.Debug", - "version": "2.0.0", - "hash": "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ=" + "version": "3.0.0", + "hash": "sha256-7/LmoRF1rUDFhJ47bTRQQFRgSHnZDO8484r3sCGqYvE=" }, { "pname": "Serilog.Sinks.File", - "version": "6.0.0", - "hash": "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow=" + "version": "7.0.0", + "hash": "sha256-LxZYUoUPkCjIIVarJilnXnqQiMrFNJtoRilmzTNtUjo=" }, { "pname": "Serilog.Sinks.Graylog", @@ -831,33 +876,38 @@ }, { "pname": "ShimSkiaSharp", - "version": "2.0.0.1", - "hash": "sha256-nnuebZfFeOHcyRsGKsqM1wmmN6sI1VXr7mbIep02AcA=" + "version": "3.2.1", + "hash": "sha256-tWuNa23TYcJBttT2ajQiLowD3toEiIKw0uTqvAQvP58=" }, { "pname": "SkiaSharp", "version": "2.88.9", "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24=" }, + { + "pname": "SkiaSharp", + "version": "3.116.1", + "hash": "sha256-EQW/zjk+GsJbpJ3zqyGARh3oHep8XgneWXcSTNnYwuk=" + }, { "pname": "SkiaSharp.HarfBuzz", - "version": "2.88.9", - "hash": "sha256-JH8Jr25eftPfq0BztamvxfDcAZtnx/jLRj5DGCS5/G8=" + "version": "3.116.1", + "hash": "sha256-GYu9itkxAJUmj7Z4etHGUvPLdtdNr+y0mcUauArRnhE=" }, { "pname": "SkiaSharp.NativeAssets.Linux", - "version": "2.88.9", - "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A=" + "version": "3.116.1", + "hash": "sha256-7u4tHVbYG4QhxatQf2g1Rkw0hmA+Ajy/7/6O4TRuUpo=" }, { "pname": "SkiaSharp.NativeAssets.macOS", - "version": "2.88.9", - "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g=" + "version": "3.116.1", + "hash": "sha256-GntlOA+Blrh43l97gHP7sZl4HY0+Hx84xId3+YTXLCE=" }, { "pname": "SkiaSharp.NativeAssets.Win32", - "version": "2.88.9", - "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" + "version": "3.116.1", + "hash": "sha256-oraulwAja3vee2T2n9sEveSTVI8/Kvku7r09yXLENI4=" }, { "pname": "SmartAnalyzers.MultithreadingAnalyzer", @@ -866,23 +916,23 @@ }, { "pname": "SQLitePCLRaw.bundle_e_sqlite3", - "version": "2.1.6", - "hash": "sha256-dZD/bZsYXjOu46ZH5Y/wgh0uhHOqIxC+S+0ecKhr718=" + "version": "2.1.10", + "hash": "sha256-kZIWjH/TVTXRIsHPZSl7zoC4KAMBMWmgFYGLrQ15Occ=" }, { "pname": "SQLitePCLRaw.core", - "version": "2.1.6", - "hash": "sha256-RxWjm52PdmMV98dgDy0BCpF988+BssRZUgALLv7TH/E=" + "version": "2.1.10", + "hash": "sha256-gpZcYwiJVCVwCyJu0R6hYxyMB39VhJDmYh9LxcIVAA8=" }, { "pname": "SQLitePCLRaw.lib.e_sqlite3", - "version": "2.1.6", - "hash": "sha256-uHt5d+SFUkSd6WD7Tg0J3e8eVoxy/FM/t4PAkc9PJT0=" + "version": "2.1.10", + "hash": "sha256-m2v2RQWol+1MNGZsx+G2N++T9BNtQGLLHXUjcwkdCnc=" }, { "pname": "SQLitePCLRaw.provider.e_sqlite3", - "version": "2.1.6", - "hash": "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8=" + "version": "2.1.10", + "hash": "sha256-MLs3jiETLZ7k/TgkHynZegCWuAbgHaDQKTPB0iNv7Fg=" }, { "pname": "StyleCop.Analyzers", @@ -896,18 +946,18 @@ }, { "pname": "Svg.Custom", - "version": "2.0.0.1", - "hash": "sha256-ljkiz8xEaIMatjiGe49/LKBaPWR5D2/EY8CCNHZO4j4=" + "version": "3.2.1", + "hash": "sha256-wp0BA9O/TBYbyEktdx//4Qs9J/EdzA4re/xyqBeVJKc=" }, { "pname": "Svg.Model", - "version": "2.0.0.1", - "hash": "sha256-ICYIWmoBMM+nuUPQQSbwM2xggPDL+VZUG2UsnotU8Qw=" + "version": "3.2.1", + "hash": "sha256-eUK486QLBAv6x+oaoZmwdhwXI+9bEgmWSXMyJczN4Bw=" }, { "pname": "Svg.Skia", - "version": "2.0.0.1", - "hash": "sha256-3kGK9hc9BjaQu6u5mQ9heGKCDLpBDblgQ4VxRFLMa0Q=" + "version": "3.2.1", + "hash": "sha256-XuMuYto6eVGu8kPybY4EbPmRS7xbA+6j5W6pyZFKMxc=" }, { "pname": "Swashbuckle.AspNetCore", @@ -939,10 +989,15 @@ "version": "4.3.0", "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" }, + { + "pname": "System.Buffers", + "version": "4.5.1", + "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" + }, { "pname": "System.CodeDom", - "version": "4.4.0", - "hash": "sha256-L1xyspJ8pDJNVPYKl+FMGf4Zwm0tlqtAyQCNW6pT6/0=" + "version": "6.0.0", + "hash": "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ=" }, { "pname": "System.Collections", @@ -956,38 +1011,43 @@ }, { "pname": "System.Collections.Immutable", - "version": "6.0.0", - "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs=" + "version": "7.0.0", + "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" + }, + { + "pname": "System.Collections.Immutable", + "version": "9.0.0", + "hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac=" }, { "pname": "System.Composition", - "version": "6.0.0", - "hash": "sha256-H5TnnxOwihI0VyRuykbOWuKFSCWNN+MUEYyloa328Nw=" + "version": "7.0.0", + "hash": "sha256-YjhxuzuVdAzRBHNQy9y/1ES+ll3QtLcd2o+o8wIyMao=" }, { "pname": "System.Composition.AttributedModel", - "version": "6.0.0", - "hash": "sha256-03DR8ecEHSKfgzwuTuxtsRW0Gb7aQtDS4LAYChZdGdc=" + "version": "7.0.0", + "hash": "sha256-3s52Dyk2J66v/B4LLYFBMyXl0I8DFDshjE+sMjW4ubM=" }, { "pname": "System.Composition.Convention", - "version": "6.0.0", - "hash": "sha256-a3DZS8CT2kV8dVpGxHKoP5wHVKsT+kiPJixckpYfdQo=" + "version": "7.0.0", + "hash": "sha256-N4MkkBXSQkcFKsEdcSe6zmyFyMmFOHmI2BNo3wWxftk=" }, { "pname": "System.Composition.Hosting", - "version": "6.0.0", - "hash": "sha256-fpoh6WBNmaHEHszwlBR/TNjd85lwesfM7ZkQhqYtLy4=" + "version": "7.0.0", + "hash": "sha256-7liQGMaVKNZU1iWTIXvqf0SG8zPobRoLsW7q916XC3M=" }, { "pname": "System.Composition.Runtime", - "version": "6.0.0", - "hash": "sha256-nGZvg2xYhhazAjOjhWqltBue+hROKP0IOiFGP8yMBW8=" + "version": "7.0.0", + "hash": "sha256-Oo1BxSGLETmdNcYvnkGdgm7JYAnQmv1jY0gL0j++Pd0=" }, { "pname": "System.Composition.TypedParts", - "version": "6.0.0", - "hash": "sha256-4uAETfmL1CvGjHajzWowsEmJgTKnuFC8u9lbYPzAN3k=" + "version": "7.0.0", + "hash": "sha256-6ZzNdk35qQG3ttiAi4OXrihla7LVP+y2fL3bx40/32s=" }, { "pname": "System.Diagnostics.Debug", @@ -999,11 +1059,6 @@ "version": "4.3.0", "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "8.0.0", - "hash": "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs=" - }, { "pname": "System.Diagnostics.Tracing", "version": "4.3.0", @@ -1011,8 +1066,8 @@ }, { "pname": "System.Drawing.Common", - "version": "8.0.8", - "hash": "sha256-u/u0US7c0dfB8TmIdN+AI2GKrWUguuEmEKMGx7NLIKE=" + "version": "9.0.2", + "hash": "sha256-S7IMV4R/nWbZs/YCwI9UwwLHDP57NkfSEIaoYNbRq54=" }, { "pname": "System.Globalization", @@ -1046,8 +1101,8 @@ }, { "pname": "System.IO.Pipelines", - "version": "6.0.3", - "hash": "sha256-v+FOmjRRKlDtDW6+TfmyMiiki010YGVTa0EwXu9X7ck=" + "version": "7.0.0", + "hash": "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY=" }, { "pname": "System.Linq", @@ -1056,14 +1111,19 @@ }, { "pname": "System.Linq.Async", - "version": "6.0.1", - "hash": "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI=" + "version": "6.0.3", + "hash": "sha256-i+2XnsOJnD7R/vCFtadp+lwrkDNAscANes2Ur0MSTl8=" }, { "pname": "System.Memory", "version": "4.5.3", "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" }, + { + "pname": "System.Memory", + "version": "4.5.5", + "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" + }, { "pname": "System.Net.Http", "version": "4.3.4", @@ -1074,6 +1134,16 @@ "version": "4.3.0", "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" }, + { + "pname": "System.Numerics.Vectors", + "version": "4.4.0", + "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U=" + }, + { + "pname": "System.Numerics.Vectors", + "version": "4.5.0", + "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" + }, { "pname": "System.Private.Uri", "version": "4.3.0", @@ -1086,8 +1156,13 @@ }, { "pname": "System.Reflection.Metadata", - "version": "6.0.1", - "hash": "sha256-id27sU4qIEIpgKenO5b4IHt6L1XuNsVe4TR9TKaLWDo=" + "version": "7.0.0", + "hash": "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "9.0.0", + "hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ=" }, { "pname": "System.Reflection.Primitives", @@ -1109,6 +1184,11 @@ "version": "4.4.0", "hash": "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig=" }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "4.5.3", + "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak=" + }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "6.0.0", @@ -1186,14 +1266,19 @@ }, { "pname": "System.Text.Encoding.CodePages", - "version": "6.0.0", - "hash": "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4=" + "version": "7.0.0", + "hash": "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo=" }, { "pname": "System.Text.Encoding.CodePages", "version": "8.0.0", "hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE=" }, + { + "pname": "System.Text.Encoding.CodePages", + "version": "9.0.10", + "hash": "sha256-Y0flSC4lgyKW9VulNCal1VBzt80LFuPEK3DRWKgPsjA=" + }, { "pname": "System.Text.Encoding.Extensions", "version": "4.3.0", @@ -1201,8 +1286,13 @@ }, { "pname": "System.Text.Json", - "version": "8.0.5", - "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=" + "version": "7.0.3", + "hash": "sha256-aSJZ17MjqaZNQkprfxm/09LaCoFtpdWmqU9BTROzWX4=" + }, + { + "pname": "System.Text.Json", + "version": "9.0.10", + "hash": "sha256-wqeobpRw3PqOw21q8oGvauj5BkX1pS02Cm78E6c742w=" }, { "pname": "System.Threading", @@ -1211,8 +1301,8 @@ }, { "pname": "System.Threading.Channels", - "version": "6.0.0", - "hash": "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE=" + "version": "7.0.0", + "hash": "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM=" }, { "pname": "System.Threading.Tasks", @@ -1221,8 +1311,13 @@ }, { "pname": "System.Threading.Tasks.Dataflow", - "version": "8.0.1", - "hash": "sha256-hgCfF91BDd/eOtLEd5jhjzgJdvwmVv4/b42fXRr3nvo=" + "version": "9.0.10", + "hash": "sha256-V3UjIEGn9Yrl/DQoKeEVg9pDpp4iNz8r9+WmQ09R1bg=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.5.4", + "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" }, { "pname": "TagLibSharp", @@ -1231,8 +1326,8 @@ }, { "pname": "TMDbLib", - "version": "2.2.0", - "hash": "sha256-r4yV7t/biDORVYP0Go6KSSmNIVRn6IuFQ+Okt8GPvbY=" + "version": "2.3.0", + "hash": "sha256-PVlZ+6dSLxrE4+QOTfXofK6gaU22eAVuh0lC3I96cKE=" }, { "pname": "Ude.NetStandard", @@ -1244,10 +1339,15 @@ "version": "2.5.1", "hash": "sha256-9D6TqKSPsjzSly0mtUGZJbrNAJ7ftz9LJjWNwnnQMz4=" }, + { + "pname": "UTF.Unknown", + "version": "2.6.0", + "hash": "sha256-cm3anHxu/tL+xMJ55vDoISmCTJUwIiP+jMFTbl0pR5s=" + }, { "pname": "z440.atl.core", - "version": "6.20.0", - "hash": "sha256-8LdLU2wgdR21bEXTBw7+RdbLYBM0vHRZhKv2ZpiVL44=" + "version": "7.5.0", + "hash": "sha256-denTZd9A4zV2Plg7PtRf6bc1gzXzxgTWPp1bs1NShwA=" }, { "pname": "zlib.net-mutliplatform", diff --git a/pkgs/by-name/je/jellyfin/package.nix b/pkgs/by-name/je/jellyfin/package.nix index 8c241d5f237a..53dbebbb2b56 100644 --- a/pkgs/by-name/je/jellyfin/package.nix +++ b/pkgs/by-name/je/jellyfin/package.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "jellyfin"; - version = "10.10.7"; # ensure that jellyfin-web has matching version + version = "10.11.0"; # ensure that jellyfin-web has matching version src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin"; rev = "v${version}"; - hash = "sha256-GWpzX8DvCafHb5V9it0ZPTXKm+NbLS7Oepe/CcMiFuI="; + hash = "sha256-8kvN2ZugmjjgSMepDdP9tc48362b6w+RpIsp/IXaivM="; }; propagatedBuildInputs = [ sqlite ]; @@ -32,8 +32,8 @@ buildDotnetModule rec { fontconfig freetype ]; - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; + dotnet-sdk = dotnetCorePackages.sdk_9_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_9_0; dotnetBuildFlags = [ "--no-self-contained" ]; makeWrapperArgs = [ From e8acdb2a18494f9303fa486843040fbfa6bf0152 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Oct 2025 11:39:22 +0000 Subject: [PATCH 128/380] netbird-dashboard: 2.19.2 -> 2.20.1 --- pkgs/by-name/ne/netbird-dashboard/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix index f9e0aa17698e..f07f06a96b5b 100644 --- a/pkgs/by-name/ne/netbird-dashboard/package.nix +++ b/pkgs/by-name/ne/netbird-dashboard/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "netbird-dashboard"; - version = "2.19.2"; + version = "2.20.1"; src = fetchFromGitHub { owner = "netbirdio"; repo = "dashboard"; rev = "v${version}"; - hash = "sha256-3rHNk/rc0j5mWF2jbrMOtFrDkosph1YWnFoh1lLHTPs="; + hash = "sha256-RvnoQRVJlZNqfmOa2c1s/ZuA0Ej7pZ7WcXM+31t22eY="; }; - npmDepsHash = "sha256-pC4Vvkb+NAGyhd090LAeGZTLVGufnC9LylJGQt8aEZg="; + npmDepsHash = "sha256-93w0ZWtrLfYRBa5Ps4duSRoiI4hu9AoK7GZRRH4zmL0="; npmFlags = [ "--legacy-peer-deps" ]; installPhase = '' From 8a9fa0f5e3d37ec8330d175bdf384949ffff69b7 Mon Sep 17 00:00:00 2001 From: sugar Date: Mon, 8 Sep 2025 09:50:30 +0200 Subject: [PATCH 129/380] iocaine: init at 2.5.1 --- pkgs/by-name/io/iocaine/package.nix | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/io/iocaine/package.nix diff --git a/pkgs/by-name/io/iocaine/package.nix b/pkgs/by-name/io/iocaine/package.nix new file mode 100644 index 000000000000..94d2822207dd --- /dev/null +++ b/pkgs/by-name/io/iocaine/package.nix @@ -0,0 +1,32 @@ +{ + stdenv, + lib, + rustPlatform, + fetchFromGitea, +}: + +rustPlatform.buildRustPackage rec { + pname = "iocaine"; + version = "2.5.1"; + + src = fetchFromGitea { + domain = "git.madhouse-project.org"; + owner = "iocaine"; + repo = "iocaine"; + tag = "iocaine-${version}"; + hash = "sha256-213QLpGBKSsT9r8O27PyMom5+OGPz0VtRBevxswISZA="; + }; + + cargoHash = "sha256-EgPGDlJX/m+v3f/tGIO+saGHoYrtiWLZuMlXEvsgnxE="; + + meta = { + description = "Deadliest poison known to AI"; + homepage = "https://iocaine.madhouse-project.org/"; + changelog = "https://git.madhouse-project.org/iocaine/iocaine/src/tag/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sugar700 ]; + mainProgram = "iocaine"; + # Lacking OS access to fix, and upstream doesn't support macOS. + broken = stdenv.hostPlatform.isDarwin; + }; +} From 3c7b8ac5079614892b6b28f04f0f4199260363eb Mon Sep 17 00:00:00 2001 From: jasonxue Date: Mon, 20 Oct 2025 22:17:52 +0800 Subject: [PATCH 130/380] mdsf: add shell completions --- pkgs/by-name/md/mdsf/package.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/by-name/md/mdsf/package.nix b/pkgs/by-name/md/mdsf/package.nix index 6287cb4e821d..cfe185d988f4 100644 --- a/pkgs/by-name/md/mdsf/package.nix +++ b/pkgs/by-name/md/mdsf/package.nix @@ -1,9 +1,11 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, versionCheckHook, nix-update-script, + installShellFiles, }: let pname = "mdsf"; @@ -24,6 +26,17 @@ rustPlatform.buildRustPackage { # many tests fail for various reasons of which most depend on the build sandbox doCheck = false; + nativeBuildInputs = [ + installShellFiles + ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd mdsf \ + --bash <($out/bin/mdsf completions bash) \ + --zsh <($out/bin/mdsf completions zsh) \ + --fish <($out/bin/mdsf completions fish) \ + --nushell <($out/bin/mdsf completions nushell) + ''; + nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; passthru.updateScript = nix-update-script { }; From de48af3709b743d20aa8cc9368b7418a0165d2a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Oct 2025 17:19:23 +0000 Subject: [PATCH 131/380] firezone-gateway: 1.4.16 -> 1.4.17 --- pkgs/by-name/fi/firezone-gateway/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/firezone-gateway/package.nix b/pkgs/by-name/fi/firezone-gateway/package.nix index 5309ebd379e2..48bac722dc86 100644 --- a/pkgs/by-name/fi/firezone-gateway/package.nix +++ b/pkgs/by-name/fi/firezone-gateway/package.nix @@ -6,15 +6,15 @@ }: rustPlatform.buildRustPackage rec { pname = "firezone-gateway"; - version = "1.4.16"; + version = "1.4.17"; src = fetchFromGitHub { owner = "firezone"; repo = "firezone"; tag = "gateway-${version}"; - hash = "sha256-Tu0Bq/Axj05dCRCd1eB7CiOXQ5n4i8hnE3ZiGCQ5ZdY="; + hash = "sha256-dVqZs5Xie9lc3F6wVMdxRHeoM7y/e9TvwjzfikenQ6w="; }; - cargoHash = "sha256-wlf+TtrRG7hHNav7WqLn2DSX9QkKFVzyiKP5CRdXlNY="; + cargoHash = "sha256-J2IqqFBuoTkbO0nMJbY680G2HTAtC1To/nMra2PCopY="; sourceRoot = "${src.name}/rust"; buildAndTestSubdir = "gateway"; RUSTFLAGS = "--cfg system_certs"; From d6d9fdd74279f8910b6bf83989b460d4d8a05ece Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 20 Oct 2025 14:21:35 -0300 Subject: [PATCH 132/380] toxvpn: fix build with cmake4 --- pkgs/by-name/to/toxvpn/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/to/toxvpn/package.nix b/pkgs/by-name/to/toxvpn/package.nix index 971d533404ef..60cab8acab30 100644 --- a/pkgs/by-name/to/toxvpn/package.nix +++ b/pkgs/by-name/to/toxvpn/package.nix @@ -37,6 +37,11 @@ stdenv.mkDerivation { cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "-DSYSTEMD=1" ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" + ''; + postInstall = "cp ${./bootstrap.json} $out/share/toxvpn/"; installCheckPhase = "$out/bin/toxvpn -h"; From 6154148eb4a37bf95d700c55c8829cdcf39ee5e8 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 20 Oct 2025 16:14:36 -0300 Subject: [PATCH 133/380] surge: fix build with cmake4 --- pkgs/by-name/su/surge/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/su/surge/package.nix b/pkgs/by-name/su/surge/package.nix index f5496d621092..af14e136c846 100644 --- a/pkgs/by-name/su/surge/package.nix +++ b/pkgs/by-name/su/surge/package.nix @@ -77,6 +77,9 @@ stdenv.mkDerivation (finalAttrs: { --replace '"zenity' '"${zenity}/bin/zenity' patchShebangs scripts/linux/ cp -r $extraContent/Skins/ resources/data/skins + + substituteInPlace libs/libsamplerate/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.1..3.18)" "cmake_minimum_required(VERSION 3.10)" ''; installPhase = '' From c79ada33c752f459ea6fbe1a5403e701334044fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Mon, 20 Oct 2025 22:06:33 +0200 Subject: [PATCH 134/380] tor-browser: remove deprecated useHardenedMalloc The option been deprecated since NixOS 23.05: https://github.com/NixOS/nixpkgs/pull/248040 --- pkgs/by-name/to/tor-browser/package.nix | 609 ++++++++++++------------ 1 file changed, 297 insertions(+), 312 deletions(-) diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix index e5d139bd6453..75f6988c6454 100644 --- a/pkgs/by-name/to/tor-browser/package.nix +++ b/pkgs/by-name/to/tor-browser/package.nix @@ -55,11 +55,6 @@ libvaSupport ? mediaSupport, libva, - # Hardening - graphene-hardened-malloc, - # Whether to use graphene-hardened-malloc - useHardenedMalloc ? null, - # Whether to use IPC for communicating with Tor useIPCTorService ? false, # Whether to disable multiprocess support @@ -69,317 +64,307 @@ extraPrefs ? "", }: -lib.warnIf (useHardenedMalloc != null) - "tor-browser: useHardenedMalloc is deprecated and enabling it can cause issues" +let + libPath = lib.makeLibraryPath ( + [ + alsa-lib + atk + cairo + dbus + dbus-glib + fontconfig + freetype + gdk-pixbuf + glib + gtk3 + libxcb + libX11 + libXext + libXrender + libXt + libXtst + libgbm + pango + pciutils + stdenv.cc.cc + stdenv.cc.libc + zlib + ] + ++ lib.optionals libnotifySupport [ libnotify ] + ++ lib.optionals waylandSupport [ + libxkbcommon + libdrm + libGL + ] + ++ lib.optionals pipewireSupport [ pipewire ] + ++ lib.optionals pulseaudioSupport [ libpulseaudio ] + ++ lib.optionals libvaSupport [ libva ] + ++ lib.optionals mediaSupport [ ffmpeg ] + ); - ( - let - libPath = lib.makeLibraryPath ( - [ - alsa-lib - atk - cairo - dbus - dbus-glib - fontconfig - freetype - gdk-pixbuf - glib - gtk3 - libxcb - libX11 - libXext - libXrender - libXt - libXtst - libgbm - pango - pciutils - stdenv.cc.cc - stdenv.cc.libc - zlib - ] - ++ lib.optionals libnotifySupport [ libnotify ] - ++ lib.optionals waylandSupport [ - libxkbcommon - libdrm - libGL - ] - ++ lib.optionals pipewireSupport [ pipewire ] - ++ lib.optionals pulseaudioSupport [ libpulseaudio ] - ++ lib.optionals libvaSupport [ libva ] - ++ lib.optionals mediaSupport [ ffmpeg ] - ); + version = "14.5.8"; - version = "14.5.8"; - - sources = { - x86_64-linux = fetchurl { - urls = [ - "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" - "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" - "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" - "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" - ]; - hash = "sha256-hf3pkl+J9Hs28XSyNoXCZM0B9A7g4/n6F7WFkD/hl/o="; - }; - - i686-linux = fetchurl { - urls = [ - "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" - "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" - "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" - "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" - ]; - hash = "sha256-iSHeHCyBg66pbGw8glmViTFMvys3EArOkXVpqJBXEfc="; - }; - }; - - distributionIni = writeText "distribution.ini" ( - lib.generators.toINI { } { - # Some light branding indicating this build uses our distro preferences - Global = { - id = "nixos"; - version = "1.0"; - about = "Tor Browser for NixOS"; - }; - } - ); - - policiesJson = writeText "policies.json" ( - builtins.toJSON { - policies.DisableAppUpdate = true; - } - ); - in - stdenv.mkDerivation rec { - pname = "tor-browser"; - inherit version; - - src = - sources.${stdenv.hostPlatform.system} - or (throw "unsupported system: ${stdenv.hostPlatform.system}"); - - nativeBuildInputs = [ - autoPatchelfHook - patchelfUnstable - copyDesktopItems - makeWrapper - wrapGAppsHook3 + sources = { + x86_64-linux = fetchurl { + urls = [ + "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" + "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" + "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" + "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - buildInputs = [ - gtk3 - alsa-lib - dbus-glib - libXtst + hash = "sha256-hf3pkl+J9Hs28XSyNoXCZM0B9A7g4/n6F7WFkD/hl/o="; + }; + + i686-linux = fetchurl { + urls = [ + "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" + "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" + "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" + "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; + hash = "sha256-iSHeHCyBg66pbGw8glmViTFMvys3EArOkXVpqJBXEfc="; + }; + }; - # Firefox uses "relrhack" to manually process relocations from a fixed offset - patchelfFlags = [ "--no-clobber-old-sections" ]; - - preferLocalBuild = true; - allowSubstitutes = false; - - desktopItems = [ - (makeDesktopItem { - name = "torbrowser"; - exec = "tor-browser %U"; - icon = "tor-browser"; - desktopName = "Tor Browser"; - genericName = "Web Browser"; - comment = meta.description; - categories = [ - "Network" - "WebBrowser" - "Security" - ]; - mimeTypes = [ - "text/html" - "text/xml" - "application/xhtml+xml" - "application/vnd.mozilla.xul+xml" - "x-scheme-handler/http" - "x-scheme-handler/https" - ]; - startupWMClass = "Tor Browser"; - }) - ]; - - buildPhase = '' - runHook preBuild - - # For convenience ... - TBB_IN_STORE=$out/share/tor-browser - - # Unpack & enter - mkdir -p "$TBB_IN_STORE" - tar xf "$src" -C "$TBB_IN_STORE" --strip-components=2 - pushd "$TBB_IN_STORE" - - # Set ELF interpreter - autoPatchelf firefox.real TorBrowser/Tor - - # firefox is a wrapper that checks for a more recent libstdc++ & appends it to the ld path - mv firefox.real firefox - - # store state at `~/.tor browser` instead of relative to executable - touch "$TBB_IN_STORE/system-install" - - # The final libPath. Note, we could split this into firefoxLibPath - # and torLibPath for accuracy, but this is more convenient ... - libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor - - # apulse uses a non-standard library path. For now special-case it. - ${lib.optionalString (audioSupport && !pulseaudioSupport) '' - libPath=${apulse}/lib/apulse:$libPath - ''} - - # Fixup paths to pluggable transports. - substituteInPlace TorBrowser/Data/Tor/torrc-defaults \ - --replace-fail './TorBrowser' "$TBB_IN_STORE/TorBrowser" - - # Prepare for autoconfig. - # - # See https://developer.mozilla.org/en-US/Firefox/Enterprise_deployment - cat >defaults/pref/autoconfig.js <mozilla.cfg <fonts' "$TBB_IN_STORE/fonts" - - # Hard-code paths to geoip data files. TBB resolves the geoip files - # relative to torrc-defaults_path but if we do not hard-code them - # here, these paths end up being written to the torrc in the user's - # state dir. - cat >>TorBrowser/Data/Tor/torrc-defaults </dev/null - - echo "Checking tor-browser wrapper ..." - $out/bin/tor-browser --version >/dev/null - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - # Install distribution customizations - install -Dvm644 ${distributionIni} $out/share/tor-browser/distribution/distribution.ini - install -Dvm644 ${policiesJson} $out/share/tor-browser/distribution/policies.json - - runHook postInstall - ''; - - passthru = { - inherit sources; - updateScript = callPackage ./update.nix { - inherit pname version meta; - }; - }; - - meta = { - description = "Privacy-focused browser routing traffic through the Tor network"; - mainProgram = "tor-browser"; - homepage = "https://www.torproject.org/"; - changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}"; - platforms = lib.attrNames sources; - maintainers = with lib.maintainers; [ - c4patino - felschr - hax404 - joachifm - panicgh - ]; - # MPL2.0+, GPL+, &c. While it's not entirely clear whether - # the compound is "libre" in a strict sense (some components place certain - # restrictions on redistribution), it's free enough for our purposes. - license = with lib.licenses; [ - mpl20 - lgpl21Plus - lgpl3Plus - free - ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + distributionIni = writeText "distribution.ini" ( + lib.generators.toINI { } { + # Some light branding indicating this build uses our distro preferences + Global = { + id = "nixos"; + version = "1.0"; + about = "Tor Browser for NixOS"; }; } - ) + ); + + policiesJson = writeText "policies.json" ( + builtins.toJSON { + policies.DisableAppUpdate = true; + } + ); +in +stdenv.mkDerivation rec { + pname = "tor-browser"; + inherit version; + + src = + sources.${stdenv.hostPlatform.system} + or (throw "unsupported system: ${stdenv.hostPlatform.system}"); + + nativeBuildInputs = [ + autoPatchelfHook + patchelfUnstable + copyDesktopItems + makeWrapper + wrapGAppsHook3 + ]; + buildInputs = [ + gtk3 + alsa-lib + dbus-glib + libXtst + ]; + + # Firefox uses "relrhack" to manually process relocations from a fixed offset + patchelfFlags = [ "--no-clobber-old-sections" ]; + + preferLocalBuild = true; + allowSubstitutes = false; + + desktopItems = [ + (makeDesktopItem { + name = "torbrowser"; + exec = "tor-browser %U"; + icon = "tor-browser"; + desktopName = "Tor Browser"; + genericName = "Web Browser"; + comment = meta.description; + categories = [ + "Network" + "WebBrowser" + "Security" + ]; + mimeTypes = [ + "text/html" + "text/xml" + "application/xhtml+xml" + "application/vnd.mozilla.xul+xml" + "x-scheme-handler/http" + "x-scheme-handler/https" + ]; + startupWMClass = "Tor Browser"; + }) + ]; + + buildPhase = '' + runHook preBuild + + # For convenience ... + TBB_IN_STORE=$out/share/tor-browser + + # Unpack & enter + mkdir -p "$TBB_IN_STORE" + tar xf "$src" -C "$TBB_IN_STORE" --strip-components=2 + pushd "$TBB_IN_STORE" + + # Set ELF interpreter + autoPatchelf firefox.real TorBrowser/Tor + + # firefox is a wrapper that checks for a more recent libstdc++ & appends it to the ld path + mv firefox.real firefox + + # store state at `~/.tor browser` instead of relative to executable + touch "$TBB_IN_STORE/system-install" + + # The final libPath. Note, we could split this into firefoxLibPath + # and torLibPath for accuracy, but this is more convenient ... + libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor + + # apulse uses a non-standard library path. For now special-case it. + ${lib.optionalString (audioSupport && !pulseaudioSupport) '' + libPath=${apulse}/lib/apulse:$libPath + ''} + + # Fixup paths to pluggable transports. + substituteInPlace TorBrowser/Data/Tor/torrc-defaults \ + --replace-fail './TorBrowser' "$TBB_IN_STORE/TorBrowser" + + # Prepare for autoconfig. + # + # See https://developer.mozilla.org/en-US/Firefox/Enterprise_deployment + cat >defaults/pref/autoconfig.js <mozilla.cfg <fonts' "$TBB_IN_STORE/fonts" + + # Hard-code paths to geoip data files. TBB resolves the geoip files + # relative to torrc-defaults_path but if we do not hard-code them + # here, these paths end up being written to the torrc in the user's + # state dir. + cat >>TorBrowser/Data/Tor/torrc-defaults </dev/null + + echo "Checking tor-browser wrapper ..." + $out/bin/tor-browser --version >/dev/null + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + # Install distribution customizations + install -Dvm644 ${distributionIni} $out/share/tor-browser/distribution/distribution.ini + install -Dvm644 ${policiesJson} $out/share/tor-browser/distribution/policies.json + + runHook postInstall + ''; + + passthru = { + inherit sources; + updateScript = callPackage ./update.nix { + inherit pname version meta; + }; + }; + + meta = { + description = "Privacy-focused browser routing traffic through the Tor network"; + mainProgram = "tor-browser"; + homepage = "https://www.torproject.org/"; + changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}"; + platforms = lib.attrNames sources; + maintainers = with lib.maintainers; [ + c4patino + felschr + hax404 + joachifm + panicgh + ]; + # MPL2.0+, GPL+, &c. While it's not entirely clear whether + # the compound is "libre" in a strict sense (some components place certain + # restrictions on redistribution), it's free enough for our purposes. + license = with lib.licenses; [ + mpl20 + lgpl21Plus + lgpl3Plus + free + ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} From d886932fdb0e641ad7d70eb26c594e550dbbe25d Mon Sep 17 00:00:00 2001 From: Coutinho de Souza Date: Mon, 20 Oct 2025 15:46:38 -0400 Subject: [PATCH 135/380] maintainers: remove onemoresuza from hare, harec and haredoc --- pkgs/by-name/ha/hare/package.nix | 2 +- pkgs/by-name/ha/harec/package.nix | 2 +- pkgs/by-name/ha/haredoc/package.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/hare/package.nix b/pkgs/by-name/ha/hare/package.nix index 4db503b574b4..406e7b72065c 100644 --- a/pkgs/by-name/ha/hare/package.nix +++ b/pkgs/by-name/ha/hare/package.nix @@ -170,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://harelang.org/"; description = "Systems programming language designed to be simple, stable, and robust"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ onemoresuza ]; + maintainers = [ ]; mainProgram = "hare"; inherit (harec.meta) platforms badPlatforms; }; diff --git a/pkgs/by-name/ha/harec/package.nix b/pkgs/by-name/ha/harec/package.nix index 73257d0296ad..046bef8274a5 100644 --- a/pkgs/by-name/ha/harec/package.nix +++ b/pkgs/by-name/ha/harec/package.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://harelang.org/"; description = "Bootstrapping Hare compiler written in C for POSIX systems"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ onemoresuza ]; + maintainers = [ ]; mainProgram = "harec"; # The upstream developers do not like proprietary operating systems; see # https://harelang.org/platforms/ diff --git a/pkgs/by-name/ha/haredoc/package.nix b/pkgs/by-name/ha/haredoc/package.nix index 773b226316ae..591983f1e093 100644 --- a/pkgs/by-name/ha/haredoc/package.nix +++ b/pkgs/by-name/ha/haredoc/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { homepage = "https://harelang.org/"; description = "Hare's documentation tool"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ onemoresuza ]; + maintainers = [ ]; mainProgram = "haredoc"; inherit (hareHook.meta) platforms badPlatforms; }; From 0909cb8a745678b68d6f2793aa5f40f10e267526 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Oct 2025 23:41:47 +0000 Subject: [PATCH 136/380] mirrord: 3.165.0 -> 3.167.0 --- pkgs/by-name/mi/mirrord/manifest.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index c2ff36881b70..711c78a223cd 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.165.0", + "version": "3.167.0", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.165.0/mirrord_linux_x86_64", - "hash": "sha256-XLmI42PHs15KFwsKzVRohdVcQiwRncuoI375OlnhrRM=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.167.0/mirrord_linux_x86_64", + "hash": "sha256-7LxoI0y82Hy2Vi7SveKgkKw1Bv5AzcMceBbV1FDhock=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.165.0/mirrord_linux_aarch64", - "hash": "sha256-IWEE2Vi/OIbL5hgOAkXhz/lJix7qjKD9yQrT2lNW4uY=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.167.0/mirrord_linux_aarch64", + "hash": "sha256-a4SuVF1e02IjAt//DgSdJ3dy4GfDaNhOHOwrZHio7OY=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.165.0/mirrord_mac_universal", - "hash": "sha256-xRFLI/97yFpM4mt+SSbCHo4CLY0ClWLrG3jUvIRO9CQ=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.167.0/mirrord_mac_universal", + "hash": "sha256-pqIjHduZMwsR6zXEURkKfixkY+FLy4oIE+aPPUX904M=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.165.0/mirrord_mac_universal", - "hash": "sha256-xRFLI/97yFpM4mt+SSbCHo4CLY0ClWLrG3jUvIRO9CQ=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.167.0/mirrord_mac_universal", + "hash": "sha256-pqIjHduZMwsR6zXEURkKfixkY+FLy4oIE+aPPUX904M=" } } } From f0553e3f118ebb8cec9cf906c9d234218b9c3181 Mon Sep 17 00:00:00 2001 From: Andrew Zah Date: Tue, 21 Oct 2025 10:11:24 +0900 Subject: [PATCH 137/380] lenmus: fix build issue due to cmake 4 --- pkgs/by-name/le/lenmus/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/le/lenmus/package.nix b/pkgs/by-name/le/lenmus/package.nix index 5f32b2f0bc2f..3854ac3ef3b8 100644 --- a/pkgs/by-name/le/lenmus/package.nix +++ b/pkgs/by-name/le/lenmus/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchFromGitHub, cmake, pkg-config, @@ -31,6 +32,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-qegOAc6vs2+6VViDHVjv0q+qjLZyTT7yPF3hFpTt5zE="; }; + patches = [ + (fetchpatch { + name = "bump-cmake-minimum-required-version.patch"; + url = "https://github.com/lenmus/lenmus/commit/cc250ca4ce9a90d8dddb0fc359c5a80609cdafcb.patch"; + hash = "sha256-aP+ooaSi6vHk+g1XftfjZ39zAgYts1vOCqZWWZhJ+G8="; + }) + ]; + env = { NIX_CFLAGS_COMPILE = "-fpermissive"; }; From 6a3aed724f9947e4e7795cf8298427c3618df80a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Oct 2025 01:34:47 +0000 Subject: [PATCH 138/380] beszel: 0.13.2 -> 0.14.1 --- pkgs/by-name/be/beszel/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/be/beszel/package.nix b/pkgs/by-name/be/beszel/package.nix index 79f012fdaea4..4301be555c87 100644 --- a/pkgs/by-name/be/beszel/package.nix +++ b/pkgs/by-name/be/beszel/package.nix @@ -7,13 +7,13 @@ }: buildGoModule rec { pname = "beszel"; - version = "0.13.2"; + version = "0.14.1"; src = fetchFromGitHub { owner = "henrygd"; repo = "beszel"; tag = "v${version}"; - hash = "sha256-5akfgX3533NkeszP/by9ZfwTmMPdG5/JKFjswP1FRp8="; + hash = "sha256-IQ39OtYG2VDyHIPFRR0VNK56czGlJly66Bwb/NYIBxY="; }; webui = buildNpmPackage { @@ -47,7 +47,7 @@ buildGoModule rec { sourceRoot = "${src.name}/internal/site"; - npmDepsHash = "sha256-7+3K8MhA+FXWRXQR5edUYbL/XcxPmUqWQPxl5k8u1xs="; + npmDepsHash = "sha256-Wtq/pesnovOyAnFta/wI+j8rml8XWORvOLz/Q82sy8g="; }; vendorHash = "sha256-IfwgL4Ms5Uho1l0yGCyumbr1N/SN+j5HaFl4hACkTsQ="; From 35fa0b804b94bc57de6a966daf2c365a1ae2027a Mon Sep 17 00:00:00 2001 From: beeb <703631+beeb@users.noreply.github.com> Date: Wed, 15 Oct 2025 17:09:48 +0200 Subject: [PATCH 139/380] lintspec: 0.10.0 -> 0.11.4 --- pkgs/by-name/li/lintspec/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/lintspec/package.nix b/pkgs/by-name/li/lintspec/package.nix index f699c09dc708..54381f2a14e9 100644 --- a/pkgs/by-name/li/lintspec/package.nix +++ b/pkgs/by-name/li/lintspec/package.nix @@ -8,16 +8,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lintspec"; - version = "0.10.0"; + version = "0.11.4"; src = fetchFromGitHub { owner = "beeb"; repo = "lintspec"; tag = "v${finalAttrs.version}"; - hash = "sha256-FCcAyOPym6e9L1yMNqdpw4m8JEeXJZhN2yJi86j/WC0="; + hash = "sha256-dd9j4eGXhNyaTOMiKK0qi8BW1Zy1kZ6+ZVMB7rrq4gE="; }; - cargoHash = "sha256-RVKoy400ZPBC18gq87DntQw73AkIqSwpMqR0dtKA0wY="; + cargoHash = "sha256-u83OgBEbZ4b2CLZv/M9Wv0tum3ZKZGOuba0leqfMDoo="; + cargoBuildFlags = [ + "--package" + "lintspec" + ]; nativeBuildInputs = [ installShellFiles ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' From e687f1f5936fa6123c07e2dbf010c3f6b61a64dd Mon Sep 17 00:00:00 2001 From: Karolis Stasaitis Date: Tue, 21 Oct 2025 09:40:37 +0200 Subject: [PATCH 140/380] dsview: fix build with cmake 4 --- .../science/electronics/dsview/cmake4.patch | 13 +++++++++++++ .../science/electronics/dsview/default.nix | 1 + 2 files changed, 14 insertions(+) create mode 100644 pkgs/applications/science/electronics/dsview/cmake4.patch diff --git a/pkgs/applications/science/electronics/dsview/cmake4.patch b/pkgs/applications/science/electronics/dsview/cmake4.patch new file mode 100644 index 000000000000..b9674dc7d01c --- /dev/null +++ b/pkgs/applications/science/electronics/dsview/cmake4.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d12bd0db..f904000b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,7 +19,7 @@ + ## along with this program. If not, see . + ## + +-cmake_minimum_required(VERSION 2.8.6) ++cmake_minimum_required(VERSION 3.10) + + project(DSView) + diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index 379cd27af0b9..17b1a69380ae 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Fix absolute install paths ./install.patch + ./cmake4.patch ]; # /build/source/libsigrok4DSL/strutil.c:343:19: error: implicit declaration of function 'strcasecmp'; did you mean 'g_strcasecmp'? [] From 3d5c8f5e6be42cca034d94fcdbb21d31d1a63022 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Oct 2025 07:56:13 +0000 Subject: [PATCH 141/380] kas: 4.8.2 -> 5.0 --- pkgs/by-name/ka/kas/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ka/kas/package.nix b/pkgs/by-name/ka/kas/package.nix index 870028924c99..13c8b6c8a5e2 100644 --- a/pkgs/by-name/ka/kas/package.nix +++ b/pkgs/by-name/ka/kas/package.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication rec { pname = "kas"; - version = "4.8.2"; + version = "5.0"; format = "pyproject"; src = fetchFromGitHub { owner = "siemens"; repo = "kas"; tag = version; - hash = "sha256-mDfGiWZKipbaXxlyx8JWeFvSyE44FcumYD9Pr/38UBQ="; + hash = "sha256-KSmLQBOYyuO9o3YZYPJPDPeGudtNYIC2yghAu98sf3Q="; }; patches = [ ./pass-terminfo-env.patch ]; From b0bc8faca25e15f5d227035b34289a4b25d2f9c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Oct 2025 07:58:54 +0000 Subject: [PATCH 142/380] riffdiff: 3.4.1 -> 3.5.0 --- pkgs/by-name/ri/riffdiff/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix index 7d066f224410..98fc4ccfb2f6 100644 --- a/pkgs/by-name/ri/riffdiff/package.nix +++ b/pkgs/by-name/ri/riffdiff/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "riffdiff"; - version = "3.4.1"; + version = "3.5.0"; src = fetchFromGitHub { owner = "walles"; repo = "riff"; tag = version; - hash = "sha256-IpEgWbmWFW4X09EeAfWadncH4ptzSom2+7kvh8h3hcM="; + hash = "sha256-qA20sLiGqDtIPWBNww+WXM5AG162RPTdkUPoJ0PLiYY="; }; - cargoHash = "sha256-I0hBh9FFoy+RhEUAHfgQa+UiSgOS0mYJy+2W/0/9kG4="; + cargoHash = "sha256-omwKOstRXIAUDgLUFqmtxu77JJzAOASzbjLEImad1cE="; passthru = { tests.version = testers.testVersion { package = riffdiff; }; From 8598b9e738dbb56e6081f8df6e88ce6d8db8a74a Mon Sep 17 00:00:00 2001 From: griffi-gh Date: Thu, 16 Oct 2025 12:23:18 +0200 Subject: [PATCH 143/380] framework-tool-tui: init at 0.5.1 --- .../by-name/fr/framework-tool-tui/package.nix | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/fr/framework-tool-tui/package.nix diff --git a/pkgs/by-name/fr/framework-tool-tui/package.nix b/pkgs/by-name/fr/framework-tool-tui/package.nix new file mode 100644 index 000000000000..df7402cb8877 --- /dev/null +++ b/pkgs/by-name/fr/framework-tool-tui/package.nix @@ -0,0 +1,40 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + udev, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "framework-tool-tui"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "grouzen"; + repo = "framework-tool-tui"; + tag = "v${finalAttrs.version}"; + hash = "sha256-R4/VeymmthI96PJt7XsKRYz1Y8QW/lV90HvJgt+e+hI="; + }; + + cargoHash = "sha256-tDNYkV5MWb4+co/gwjpAt/M7yJbEWrryieJoBuXmY8M="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ udev ]; + + meta = { + description = "TUI for controlling and monitoring Framework Computers hardware"; + longDescription = '' + A snappy TUI dashboard for controlling and monitoring your Framework Laptop hardware — + charging, privacy, lighting, USB PD ports, and more. + ''; + homepage = "https://github.com/grouzen/framework-tool-tui"; + changelog = "https://github.com/grouzen/framework-tool-tui/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ + griffi-gh + autra + ]; + mainProgram = "framework-tool-tui"; + }; +}) From 3eca6bf120f315b1971142d3130241c117707146 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Mon, 20 Oct 2025 23:12:46 +0200 Subject: [PATCH 144/380] matomo: 5.4.0 -> 5.5.1 https://matomo.org/changelog/matomo-5-5-0/ https://matomo.org/changelog/matomo-5-5-1/ --- pkgs/by-name/ma/matomo/change-path-geoip2-5.x.patch | 2 +- pkgs/by-name/ma/matomo/package.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/matomo/change-path-geoip2-5.x.patch b/pkgs/by-name/ma/matomo/change-path-geoip2-5.x.patch index 601e0815cb6e..50847feaf2de 100644 --- a/pkgs/by-name/ma/matomo/change-path-geoip2-5.x.patch +++ b/pkgs/by-name/ma/matomo/change-path-geoip2-5.x.patch @@ -6,5 +6,5 @@ return [ - 'path.geoip2' => Piwik\DI::string('{path.root}/misc/'), + 'path.geoip2' => PIWIK_USER_PATH . '/misc/', - 'geopip2.ispEnabled' => true + 'geopip2.ispEnabled' => true, ]; diff --git a/pkgs/by-name/ma/matomo/package.nix b/pkgs/by-name/ma/matomo/package.nix index 53c7fcc46ff4..8887491f8e78 100644 --- a/pkgs/by-name/ma/matomo/package.nix +++ b/pkgs/by-name/ma/matomo/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "matomo"; - version = "5.4.0"; + version = "5.5.1"; src = fetchurl { url = "https://builds.matomo.org/matomo-${finalAttrs.version}.tar.gz"; - hash = "sha256-PRZYqJBebDsjeT9WBArRX3GKFbW5TtejV2FOo8jjaMU="; + hash = "sha256-aL2mz7qyDT43Ez2BFzrdPyQX9/m3FUfz7copwa7u/zs="; }; nativeBuildInputs = [ makeWrapper ]; From 782d2b48c3ab835728014bc45f63845dbc436fc8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Oct 2025 08:32:18 +0000 Subject: [PATCH 145/380] python3Packages.google-cloud-workflows: 1.18.2 -> 1.19.0 --- .../python-modules/google-cloud-workflows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-workflows/default.nix b/pkgs/development/python-modules/google-cloud-workflows/default.nix index 09c61243b19c..d54d22e75f9f 100644 --- a/pkgs/development/python-modules/google-cloud-workflows/default.nix +++ b/pkgs/development/python-modules/google-cloud-workflows/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-workflows"; - version = "1.18.2"; + version = "1.19.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_workflows"; inherit version; - hash = "sha256-S7k2QZv+EQyfZ6RjG+NA/+a9IBQpnMTE+TIbXlIC1N8="; + hash = "sha256-SODiguyX82EPPvm3wvRp7tAcArNINmc9c1+WkkKPNHE="; }; build-system = [ setuptools ]; From ae67150a8d7e0903894fa4b0c5a8050e13cd7b21 Mon Sep 17 00:00:00 2001 From: Karolis Stasaitis Date: Tue, 21 Oct 2025 12:49:26 +0200 Subject: [PATCH 146/380] ffts: fix build with cmake 4 --- pkgs/by-name/ff/ffts/cmake4.patch | 10 ++++++++++ pkgs/by-name/ff/ffts/package.nix | 4 ++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/by-name/ff/ffts/cmake4.patch diff --git a/pkgs/by-name/ff/ffts/cmake4.patch b/pkgs/by-name/ff/ffts/cmake4.patch new file mode 100644 index 000000000000..9c4f91685aef --- /dev/null +++ b/pkgs/by-name/ff/ffts/cmake4.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 748f412..d8821ee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.10) + + project(ffts C ASM) + diff --git a/pkgs/by-name/ff/ffts/package.nix b/pkgs/by-name/ff/ffts/package.nix index 25b371610fe5..5e92443d3730 100644 --- a/pkgs/by-name/ff/ffts/package.nix +++ b/pkgs/by-name/ff/ffts/package.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation { cmakeFlags = [ "-DENABLE_SHARED=ON" ]; + patches = [ + ./cmake4.patch + ]; + meta = { description = "Fastest Fourier Transform in the South"; homepage = "https://github.com/linkotec/ffts"; From 18bd2aac0efb143410f827772bd51c814cc969fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Oct 2025 11:50:54 +0000 Subject: [PATCH 147/380] python3Packages.google-cloud-webrisk: 1.18.1 -> 1.19.0 --- .../python-modules/google-cloud-webrisk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-webrisk/default.nix b/pkgs/development/python-modules/google-cloud-webrisk/default.nix index ad6b545c1306..43db35398b72 100644 --- a/pkgs/development/python-modules/google-cloud-webrisk/default.nix +++ b/pkgs/development/python-modules/google-cloud-webrisk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-webrisk"; - version = "1.18.1"; + version = "1.19.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_webrisk"; inherit version; - hash = "sha256-3OUxiDZtRfmipeyCW8in6+GkVnlilWgE8Hzr6G+1KQU="; + hash = "sha256-TuWU+3pfwFt8E06zUDAY8+JJb+2j4l/eHP7Y0dgE0gs="; }; build-system = [ setuptools ]; From 235f38852d9dff2971eebf5b5dd521e36a7b8de5 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Tue, 21 Oct 2025 09:38:30 -0300 Subject: [PATCH 148/380] grip-search: fix build with cmake4 --- pkgs/by-name/gr/grip-search/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/gr/grip-search/package.nix b/pkgs/by-name/gr/grip-search/package.nix index 9d2f313b4388..c90d80c73485 100644 --- a/pkgs/by-name/gr/grip-search/package.nix +++ b/pkgs/by-name/gr/grip-search/package.nix @@ -41,6 +41,9 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/general/config.h --replace-fail "CUSTOM-BUILD" "${version}" + + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)" ''; meta = with lib; { From e36144c463077cd9a5f8a63a83112c6dc54f0dce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Oct 2025 14:02:12 +0000 Subject: [PATCH 149/380] harbor-cli: 0.0.12 -> 0.0.13 --- pkgs/by-name/ha/harbor-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/harbor-cli/package.nix b/pkgs/by-name/ha/harbor-cli/package.nix index a2b4efeaa48a..8b46de187513 100644 --- a/pkgs/by-name/ha/harbor-cli/package.nix +++ b/pkgs/by-name/ha/harbor-cli/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "harbor-cli"; - version = "0.0.12"; + version = "0.0.13"; src = fetchFromGitHub { owner = "goharbor"; repo = "harbor-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-wdUXLgmdxkWzvLCuIJSkos1z7nyETZv3mNzGtBBJVUM="; + hash = "sha256-TVuWSbBPRXq9icfMXEg0wONaqD5S2ge5DQiDHSlrADk="; }; - vendorHash = "sha256-OJTyX+HXyC6avsgUCzEfU0ej493J8p77r59j+X/Vqwk="; + vendorHash = "sha256-Pj573V6S2LaytQMK0jGVyLMX/GBZ1GOmYV/LPO1ScS4="; excludedPackages = [ "dagger" From f00deff49f2df70bea9a637becf0bcbc5f0ee33c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 21 Oct 2025 19:09:04 +0200 Subject: [PATCH 150/380] blas-reference: remove blas-reference has been moved into lapack-reference. It is no longer maintained as free-standing package and the current version is outdated. Use lapack-reference instead. --- pkgs/by-name/bl/blas-reference/package.nix | 62 ---------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 pkgs/by-name/bl/blas-reference/package.nix diff --git a/pkgs/by-name/bl/blas-reference/package.nix b/pkgs/by-name/bl/blas-reference/package.nix deleted file mode 100644 index 326b7e7fe4e2..000000000000 --- a/pkgs/by-name/bl/blas-reference/package.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - cmake, - gfortran, - # Whether to build with ILP64 interface - blas64 ? false, -}: - -stdenv.mkDerivation rec { - pname = "blas"; - version = "3.12.0"; - - src = fetchurl { - url = "http://www.netlib.org/blas/${pname}-${version}.tgz"; - sha256 = "sha256-zMQbXQiOUNsAMDF66bDJrzdXEME5KsrR/iCWAtpaWq0="; - }; - - passthru = { inherit blas64; }; - - nativeBuildInputs = [ - cmake - gfortran - ]; - - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ] ++ lib.optional blas64 "-DBUILD_INDEX64=ON"; - - # CMake 4 is no longer retro compatible with versions < 3.5 - postPatch = '' - substituteInPlace CMakeLists.txt --replace-fail \ - "cmake_minimum_required(VERSION 3.2)" \ - "cmake_minimum_required(VERSION 3.5)" - ''; - - postInstall = - let - canonicalExtension = - if stdenv.hostPlatform.isLinux then - "${stdenv.hostPlatform.extensions.sharedLibrary}.${lib.versions.major version}" - else - stdenv.hostPlatform.extensions.sharedLibrary; - in - lib.optionalString blas64 '' - ln -s $out/lib/libblas64${canonicalExtension} $out/lib/libblas${canonicalExtension} - ''; - - preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' - for fn in $(find $out/lib -name "*.so*"); do - if [ -L "$fn" ]; then continue; fi - install_name_tool -id "$fn" "$fn" - done - ''; - - meta = with lib; { - description = "Basic Linear Algebra Subprograms"; - license = licenses.publicDomain; - maintainers = [ maintainers.markuskowa ]; - homepage = "http://www.netlib.org/blas/"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4b7c42542c5f..4946d4c2d6cb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -544,6 +544,7 @@ mapAliases { bisq-desktop = throw "bisq-desktop has been removed because OpenJFX 11 was removed"; # Added 2024-11-17 bitmeter = throw "bitmeter has been removed, use `x42-meter 18` from the x42-plugins pkg instead."; # Added 2025-10-03 bitwarden = bitwarden-desktop; # Added 2024-02-25 + blas-reference = throw "blas-reference has been removed since it has been discontinued as free-standing package. It is now contained within lapack-reference."; # Added 2025-10-21 blender-with-packages = args: lib.warnOnInstantiate From e4510bcb30d6f6e135a85f381f1d7971edaa328c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 21 Oct 2025 19:34:40 +0200 Subject: [PATCH 151/380] powershell: 7.5.3 -> 7.5.4 --- pkgs/by-name/po/powershell/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/po/powershell/package.nix b/pkgs/by-name/po/powershell/package.nix index 4dc7fab221bf..67937b0fb035 100644 --- a/pkgs/by-name/po/powershell/package.nix +++ b/pkgs/by-name/po/powershell/package.nix @@ -31,7 +31,7 @@ let in stdenv.mkDerivation rec { pname = "powershell"; - version = "7.5.3"; + version = "7.5.4"; src = passthru.sources.${stdenv.hostPlatform.system} @@ -96,19 +96,19 @@ stdenv.mkDerivation rec { sources = { aarch64-darwin = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-arm64.tar.gz"; - hash = "sha256-9PrFxy6MCbo7b7hmfyGx1zVWBHgZhX/OeIMmjQI2nN4="; + hash = "sha256-OqrdfKYvHk2+WRRbavJOkm1h+NqKR4K8U15QDBhBNfA="; }; aarch64-linux = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz"; - hash = "sha256-SmtlbdDnUegsXfm5pCRb0ex9Id5TNK+72ALf0AlZVZk="; + hash = "sha256-SzLUy4akPfuD1WAtApQpW/Ivr7+eB4XRqu+Bk4zakvg="; }; x86_64-darwin = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz"; - hash = "sha256-wxAB9bwKTSNkGarwVNjAMWAnozHTPi+0HPjSdko1fgU="; + hash = "sha256-zRagTBuZzay9wDN7D9DaUNvxqLToQ3vLTKkRjvcpIRo="; }; x86_64-linux = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz"; - hash = "sha256-XHTgu6/YvlnnImfwVwD9ZhU0TZz00wRg2bbRLNSoiow="; + hash = "sha256-H9eYP+VsqeYjPxJpJe2yS/a2sz41a2mZbZJcTblOL+8="; }; }; tests.version = testers.testVersion { From 43dfca5d131bb160e18eb358ba04c7ea80023bca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 Oct 2025 19:04:47 +0200 Subject: [PATCH 152/380] python313Packages.aioshutil: 1.6.a1 -> 1.6 Diff: https://github.com/kumaraditya303/aioshutil/compare/v1.6.a1...v1.6 Changelog: https://github.com/kumaraditya303/aioshutil/releases/tag/v1.6 --- pkgs/development/python-modules/aioshutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioshutil/default.nix b/pkgs/development/python-modules/aioshutil/default.nix index a48d53f8a5b3..579fe33bd1de 100644 --- a/pkgs/development/python-modules/aioshutil/default.nix +++ b/pkgs/development/python-modules/aioshutil/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aioshutil"; - version = "1.6.a1"; + version = "1.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "kumaraditya303"; repo = "aioshutil"; tag = "v${version}"; - hash = "sha256-KoKIlliWSbU8KY92SgFm4Wams87O22KVlE41q18Sk3I="; + hash = "sha256-+8BpL9CVH0X/9H7vL4xuV5CdA3A10a2A1q4wt1x1sSM="; }; build-system = [ setuptools-scm ]; From 6c910ccd4f954d59334727835445619e1d7d4333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 21 Oct 2025 10:53:21 -0700 Subject: [PATCH 153/380] python3Packages.pysmhi: fix tests on Darwin --- pkgs/development/python-modules/pysmhi/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pysmhi/default.nix b/pkgs/development/python-modules/pysmhi/default.nix index da449ca28eaa..9427b8ca00a8 100644 --- a/pkgs/development/python-modules/pysmhi/default.nix +++ b/pkgs/development/python-modules/pysmhi/default.nix @@ -39,6 +39,8 @@ buildPythonPackage rec { syrupy ]; + __darwinAllowLocalNetworking = true; + meta = { changelog = "https://github.com/gjohansson-ST/pysmhi/releases/tag/${src.tag}"; description = "Retrieve open data from SMHI api"; From dda9be0de6f0847f9a27b96d2be8072d30b932df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 21 Oct 2025 10:56:25 -0700 Subject: [PATCH 154/380] python3Packages.python-bsblan: fix tests on Darwin --- pkgs/development/python-modules/python-bsblan/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index 572447f69c36..fc09767f6dae 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -55,6 +55,8 @@ buildPythonPackage rec { pytestCheckHook ]; + __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "bsblan" ]; meta = with lib; { From 6e46b015a4307017cc5eb21edcac9666cdd004b3 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Tue, 21 Oct 2025 16:25:40 -0300 Subject: [PATCH 155/380] libjson-rpc-cpp: fix build with cmake4 --- pkgs/by-name/li/libjson-rpc-cpp/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/li/libjson-rpc-cpp/package.nix b/pkgs/by-name/li/libjson-rpc-cpp/package.nix index b2e3417c0920..39b88c637d67 100644 --- a/pkgs/by-name/li/libjson-rpc-cpp/package.nix +++ b/pkgs/by-name/li/libjson-rpc-cpp/package.nix @@ -50,6 +50,10 @@ stdenv.mkDerivation rec { done sed -i -re 's#MATCHES "jsoncpp"#MATCHES ".*/jsoncpp/json$"#g' cmake/FindJsoncpp.cmake + + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" \ + --replace-fail "cmake_policy(SET CMP0042 OLD)" "" ''; preConfigure = '' From e2c4571eefa1d97e71e7f789b435ec79338a6f7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 21 Oct 2025 12:49:46 -0700 Subject: [PATCH 156/380] python3Packages.python-rapidjson: 1.21 -> 1.22 Diff: https://github.com/python-rapidjson/python-rapidjson/compare/v1.21...v1.22 Changelog: https://github.com/python-rapidjson/python-rapidjson/blob/v1.22/CHANGES.rst --- pkgs/development/python-modules/python-rapidjson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index 7d5e92b9407b..e60e070c8614 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -10,7 +10,7 @@ }: buildPythonPackage rec { - version = "1.21"; + version = "1.22"; pname = "python-rapidjson"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "python-rapidjson"; repo = "python-rapidjson"; tag = "v${version}"; - hash = "sha256-qpq7gNdWDSNTVTqV1rnRffap0VrlHOr4soAY/SXqd1k="; + hash = "sha256-q+qIuFD3TboevD88iaBQxwOoOdb6I+yyCsNXIqMcR3g="; }; patches = [ From bc23f1e7637ce90657d746653b44b6ff8a96f4b6 Mon Sep 17 00:00:00 2001 From: fleaz Date: Tue, 21 Oct 2025 23:50:02 +0200 Subject: [PATCH 157/380] prometheus-storagebox-exporter: 0-unstable-2025-07-28 -> 1.0.0 --- .../pr/prometheus-storagebox-exporter/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pr/prometheus-storagebox-exporter/package.nix b/pkgs/by-name/pr/prometheus-storagebox-exporter/package.nix index 9a4dbd6d1a46..f9b5b50b1696 100644 --- a/pkgs/by-name/pr/prometheus-storagebox-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-storagebox-exporter/package.nix @@ -4,18 +4,18 @@ fetchFromGitHub, }: -buildGoModule { +buildGoModule rec { pname = "prometheus-storagebox-exporter"; - version = "0-unstable-2025-07-28"; + version = "1.0.0"; src = fetchFromGitHub { owner = "fleaz"; repo = "prometheus-storagebox-exporter"; - hash = "sha256-HGUAvoLIVXwZT/CJ1yj9H6ClNRwiJ8rjjluAQ6GdBME="; - rev = "e03cfd5f60f7847b74de2f6f47690bc03b7c157a"; + hash = "sha256-sufxNnHAdOaYEzKj9vriDrJF6Tq4Eim3Z45FEuuG97Q="; + tag = "v${version}"; }; - vendorHash = "sha256-w2S8LWQyDLnUba7+YnTk7GhRXR/agbF5GFIeOPk8w64="; + vendorHash = "sha256-hWM7JnL0x+vsUrQsJZGM3z2jB3F1wtjKWmX8j+WnjKY="; meta = { description = "Prometheus exporter for Hetzner storage boxes"; From c06ad375ebc8b7bc5e7c87cdef14166e61195978 Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Tue, 21 Oct 2025 23:54:58 +0200 Subject: [PATCH 158/380] android-udev-rules: drop As of systemd 258 adb and fastboot connections are handled by a built-in uaccess rule, so a dedicated package with hardcoded ID-based udev rules is no longer needed. Drop the android-udev-rules package and related mentions of the adbusers group, which is also no longer used. --- doc/release-notes/rl-2511.section.md | 2 + nixos/modules/programs/adb.nix | 4 -- nixos/modules/programs/envision.nix | 1 - nixos/modules/services/video/wivrn.nix | 1 - .../by-name/an/android-udev-rules/package.nix | 44 ------------------- pkgs/top-level/aliases.nix | 1 + 6 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 pkgs/by-name/an/android-udev-rules/package.nix diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index ec1bec180d02..d9a0e065b598 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -180,6 +180,8 @@ - `proton-caller` has been removed due to lack of upstream maintenance. +- `android-udev-rules` has been removed, as it is effectively superseded by built-in uaccess rules in systemd. + - `lima` package now only includes the guest agent for the host's architecture by default. If your guest VM's architecture differs from your Lima host's, you'll need to enable the `lima-additional-guestagents` package by setting `withAdditionalGuestAgents = true` when overriding lima with this input. - `mongodb-6_0` was removed as it is end of life as of 2025-07-31. diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix index 28182df9cc23..4ae2569049ed 100644 --- a/nixos/modules/programs/adb.nix +++ b/nixos/modules/programs/adb.nix @@ -16,8 +16,6 @@ type = lib.types.bool; description = '' Whether to configure system to use Android Debug Bridge (adb). - To grant access to a user, it must be part of adbusers group: - `users.users.alice.extraGroups = ["adbusers"];` ''; }; }; @@ -25,8 +23,6 @@ ###### implementation config = lib.mkIf config.programs.adb.enable { - services.udev.packages = [ pkgs.android-udev-rules ]; environment.systemPackages = [ pkgs.android-tools ]; - users.groups.adbusers = { }; }; } diff --git a/nixos/modules/programs/envision.nix b/nixos/modules/programs/envision.nix index 02f7ba5fdbeb..b31980f03eb8 100644 --- a/nixos/modules/programs/envision.nix +++ b/nixos/modules/programs/envision.nix @@ -34,7 +34,6 @@ in services.udev = { enable = true; packages = with pkgs; [ - android-udev-rules xr-hardware ]; }; diff --git a/nixos/modules/services/video/wivrn.nix b/nixos/modules/services/video/wivrn.nix index 6f4538964283..9c7250fb7d08 100644 --- a/nixos/modules/services/video/wivrn.nix +++ b/nixos/modules/services/video/wivrn.nix @@ -217,7 +217,6 @@ in }; services = { - udev.packages = with pkgs; [ android-udev-rules ]; avahi = { enable = true; publish = { diff --git a/pkgs/by-name/an/android-udev-rules/package.nix b/pkgs/by-name/an/android-udev-rules/package.nix deleted file mode 100644 index 4c118124e02b..000000000000 --- a/pkgs/by-name/an/android-udev-rules/package.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - udevCheckHook, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "android-udev-rules"; - version = "20250525"; - - src = fetchFromGitHub { - owner = "M0Rf30"; - repo = "android-udev-rules"; - rev = finalAttrs.version; - hash = "sha256-4ODU9EoVYV+iSu6+M9ePed45QkOZgWkDUlFTlWJ8ttQ="; - }; - - installPhase = '' - runHook preInstall - install -D 51-android.rules $out/lib/udev/rules.d/51-android.rules - runHook postInstall - ''; - - nativeBuildInputs = [ - udevCheckHook - ]; - doInstallCheck = true; - - meta = { - homepage = "https://github.com/M0Rf30/android-udev-rules"; - description = "Android udev rules list aimed to be the most comprehensive on the net"; - longDescription = '' - Android udev rules list aimed to be the most comprehensive on the net. - To use on NixOS, simply add this package to services.udev.packages: - ```nix - services.udev.packages = [ pkgs.android-udev-rules ]; - ``` - ''; - platforms = lib.platforms.linux; - license = lib.licenses.gpl3Plus; - maintainers = [ ]; - teams = [ lib.teams.android ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4b7c42542c5f..f3c45aee3f03 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -434,6 +434,7 @@ mapAliases { alsaUtils = throw "'alsaUtils' has been renamed to/replaced by 'alsa-utils'"; # Converted to throw 2024-10-17 amazon-qldb-shell = throw "'amazon-qldb-shell' has been removed due to being unmaintained upstream"; # Added 2025-07-30 amdvlk = throw "'amdvlk' has been removed since it was deprecated by AMD. Its replacement, RADV, is enabled by default."; # Added 2025-09-20 + android-udev-rules = throw "'android-udev-rules' has been removed due to being superseded by built-in systemd uaccess rules."; # Added 2025-10-21 angelfish = throw "'angelfish' has been renamed to/replaced by 'libsForQt5.kdeGear.angelfish'"; # Converted to throw 2024-10-17 animeko = throw "'animeko' has been removed since it is unmaintained"; # Added 2025-08-20 ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11 From bcf1dd999f32c7608f19e0b45ce0d46476dbfef3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 22 Oct 2025 07:31:04 +0200 Subject: [PATCH 159/380] =?UTF-8?q?fstar:=202025.08.07=20=E2=86=92=202025.?= =?UTF-8?q?10.06?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/fs/fstar/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/fs/fstar/package.nix b/pkgs/by-name/fs/fstar/package.nix index fc810157836f..55f3433789b4 100644 --- a/pkgs/by-name/fs/fstar/package.nix +++ b/pkgs/by-name/fs/fstar/package.nix @@ -17,15 +17,15 @@ let fstarZ3 = callPackage ./z3 { }; in -ocamlPackages.buildDunePackage rec { +ocamlPackages.buildDunePackage (finalAttrs: { pname = "fstar"; - version = "2025.08.07"; + version = "2025.10.06"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; - rev = "v${version}"; - hash = "sha256-IfwMLMbyC1+iPIG48zm6bzhKCHKPOpVaHdlLhU5g3co="; + rev = "v${finalAttrs.version}"; + hash = "sha256-PH3ylEiUS+mfFtYV+KI7xrCewkEutM1c14A+ARsyOQY="; }; nativeBuildInputs = [ @@ -114,7 +114,7 @@ ocamlPackages.buildDunePackage rec { meta = { description = "ML-like functional programming language aimed at program verification"; homepage = "https://www.fstar-lang.org"; - changelog = "https://github.com/FStarLang/FStar/raw/v${version}/CHANGES.md"; + changelog = "https://github.com/FStarLang/FStar/raw/v${finalAttrs.version}/CHANGES.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ numinit @@ -122,4 +122,4 @@ ocamlPackages.buildDunePackage rec { mainProgram = "fstar.exe"; platforms = with lib.platforms; darwin ++ linux; }; -} +}) From 6e67c6ab86e135ed0fa0d5bbbb112f84f94dcc62 Mon Sep 17 00:00:00 2001 From: Svenum Date: Tue, 14 Oct 2025 11:28:19 +0200 Subject: [PATCH 160/380] audialitiy2: fix build --- pkgs/by-name/au/audiality2/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/au/audiality2/package.nix b/pkgs/by-name/au/audiality2/package.nix index 61e83d4fac5d..d6c6e328fa7d 100644 --- a/pkgs/by-name/au/audiality2/package.nix +++ b/pkgs/by-name/au/audiality2/package.nix @@ -20,6 +20,12 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "0ipqna7a9mxqm0fl9ggwhbc7i9yxz3jfyi0w3dymjp40v7jw1n20"; }; + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + 'cmake_minimum_required(VERSION 2.8)' \ + 'cmake_minimum_required(VERSION 3.5)' + ''; + nativeBuildInputs = [ cmake pkg-config From d1342a6cfce204faa8278e1143aba6ae77fee7e5 Mon Sep 17 00:00:00 2001 From: Svenum Date: Tue, 14 Oct 2025 12:48:17 +0200 Subject: [PATCH 161/380] bowtie2: fix build --- pkgs/by-name/bo/bowtie2/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/bo/bowtie2/package.nix b/pkgs/by-name/bo/bowtie2/package.nix index 5286edb36f81..7349d505e7ce 100644 --- a/pkgs/by-name/bo/bowtie2/package.nix +++ b/pkgs/by-name/bo/bowtie2/package.nix @@ -28,7 +28,9 @@ stdenv.mkDerivation (finalAttrs: { # TODO: check with other distros and report upstream postPatch = '' substituteInPlace CMakeLists.txt \ - --replace "-m64" "" + --replace-fail "-m64" "" \ + --replace-fail 'cmake_minimum_required(VERSION 3.1 FATAL_ERROR)' \ + 'cmake_minimum_required(VERSION 3.5 FATAL_ERROR)' ''; nativeBuildInputs = [ cmake ]; From 38ae2a8fe89f0c9e36cb998b9cebd541d1128208 Mon Sep 17 00:00:00 2001 From: Svenum Date: Tue, 14 Oct 2025 12:51:52 +0200 Subject: [PATCH 162/380] bustools: fix build --- pkgs/by-name/bu/bustools/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/bu/bustools/package.nix b/pkgs/by-name/bu/bustools/package.nix index d42e48bf131f..4951b32c5115 100644 --- a/pkgs/by-name/bu/bustools/package.nix +++ b/pkgs/by-name/bu/bustools/package.nix @@ -23,6 +23,12 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + 'cmake_minimum_required(VERSION 2.8.12)' \ + 'cmake_minimum_required(VERSION 3.5)' + ''; + passthru.tests.version = testers.testVersion { package = bustools; command = "bustools version"; From 64db0c708c029a22bda6d5d6da560d2294e38b5c Mon Sep 17 00:00:00 2001 From: Svenum Date: Tue, 14 Oct 2025 23:32:45 +0200 Subject: [PATCH 163/380] qstopmotion: fix build --- pkgs/by-name/qs/qstopmotion/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/qs/qstopmotion/package.nix b/pkgs/by-name/qs/qstopmotion/package.nix index 83913cf2905a..52e0d17f564b 100644 --- a/pkgs/by-name/qs/qstopmotion/package.nix +++ b/pkgs/by-name/qs/qstopmotion/package.nix @@ -67,7 +67,10 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace CMakeLists.txt \ --replace-fail \ "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml" \ - "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml Multimedia" + "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml Multimedia" \ + --replace-fail \ + "cmake_minimum_required(VERSION 3.0.2)" \ + "cmake_minimum_required(VERSION 3.5)" grep -rl 'qwt' . | xargs sed -i 's@@@g' ''; From b76af7d00e5711168729387ea45b852da82d1374 Mon Sep 17 00:00:00 2001 From: Svenum Date: Thu, 16 Oct 2025 08:55:40 +0200 Subject: [PATCH 164/380] chiaki: fix build --- pkgs/games/chiaki/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/games/chiaki/default.nix b/pkgs/games/chiaki/default.nix index 608664d61ad5..03e5c528ac2f 100644 --- a/pkgs/games/chiaki/default.nix +++ b/pkgs/games/chiaki/default.nix @@ -33,6 +33,12 @@ mkDerivation rec { pkg-config ]; + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + 'cmake_minimum_required(VERSION 3.2)' \ + 'cmake_minimum_required(VERSION 3.5)' + ''; + buildInputs = [ ffmpeg libopus From ee13958ad2234eae15cf11b16a8ea978936211a9 Mon Sep 17 00:00:00 2001 From: Svenum Date: Wed, 22 Oct 2025 09:17:26 +0200 Subject: [PATCH 165/380] clfft: fix build --- pkgs/by-name/cl/clfft/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/cl/clfft/package.nix b/pkgs/by-name/cl/clfft/package.nix index e81f6aac8ceb..5c1ed6fba19c 100644 --- a/pkgs/by-name/cl/clfft/package.nix +++ b/pkgs/by-name/cl/clfft/package.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { postPatch = '' sed -i '/-m64/d;/-m32/d' CMakeLists.txt + substituteInPlace CMakeLists.txt --replace-fail \ + 'cmake_minimum_required( VERSION 2.6 )' \ + 'cmake_minimum_required( VERSION 3.5 ) ' ''; nativeBuildInputs = [ cmake ]; From 115adc466a67265e2352e4dc3431e25f4c59bc29 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Wed, 22 Oct 2025 00:20:51 +0300 Subject: [PATCH 166/380] nixos/plymouth: replace `with lib;` with `inherit` --- nixos/modules/system/boot/plymouth.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 395632466f27..1023fa8ce42d 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -6,9 +6,20 @@ ... }: -with lib; - let + inherit (lib) + mkOption + mkEnableOption + optional + mkIf + mkBefore + mkAfter + literalExpression + types + literalMD + getBin + escapeShellArg + ; plymouth = pkgs.plymouth.override { systemd = config.boot.initrd.systemd.package; @@ -109,7 +120,7 @@ in }; themePackages = mkOption { - default = lib.optional (cfg.theme == "breeze") nixosBreezePlymouth; + default = optional (cfg.theme == "breeze") nixosBreezePlymouth; defaultText = literalMD '' A NixOS branded variant of the breeze theme when `config.${opt.theme} == "breeze"`, otherwise @@ -202,7 +213,7 @@ in boot.initrd.systemd = { extraBin.plymouth = "${plymouth}/bin/plymouth"; # for the recovery shell storePaths = [ - "${lib.getBin config.boot.initrd.systemd.package}/bin/systemd-tty-ask-password-agent" + "${getBin config.boot.initrd.systemd.package}/bin/systemd-tty-ask-password-agent" "${plymouth}/bin/plymouthd" "${plymouth}/sbin/plymouthd" ]; @@ -306,7 +317,7 @@ in '') ]; - boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) ( + boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) ( '' copy_bin_and_libs ${plymouth}/bin/plymouth copy_bin_and_libs ${plymouth}/bin/plymouthd From c6e38d30329ca883e627e8aa7a489f4d1f149c2c Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Wed, 22 Oct 2025 10:00:39 +0000 Subject: [PATCH 167/380] lxqt.libqtxdg: fix build against Qt >= 6.10 --- pkgs/desktops/lxqt/libqtxdg/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index 3ea0a857efe8..dabc9a6eb7fa 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, qtbase, qtsvg, @@ -27,6 +28,16 @@ stdenv.mkDerivation rec { ."${version}"; }; + patches = lib.optionals (version == "4.2.0") [ + # fix build against Qt >= 6.10 (https://github.com/lxqt/libqtxdg/pull/313) + # TODO: drop when upgrading beyond version 4.2.0 + (fetchpatch { + name = "cmake-fix-build-with-Qt-6.10.patch"; + url = "https://github.com/lxqt/libqtxdg/commit/b01a024921acdfd5b0e97d5fda2933c726826e99.patch"; + hash = "sha256-njpn6pU9BHlfYfkw/jEwh8w3Wo1F8MlRU8iQB+Tz2zU="; + }) + ]; + nativeBuildInputs = [ cmake lxqt-build-tools From e3152f4bc7e5f15e2314d7b64f216c2a4f4aef41 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Wed, 22 Oct 2025 10:00:39 +0000 Subject: [PATCH 168/380] lxqt.libqtxdg: modernize --- pkgs/desktops/lxqt/libqtxdg/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index dabc9a6eb7fa..b5b23b1569a8 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -12,23 +12,23 @@ version ? "4.2.0", }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libqtxdg"; inherit version; src = fetchFromGitHub { owner = "lxqt"; repo = "libqtxdg"; - rev = version; + tag = finalAttrs.version; hash = { "3.12.0" = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU="; "4.2.0" = "sha256-TSyVYlWsmB/6gxJo+CjROBQaWsmYZAwkM8BwiWP+XBI="; } - ."${version}"; + ."${finalAttrs.version}"; }; - patches = lib.optionals (version == "4.2.0") [ + patches = lib.optionals (finalAttrs.version == "4.2.0") [ # fix build against Qt >= 6.10 (https://github.com/lxqt/libqtxdg/pull/313) # TODO: drop when upgrading beyond version 4.2.0 (fetchpatch { @@ -59,11 +59,11 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { homepage = "https://github.com/lxqt/libqtxdg"; description = "Qt implementation of freedesktop.org xdg specs"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - teams = [ teams.lxqt ]; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; + teams = [ lib.teams.lxqt ]; }; -} +}) From 020a5073f18b1e21750b8513adacbce75362ea9f Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Wed, 22 Oct 2025 10:00:39 +0000 Subject: [PATCH 169/380] lxqt.libfm-qt: fix build against Qt >= 6.10 --- pkgs/desktops/lxqt/libfm-qt/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index 74a5afc95c60..aef56f98f801 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, libXdmcp, libexif, @@ -35,6 +36,16 @@ stdenv.mkDerivation rec { ."${version}"; }; + patches = lib.optionals (version == "2.2.0") [ + # fix build against Qt >= 6.10 (https://github.com/lxqt/libfm-qt/pull/1060) + # TODO: drop when upgrading beyond version 2.2.0 + (fetchpatch { + name = "cmake-fix-build-with-Qt-6.10.patch"; + url = "https://github.com/lxqt/libfm-qt/commit/3bcbae5831f5ce3d2f06dc370f0c2ad0026ae82a.patch"; + hash = "sha256-nTuPXlkP7AzC8R4OHfQx6/kxPsDjaw7tGzQGyiYqQSQ="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config From 97bf55a00bdd3444daa7d1fef30e2318178c09d7 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Wed, 22 Oct 2025 10:00:39 +0000 Subject: [PATCH 170/380] lxqt.libfm-qt: modernize --- pkgs/desktops/lxqt/libfm-qt/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index aef56f98f801..222b4e839514 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -20,23 +20,23 @@ qtx11extras ? null, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libfm-qt"; inherit version; src = fetchFromGitHub { owner = "lxqt"; repo = "libfm-qt"; - rev = version; + tag = finalAttrs.version; hash = { "1.4.0" = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4="; "2.2.0" = "sha256-xLXHwrcMJ8PObZ2qWVZTf9FREcjUi5qtcCJgNHj391Q="; } - ."${version}"; + ."${finalAttrs.version}"; }; - patches = lib.optionals (version == "2.2.0") [ + patches = lib.optionals (finalAttrs.version == "2.2.0") [ # fix build against Qt >= 6.10 (https://github.com/lxqt/libfm-qt/pull/1060) # TODO: drop when upgrading beyond version 2.2.0 (fetchpatch { @@ -63,15 +63,15 @@ stdenv.mkDerivation rec { lxqt-menu-data menu-cache ] - ++ (lib.optionals (lib.versionAtLeast "2.0.0" version) [ qtx11extras ]); + ++ (lib.optionals (lib.versionAtLeast "2.0.0" finalAttrs.version) [ qtx11extras ]); passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { homepage = "https://github.com/lxqt/libfm-qt"; description = "Core library of PCManFM-Qt (Qt binding for libfm)"; - license = licenses.lgpl21Plus; - platforms = with platforms; unix; - teams = [ teams.lxqt ]; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.unix; + teams = [ lib.teams.lxqt ]; }; -} +}) From e89d3caa32e904f1d653aa8209fdfaaef5f6077f Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Wed, 22 Oct 2025 10:00:39 +0000 Subject: [PATCH 171/380] lxqt.lxqt-panel: fix build against Qt >= 6.10 --- pkgs/desktops/lxqt/lxqt-panel/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index 957287946690..4e4d5d73f931 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, pkg-config, alsa-lib, @@ -44,6 +45,16 @@ stdenv.mkDerivation rec { hash = "sha256-ui+HD2igPiyIOgIKPbgfO4dnfm2rFP/R6oG2pH5g5VY="; }; + patches = [ + # fix build against Qt >= 6.10 (https://github.com/lxqt/lxqt-panel/pull/2306) + # TODO: drop when upgrading beyond version 2.2.2 + (fetchpatch { + name = "cmake-fix-build-with-Qt-6.10.patch"; + url = "https://github.com/lxqt/lxqt-panel/commit/fce8cd99a1de0e637e8539c4d8ac68832a40fa6d.patch"; + hash = "sha256-KXxV6SZqdpvZSn+zbBZ32Qs6XKfFXEej1F4qBt+MzxA="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config From 4e3055e86224af8235f46931a9912f93d3fd43bf Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Wed, 22 Oct 2025 10:00:39 +0000 Subject: [PATCH 172/380] lxqt.lxqt-panel: modernize --- pkgs/desktops/lxqt/lxqt-panel/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index 4e4d5d73f931..b5893196071a 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -34,14 +34,14 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lxqt-panel"; version = "2.2.2"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-panel"; - rev = version; + tag = finalAttrs.version; hash = "sha256-ui+HD2igPiyIOgIKPbgfO4dnfm2rFP/R6oG2pH5g5VY="; }; @@ -91,12 +91,12 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { homepage = "https://github.com/lxqt/lxqt-panel"; description = "LXQt desktop panel"; mainProgram = "lxqt-panel"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - teams = [ teams.lxqt ]; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; + teams = [ lib.teams.lxqt ]; }; -} +}) From 45673136b0818a0bcd501dd41028e49888feb5f5 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Wed, 22 Oct 2025 10:00:39 +0000 Subject: [PATCH 173/380] lxqt.lxqt-qtplugin: fix build against Qt >= 6.10 --- pkgs/desktops/lxqt/lxqt-qtplugin/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index 8f11a11dbb96..c3078f95085d 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, libdbusmenu-lxqt, libfm-qt, @@ -25,6 +26,16 @@ stdenv.mkDerivation rec { hash = "sha256-qXadz9JBk4TURAWj6ByP/lGV1u0Z6rNJ/VraBh5zY+Q="; }; + patches = [ + # fix build against Qt >= 6.10 (https://github.com/lxqt/lxqt-qtplugin/pull/100) + # TODO: drop when upgrading beyond version 2.2.0 + (fetchpatch { + name = "cmake-fix-build-with-Qt-6.10.patch"; + url = "https://github.com/lxqt/lxqt-qtplugin/commit/90473945206dbf21816a00dfba27426a5b5a9e25.patch"; + hash = "sha256-cCghOJHsveR5IYisEFv3h8WreRDi0kuyj/2YBD+ATsc="; + }) + ]; + nativeBuildInputs = [ cmake lxqt-build-tools From 96084835c500693bf12c94db871d7220d3492834 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Wed, 22 Oct 2025 10:00:39 +0000 Subject: [PATCH 174/380] lxqt.lxqt-qtplugin: modernize --- pkgs/desktops/lxqt/lxqt-qtplugin/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index c3078f95085d..db6a8b2ae8bb 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -15,14 +15,14 @@ wrapQtAppsHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lxqt-qtplugin"; version = "2.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-qtplugin"; - rev = version; + tag = finalAttrs.version; hash = "sha256-qXadz9JBk4TURAWj6ByP/lGV1u0Z6rNJ/VraBh5zY+Q="; }; @@ -58,11 +58,11 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { homepage = "https://github.com/lxqt/lxqt-qtplugin"; description = "LXQt Qt platform integration plugin"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - teams = [ teams.lxqt ]; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; + teams = [ lib.teams.lxqt ]; }; -} +}) From b1f1eb2bda918793b175415dca3b7054fb0ff6c5 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Wed, 22 Oct 2025 10:00:40 +0000 Subject: [PATCH 175/380] lxqt.screengrab: fix build against Qt >= 6.10 --- pkgs/desktops/lxqt/screengrab/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index f2ef16012680..09bad89905e3 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, autoPatchelfHook, gitUpdater, @@ -31,6 +32,16 @@ stdenv.mkDerivation rec { hash = "sha256-6cGj3Ijv4DsAdJjcHKUg5et+yYc5miIHHZOTD2D9ASk="; }; + patches = [ + # fix build against Qt >= 6.10 (https://github.com/lxqt/screengrab/pull/434) + # TODO: drop when upgrading beyond version 3.0.0 + (fetchpatch { + name = "cmake-fix-build-with-Qt-6.10.patch"; + url = "https://github.com/lxqt/screengrab/commit/1621ef5df9461cdd1dcef3faee36e9419f1ca08c.patch"; + hash = "sha256-+rpCDLnHmgy/1PME3QaN+978W+jR6PDmiZ/5hAx8Djg="; + }) + ]; + nativeBuildInputs = [ cmake lxqt-build-tools From 4490f10953a7b5350b8fc740bf40038c6d1e5724 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Wed, 22 Oct 2025 10:00:40 +0000 Subject: [PATCH 176/380] lxqt.screengrab: modernize --- pkgs/desktops/lxqt/screengrab/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index 09bad89905e3..e93d0afce933 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -21,14 +21,14 @@ wrapQtAppsHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "screengrab"; version = "3.0.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "screengrab"; - rev = version; + tag = finalAttrs.version; hash = "sha256-6cGj3Ijv4DsAdJjcHKUg5et+yYc5miIHHZOTD2D9ASk="; }; @@ -65,12 +65,12 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { homepage = "https://github.com/lxqt/screengrab"; description = "Crossplatform tool for fast making screenshots"; mainProgram = "screengrab"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - teams = [ teams.lxqt ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + teams = [ lib.teams.lxqt ]; }; -} +}) From 7cddd344d09185de9a833023f61bfef104604a8a Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Wed, 22 Oct 2025 10:00:40 +0000 Subject: [PATCH 177/380] lxqt.xdg-desktop-portal-lxqt: fix build against Qt >= 6.10 --- .../desktops/lxqt/xdg-desktop-portal-lxqt/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix index 52956cd0bc64..29cf01143dfb 100644 --- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix +++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, kwindowsystem, libexif, @@ -25,6 +26,16 @@ stdenv.mkDerivation rec { hash = "sha256-y3VqDuFagKcG8O5m5qjRGtlUZXfIXV0tclvZLChhWkg="; }; + patches = [ + # fix build against Qt >= 6.10 (https://github.com/lxqt/xdg-desktop-portal-lxqt/pull/50) + # TODO: drop when upgrading beyond version 1.2.0 + (fetchpatch { + name = "cmake-fix-build-with-Qt-6.10.patch"; + url = "https://github.com/lxqt/xdg-desktop-portal-lxqt/commit/15fae3c57a8e8149ef19a8c919f5728016390e3f.patch"; + hash = "sha256-oReYMEr+tBDHtnFDZahBwTtzgtL/BABZO64yob9tem4="; + }) + ]; + nativeBuildInputs = [ cmake wrapQtAppsHook From ea9f4739b60e933dee0d02972cdbdda94b12b856 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Wed, 22 Oct 2025 10:00:40 +0000 Subject: [PATCH 178/380] lxqt.xdg-desktop-portal-lxqt: modernize --- .../lxqt/xdg-desktop-portal-lxqt/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix index 29cf01143dfb..2836344f6ddc 100644 --- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix +++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix @@ -15,14 +15,14 @@ extraQtStyles ? [ ], }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-lxqt"; version = "1.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "xdg-desktop-portal-lxqt"; - rev = version; + tag = finalAttrs.version; hash = "sha256-y3VqDuFagKcG8O5m5qjRGtlUZXfIXV0tclvZLChhWkg="; }; @@ -53,11 +53,11 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { homepage = "https://github.com/lxqt/xdg-desktop-portal-lxqt"; description = "Backend implementation for xdg-desktop-portal that is using Qt/KF5/libfm-qt"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.romildo ]; }; -} +}) From ca1811bd0cb2bca8e235a15411734d69faf8febf Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 22 Oct 2025 07:17:54 -0300 Subject: [PATCH 179/380] louvain-community: fix build with cmake4 --- pkgs/by-name/lo/louvain-community/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/lo/louvain-community/package.nix b/pkgs/by-name/lo/louvain-community/package.nix index 97d0c3e7acd4..139da16aa76f 100644 --- a/pkgs/by-name/lo/louvain-community/package.nix +++ b/pkgs/by-name/lo/louvain-community/package.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = unstableGitUpdater { }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.3 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "Louvain Community Detection Library"; homepage = "https://github.com/meelgroup/louvain-community"; From ab49e37a022de924b83b600371dd89d5135ca23c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 21 Oct 2025 16:56:14 +0200 Subject: [PATCH 180/380] nixos/facter: add core library and system detection This adds foundational functionality for nixos-facter hardware detection: - lib.nix: Internal helper functions for querying facter reports - hasCpu/hasAmdCpu/hasIntelCpu: CPU vendor detection - collectDrivers: Extract driver_modules from hardware entries - toZeroPaddedHex: Format USB device IDs (for fingerprint matching) - system.nix: Auto-detect nixpkgs.hostPlatform from facter report Automatically sets the correct platform (x86_64-linux, aarch64-linux, etc.) based on the hardware report, reducing manual configuration. This builds on the base infrastructure added in PR #450303 and provides the foundation for upcoming hardware detection modules (boot, networking, graphics, etc.). Part of the incremental upstreaming effort from: https://github.com/nix-community/nixos-facter-modules --- nixos/modules/hardware/facter/default.nix | 4 ++ nixos/modules/hardware/facter/lib.nix | 59 +++++++++++++++++++++++ nixos/modules/hardware/facter/system.nix | 15 ++++++ 3 files changed, 78 insertions(+) create mode 100644 nixos/modules/hardware/facter/lib.nix create mode 100644 nixos/modules/hardware/facter/system.nix diff --git a/nixos/modules/hardware/facter/default.nix b/nixos/modules/hardware/facter/default.nix index 0d3163185b98..471bee49b95b 100644 --- a/nixos/modules/hardware/facter/default.nix +++ b/nixos/modules/hardware/facter/default.nix @@ -4,6 +4,10 @@ ... }: { + imports = [ + ./system.nix + ]; + meta.maintainers = with lib.maintainers; [ mic92 ]; options.hardware.facter = with lib; { diff --git a/nixos/modules/hardware/facter/lib.nix b/nixos/modules/hardware/facter/lib.nix new file mode 100644 index 000000000000..099254cbce8d --- /dev/null +++ b/nixos/modules/hardware/facter/lib.nix @@ -0,0 +1,59 @@ +# Internal library functions for hardware.facter modules +# Eventually we can think about moving this under lib/ +# These are facter-specific helpers for querying nixos-facter reports +lib: +let + + inherit (lib) assertMsg; + + # Query if a facter report contains a CPU with the given vendor name + hasCpu = + name: + { + hardware ? { }, + ... + }: + let + cpus = hardware.cpu or [ ]; + in + assert assertMsg (hardware != { }) "no hardware entries found in the report"; + assert assertMsg (cpus != [ ]) "no cpu entries found in the report"; + builtins.any ( + { + vendor_name ? null, + ... + }: + assert assertMsg (vendor_name != null) "detail.vendor_name not found in cpu entry"; + vendor_name == name + ) cpus; + + # Extract all driver_modules from a list of hardware entries + collectDrivers = list: lib.catAttrs "driver_modules" list; + + # Convert number to zero-padded 4-digit hex string (for USB device IDs) + toZeroPaddedHex = + n: + let + hex = lib.toHexString n; + len = builtins.stringLength hex; + in + if len == 1 then + "000${hex}" + else if len == 2 then + "00${hex}" + else if len == 3 then + "0${hex}" + else + hex; +in +{ + inherit + hasCpu + collectDrivers + toZeroPaddedHex + ; + + hasAmdCpu = hasCpu "AuthenticAMD"; + hasIntelCpu = hasCpu "GenuineIntel"; + +} diff --git a/nixos/modules/hardware/facter/system.nix b/nixos/modules/hardware/facter/system.nix new file mode 100644 index 000000000000..02e329f8e162 --- /dev/null +++ b/nixos/modules/hardware/facter/system.nix @@ -0,0 +1,15 @@ +{ + config, + options, + lib, + ... +}: +{ + # Skip setting hostPlatform in test VMs where it's read-only + # Tests have virtualisation.test options and import read-only.nix + config.nixpkgs = lib.optionalAttrs (!(options ? virtualisation.test)) { + hostPlatform = lib.mkIf ( + config.hardware.facter.report.system or null != null && !options.nixpkgs.pkgs.isDefined + ) (lib.mkDefault config.hardware.facter.report.system); + }; +} From d5fd4f001b4aaae09c98fd260ae0256e6aa09b1a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 22 Oct 2025 11:14:52 +0200 Subject: [PATCH 181/380] grafana: fix `find(1)` brackets in `go.mod` fixup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DAMN you `find`! The parentheses are only necessary when having `-exec` 🫠 It does what I expected, i.e. finding EVERY go.mod and go.work instead of only go.work when not using `-exec`. --- pkgs/servers/monitoring/grafana/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 524ba2fa4c0e..6d5d8a69bd5a 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -64,7 +64,7 @@ buildGoModule (finalAttrs: { # This is still better than maintaining some list of go.mod files (or exclusions of that) # where to patch the go version (and where to not do that). postPatch = '' - find . -name go.mod -or -name "go.work" -type f -exec sed -i -e 's/^go .*/go ${finalAttrs.passthru.go.version}/g' {} \; + find . \( -name go.mod -or -name "go.work" \) -type f -exec sed -i -e 's/^go .*/go ${finalAttrs.passthru.go.version}/g' {} \; ''; proxyVendor = true; From 3d7406bd588638a9c4d9db4ee3dc87ea0ee5180d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 22 Oct 2025 11:15:55 +0200 Subject: [PATCH 182/380] grafana: 12.2.0 -> 12.2.1 ChangeLog: https://github.com/grafana/grafana/releases/tag/v12.2.1 --- pkgs/servers/monitoring/grafana/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 6d5d8a69bd5a..eac1cb5e7ec6 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -19,7 +19,7 @@ buildGoModule (finalAttrs: { pname = "grafana"; - version = "12.2.0"; + version = "12.2.1"; subPackages = [ "pkg/cmd/grafana" @@ -31,7 +31,7 @@ buildGoModule (finalAttrs: { owner = "grafana"; repo = "grafana"; rev = "v${finalAttrs.version}"; - hash = "sha256-EFqR+du+ZeWih7+s4iVVAiwOvTwbF1pNg1TntkoGCEQ="; + hash = "sha256-fOlf+NTV1DIotC0JyG+PCMe8uPr+mfe/CLQP7dmRtkg="; }; # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22 @@ -46,12 +46,12 @@ buildGoModule (finalAttrs: { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry_4.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-BqlkFgWiU5gruDHjkazNy6GKL2KgpcrwaHXDYNBF9EY="; + hash = "sha256-aXWi2hriPHm1Gsmd6Zg8eTR//KuI6SrvJAYhTeRZTug="; }; disallowedRequisites = [ finalAttrs.offlineCache ]; - vendorHash = "sha256-yoOs9MngUCfvvK9rPUsXCoSc5LiRs0g66KdINLQzO8Q="; + vendorHash = "sha256-TvKG/fUBure2wiZDVFD7dHGVDBl8gqWRkv2YBYNcIDQ="; # Grafana seems to just set it to the latest version available # nowadays. From 9f62ff9ffdd9265c53838e719058a8c299dfd59f Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 22 Oct 2025 08:03:08 -0300 Subject: [PATCH 183/380] arjun-cnf: fix build with cmake4 --- pkgs/by-name/ar/arjun-cnf/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ar/arjun-cnf/package.nix b/pkgs/by-name/ar/arjun-cnf/package.nix index b257a607c94c..0542eef55abc 100644 --- a/pkgs/by-name/ar/arjun-cnf/package.nix +++ b/pkgs/by-name/ar/arjun-cnf/package.nix @@ -38,6 +38,11 @@ stdenv.mkDerivation (finalAttrs: { louvain-community ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.3 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "CNF minimizer and minimal independent set calculator"; homepage = "https://github.com/meelgroup/arjun"; From d0291f419cdd70b2a9462270018b84bbce593257 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Oct 2025 11:14:57 +0000 Subject: [PATCH 184/380] prisma-language-server: 6.17.1 -> 6.18.0 --- pkgs/by-name/pr/prisma-language-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/prisma-language-server/package.nix b/pkgs/by-name/pr/prisma-language-server/package.nix index a7b5f6fc35d4..9e5412b94327 100644 --- a/pkgs/by-name/pr/prisma-language-server/package.nix +++ b/pkgs/by-name/pr/prisma-language-server/package.nix @@ -6,17 +6,17 @@ buildNpmPackage (finalAttrs: { pname = "prisma-language-server"; - version = "6.17.1"; + version = "6.18.0"; src = fetchFromGitHub { owner = "prisma"; repo = "language-tools"; tag = "${finalAttrs.version}"; - hash = "sha256-L2THhIjCeoNRUWTQ0aMkXeatjunRPhd0m4No5UE11lI="; + hash = "sha256-o6v7IcpSXDBd/R5XmSMklc3GsWWLKAvvzmi7bTTDlpU="; }; sourceRoot = "${finalAttrs.src.name}/packages/language-server"; - npmDepsHash = "sha256-Fa6Eajzm3/NHHr4ngsgJ/CFfEcQ2J3DTEQEUcK7ZdeU="; + npmDepsHash = "sha256-XcJ5ky9MLa2Ta7Xuwf57Zs6SzpUR5h5J640TH39Ukbg="; meta = { description = "Language server for Prisma"; From 4d268775b4b9afcbe2461c31ccc3ccbf81f5eade Mon Sep 17 00:00:00 2001 From: Mirza Arnaut Date: Tue, 21 Oct 2025 17:02:49 +0200 Subject: [PATCH 185/380] beszel: add arunoruto to maintainers list --- pkgs/by-name/be/beszel/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/be/beszel/package.nix b/pkgs/by-name/be/beszel/package.nix index 79f012fdaea4..b30719113978 100644 --- a/pkgs/by-name/be/beszel/package.nix +++ b/pkgs/by-name/be/beszel/package.nix @@ -73,7 +73,10 @@ buildGoModule rec { homepage = "https://github.com/henrygd/beszel"; changelog = "https://github.com/henrygd/beszel/releases/tag/v${version}"; description = "Lightweight server monitoring hub with historical data, docker stats, and alerts"; - maintainers = with lib.maintainers; [ bot-wxt1221 ]; + maintainers = with lib.maintainers; [ + bot-wxt1221 + arunoruto + ]; license = lib.licenses.mit; }; } From fbc0a134eaa3565fe6af532b36367509a2d238cd Mon Sep 17 00:00:00 2001 From: Simon Hauser Date: Wed, 22 Oct 2025 14:15:50 +0200 Subject: [PATCH 186/380] proxysql: 3.0.1 -> 3.0.2 Changelog: https://github.com/sysown/proxysql/releases/tag/v3.0.2 --- pkgs/by-name/pr/proxysql/makefiles.patch | 35 +++++++++++++++++++----- pkgs/by-name/pr/proxysql/package.nix | 4 +-- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/pr/proxysql/makefiles.patch b/pkgs/by-name/pr/proxysql/makefiles.patch index cf6328920254..17facc6744c1 100644 --- a/pkgs/by-name/pr/proxysql/makefiles.patch +++ b/pkgs/by-name/pr/proxysql/makefiles.patch @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index b9ad6f71..60e71a86 100644 +index 01aa5730..6c71b3a5 100644 --- a/Makefile +++ b/Makefile @@ -81,10 +81,7 @@ endif @@ -35,7 +35,7 @@ index b9ad6f71..60e71a86 100644 install -m 0755 etc/init.d/proxysql /etc/init.d ifeq ($(DISTRO),"CentOS Linux") diff --git a/deps/Makefile b/deps/Makefile -index 7c8fcc85..4ae0aba1 100644 +index 87d2a20e..505e069a 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -61,27 +61,22 @@ default: $(targets) @@ -66,7 +66,7 @@ index 7c8fcc85..4ae0aba1 100644 cd libhttpserver/libhttpserver && patch -p1 < ../noexcept.patch cd libhttpserver/libhttpserver && patch -p1 < ../re2_regex.patch cd libhttpserver/libhttpserver && patch -p1 < ../final_val_post_process.patch -@@ -99,58 +94,49 @@ libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a +@@ -99,77 +94,66 @@ libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a libev/libev/.libs/libev.a: @@ -83,7 +83,8 @@ index 7c8fcc85..4ae0aba1 100644 cd coredumper && rm -rf coredumper-*/ || true cd coredumper && tar -zxf coredumper-*.tar.gz cd coredumper/coredumper && patch -p1 < ../includes.patch - cd coredumper/coredumper && cmake . -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Debug +- cd coredumper/coredumper && cmake . -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Debug ++ cd coredumper/coredumper && cmake . -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Debug -DCMAKE_POLICY_VERSION_MINIMUM=3.5 cd coredumper/coredumper && CC=${CC} CXX=${CXX} ${MAKE} coredumper: coredumper/coredumper/src/libcoredumper.a @@ -125,7 +126,18 @@ index 7c8fcc85..4ae0aba1 100644 cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE} lz4: lz4/lz4/lib/liblz4.a -@@ -168,8 +154,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s + + + clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a: + cd clickhouse-cpp && rm -rf clickhouse-cpp-*/ || true + cd clickhouse-cpp && tar -zxf v2.3.0.tar.gz + cd clickhouse-cpp && ln -fs clickhouse-cpp-*/ clickhouse-cpp + cd clickhouse-cpp/clickhouse-cpp && patch clickhouse/base/wire_format.h < ../wire_format.patch +- cd clickhouse-cpp/clickhouse-cpp && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo . ++ cd clickhouse-cpp/clickhouse-cpp && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_POLICY_VERSION_MINIMUM=3.5 . + cd clickhouse-cpp/clickhouse-cpp && CC=${CC} CXX=${CXX} ${MAKE} + + clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a libdaemon/libdaemon/libdaemon/.libs/libdaemon.a: @@ -134,6 +146,15 @@ index 7c8fcc85..4ae0aba1 100644 cd libdaemon/libdaemon && patch -p0 < ../daemon_fork_umask.patch cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub && ./configure --disable-examples cd libdaemon/libdaemon && CC=${CC} CXX=${CXX} ${MAKE} +@@ -194,7 +178,7 @@ mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a: + cd mariadb-client-library && rm -rf mariadb-connector-c-*/ || true + cd mariadb-client-library && tar -zxf mariadb-connector-c-3.3.8-src.tar.gz + cd mariadb-client-library/mariadb_client && patch -p0 < ../plugin_auth_CMakeLists.txt.patch +- cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include . ++ cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include . + ifeq ($(PROXYDEBUG),1) + cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_context.h.patch + else ifeq ($(USEVALGRIND),1) @@ -253,18 +237,13 @@ sqlite3/sqlite3/sqlite3.o: sqlite3: sqlite3/sqlite3/sqlite3.o @@ -170,8 +191,8 @@ index 7c8fcc85..4ae0aba1 100644 - cd postgresql && tar -zxf postgresql-*.tar.gz cd postgresql/postgresql && patch -p0 < ../get_result_from_pgconn.patch cd postgresql/postgresql && patch -p0 < ../handle_row_data.patch - #cd postgresql/postgresql && LD_LIBRARY_PATH="$(shell pwd)/libssl/openssl" ./configure --with-ssl=openssl --with-includes="$(shell pwd)/libssl/openssl/include/" --with-libraries="$(shell pwd)/libssl/openssl/" --without-readline --enable-debug CFLAGS="-ggdb -O0 -fno-omit-frame-pointer" CPPFLAGS="-g -O0" -@@ -360,4 +335,3 @@ cleanall: + cd postgresql/postgresql && patch -p0 < ../fmt_err_msg.patch +@@ -361,4 +336,3 @@ cleanall: cd libusual && rm -rf libusual-*/ || true cd libscram && rm -rf lib/* obj/* || true .PHONY: cleanall diff --git a/pkgs/by-name/pr/proxysql/package.nix b/pkgs/by-name/pr/proxysql/package.nix index 0d9012a2054a..6efeb676bec4 100644 --- a/pkgs/by-name/pr/proxysql/package.nix +++ b/pkgs/by-name/pr/proxysql/package.nix @@ -37,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "proxysql"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "sysown"; repo = "proxysql"; tag = "v${finalAttrs.version}"; - hash = "sha256-yGxn46Vm8YdtIvvoTlOHQ1aAP2J/h/kFqr4ehruDsTw="; + hash = "sha256-kbfuUulEDPx/5tpp7uOkIXQuyaFYzos3crCvkWHSmHg="; }; patches = [ From b9a335b180e8f61b3e027add1d0ade0ef61ce986 Mon Sep 17 00:00:00 2001 From: Julia Brunenberg Date: Wed, 22 Oct 2025 12:04:37 +0200 Subject: [PATCH 187/380] qdmr: add maintainer juliabru --- pkgs/by-name/qd/qdmr/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/qd/qdmr/package.nix b/pkgs/by-name/qd/qdmr/package.nix index ec24d4032f95..a307759560e1 100644 --- a/pkgs/by-name/qd/qdmr/package.nix +++ b/pkgs/by-name/qd/qdmr/package.nix @@ -77,7 +77,10 @@ stdenv.mkDerivation rec { description = "GUI application and command line tool for programming DMR radios"; homepage = "https://dm3mat.darc.de/qdmr/"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ _0x4A6F ]; + maintainers = with lib.maintainers; [ + _0x4A6F + juliabru + ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } From 7ac0bf8ee4cdf5e3d9687123e0692458a46d590d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 22 Oct 2025 15:25:53 +0200 Subject: [PATCH 188/380] ktailctl: 0.21.2 -> 0.21.3 Diff: https://github.com/f-koehler/KTailctl/compare/v0.21.2...v0.21.3 --- pkgs/by-name/kt/ktailctl/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/kt/ktailctl/package.nix b/pkgs/by-name/kt/ktailctl/package.nix index 26207bd9d4de..3f684aed23cf 100644 --- a/pkgs/by-name/kt/ktailctl/package.nix +++ b/pkgs/by-name/kt/ktailctl/package.nix @@ -1,9 +1,9 @@ { - buildGo124Module, + buildGoModule, cmake, fetchFromGitHub, git, - go_1_24, + go, lib, nlohmann_json, stdenv, @@ -11,21 +11,21 @@ }: let - version = "0.21.2"; + version = "0.21.3"; src = fetchFromGitHub { owner = "f-koehler"; repo = "KTailctl"; rev = "v${version}"; - hash = "sha256-CP5ivqhYVCotsL6e9eV9L1OGr2W+vNHJOq8hMYj7g/o="; + hash = "sha256-BKVq6d8CDmAOGULKoxXtlGbtgNu7wfsQnsyYV7PiFfc="; }; goDeps = - (buildGo124Module { + (buildGoModule { pname = "ktailctl-go-wrapper"; inherit src version; modRoot = "src/wrapper"; - vendorHash = "sha256-uZydTufEpGKbX3T3Zm4WTU2ZZNhC6oHSb/sHPM4ekmQ="; + vendorHash = "sha256-RhVZ1yXm+gJHM993Iw1XM/w/O1YiG6Mt4YMK+0JqRpg="; }).goModules; in stdenv.mkDerivation { @@ -50,7 +50,7 @@ stdenv.mkDerivation { cmake extra-cmake-modules git - go_1_24 + go wrapQtAppsHook ]; From dbaaa4b058687335828393302dfd8f25f4aa73fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Oct 2025 13:42:48 +0000 Subject: [PATCH 189/380] python3Packages.plugwise: 1.8.0 -> 1.8.2 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 31be8adb7114..8b63f53d48a6 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "1.8.0"; + version = "1.8.2"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; tag = "v${version}"; - hash = "sha256-a0svh7FyQbuo74gIRxPA8WiFSG7zKkA0oZgztAmfd4o="; + hash = "sha256-9mJznR6iUyKBojMaSxlsaP4XjaHtYMPkq/wGr5F90ik="; }; postPatch = '' From 9e6f02e8b9f60bafe3b16e5f388667ac9f20116e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Oct 2025 13:52:37 +0000 Subject: [PATCH 190/380] cnquery: 12.5.1 -> 12.6.0 --- pkgs/by-name/cn/cnquery/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix index 23ea89b4c39f..ad34ce6ecf15 100644 --- a/pkgs/by-name/cn/cnquery/package.nix +++ b/pkgs/by-name/cn/cnquery/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "12.5.1"; + version = "12.6.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; tag = "v${version}"; - hash = "sha256-f7P7m+RBrWxvdBMtPXZLNB4/Alr0ByiEhh9mIcVPfLk="; + hash = "sha256-f+2E3pG5c/3yrsvBPJp9QUHcDRY4vmmxeosw/jfQ+mY="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-i0atpv6vtbbpTKuh9aJU6oPILCqdshB0MVbgOn6fppw="; + vendorHash = "sha256-NI6x1MIdIHK4OfoqRvnyGxJZaCxLclaU4/rNvDx/Fhc="; ldflags = [ "-w" From cad32a24812b17a574b1ce57a7885dd4459f9f4a Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Mon, 20 Oct 2025 23:22:57 +0530 Subject: [PATCH 191/380] dprint-plugins: update all plugins Signed-off-by: phanirithvij dprint-plugins: fix update script Co-authored-by: Kenichi Kamiya Co-authored-by: Wolfgang Walther Signed-off-by: phanirithvij --- pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix | 6 +++--- pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix | 6 +++--- pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix | 6 +++--- pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix | 6 +++--- pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix | 6 +++--- pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix | 6 +++--- pkgs/by-name/dp/dprint/plugins/update-plugins.py | 4 ++-- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix index 5a14b10c58a9..1b6b85835d3e 100644 --- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix @@ -1,7 +1,7 @@ { mkDprintPlugin }: mkDprintPlugin { description = "Dockerfile code formatter"; - hash = "sha256-gsfMLa4zw8AblOS459ZS9OZrkGCQi5gBN+a3hvOsspk="; + hash = "sha256-GaK1sYdZPwQWJmz2ULcsGpWDiKjgPhqNRoGgQfGOkqc="; initConfig = { configExcludes = [ ]; configKey = "dockerfile"; @@ -9,6 +9,6 @@ mkDprintPlugin { }; pname = "dprint-plugin-dockerfile"; updateUrl = "https://plugins.dprint.dev/dprint/dockerfile/latest.json"; - url = "https://plugins.dprint.dev/dockerfile-0.3.2.wasm"; - version = "0.3.2"; + url = "https://plugins.dprint.dev/dockerfile-0.3.3.wasm"; + version = "0.3.3"; } diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix index aeb931ecd58e..d83c0588a4ff 100644 --- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix @@ -1,7 +1,7 @@ { mkDprintPlugin }: mkDprintPlugin { description = "Ruff (Python) wrapper plugin"; - hash = "sha256-15InHQgF9c0Js4yUJxmZ1oNj1O16FBU12u/GOoaSAJ8="; + hash = "sha256-qT+6zPbX3KrONXshwzLoGTWRXM93VKO0lN9ycJujEDM="; initConfig = { configExcludes = [ ]; configKey = "ruff"; @@ -12,6 +12,6 @@ mkDprintPlugin { }; pname = "dprint-plugin-ruff"; updateUrl = "https://plugins.dprint.dev/dprint/ruff/latest.json"; - url = "https://plugins.dprint.dev/ruff-0.3.9.wasm"; - version = "0.3.9"; + url = "https://plugins.dprint.dev/ruff-0.6.1.wasm"; + version = "0.6.1"; } diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix index 1abaa2a54ea1..89a3b44c0e48 100644 --- a/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix +++ b/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix @@ -1,7 +1,7 @@ { mkDprintPlugin }: mkDprintPlugin { description = "CSS, SCSS, Sass and Less formatter"; - hash = "sha256-mFlhfqtglKtKNls96PO/2AWLL1fNC5msQCd9EgdKauE="; + hash = "sha256-IAIix6c9/GNDZsRk95T/rpvMh7HqFgBoq5KDVYHHOjU="; initConfig = { configExcludes = [ "**/node_modules" ]; configKey = "malva"; @@ -14,6 +14,6 @@ mkDprintPlugin { }; pname = "g-plane-malva"; updateUrl = "https://plugins.dprint.dev/g-plane/malva/latest.json"; - url = "https://plugins.dprint.dev/g-plane/malva-v0.11.2.wasm"; - version = "0.11.2"; + url = "https://plugins.dprint.dev/g-plane/malva-v0.14.3.wasm"; + version = "0.14.3"; } diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix index 6c9ea245898e..633820b9ce32 100644 --- a/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix +++ b/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix @@ -1,7 +1,7 @@ { mkDprintPlugin }: mkDprintPlugin { description = "HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, and Vento formatter"; - hash = "sha256-fCvurr8f79io/jIjwCfwr/WGjvcKZtptRrx9GFfytSI="; + hash = "sha256-TQxHIw5IXZwFA/WzIJ33ZckJNkHwW67lnh0cCGkgmrs="; initConfig = { configExcludes = [ ]; configKey = "markup"; @@ -19,6 +19,6 @@ mkDprintPlugin { }; pname = "g-plane-markup_fmt"; updateUrl = "https://plugins.dprint.dev/g-plane/markup_fmt/latest.json"; - url = "https://plugins.dprint.dev/g-plane/markup_fmt-v0.19.0.wasm"; - version = "0.19.0"; + url = "https://plugins.dprint.dev/g-plane/markup_fmt-v0.24.0.wasm"; + version = "0.24.0"; } diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix index 6cdea7f70ae7..084bdadbb763 100644 --- a/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix +++ b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix @@ -1,7 +1,7 @@ { mkDprintPlugin }: mkDprintPlugin { description = "GraphQL formatter"; - hash = "sha256-PlQwpR0tMsghMrOX7is+anN57t9xa9weNtoWpc0E9ec="; + hash = "sha256-xEEBnmxxiIPNOePBDS2HG6lfAhR4l53w+QDF2mXdyzg="; initConfig = { configExcludes = [ ]; configKey = "graphql"; @@ -12,6 +12,6 @@ mkDprintPlugin { }; pname = "g-plane-pretty_graphql"; updateUrl = "https://plugins.dprint.dev/g-plane/pretty_graphql/latest.json"; - url = "https://plugins.dprint.dev/g-plane/pretty_graphql-v0.2.1.wasm"; - version = "0.2.1"; + url = "https://plugins.dprint.dev/g-plane/pretty_graphql-v0.2.3.wasm"; + version = "0.2.3"; } diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix index ca0b4883918b..7667e46621f3 100644 --- a/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix +++ b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix @@ -1,7 +1,7 @@ { mkDprintPlugin }: mkDprintPlugin { description = "YAML formatter"; - hash = "sha256-6ua021G7ZW7Ciwy/OHXTA1Joj9PGEx3SZGtvaA//gzo="; + hash = "sha256-iSh5SRrjQB1hJoKkkup7R+Durcu+cxePa7GDVjwnexU="; initConfig = { configExcludes = [ ]; configKey = "yaml"; @@ -12,6 +12,6 @@ mkDprintPlugin { }; pname = "g-plane-pretty_yaml"; updateUrl = "https://plugins.dprint.dev/g-plane/pretty_yaml/latest.json"; - url = "https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.0.wasm"; - version = "0.5.0"; + url = "https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.1.wasm"; + version = "0.5.1"; } diff --git a/pkgs/by-name/dp/dprint/plugins/update-plugins.py b/pkgs/by-name/dp/dprint/plugins/update-plugins.py index 54eab2a67355..9c1e5c91883c 100755 --- a/pkgs/by-name/dp/dprint/plugins/update-plugins.py +++ b/pkgs/by-name/dp/dprint/plugins/update-plugins.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i python -p nix 'python3.withPackages (pp: [ pp.requests ])' +#!nix-shell -i python3 -p nix 'python3.withPackages (ps: [ ps.requests ])' import json import os @@ -138,7 +138,7 @@ def update_plugins(): "updateUrl": update_url, "pname": pname, "version": e["version"], - "description": e["description"], + "description": e["description"].rstrip("."), "initConfig": { "configKey": e["configKey"], "configExcludes": e["configExcludes"], From 3d00669140f623de5e0a19e84cd70b8f3cdc454d Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 22 Oct 2025 11:05:06 -0400 Subject: [PATCH 192/380] rl-2511: Move entries from incorrect sections --- doc/release-notes/rl-2511.section.md | 26 +++++++++---------- .../manual/release-notes/rl-2511.section.md | 3 +++ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 5e22edd9f6dc..08887b914fd0 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -30,6 +30,11 @@ - Everything related to `bower` was removed, as it is deprecated and not used by anything in nixpkgs. +- `reaction` has been updated to version 2, which includes some breaking changes. + For more information, [check the release article](https://blog.ppom.me/en-reaction-v2). + +- `mealie` has been updated to 3.0.2: This update introduces breaking changes in some API endpoints (see the [release changelog](https://github.com/mealie-recipes/mealie/releases/tag/v3.0.0)). + - The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader - `installShellFiles`: Allow installManPage to take a piped input, add the `--name` flag for renaming the file when installed. Can also append `--` to opt-out of all subsequent parsing. @@ -263,6 +268,13 @@ - The systemd initrd will now respect `x-systemd.wants` and `x-systemd.requires` for reliably unlocking multi-disk bcachefs volumes. +- `neovim`: Added support for the `vim.o.exrc` option, the `VIMINIT` environment variable, and sourcing of `sysinit.vim`. + + See the neovim help page [`:help startup`](https://neovim.io/doc/user/starting.html#startup) for more information, as well as [the nixpkgs neovim wrapper documentation](#neovim-custom-configuration). + +- `cloudflare-ddns`: Added package cloudflare-ddns. + + - [`homebox` 0.20.0](https://github.com/sysadminsmedia/homebox/releases/tag/v0.20.0) changed how assets are stored and hashed. It is recommended to back up your database before this update. In particular, `--storage-data` was replaced with `--storage-conn-string` and `--storage-prefix-path`. If your configuration set `HBOX_STORAGE_DATA` manually, you must migrate it to `HBOX_STORAGE_CONN_STRING` and `HBOX_STORAGE_PREFIX_PATH`. - GIMP now defaults to version 3. Use `gimp2` for the old version. @@ -322,13 +334,8 @@ -- `mealie` has been updated to 3.0.2: This update introduces breaking changes in some API endpoints (see the [release changelog](https://github.com/mealie-recipes/mealie/releases/tag/v3.0.0)). - ### Breaking changes {#sec-nixpkgs-release-25.11-lib-breaking} -- `reaction` has been updated to version 2, which includes some breaking changes. - For more information, [check the release article](https://blog.ppom.me/en-reaction-v2). - - `lib.mapAttrsFlatten` has been removed, following its deprecation in NixOS 24.11. Use `lib.attrsets.mapAttrsToList` instead. - `lib.attrsets.cartesianProductOfSets` has been removed, following its deprecation in NixOS 24.11. Use `lib.attrsets.cartesianProduct` instead. @@ -344,9 +351,6 @@ and called `setup.py` from the source tree, which is deprecated. The modern alternative is to configure `pyproject = true` with `build-system = [ setuptools ]`. -- `boot.enableContainers` is only turned on when a declarative NixOS container is defined in `containers`. - If you use the `nixos-container` tool for imperative container management, set `boot.enableContainers = true;` explicitly. - ### Deprecations {#sec-nixpkgs-release-25.11-lib-deprecations} - `lib.options.mkAliasOptionModuleMD` is now obsolete; use the identical [`lib.options.mkAliasOptionModule`] instead. @@ -363,10 +367,4 @@ ### Additions and Improvements {#sec-nixpkgs-release-25.11-lib-additions-improvements} -- `neovim`: Added support for the `vim.o.exrc` option, the `VIMINIT` environment variable, and sourcing of `sysinit.vim`. - - See the neovim help page [`:help startup`](https://neovim.io/doc/user/starting.html#startup) for more information, as well as [the nixpkgs neovim wrapper documentation](#neovim-custom-configuration). - -- `cloudflare-ddns`: Added package cloudflare-ddns. - - `lib.cli.toCommandLine`, `lib.cli.toCommandLineShell`, `lib.cli.toCommandLineGNU` and `lib.cli.toCommandLineShellGNU` have been added to address multiple issues in `lib.cli.toGNUCommandLine` and `lib.cli.toGNUCommandLineShell`. diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 8b3a14483687..a4dd44596b39 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -180,6 +180,9 @@ - The `services.polipo` module has been removed as `polipo` is unmaintained and archived upstream. +- `boot.enableContainers` is only turned on when a declarative NixOS container is defined in `containers`. + If you use the `nixos-container` tool for imperative container management, set `boot.enableContainers = true;` explicitly. + - `virtualisation.lxd` has been removed due to lack of Nixpkgs maintenance. Users can migrate to `virtualisation.incus`, a fork of LXD, as a replacement. See [Incus migration documentation](https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/) for migration information. - `virtualisation.libvirtd` now uses OVMF images shipped with QEMU for UEFI machines. `virtualisation.libvirtd.qemu.ovmf` has been removed. From 9f68527a7355427f0265b9b160c7526213ba0343 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Sep 2025 12:39:51 +0000 Subject: [PATCH 193/380] openapi-generator-cli: 7.15.0 -> 7.16.0 --- pkgs/by-name/op/openapi-generator-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openapi-generator-cli/package.nix b/pkgs/by-name/op/openapi-generator-cli/package.nix index d0d5200d0b37..10f37d24530e 100644 --- a/pkgs/by-name/op/openapi-generator-cli/package.nix +++ b/pkgs/by-name/op/openapi-generator-cli/package.nix @@ -9,7 +9,7 @@ let jre = jre_headless; - version = "7.15.0"; + version = "7.16.0"; mainProgram = "openapi-generator-cli"; this = maven.buildMavenPackage { inherit version; @@ -20,10 +20,10 @@ let owner = "OpenAPITools"; repo = "openapi-generator"; tag = "v${version}"; - hash = "sha256-IgjlMOHMASijIt5nMqOZcUpxecbWljHh9rA1YUwUmwM="; + hash = "sha256-CoztWf2H2rXcx4d8Av8cBXzMqIZsrSCgx21i3+o2ufo="; }; - mvnHash = "sha256-woHPf7vPja70cNj6Glqr0OGAR8CV8qWiRu0hkmCcCrA="; + mvnHash = "sha256-5Kzv9h3X5s/1D0Gd1XQRvNGVAyf44QcriJFvS07wdZo="; mvnParameters = "-Duser.home=$TMPDIR"; doCheck = false; From ccb612fa02c5a5a4185b859ab82fa3dc61756a7c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Oct 2025 15:40:07 +0000 Subject: [PATCH 194/380] python3Packages.async-modbus: 0.2.2 -> 0.2.3 --- pkgs/development/python-modules/async-modbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/async-modbus/default.nix b/pkgs/development/python-modules/async-modbus/default.nix index dcc5a4247a6f..e302b4f7568e 100644 --- a/pkgs/development/python-modules/async-modbus/default.nix +++ b/pkgs/development/python-modules/async-modbus/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "async-modbus"; - version = "0.2.2"; + version = "0.2.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tiagocoutinho"; repo = "async_modbus"; tag = "v${version}"; - hash = "sha256-xms2OfX5bHPXswwhLhyh6HFsm1YqDwKclUirxrgL4i0="; + hash = "sha256-d4TTs3TtD/9eFdzXBaY+QeAMeRWTvsWeaxONeG0AXJU="; }; patches = [ From b750702053f21dc06f8ce49b3278e1a5119b57b0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Oct 2025 17:59:19 +0200 Subject: [PATCH 195/380] python313Packages.async-modbus: modernize --- .../python-modules/async-modbus/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/async-modbus/default.nix b/pkgs/development/python-modules/async-modbus/default.nix index e302b4f7568e..ce18fc2268f2 100644 --- a/pkgs/development/python-modules/async-modbus/default.nix +++ b/pkgs/development/python-modules/async-modbus/default.nix @@ -7,7 +7,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, setuptools, umodbus, }: @@ -15,9 +14,7 @@ buildPythonPackage rec { pname = "async-modbus"; version = "0.2.3"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "tiagocoutinho"; @@ -39,9 +36,9 @@ buildPythonPackage rec { --replace '"--durations=2", "--verbose"' "" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ connio umodbus ]; @@ -57,7 +54,8 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Modbus communication"; homepage = "https://github.com/tiagocoutinho/async_modbus"; - license = with licenses; [ gpl3Plus ]; + changelog = "https://github.com/tiagocoutinho/async_modbus/releases/tag/${src.tag}"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; }; } From 702ac68c3cccc4371bb27ad474a67b0ac7346e9c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Oct 2025 18:00:29 +0200 Subject: [PATCH 196/380] python312Packages.mypy-boto3-dynamodb: 1.40.44 -> 1.40.56 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index ae9b79cabbee..96f3f68939bb 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -434,8 +434,8 @@ in "sha256-obbn0FjZQDwFucsnH3N1+zfe1aWFE5PWHUWiLAeupqA="; mypy-boto3-dynamodb = - buildMypyBoto3Package "dynamodb" "1.40.44" - "sha256-WPo6Y4scrvVkS2D1iU4RgqKVH+swo9xt7bNOGwyd7Zk="; + buildMypyBoto3Package "dynamodb" "1.40.56" + "sha256-V23RL+ESV1QGbn+kgPksEjIglwqdafdmOlbXAfKXisU="; mypy-boto3-dynamodbstreams = buildMypyBoto3Package "dynamodbstreams" "1.40.40" From facfcf8a43a7ad7ce161dcf0940327820716a2c5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Oct 2025 18:00:34 +0200 Subject: [PATCH 197/380] python312Packages.mypy-boto3-emr: 1.40.0 -> 1.40.56 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 96f3f68939bb..092e5b901475 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -498,8 +498,8 @@ in "sha256-TGc78KsQ4y8QSFutN+/cj/gr2iJWi7fYh52OYFCFwho="; mypy-boto3-emr = - buildMypyBoto3Package "emr" "1.40.0" - "sha256-crNaa6bqSP7fCsFV5CnAHazDpXrFkkb46ria2LWTDvY="; + buildMypyBoto3Package "emr" "1.40.56" + "sha256-Khke6Z4btoZe5VlLDLJEmwxDD3o/uOYImj/bUy92Wdc="; mypy-boto3-emr-containers = buildMypyBoto3Package "emr-containers" "1.40.29" From adf1f27f1b990864611918edbb9efc44a5df554b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Oct 2025 18:00:53 +0200 Subject: [PATCH 198/380] python312Packages.mypy-boto3-mediaconvert: 1.40.17 -> 1.40.56 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 092e5b901475..7f3800a813e6 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -861,8 +861,8 @@ in "sha256-18sD6lfs5Y9BBp3j8c/TVjI/3KZbO6pKuYPYKir1NQY="; mypy-boto3-mediaconvert = - buildMypyBoto3Package "mediaconvert" "1.40.17" - "sha256-L2/TEQbnd60RuCaqpNI/xyQ76AqbIUe5KWwZtSf+2I8="; + buildMypyBoto3Package "mediaconvert" "1.40.56" + "sha256-oxrbkvlpIII2Ib8hMF0UnZ6PNFYnDHceA6V9M1thF18="; mypy-boto3-medialive = buildMypyBoto3Package "medialive" "1.40.45" From 25f48567b316b24dfd375ed0b0288ab1aad79b83 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Oct 2025 18:00:56 +0200 Subject: [PATCH 199/380] python312Packages.mypy-boto3-meteringmarketplace: 1.40.0 -> 1.40.56 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 7f3800a813e6..cda7504ab743 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -901,8 +901,8 @@ in "sha256-f/tGLKRnpzMDLAzQH1W7sUjGljb04Ws5Tidh8lL0pWE="; mypy-boto3-meteringmarketplace = - buildMypyBoto3Package "meteringmarketplace" "1.40.0" - "sha256-wbPakhKKDtNY6y84jzqJQlP7IiG5QAKQTRsYP/tndV8="; + buildMypyBoto3Package "meteringmarketplace" "1.40.56" + "sha256-idAuSb9+u1KVh13BBNSgXYkqKHZHcSfQ3rVxiDBLdVU="; mypy-boto3-mgh = buildMypyBoto3Package "mgh" "1.40.18" From 23f8bd6ee172570a1c188ffe944b5d89871e5f63 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Oct 2025 18:01:27 +0200 Subject: [PATCH 200/380] python313Packages.botocore-stubs: 1.40.55 -> 1.40.56 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 6d399c408e44..7857f852ee6d 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.40.55"; + version = "1.40.56"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-V8iXiwu+QKn6Kf3lZN6KBGeaIj9DCpfQOtpi7BEiMa8="; + hash = "sha256-qpU1uKD3E1sGJQTjnny8g/s/ALLU3CurphcENrSUtpY="; }; nativeBuildInputs = [ setuptools ]; From 85941dcc960bdca4ecf88e230f4535d2659aa120 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Oct 2025 18:01:30 +0200 Subject: [PATCH 201/380] python313Packages.boto3-stubs: 1.40.55 -> 1.40.56 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 0ec58fa99c7a..e9f72aa92c71 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -358,13 +358,13 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.40.55"; + version = "1.40.56"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-oRra+OrHfE7Uwbe/ckGwzZrQI9wcF8SbRfNa30wht/8="; + hash = "sha256-5WRFI+/39Qut5en0okVEtA+EnpBRlJ41ASA6IGJ/QmM="; }; build-system = [ setuptools ]; From 2ee9a375d9375b706e17b77cb683dc8be0223e6d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Oct 2025 18:14:25 +0200 Subject: [PATCH 202/380] python313Packages.tencentcloud-sdk-python: 3.0.1476 -> 3.0.1479 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.0.1476...3.0.1479 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1479/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 258852bb9976..ef0672e82392 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.1476"; + version = "3.0.1479"; pyproject = true; src = fetchFromGitHub { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-FzCZT5ZIPdjl568lilb2syJA47FW1jjW7mYLj2cIO4k="; + hash = "sha256-RvMQk/8btxQ2c9idSnLmZedM/oDID9OFKcEikHXRIxs="; }; build-system = [ setuptools ]; From 41c4edc26bc025a9764f33359f74a3526a1f3e58 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Wed, 22 Oct 2025 18:47:50 +0200 Subject: [PATCH 203/380] victoriametrics: 1.127.0 -> 1.128.0 Release notes: https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.128.0 Full changelog: https://github.com/VictoriaMetrics/VictoriaMetrics/compare/v1.127.0...v1.128.0 --- pkgs/by-name/vi/victoriametrics/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 2ceb5c9ace3c..704465fd1b83 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.127.0"; + version = "1.128.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-j0PikCV0VWSfp2rvwssXwvkRGQzFNd6hidZv3bufUuI="; + hash = "sha256-X1TkE0lJNu68iETf8M8U5IZvRadtIPR6LqP61uzhD3Y="; }; vendorHash = null; @@ -53,7 +53,7 @@ buildGoModule (finalAttrs: { # Allow older go versions substituteInPlace go.mod \ - --replace-fail "go 1.25.1" "go ${finalAttrs.passthru.go.version}" + --replace-fail "go 1.25.3" "go ${finalAttrs.passthru.go.version}" # Increase timeouts in tests to prevent failure on heavily loaded builders substituteInPlace lib/storage/storage_test.go \ From e6aa2e34a15ec7eb4309267d9942814b2015c820 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Wed, 22 Oct 2025 13:09:00 +0300 Subject: [PATCH 204/380] nixos/plymouth: add package option --- .../manual/release-notes/rl-2511.section.md | 2 + nixos/modules/system/boot/plymouth.nix | 49 +++++++++++-------- 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index d1285109a0ce..b845345a2872 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -331,6 +331,8 @@ - `services.dnscrypt-proxy` gains a `package` option to specify dnscrypt-proxy package to use. +- `boot.plymouth` now has a [`package`](#opt-boot.plymouth.package) option to specify the package used in the module. + - `services.limesurvey` now supports nginx as reverse-proxy. Available through [services.limesurvey.webserver](#opt-services.limesurvey.webserver). - `services.nextcloud.configureRedis` now defaults to `true` in accordance with upstream recommendations to have caching for file locking. See the [upstream doc](https://docs.nextcloud.com/server/31/admin_manual/configuration_files/files_locking_transactional.html) for further details. diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 1023fa8ce42d..51026e8c7a6a 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -21,10 +21,6 @@ let escapeShellArg ; - plymouth = pkgs.plymouth.override { - systemd = config.boot.initrd.systemd.package; - }; - cfg = config.boot.plymouth; opt = options.boot.plymouth; @@ -64,7 +60,7 @@ let themesEnv = pkgs.buildEnv { name = "plymouth-themes"; paths = [ - plymouth + cfg.package plymouthLogos ] ++ cfg.themePackages; @@ -96,7 +92,7 @@ let preStartQuitFixup = { serviceConfig.ExecStartPre = [ "" - "${plymouth}/bin/plymouth quit --wait" + "${cfg.package}/bin/plymouth quit --wait" ]; }; @@ -110,6 +106,19 @@ in enable = mkEnableOption "Plymouth boot splash screen"; + package = mkOption { + description = "The plymouth package to use."; + type = types.package; + default = pkgs.plymouth.override { + systemd = config.boot.initrd.systemd.package; + }; + defaultText = literalExpression '' + pkgs.plymouth.override { + systemd = config.boot.initrd.systemd.package; + } + ''; + }; + font = mkOption { default = "${pkgs.dejavu_fonts.minimal}/share/fonts/truetype/DejaVuSans.ttf"; defaultText = literalExpression ''"''${pkgs.dejavu_fonts.minimal}/share/fonts/truetype/DejaVuSans.ttf"''; @@ -175,15 +184,15 @@ in boot.kernelParams = [ "splash" ]; # To be discoverable by systemd. - environment.systemPackages = [ plymouth ]; + environment.systemPackages = [ cfg.package ]; environment.etc."plymouth/plymouthd.conf".source = configFile; environment.etc."plymouth/plymouthd.defaults".source = - "${plymouth}/share/plymouth/plymouthd.defaults"; + "${cfg.package}/share/plymouth/plymouthd.defaults"; environment.etc."plymouth/logo.png".source = cfg.logo; environment.etc."plymouth/themes".source = "${themesEnv}/share/plymouth/themes"; # XXX: Needed because we supply a different set of plugins in initrd. - environment.etc."plymouth/plugins".source = "${plymouth}/lib/plymouth"; + environment.etc."plymouth/plugins".source = "${cfg.package}/lib/plymouth"; systemd.tmpfiles.rules = [ "d /run/plymouth 0755 root root 0 -" @@ -192,7 +201,7 @@ in "L+ /run/plymouth/plugins - - - - /etc/plymouth/plugins" ]; - systemd.packages = [ plymouth ]; + systemd.packages = [ cfg.package ]; systemd.services.plymouth-kexec.wantedBy = [ "kexec.target" ]; systemd.services.plymouth-halt.wantedBy = [ "halt.target" ]; @@ -211,13 +220,13 @@ in systemd.services.emergency = preStartQuitFixup; boot.initrd.systemd = { - extraBin.plymouth = "${plymouth}/bin/plymouth"; # for the recovery shell + extraBin.plymouth = "${cfg.package}/bin/plymouth"; # for the recovery shell storePaths = [ "${getBin config.boot.initrd.systemd.package}/bin/systemd-tty-ask-password-agent" - "${plymouth}/bin/plymouthd" - "${plymouth}/sbin/plymouthd" + "${cfg.package}/bin/plymouthd" + "${cfg.package}/sbin/plymouthd" ]; - packages = [ plymouth ]; # systemd units + packages = [ cfg.package ]; # systemd units services.rescue = preStartQuitFixup; services.emergency = preStartQuitFixup; @@ -226,7 +235,7 @@ in # Files "/etc/plymouth/plymouthd.conf".source = configFile; "/etc/plymouth/logo.png".source = cfg.logo; - "/etc/plymouth/plymouthd.defaults".source = "${plymouth}/share/plymouth/plymouthd.defaults"; + "/etc/plymouth/plymouthd.defaults".source = "${cfg.package}/share/plymouth/plymouthd.defaults"; # Directories "/etc/plymouth/plugins".source = pkgs.runCommand "plymouth-initrd-plugins" { } ( checkIfThemeExists @@ -236,7 +245,7 @@ in mkdir -p $out/renderers # module might come from a theme cp ${themesEnv}/lib/plymouth/*.so $out - cp ${plymouth}/lib/plymouth/renderers/*.so $out/renderers + cp ${cfg.package}/lib/plymouth/renderers/*.so $out/renderers # useless in the initrd, and adds several megabytes to the closure rm $out/renderers/x11.so '' @@ -319,8 +328,8 @@ in boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) ( '' - copy_bin_and_libs ${plymouth}/bin/plymouth - copy_bin_and_libs ${plymouth}/bin/plymouthd + copy_bin_and_libs ${cfg.package}/bin/plymouth + copy_bin_and_libs ${cfg.package}/bin/plymouthd '' + checkIfThemeExists @@ -331,12 +340,12 @@ in mkdir -p $out/lib/plymouth/renderers # module might come from a theme cp ${themesEnv}/lib/plymouth/*.so $out/lib/plymouth - cp ${plymouth}/lib/plymouth/renderers/*.so $out/lib/plymouth/renderers + cp ${cfg.package}/lib/plymouth/renderers/*.so $out/lib/plymouth/renderers # useless in the initrd, and adds several megabytes to the closure rm $out/lib/plymouth/renderers/x11.so mkdir -p $out/share/plymouth/themes - cp ${plymouth}/share/plymouth/plymouthd.defaults $out/share/plymouth + cp ${cfg.package}/share/plymouth/plymouthd.defaults $out/share/plymouth # Copy themes into working directory for patching mkdir themes From 9da8ee8d57230fea9d2cefa93392e89080a76725 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 21 Oct 2025 18:16:59 -0700 Subject: [PATCH 205/380] imagelol: use system libraries, unbreak darwin Replace bundled zlib, libpng, and stb with system libraries via a patch file. Some of bundled libraries fail to build on clang. This also removes the broken flag on darwin. --- pkgs/by-name/im/imagelol/package.nix | 38 ++++++++++--------- .../by-name/im/imagelol/use-system-libs.patch | 32 ++++++++++++++++ 2 files changed, 52 insertions(+), 18 deletions(-) create mode 100644 pkgs/by-name/im/imagelol/use-system-libs.patch diff --git a/pkgs/by-name/im/imagelol/package.nix b/pkgs/by-name/im/imagelol/package.nix index c177b42a7f8e..1e0c8bed3483 100644 --- a/pkgs/by-name/im/imagelol/package.nix +++ b/pkgs/by-name/im/imagelol/package.nix @@ -4,6 +4,8 @@ fetchFromGitHub, fetchpatch, cmake, + libpng, + stb, }: stdenv.mkDerivation rec { @@ -25,10 +27,11 @@ stdenv.mkDerivation rec { url = "https://github.com/MCredstoner2004/ImageLOL/commit/013fb1f901d88f5fd21a896bfab47c7fff0737d7.patch"; hash = "sha256-RVaG2xbUqE4CxqI2lhvug2qihT6A8vN+pIfK58CXLDw="; includes = [ "imagelol/ImageLOL.inl" ]; - # change lib/ for imagelol stripLen = 2; extraPrefix = "imagelol/"; }) + # use system libraries instead of bundled versions + ./use-system-libs.patch ]; # fix for case-sensitive filesystems @@ -36,28 +39,28 @@ stdenv.mkDerivation rec { postPatch = '' mv imagelol src substituteInPlace CMakeLists.txt \ - --replace 'add_subdirectory("imagelol")' 'add_subdirectory("src")' + --replace-fail 'add_subdirectory("imagelol")' 'add_subdirectory("src")' - substituteInPlace External/zlib-no-examples/CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 2.4.4)" "cmake_minimum_required(VERSION 3.10)" - substituteInPlace External/libpng/CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)" \ - --replace-fail "cmake_policy(VERSION 3.1)" "cmake_policy(VERSION 3.10)" + # use system stb headers + substituteInPlace External/stb_image-cmake/CMakeLists.txt \ + --replace-fail '"''${CMAKE_CURRENT_SOURCE_DIR}/../stb"' '"${stb}/include/stb"' + + # remove bundled libraries + rm -r External/zlib External/zlib-no-examples External/libpng External/stb ''; nativeBuildInputs = [ cmake ]; - installPhase = '' - mkdir -p $out/bin - cp ./ImageLOL $out/bin - ''; + buildInputs = [ + libpng + stb + ]; - cmakeFlags = [ - (lib.cmakeFeature "CMAKE_C_FLAGS" "-std=gnu90") - ] - ++ lib.optional ( - stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 - ) "-DPNG_ARM_NEON=off"; + installPhase = '' + runHook preInstall + install -Dm755 ImageLOL -t $out/bin + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/MCredstoner2004/ImageLOL"; @@ -65,7 +68,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ ]; platforms = platforms.unix; - broken = stdenv.hostPlatform.isDarwin; mainProgram = "ImageLOL"; }; } diff --git a/pkgs/by-name/im/imagelol/use-system-libs.patch b/pkgs/by-name/im/imagelol/use-system-libs.patch new file mode 100644 index 000000000000..05e89a41d16b --- /dev/null +++ b/pkgs/by-name/im/imagelol/use-system-libs.patch @@ -0,0 +1,32 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,26 +3,12 @@ + project(ImageLOL VERSION 0.0) + set(CMAKE_CXX_STANDARD 20) + set(CMAKE_CXX_STANDARD_REQUIRED True) +-include_directories("External/zlib" "External/libpng") + add_subdirectory("External/stb_image-cmake") + +-set(SKIP_INSTALL_ALL ON CACHE BOOL "") +-add_subdirectory("External/zlib-no-examples") +- +-set(PNG_BUILD_ZLIB ON CACHE BOOL "") +-link_libraries(zlibstatic) +-get_target_property(ZLIB_INCLUDE_DIRECTORIES zlibstatic INCLUDE_DIRECTORIES) +-include_directories(${ZLIB_INCLUDE_DIRECTORIES}) +-set(ZLIB_INCLUDE_DIR ${ZLIB_INCLUDE_DIRECTORIES} CACHE PATH "") +-set(PNG_SHARED OFF CACHE BOOL "") +-set(PNG_EXECUTABLES OFF CACHE BOOL "") +-add_subdirectory("External/libpng") +-add_dependencies(png_static zlibstatic zlib) +-add_dependencies(genfiles zlibstatic) +-unset(SKIP_INSTALL_ALL CACHE) +-get_target_property(LIBPNG_INCLUDE_DIRECTORIES png_static INCLUDE_DIRECTORIES) ++find_package(PNG REQUIRED) ++set(LIBPNG_INCLUDE_DIRECTORIES ${PNG_INCLUDE_DIRS}) + + add_subdirectory("imagelol") + add_executable(ImageLOL main.cpp) + target_include_directories(ImageLOL PRIVATE ${LIBPNG_INCLUDE_DIRECTORIES}) +-target_link_libraries(ImageLOL PRIVATE stb_image png_static zlibstatic libimagelol) ++target_link_libraries(ImageLOL PRIVATE stb_image PNG::PNG libimagelol) From bfaa803e7dc276e35e608c29196905411ba09c1c Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 20 Oct 2025 13:57:09 -0300 Subject: [PATCH 206/380] translatelocally: fix build with cmake4 --- pkgs/by-name/tr/translatelocally/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/tr/translatelocally/package.nix b/pkgs/by-name/tr/translatelocally/package.nix index 3ade4781eca9..5e4344db5744 100644 --- a/pkgs/by-name/tr/translatelocally/package.nix +++ b/pkgs/by-name/tr/translatelocally/package.nix @@ -38,6 +38,12 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' echo '#define GIT_REVISION "${rev} ${finalAttrs.version}"' > \ 3rd_party/bergamot-translator/3rd_party/marian-dev/src/common/git_revision.h + + substituteInPlace 3rd_party/bergamot-translator/3rd_party/marian-dev/src/3rd_party/sentencepiece/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.1 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" + + substituteInPlace 3rd_party/bergamot-translator/3rd_party/marian-dev/src/3rd_party/ruy/third_party/cpuinfo/deps/clog/CMakeLists.txt \ + --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" ''; # https://github.com/XapaJIaMnu/translateLocally/blob/81ed8b9/.github/workflows/build.yml#L330 From 6e1fb5d6b26c20fe752417dbd03ddffc141e2760 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Wed, 22 Oct 2025 20:47:33 +0300 Subject: [PATCH 207/380] nixos/plymouth: make use of lib.getExe' wherever possible --- nixos/modules/system/boot/plymouth.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 51026e8c7a6a..3636503992c5 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -17,7 +17,7 @@ let literalExpression types literalMD - getBin + getExe' escapeShellArg ; @@ -92,7 +92,7 @@ let preStartQuitFixup = { serviceConfig.ExecStartPre = [ "" - "${cfg.package}/bin/plymouth quit --wait" + "${getExe' cfg.package "plymouth"} quit --wait" ]; }; @@ -220,10 +220,10 @@ in systemd.services.emergency = preStartQuitFixup; boot.initrd.systemd = { - extraBin.plymouth = "${cfg.package}/bin/plymouth"; # for the recovery shell + extraBin.plymouth = getExe' cfg.package "plymouth"; # for the recovery shell storePaths = [ - "${getBin config.boot.initrd.systemd.package}/bin/systemd-tty-ask-password-agent" - "${cfg.package}/bin/plymouthd" + (getExe' config.boot.initrd.systemd.package "systemd-tty-ask-password-agent") + (getExe' cfg.package "plymouthd") "${cfg.package}/sbin/plymouthd" ]; packages = [ cfg.package ]; # systemd units @@ -328,8 +328,8 @@ in boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) ( '' - copy_bin_and_libs ${cfg.package}/bin/plymouth - copy_bin_and_libs ${cfg.package}/bin/plymouthd + copy_bin_and_libs ${getExe' cfg.package "plymouth"} + copy_bin_and_libs ${getExe' cfg.package "plymouthd"} '' + checkIfThemeExists From aabdb0af1e10da264d6a5dbe344e5f5c767cb2f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Oct 2025 17:56:32 +0000 Subject: [PATCH 208/380] bluemap: 5.12 -> 5.13 --- pkgs/by-name/bl/bluemap/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bl/bluemap/package.nix b/pkgs/by-name/bl/bluemap/package.nix index 13d5c1226156..da8193a8e798 100644 --- a/pkgs/by-name/bl/bluemap/package.nix +++ b/pkgs/by-name/bl/bluemap/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "bluemap"; - version = "5.12"; + version = "5.13"; src = fetchurl { url = "https://github.com/BlueMap-Minecraft/BlueMap/releases/download/v${version}/BlueMap-${version}-cli.jar"; - hash = "sha256-k+tSIlgOj7o7aHPdJzXSW1zxx2pZ67TB3aJ4Fv7U0pM="; + hash = "sha256-NDnslNJ3B6Cjxr6qem9xRX71ddHP014cGynJZdiFDpE="; }; dontUnpack = true; From 13f7bf35e786a6840e78b6725808ce030304be4d Mon Sep 17 00:00:00 2001 From: Ulysses Zhan Date: Tue, 21 Oct 2025 19:24:06 -0700 Subject: [PATCH 209/380] everest{,-bin}: 5806 -> 5935 --- pkgs/by-name/ev/everest-bin/package.nix | 6 +- pkgs/by-name/ev/everest/deps.json | 199 ++++-------------------- pkgs/by-name/ev/everest/package.nix | 24 ++- pkgs/by-name/ev/everest/update.sh | 1 - 4 files changed, 50 insertions(+), 180 deletions(-) diff --git a/pkgs/by-name/ev/everest-bin/package.nix b/pkgs/by-name/ev/everest-bin/package.nix index 80387bdfd538..2f0076b4dfd2 100644 --- a/pkgs/by-name/ev/everest-bin/package.nix +++ b/pkgs/by-name/ev/everest-bin/package.nix @@ -8,15 +8,15 @@ let pname = "everest"; - version = "5806"; + version = "5935"; phome = "$out/lib/Celeste"; in stdenvNoCC.mkDerivation { inherit pname version; src = fetchzip { - url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.5806.0/main.zip"; + url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.5935.0/main.zip"; extension = "zip"; - hash = "sha256-Hw/BNvWfhdO7bvYrY/Px12BRG1SYcCBeAXBH4QnKyeY="; + hash = "sha256-XYvXrfHSjSShAg3r2qikt1CPXldYvsU1EvRJNzJoGTU="; }; buildInputs = [ icu diff --git a/pkgs/by-name/ev/everest/deps.json b/pkgs/by-name/ev/everest/deps.json index 9fc14832db35..6a228fef7f00 100644 --- a/pkgs/by-name/ev/everest/deps.json +++ b/pkgs/by-name/ev/everest/deps.json @@ -1,4 +1,14 @@ [ + { + "pname": "DotNet.ReproducibleBuilds", + "version": "1.2.25", + "hash": "sha256-Vl9RPq9vCO4bjulPZiOr3gDVKlr9vnuKIIX3KWlRxvw=" + }, + { + "pname": "DotNet.ReproducibleBuilds.Isolated", + "version": "1.2.25", + "hash": "sha256-NpGbG9rnKKN6ejz1xqUa2AYx8mGSv+ZHbducFGhhrwA=" + }, { "pname": "DotNetZip", "version": "1.16.0", @@ -24,16 +34,6 @@ "version": "3.0.2", "hash": "sha256-iAX3oCX2092oKXEASUhMkh2A1kh1cBRSkkMJ6BmszRA=" }, - { - "pname": "Microsoft.AspNetCore.App.Ref", - "version": "3.0.1", - "hash": "sha256-y4VQ8teCZOnCJyg0rh3s1SbbqfoEclB5T6lCfMrxWUw=" - }, - { - "pname": "Microsoft.AspNetCore.App.Ref", - "version": "3.1.10", - "hash": "sha256-51D1XkqFMPHJzOmt1HQ0Bf1n9K0auwEyxTJuqA/8xHY=" - }, { "pname": "Microsoft.AspNetCore.App.Ref", "version": "5.0.0", @@ -49,21 +49,6 @@ "version": "7.0.20", "hash": "sha256-OEDXXjQ1HDRPiA4Y1zPr1xUeH6wlzTCJpts+DZL61wI=" }, - { - "pname": "Microsoft.AspNetCore.App.Ref", - "version": "8.0.20", - "hash": "sha256-A6300qL9iP7iuY4wF9QkmOcuvoJFB0H64BAM5oGZF/4=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", - "version": "3.0.3", - "hash": "sha256-CbtnZSF+lvyeIfEUC8a0Jf4EMvYAxa9mvWF9lyLymMk=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", - "version": "3.1.32", - "hash": "sha256-OV3Ie8JGTEwNI4Y6DJFh+ZUrBTwrSdFjEbfljfAwn3s=" - }, { "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", "version": "5.0.17", @@ -79,11 +64,6 @@ "version": "7.0.20", "hash": "sha256-vq59xMfrET8InzUhkAsbs2xp3ML+SO9POsbwAiYKzkA=" }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", - "version": "8.0.20", - "hash": "sha256-rToqTSs66gvIi2I69+0/qjhKAXk5/rRQUh0KetP3ZxE=" - }, { "pname": "Microsoft.Build.Tasks.Git", "version": "1.1.0", @@ -129,26 +109,6 @@ "version": "3.1.16", "hash": "sha256-42cFtaZFzM93I0gZjuDbcEYWM5Pld+kx2MkWu0J66ww=" }, - { - "pname": "Microsoft.NET.Sdk.IL", - "version": "8.0.0", - "hash": "sha256-guQcVwSaVwJ0uJvUYZqk1bZ9ATLBk3zWHZmTW7EV1KM=" - }, - { - "pname": "Microsoft.NETCore.App", - "version": "2.1.0", - "hash": "sha256-RJksv5W7LhWJYGmkwYHfiU0s9XLCvT05KxSMz6U1/OE=" - }, - { - "pname": "Microsoft.NETCore.App.Host.linux-x64", - "version": "3.0.3", - "hash": "sha256-hIdA8ncOXoDM6/ryKCTVz/vZrqFLffxAgpN/qfl2L6Y=" - }, - { - "pname": "Microsoft.NETCore.App.Host.linux-x64", - "version": "3.1.32", - "hash": "sha256-ajR6pZv0zuzWDyxEnWtAuhasV5biV5lvweEbefTISiM=" - }, { "pname": "Microsoft.NETCore.App.Host.linux-x64", "version": "5.0.17", @@ -164,21 +124,6 @@ "version": "7.0.20", "hash": "sha256-Y1Dg8Sqhya86xD+9aJOuznT4mJUyFmoF/YZc0+5LBdc=" }, - { - "pname": "Microsoft.NETCore.App.Host.linux-x64", - "version": "8.0.20", - "hash": "sha256-NlwDtSJmxP+9oIqWEMKU12o96g9TzQAEt//votxI2PU=" - }, - { - "pname": "Microsoft.NETCore.App.Ref", - "version": "3.0.0", - "hash": "sha256-PHovvd+mPN9HoCF0rFEnS015p7Yj76+e9cfSU4JAI+I=" - }, - { - "pname": "Microsoft.NETCore.App.Ref", - "version": "3.1.0", - "hash": "sha256-nuAvHwmJ2s3Ob1qNDH1+uV3awOZaWlaV3FenTmPUWyM=" - }, { "pname": "Microsoft.NETCore.App.Ref", "version": "5.0.0", @@ -194,21 +139,6 @@ "version": "7.0.20", "hash": "sha256-W9RU3bja4BQLAbsaIhANQPJJh6DycDiBR+WZ3mK6Zrs=" }, - { - "pname": "Microsoft.NETCore.App.Ref", - "version": "8.0.20", - "hash": "sha256-1YXXJaiMZOIbLduuWyFGSWt6hOxKa3URNsPDfiMrnDM=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-x64", - "version": "3.0.3", - "hash": "sha256-mxA9JF2WyEDV8yahdwhe4qfCTbIFroUfmMzPBa91b/o=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-x64", - "version": "3.1.32", - "hash": "sha256-h4HjfRnvH81dW84S3TCPcCfxeQLiLN7b1ZleRNsprFY=" - }, { "pname": "Microsoft.NETCore.App.Runtime.linux-x64", "version": "5.0.17", @@ -224,36 +154,11 @@ "version": "7.0.20", "hash": "sha256-L+WaGvoXVMT3tZ7R5xFE06zaLcC3SI7LEf4ATBkUAGQ=" }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-x64", - "version": "8.0.20", - "hash": "sha256-BkV2ZjBpQvLhijWFSwWDpr5m2ffNlCtYJA5TUTro6no=" - }, - { - "pname": "Microsoft.NETCore.DotNetAppHost", - "version": "2.1.0", - "hash": "sha256-LV8pnNFsKGFONyCTGsd8qB5A+EUIiyvbYWAr0eOEFoI=" - }, - { - "pname": "Microsoft.NETCore.DotNetHostPolicy", - "version": "2.1.0", - "hash": "sha256-FqQm4BLznzRmF1nhk3nEwrdeAdCY35eBmHk6/4+MCPY=" - }, - { - "pname": "Microsoft.NETCore.DotNetHostResolver", - "version": "2.1.0", - "hash": "sha256-5nQTmMhaEvbuT+1f7u0t0tEK3SCVUeXhsExq8tiYBI0=" - }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "2.1.0", - "hash": "sha256-v09ltBAKTX8iAKuU2nCl+Op/ilVJQ0POZUh2z+u0rVo=" - }, { "pname": "Microsoft.NETCore.Platforms", "version": "3.1.0", @@ -269,11 +174,6 @@ "version": "1.1.0", "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "2.1.0", - "hash": "sha256-+KdWdA9I392SRqMb9KaiiRZatfvJ9RcdbtyGUkpHW7U=" - }, { "pname": "Microsoft.NETFramework.ReferenceAssemblies", "version": "1.0.3", @@ -331,33 +231,28 @@ }, { "pname": "Mono.Cecil", - "version": "0.11.5", - "hash": "sha256-nPFwbzW08gnCjadBdgi+16MHYhsPAXnFIliveLxGaNA=" + "version": "0.11.6", + "hash": "sha256-0qI4MqqpSLqaAazEK1cm40xfmVlY8bMNRcDnxws6ctU=" }, { "pname": "MonoMod.Backports", - "version": "1.1.0", - "hash": "sha256-ruRX10/u+lRfMKr0UMbCVYS/nUK5fzV4+8ujJXBnles=" + "version": "1.1.2", + "hash": "sha256-oXhcnMo0rDZDcpmhGVhQhax0lFeb9DT3GfSooesOo38=" }, { "pname": "MonoMod.Core", - "version": "1.0.0", - "hash": "sha256-Y55fgMd0d35qztqqC0drzn3NdSMYLiWie8IL9LbmFnc=" + "version": "1.3.0", + "hash": "sha256-B/pb8hor4npd3YSkvEF8FEO7xbbcHIfLapTUcrd5qRY=" }, { "pname": "MonoMod.ILHelpers", - "version": "1.0.0", - "hash": "sha256-N6ybnOMkEtxXy/PdJAEkqHggHYSLETbCMF+mgNGXAvo=" - }, - { - "pname": "MonoMod.Patcher", - "version": "25.0.0-prerelease.1", - "hash": "sha256-+5kddzc3FheDIRNoTPWQREc1ufVFjfPFiiKrXTPCTWQ=" + "version": "1.1.0", + "hash": "sha256-seoET5fqsyOY8g7DfNpLQHNTdUVY3U/xCoYFC4UrOKw=" }, { "pname": "MonoMod.RuntimeDetour", - "version": "25.0.0", - "hash": "sha256-yyP3kTN+OcOoO8xmHZfebKB/EtWNi7V6aJnXUTjVU/8=" + "version": "25.3.0", + "hash": "sha256-ZDS2MYHwL+cGuGycqivqfS/i+Uglx203SGtFx3vCSOA=" }, { "pname": "MonoMod.RuntimeDetour.HookGen", @@ -366,8 +261,8 @@ }, { "pname": "MonoMod.Utils", - "version": "25.0.0", - "hash": "sha256-PL7/F0zXnLRb5icD5zl/QCeMyTEsJZKOvSBvM1t8BEY=" + "version": "25.0.8", + "hash": "sha256-k2Nh8btGmOhKCEmCnO7t5pQszrzH0Lok5mgwWBRXviE=" }, { "pname": "NETStandard.Library", @@ -499,36 +394,6 @@ "version": "4.3.0", "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" }, - { - "pname": "runtime.linux-x64.Microsoft.NETCore.App", - "version": "2.1.0", - "hash": "sha256-qFtPLe3t/V9DZTaYhAO6MbVsyzH4hcQQUvyIJ6ywbEw=" - }, - { - "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost", - "version": "2.1.0", - "hash": "sha256-NMuEFKc68Vn4bVoX6kdGSQeyDpktUYliUg6Lbj4E8FU=" - }, - { - "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy", - "version": "2.1.0", - "hash": "sha256-U/WlbUpImqPjZf075WgBOb1o1i1H3VOL4QbzHfQ9Itk=" - }, - { - "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver", - "version": "2.1.0", - "hash": "sha256-vcB6FY1GDP+kTsmp9OXpPg50sXKqOSJzWUSuNlN1+rs=" - }, - { - "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm", - "version": "6.0.0", - "hash": "sha256-i/UcSf9HhYBtscSZKsaPReL/ntN8EQhmEpFIkEfoGhQ=" - }, - { - "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm", - "version": "6.0.0", - "hash": "sha256-flN7eEFoqIUmbuGHgVu/R1F7trwjOXwxmBVw/+Jv2Hg=" - }, { "pname": "runtime.native.System", "version": "4.3.0", @@ -659,11 +524,6 @@ "version": "4.3.0", "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" }, - { - "pname": "System.Collections.Immutable", - "version": "6.0.0", - "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs=" - }, { "pname": "System.Collections.Immutable", "version": "8.0.0", @@ -774,11 +634,6 @@ "version": "4.3.0", "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" }, - { - "pname": "System.Numerics.Vectors", - "version": "4.4.0", - "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U=" - }, { "pname": "System.Numerics.Vectors", "version": "4.5.0", @@ -864,11 +719,6 @@ "version": "4.3.0", "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.3", - "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak=" - }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "6.0.0", @@ -1029,6 +879,11 @@ "version": "4.3.0", "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" }, + { + "pname": "Vezel.Zig.Toolsets.linux-x64", + "version": "0.14.1.1", + "hash": "sha256-H32XG4157eWqa6qcVtd4t6Ef35MzYnXqr62FcwMAxSo=" + }, { "pname": "YamlDotNet", "version": "16.1.3", diff --git a/pkgs/by-name/ev/everest/package.nix b/pkgs/by-name/ev/everest/package.nix index f32b1ad20f42..a6f7bcf3f285 100644 --- a/pkgs/by-name/ev/everest/package.nix +++ b/pkgs/by-name/ev/everest/package.nix @@ -11,7 +11,7 @@ let pname = "everest"; - version = "5806"; + version = "5935"; phome = "$out/lib/Celeste"; in buildDotnetModule { @@ -20,11 +20,11 @@ buildDotnetModule { src = fetchFromGitHub { owner = "EverestAPI"; repo = "Everest"; - rev = "e47f67fc8c4b0b60b0a75112c5c90704ed371040"; + rev = "6a6da718227b357f5b997499e454d5dc5c3e2788"; fetchSubmodules = true; # TODO: use leaveDotGit = true and modify external/MonoMod in postFetch to please SourceLink # Microsoft.SourceLink.Common.targets(53,5): warning : Source control information is not available - the generated source link is empty. - hash = "sha256-scizz5U9DQaeJsh0dg7Lllycd/D3Ezu8QNYPPZFGJhY="; + hash = "sha256-qSDcwqjJeb2pNbyriZ/9Gk72DyR5KdIoncXol7JZvFg="; }; nativeBuildInputs = [ autoPatchelfHook ]; @@ -44,9 +44,25 @@ buildDotnetModule { autoPatchelf lib-ext/piton/piton-linux_x64 ''; - dotnet-sdk = dotnetCorePackages.sdk_9_0; + dotnet-sdk = + with dotnetCorePackages; + sdk_9_0 + // { + inherit + (combinePackages [ + sdk_9_0 + sdk_8_0 + ]) + packages + targetPackages + ; + }; nugetDeps = ./deps.json; + # Workaround from https://github.com/NixOS/nixpkgs/issues/454432 + # Necessitated by https://github.com/MonoMod/MonoMod/pull/246 + dotnetRestoreFlags = [ "--force-evaluate" ]; + # Needed for ILAsm projects: https://github.com/NixOS/nixpkgs/issues/370754#issuecomment-2571475814 linkNugetPackages = true; diff --git a/pkgs/by-name/ev/everest/update.sh b/pkgs/by-name/ev/everest/update.sh index 569f64ffc08b..29f9c13e3ae0 100755 --- a/pkgs/by-name/ev/everest/update.sh +++ b/pkgs/by-name/ev/everest/update.sh @@ -19,6 +19,5 @@ version=$(echo "$latest" | jq -r .version) url=$(echo "$latest" | jq -r .mainDownload) update-source-version everest $version --rev=$commit -echo > "$(dirname "$(nix-instantiate --eval --strict -A everest.meta.position | sed -re 's/^"(.*):[0-9]+"$/\1/')")/deps.json" "$(nix-build --attr everest.fetch-deps --no-out-link)" update-source-version everest-bin $version "" $url From e0ba8aa4123f5bf062a7308c07be5c8cdc9f9795 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Wed, 22 Oct 2025 22:10:29 +0200 Subject: [PATCH 210/380] yt-dlp: 2025.10.14 -> 2025.10.22 Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2025.10.22 Diff: https://github.com/yt-dlp/yt-dlp/compare/2025.10.14...2025.10.22 --- pkgs/by-name/yt/yt-dlp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix index ae0b2733f6b9..a54f623a3b51 100644 --- a/pkgs/by-name/yt/yt-dlp/package.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -19,14 +19,14 @@ python3Packages.buildPythonApplication rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2025.10.14"; + version = "2025.10.22"; pyproject = true; src = fetchFromGitHub { owner = "yt-dlp"; repo = "yt-dlp"; tag = version; - hash = "sha256-x7vpuXUihlC4jONwjmWnPECFZ7xiVAOFSDUgBNvl+aA="; + hash = "sha256-jQaENEflaF9HzY/EiMXIHgUehAJ3nnDT9IbaN6bDcac="; }; postPatch = '' From 9ea88ca354f8c162b22cf7baf6f714d708eca585 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Wed, 22 Oct 2025 21:11:19 +0100 Subject: [PATCH 211/380] ci/eval/compare/maintainers: simplify `meta.position` predicate --- ci/eval/compare/maintainers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix index 854c1f730bda..9f19a4c382eb 100644 --- a/ci/eval/compare/maintainers.nix +++ b/ci/eval/compare/maintainers.nix @@ -73,7 +73,7 @@ let (lib.unsafeGetAttrPos "pname" drv) (lib.unsafeGetAttrPos "version" drv) ] - ++ lib.optionals (drv.meta.position or null != null) [ + ++ lib.optionals (drv ? meta.position) [ # Use ".meta.position" for cases when most of the package is # defined in a "common" section and the only place where # reference to the file with a derivation the "pos" From 934a9ff265fc585ab043a40e0c899d455f91f1cf Mon Sep 17 00:00:00 2001 From: Zhaith Izaliel Date: Wed, 22 Oct 2025 22:18:16 +0200 Subject: [PATCH 212/380] maintainers: add Zhaith-Izaliel --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 52b6e7231b96..c50b17a3308f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -28952,6 +28952,11 @@ githubId = 1329212; name = "Andy Zhang"; }; + zhaithizaliel = { + name = "Zhaith Izaliel"; + github = "Zhaith-Izaliel"; + githubId = 39216756; + }; zhaofengli = { email = "hello@zhaofeng.li"; matrix = "@zhaofeng:zhaofeng.li"; From 4a0a1c6ad27f9e7fbf64c5698c9d5a1851249ec0 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 22 Oct 2025 17:34:08 -0300 Subject: [PATCH 213/380] minia: fix build with cmake4 --- pkgs/by-name/mi/minia/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/mi/minia/package.nix b/pkgs/by-name/mi/minia/package.nix index 1397cc2cb286..33dfd798cad7 100644 --- a/pkgs/by-name/mi/minia/package.nix +++ b/pkgs/by-name/mi/minia/package.nix @@ -33,6 +33,13 @@ stdenv.mkDerivation rec { rm -rf thirdparty/gatb-core/gatb-core/thirdparty/{hdf5,boost} ''; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" + substituteInPlace thirdparty/gatb-core/gatb-core/CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 3.1.0)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "Short read genome assembler"; mainProgram = "minia"; From 3fbc67c715303e209fff85e52c0ecce9c94f781e Mon Sep 17 00:00:00 2001 From: Zhaith Izaliel Date: Wed, 22 Oct 2025 22:32:00 +0200 Subject: [PATCH 214/380] iio-niri: init at 1.2.1 --- pkgs/by-name/ii/iio-niri/package.nix | 37 ++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/ii/iio-niri/package.nix diff --git a/pkgs/by-name/ii/iio-niri/package.nix b/pkgs/by-name/ii/iio-niri/package.nix new file mode 100644 index 000000000000..e203e26149a8 --- /dev/null +++ b/pkgs/by-name/ii/iio-niri/package.nix @@ -0,0 +1,37 @@ +{ + rustPlatform, + lib, + fetchFromGitHub, + dbus, + pkg-config, +}: +rustPlatform.buildRustPackage rec { + pname = "iio-niri"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "Zhaith-Izaliel"; + repo = "iio-niri"; + tag = "v${version}"; + hash = "sha256-IOMJ1xtjUkUoUgFZ9pxBf5XKdaUHu3WbUH5TlEiNRc4="; + }; + + cargoHash = "sha256-b05Jy+EKFAUcHR9+SdjHZUcIZG0Ta+ar/qc0GdRlJik="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + dbus + ]; + + meta = { + description = "Listen to iio-sensor-proxy and updates Niri output orientation depending on the accelerometer orientation"; + homepage = "https://github.com/Zhaith-Izaliel/iio-niri"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ zhaithizaliel ]; + mainProgram = "iio-niri"; + platforms = lib.platforms.linux; + }; +} From 8c8d23b188e87ba370897a53101fb3c41a4063db Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 22 Oct 2025 18:52:27 +0000 Subject: [PATCH 215/380] python3Packages.textual: 6.3.0 -> 6.4.0 Diff: https://github.com/Textualize/textual/compare/v6.3.0...v6.4.0 Changelog: https://github.com/Textualize/textual/blob/v6.4.0/CHANGELOG.md --- pkgs/development/python-modules/textual/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 4dfe95cadb03..68eee933c737 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -11,6 +11,7 @@ platformdirs, rich, typing-extensions, + mdit-py-plugins, # optional-dependencies tree-sitter, @@ -29,14 +30,14 @@ buildPythonPackage rec { pname = "textual"; - version = "6.3.0"; + version = "6.4.0"; pyproject = true; src = fetchFromGitHub { owner = "Textualize"; repo = "textual"; tag = "v${version}"; - hash = "sha256-3KxSuyfczyulbpysAO8mF7wvzd+807Lj6l6g0TygBnI="; + hash = "sha256-lwtgPJK62SntL0ThoIpmEq0Ngjf8wl73Q8PXjvut3ps="; }; build-system = [ poetry-core ]; @@ -46,6 +47,7 @@ buildPythonPackage rec { ]; dependencies = [ markdown-it-py + mdit-py-plugins platformdirs rich typing-extensions From 71133711b3f6fdfd7076620189765bdb1ce0d1ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Oct 2025 20:55:32 +0000 Subject: [PATCH 216/380] llama-cpp: 6782 -> 6821 --- pkgs/by-name/ll/llama-cpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index b832dddde80b..e45a22e0aefb 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -75,13 +75,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "6782"; + version = "6821"; src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-9cFuYkEcgUHsC4jg8qzKvHA8xI8Bp0w4AQKEt/TACUI="; + hash = "sha256-HqrX7xOYsF0UUF12c8KgIM2HMeTm1XxiFPuz/PaToI0="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT From 294984f6e7a245a870092bf3d2e13ddfdd25a77f Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 22 Oct 2025 17:22:24 -0300 Subject: [PATCH 217/380] midivisualizer: 7.0 -> 7.2, mark as broken on darwin --- pkgs/by-name/mi/midivisualizer/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/midivisualizer/package.nix b/pkgs/by-name/mi/midivisualizer/package.nix index d9ff9bf1ec6c..601f52e080de 100644 --- a/pkgs/by-name/mi/midivisualizer/package.nix +++ b/pkgs/by-name/mi/midivisualizer/package.nix @@ -5,6 +5,7 @@ cmake, pkg-config, libX11, + libnotify, glfw, makeWrapper, libXrandr, @@ -16,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "midivisualizer"; - version = "7.0"; + version = "7.2"; src = fetchFromGitHub { owner = "kosua20"; repo = "MIDIVisualizer"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-wfPSPH+E9cErVvfJZqHttFtjiUYJopM/u6w6NpRHifE="; + sha256 = "sha256-Ilsqc14PBTqreLhrEpvMOZAp37xOY/OwuhHTjeOjqm8="; }; nativeBuildInputs = [ @@ -34,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glfw ffmpeg-full + libnotify ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 @@ -65,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/kosua20/MIDIVisualizer"; license = licenses.mit; platforms = platforms.unix; + broken = stdenv.hostPlatform.isDarwin; maintainers = [ maintainers.ericdallo ]; }; }) From ddb5a1988b59a15888ec609ace17a4916c161860 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 22 Oct 2025 21:27:38 +0000 Subject: [PATCH 218/380] python3Packages.sqlfmt: 0.27.0 -> 0.28.1 Diff: https://github.com/tconbeer/sqlfmt/compare/v0.27.0...v0.28.1 Changelog: https://github.com/tconbeer/sqlfmt/blob/v0.28.1/CHANGELOG.md --- .../python-modules/sqlfmt/default.nix | 46 +++++++++++++------ 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/sqlfmt/default.nix b/pkgs/development/python-modules/sqlfmt/default.nix index 2f1dff47901a..1acdfcfa0664 100644 --- a/pkgs/development/python-modules/sqlfmt/default.nix +++ b/pkgs/development/python-modules/sqlfmt/default.nix @@ -1,23 +1,33 @@ { lib, - black, buildPythonPackage, - click, fetchFromGitHub, - gitpython, + pythonOlder, + + # build-system + hatchling, + + # dependencies + click, jinja2, platformdirs, - poetry-core, + tqdm, + + # optional-dependencies + black, + gitpython, + + # tests + addBinToPathHook, pytest-asyncio, pytestCheckHook, - pythonOlder, - tqdm, + versionCheckHook, writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "sqlfmt"; - version = "0.27.0"; + version = "0.28.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -26,11 +36,14 @@ buildPythonPackage rec { owner = "tconbeer"; repo = "sqlfmt"; tag = "v${version}"; - hash = "sha256-Yel9SB7KrDqtuZxNx4omz6u4AID8Fk5kFYKBEZD1fuU="; + hash = "sha256-H896Ey4iJFuvcLLvLilN/6nN4gxpvv3VJKIjivEDwMU="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; + pythonRelaxDeps = [ + "click" + ]; dependencies = [ click jinja2 @@ -43,18 +56,23 @@ buildPythonPackage rec { sqlfmt_primer = [ gitpython ]; }; + pythonImportsCheck = [ "sqlfmt" ]; + nativeCheckInputs = [ + addBinToPathHook pytest-asyncio pytestCheckHook + versionCheckHook writableTmpDirAsHomeHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); + versionCheckProgramArg = "--version"; - preCheck = '' - export PATH="$PATH:$out/bin"; - ''; - - pythonImportsCheck = [ "sqlfmt" ]; + disabledTestPaths = [ + # TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr' + "tests/functional_tests/test_end_to_end.py" + "tests/unit_tests/test_cli.py" + ]; meta = { description = "Sqlfmt formats your dbt SQL files so you don't have to"; From 3e14dbd9c9e9c43bd73042ea3ff83179b435624f Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 22 Oct 2025 18:36:05 -0300 Subject: [PATCH 219/380] mni_autoreg: fix build with cmake4 --- pkgs/by-name/mn/mni_autoreg/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/mn/mni_autoreg/package.nix b/pkgs/by-name/mn/mni_autoreg/package.nix index e7698513891e..fe1b40ba90b1 100644 --- a/pkgs/by-name/mn/mni_autoreg/package.nix +++ b/pkgs/by-name/mn/mni_autoreg/package.nix @@ -48,6 +48,12 @@ stdenv.mkDerivation { done ''; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)" \ + --replace-fail "CMAKE_POLICY(SET CMP0026 OLD)" "CMAKE_POLICY(SET CMP0026 NEW)" + ''; + meta = { homepage = "https://github.com/BIC-MNI/mni_autoreg"; description = "Tools for automated registration using the MINC image format"; From dd76681b3a0f072ff626cdd2b267c0fae46ad17d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 22 Oct 2025 21:42:21 +0000 Subject: [PATCH 220/380] harlequin: address click 8.2.x incompatibility --- pkgs/by-name/ha/harlequin/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix index 6a06668e656c..b12abb6b7a03 100644 --- a/pkgs/by-name/ha/harlequin/package.nix +++ b/pkgs/by-name/ha/harlequin/package.nix @@ -47,6 +47,7 @@ pythonPackages.buildPythonApplication rec { }; pythonRelaxDeps = [ + "click" "numpy" "pyarrow" "questionary" @@ -104,6 +105,10 @@ pythonPackages.buildPythonApplication rec { # Tests require network access "test_connect_extensions" "test_connect_prql" + + # Broken since click was updated to 8.2.1 in https://github.com/NixOS/nixpkgs/pull/448189 + # AssertionError + "test_bad_adapter_opt" ] ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ # Test incorrectly tries to load a dylib/so compiled for x86_64 From d7ce9cddbd1560d76cce350cc45deab031207f34 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 22 Oct 2025 18:47:25 -0300 Subject: [PATCH 221/380] molequeue: fix build with cmake4 --- .../libraries/science/chemistry/molequeue/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/science/chemistry/molequeue/default.nix b/pkgs/development/libraries/science/chemistry/molequeue/default.nix index dba6e33b22e6..122214040a08 100644 --- a/pkgs/development/libraries/science/chemistry/molequeue/default.nix +++ b/pkgs/development/libraries/science/chemistry/molequeue/default.nix @@ -25,6 +25,11 @@ stdenv.mkDerivation rec { buildInputs = [ qttools ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.3 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" + ''; + # Fix the broken CMake files to use the correct paths postInstall = '' substituteInPlace $out/lib/cmake/molequeue/MoleQueueConfig.cmake \ From 54d5d50e6045686a205eaefbdd461464a504e9db Mon Sep 17 00:00:00 2001 From: Linus Karl Date: Wed, 22 Oct 2025 17:57:29 +0200 Subject: [PATCH 222/380] indilib: fix hash of tag, remove patch --- .../libraries/science/astronomy/indilib/default.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index 527f716a686d..a9200c388be5 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch2, bash, cmake, cfitsio, @@ -30,18 +29,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "indilib"; repo = "indi"; rev = "v${finalAttrs.version}"; - hash = "sha256-0+ZC9NoanBDojYz/ufZUpUQB++vnMcUYtG1UmmVGbTg="; + hash = "sha256-WfVC5CLzwyO40Kpv/SZaYiPGDvWLUydQaA8FvTVhHqg="; }; - # fixes version number. This commit is directly after the tagged commit in master - # should be removed with the next release - patches = [ - (fetchpatch2 { - url = "https://github.com/indilib/indi/commit/91e3e35250126887a856e90b6a0a30697fb01545.patch?full_index=1"; - hash = "sha256-ho1S+A6gTQ9ELy/QE14S6daXyMN+vASFbXa2vMWdqR8="; - }) - ]; - nativeBuildInputs = [ cmake ]; From 0449e34b11f15ee2958e75d2b7301341f807e6ac Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 22 Oct 2025 19:09:06 -0300 Subject: [PATCH 223/380] mozart2: fix build with cmake4 --- pkgs/development/compilers/mozart/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix index 88736dffdeec..d9f82898c8e7 100644 --- a/pkgs/development/compilers/mozart/default.nix +++ b/pkgs/development/compilers/mozart/default.nix @@ -76,6 +76,17 @@ stdenv.mkDerivation rec { tk ]; + postPatch = '' + substituteInPlace {vm,.}/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" + substituteInPlace vm/vm/test/gtest/{googletest,.}/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.6.4)" "cmake_minimum_required(VERSION 3.10)" + substituteInPlace bootcompiler/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" + substituteInPlace {boosthost,opi,wish,stdlib}/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8.6)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "Open source implementation of Oz 3"; maintainers = with maintainers; [ From 4704a316771e45164f4747471f4cb146d4101370 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Mon, 20 Oct 2025 18:08:43 +0200 Subject: [PATCH 224/380] CubicSDR: fix build with cmake4 --- pkgs/by-name/cu/cubicsdr/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/cu/cubicsdr/package.nix b/pkgs/by-name/cu/cubicsdr/package.nix index 7f7a9f0d67e5..53f769ac092d 100644 --- a/pkgs/by-name/cu/cubicsdr/package.nix +++ b/pkgs/by-name/cu/cubicsdr/package.nix @@ -55,6 +55,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_HAMLIB=ON" ] ++ lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON"; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required (VERSION 3.10)" + ''; + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change libliquid.dylib ${lib.getLib liquid-dsp}/lib/libliquid.dylib ''${out}/bin/CubicSDR ''; From 18084c88a903b25ccab6bfc3d550189765c1e133 Mon Sep 17 00:00:00 2001 From: Defelo Date: Wed, 22 Oct 2025 22:15:43 +0000 Subject: [PATCH 225/380] chhoto-url: 6.3.2 -> 6.4.0 Changelog: https://github.com/SinTan1729/chhoto-url/releases/tag/6.4.0 Diff: https://github.com/SinTan1729/chhoto-url/compare/6.3.2...6.4.0 --- pkgs/by-name/ch/chhoto-url/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix index 778471e975ad..f6add0a52d8f 100644 --- a/pkgs/by-name/ch/chhoto-url/package.nix +++ b/pkgs/by-name/ch/chhoto-url/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "chhoto-url"; - version = "6.3.2"; + version = "6.4.0"; src = fetchFromGitHub { owner = "SinTan1729"; repo = "chhoto-url"; tag = finalAttrs.version; - hash = "sha256-k5fxU3HWhlYlBjmHNsj4lin7LHdwswbwm5bCVmCMjg8="; + hash = "sha256-IghMhr1ksoTWPvuQ66XfXWrNgPAmS39OqjdhwpElD3U="; }; sourceRoot = "${finalAttrs.src.name}/actix"; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/" ''; - cargoHash = "sha256-oR1SCEbMMDfQyvhoUJzBiK4VHCZwx+o/PaZBfxPB2K8="; + cargoHash = "sha256-cxw0Gg80UHvkjBXGt7tKMEinfhS2aT4fZ7oDzNNHnX8="; postInstall = '' mkdir -p $out/share/chhoto-url From 40211ad1af58b87610e078216468b4e0f16b656d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Oct 2025 22:23:54 +0000 Subject: [PATCH 226/380] qownnotes: 25.10.3 -> 25.10.4 --- pkgs/by-name/qo/qownnotes/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index 6c9e932f5297..73db3a0cda24 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "qownnotes"; appname = "QOwnNotes"; - version = "25.10.3"; + version = "25.10.4"; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz"; - hash = "sha256-hXqfo+67m1yEr8q7UQ+Er+BuJrIB3Z8M+x39PpmUdxA="; + hash = "sha256-taYrPrirSIu1CGs8GeX2lhSS8R1l3mr8YPqpkH4Y/bk="; }; nativeBuildInputs = [ From a6d5d6ba57fb8ff1b91147a8e4d26c09a2393bb8 Mon Sep 17 00:00:00 2001 From: Defelo Date: Wed, 22 Oct 2025 22:17:31 +0000 Subject: [PATCH 227/380] hyfetch: 2.0.2 -> 2.0.4 Changelog: https://github.com/hykilpikonna/hyfetch/releases/tag/2.0.4 Diff: https://github.com/hykilpikonna/hyfetch/compare/2.0.2...2.0.4 --- pkgs/by-name/hy/hyfetch/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix index 098d367be445..a258372f80fe 100644 --- a/pkgs/by-name/hy/hyfetch/package.nix +++ b/pkgs/by-name/hy/hyfetch/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hyfetch"; - version = "2.0.2"; + version = "2.0.4"; src = fetchFromGitHub { owner = "hykilpikonna"; repo = "hyfetch"; tag = finalAttrs.version; - hash = "sha256-Y9v2vrpTPlsgFRoo33NDVoyQSgUD/stKQLJXzUxFesA="; + hash = "sha256-nqbdkVEKuzuDDK4NivzJ6hfm3KqkFqorETiEaTqgKNY="; }; - cargoHash = "sha256-auOeH/1KtxS7a1APOtCMwNTdEQ976BL/jEKj2ADaakQ="; + cargoHash = "sha256-Lem/6q0+P+1Hy+ZCJvP+O7kws49ytKEhzytT2+B4aRE="; nativeBuildInputs = [ installShellFiles From a2f52f4cca4851511b74cc88540964fe2dac7256 Mon Sep 17 00:00:00 2001 From: Defelo Date: Wed, 22 Oct 2025 22:17:58 +0000 Subject: [PATCH 228/380] python312Packages.asyncer: 0.0.9 -> 0.0.10 Changelog: https://github.com/fastapi/asyncer/releases/tag/0.0.10 Diff: https://github.com/fastapi/asyncer/compare/0.0.9...0.0.10 --- pkgs/development/python-modules/asyncer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncer/default.nix b/pkgs/development/python-modules/asyncer/default.nix index daa9524cf7ea..6047204329b7 100644 --- a/pkgs/development/python-modules/asyncer/default.nix +++ b/pkgs/development/python-modules/asyncer/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyncer"; - version = "0.0.9"; + version = "0.0.10"; pyproject = true; src = fetchFromGitHub { owner = "fastapi"; repo = "asyncer"; tag = version; - hash = "sha256-1M5MGaxfEfJMCfAoGorNGbRBZdvLue5lHu8DuR96mLo="; + hash = "sha256-LjQOhcnCwM4Vcw+lBq6bexPYewRuhkU/R/pkDTEVHWQ="; }; build-system = [ pdm-backend ]; From 9e682fcd5472e27677aaa9722c28f9d26d489946 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 23 Oct 2025 09:05:14 +1000 Subject: [PATCH 229/380] zfs_unstable: 2.4.0-rc2 -> 2.4.0-rc3 Diff: https://github.com/openzfs/zfs/compare/zfs-2.4.0-rc2...zfs-2.4.0-rc3 Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.4.0-rc3 --- pkgs/os-specific/linux/zfs/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 8c9b35be6056..d54f41119b36 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -16,14 +16,14 @@ callPackage ./generic.nix args { # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.4.0-rc2"; + version = "2.4.0-rc3"; # rev = ""; tests = { inherit (nixosTests.zfs) unstable; }; - hash = "sha256-NoY8lXQ/qxO0cQLmU0tIjqqWUThfWzVioigpS2crbeE="; + hash = "sha256-VfCeQqgahNNQA4jsiFHTdUjgXIH26k5r3q/Rpo2JrCc="; extraLongDescription = '' This is "unstable" ZFS, and will usually be a pre-release version of ZFS. From 8433198def9414c7bc09f2bb4476e4e616b04a1d Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Thu, 23 Oct 2025 00:32:15 +0100 Subject: [PATCH 230/380] nixos/zeronet: fix meta.maintainers Fixes 982ede4108972fad3e7f7e77f08039ebeaa78402 --- nixos/modules/services/networking/zeronet.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/zeronet.nix b/nixos/modules/services/networking/zeronet.nix index fd85f29e300e..9dc737bd7d0d 100644 --- a/nixos/modules/services/networking/zeronet.nix +++ b/nixos/modules/services/networking/zeronet.nix @@ -134,6 +134,6 @@ with lib; ]; meta = { - inherit (pkgs.zeronet) maintainers; + inherit (pkgs.zeronet.meta) maintainers; }; } From 1b1e26e1b86bc1de2306d3bf4421e34a557bfea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 Oct 2025 01:47:50 +0200 Subject: [PATCH 231/380] nextcloud-client: 3.17.2 -> 4.0.0 Diff: https://github.com/nextcloud-releases/desktop/compare/v3.17.2...v4.0.0 Changelog: https://github.com/nextcloud/desktop/releases/tag/v4.0.0 --- pkgs/by-name/ne/nextcloud-client/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix index 44dcf47ce335..f55675dff4ed 100644 --- a/pkgs/by-name/ne/nextcloud-client/package.nix +++ b/pkgs/by-name/ne/nextcloud-client/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "nextcloud-client"; - version = "3.17.2"; + version = "4.0.0"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "nextcloud-releases"; repo = "desktop"; tag = "v${version}"; - hash = "sha256-jBlQh5tHP+2LyFCnP0m/ud3nU40i5cWtUwSeM5auQX8="; + hash = "sha256-IXX1PdMR3ptgH7AufnGKBeKftZgai7KGvYW+OCkM8jo="; }; patches = [ From 3ac75fb3b986a6529d50eefc7aa1be943f4b6b22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Oct 2025 23:58:29 +0000 Subject: [PATCH 232/380] cosmic-ext-applet-caffeine: 0-unstable-2025-10-16 -> 0-unstable-2025-10-22 --- pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix b/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix index a508e77d7565..c5901df0f842 100644 --- a/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix +++ b/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage { pname = "cosmic-ext-applet-caffeine"; - version = "0-unstable-2025-10-16"; + version = "0-unstable-2025-10-22"; src = fetchFromGitHub { owner = "tropicbliss"; repo = "cosmic-ext-applet-caffeine"; - rev = "0b50a109495d02ab8c99a501d2dd7575c6fabc1b"; - hash = "sha256-Z84LqsPVGd7PfOUmC1iJWgTGrl6FicaxZHwTZmgmAyk="; + rev = "2d27a3dec13ca455975f39927bad040f36576d03"; + hash = "sha256-4MP1H3U1sr7+h5Psf6wTiQuJJgEtlRrgQKdF7COkosI="; }; - cargoHash = "sha256-TC7WNJUxGZpfDbDgnifBSZM7SvN2/Iw0HRXWPDXnDBM="; + cargoHash = "sha256-89/0XEdQ7MCycAkHhTkA5FCj/eKVLgWDhljKB/Lo4+4="; nativeBuildInputs = [ libcosmicAppHook From f8ba5f3ff77af7a06dc9a8e01bb9c12156f9d8e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 00:21:25 +0000 Subject: [PATCH 233/380] libretro.ppsspp: 0-unstable-2025-10-17 -> 0-unstable-2025-10-22 --- pkgs/applications/emulators/libretro/cores/ppsspp.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix index 2ac064a36510..7acd6a288f8a 100644 --- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix +++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix @@ -13,13 +13,13 @@ }: mkLibretroCore { core = "ppsspp"; - version = "0-unstable-2025-10-17"; + version = "0-unstable-2025-10-22"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; - rev = "4ccf013d3b52314b935d8fc49b70f08d546aa48b"; - hash = "sha256-e1iqnhJQKYXddp3VwpAPg6eHBnDHOFvo1b4evp8f8X4="; + rev = "28790c19af7ddfa822c4152a3cae4a7fb6c06bc7"; + hash = "sha256-m1qmgr92Ni8wAYer6kIdcu+BUiBSROFcSC/M3v/JOmA="; fetchSubmodules = true; }; From 1119d225de6747ee87b3674ae4e67b1a8e8fabb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 Oct 2025 02:25:40 +0200 Subject: [PATCH 234/380] nixos/librenms: update config cache otherwise any change to .env is never reflected. --- nixos/modules/services/monitoring/librenms.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/monitoring/librenms.nix b/nixos/modules/services/monitoring/librenms.nix index ef3593cf038c..3d8d3dbd8296 100644 --- a/nixos/modules/services/monitoring/librenms.nix +++ b/nixos/modules/services/monitoring/librenms.nix @@ -668,6 +668,9 @@ in ${artisanWrapper}/bin/librenms-artisan optimize echo "${package}" > ${cfg.dataDir}/package fi + + # to make sure to not read an outdated .env file + ${artisanWrapper}/bin/librenms-artisan config:cache ''; }; From 0b6ef9155412e6b3d34cb43d54a6ee84cb2db921 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 01:13:54 +0000 Subject: [PATCH 235/380] gh-markdown-preview: 1.10.1 -> 1.11.0 --- pkgs/by-name/gh/gh-markdown-preview/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gh/gh-markdown-preview/package.nix b/pkgs/by-name/gh/gh-markdown-preview/package.nix index a6d83efa539a..7507a1343ee1 100644 --- a/pkgs/by-name/gh/gh-markdown-preview/package.nix +++ b/pkgs/by-name/gh/gh-markdown-preview/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gh-markdown-preview"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "yusukebe"; repo = "gh-markdown-preview"; rev = "v${version}"; - hash = "sha256-jvdNAxPAr3ieOhUWeALmopeN06mZZJ+zBDFVl7gsYoc="; + hash = "sha256-Q6rTkiklSU1lh4mEKYJYXOmGlRkNUYTC/jtMkVVFRu0="; }; vendorHash = "sha256-O6Q9h5zcYAoKLjuzGu7f7UZY0Y5rL2INqFyJT2QZJ/E="; From 428a26ee7c9dfe6df677063083b819f86c86ffdb Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Thu, 16 Oct 2025 13:00:03 +0800 Subject: [PATCH 236/380] wechat: 4.1.0.19-29668 -> 4.1.0.34-29721 for darwin --- pkgs/by-name/we/wechat/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix index 945a202f9c78..2fce20ac0308 100644 --- a/pkgs/by-name/we/wechat/package.nix +++ b/pkgs/by-name/we/wechat/package.nix @@ -30,14 +30,14 @@ let # https://dldir1.qq.com/weixin/mac/mac-release.xml any-darwin = let - version = "4.1.0.19-29668"; + version = "4.1.0.34-29721"; version' = lib.replaceString "-" "_" version; in { inherit version; src = fetchurl { url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg"; - hash = "sha256-EAKfskB3zY4C05MVCoyxzW6wuRw8b2nXIynyEjx8Rvw="; + hash = "sha256-UwQrU4uVCKnAYXFSnlIfXQbBxyR3KNn6f1Mp4bCSAZI="; }; }; in From 4a6e852d13dcf257d2f18aadfdf6c15eba7dba37 Mon Sep 17 00:00:00 2001 From: botnk Date: Thu, 23 Oct 2025 01:43:07 +0000 Subject: [PATCH 237/380] zed-editor: 0.208.6 -> 0.209.5 Changelog: https://github.com/zed-industries/zed/releases/tag/v0.209.5 --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 89eb02b392a5..5aade7dcf8d3 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -101,7 +101,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.208.6"; + version = "0.209.5"; outputs = [ "out" @@ -114,7 +114,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-EzfeLSalC4pTtaiDWXYib5jDDKGVZ+PzFjgMjIGrUDg="; + hash = "sha256-p5qKbNPf7j4HiYv+Ej7df131z8xL09egbyOUwIkYC5Q="; }; postPatch = '' @@ -134,7 +134,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm -r $out/git/*/candle-book/ ''; - cargoHash = "sha256-PxreCKshDvzLQzPvNpGyNz3jOPIDiz7JHy/9nEujnKg="; + cargoHash = "sha256-6LBBa6CDLrEkyazZuqDj2wj41KQnhp3NRw5AlaUtxj0="; nativeBuildInputs = [ cmake From 02a6a4cf343148cbbd1cd1d94a2811d3319fc167 Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Wed, 22 Oct 2025 21:51:47 -0400 Subject: [PATCH 238/380] paperless-ngx: 2.19.0 -> 2.19.1 changelog: https://github.com/paperless-ngx/paperless-ngx/releases/tag/v2.19.1 --- pkgs/by-name/pa/paperless-ngx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index a518dc7625f9..80567181881a 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -28,13 +28,13 @@ xorg, }: let - version = "2.19.0"; + version = "2.19.1"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; tag = "v${version}"; - hash = "sha256-t2T42K+F3PaMfNDFa3NF/rAcG6izKTXMIzgD68WdVFE="; + hash = "sha256-J9e39c8AnEj+1lB+KrxsG3h4VjTo65an24IJ5mvACUE="; }; python = python3.override { From efea9cb2cff2dbc2008608775467b25131d52551 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 02:06:02 +0000 Subject: [PATCH 239/380] lasuite-meet: 0.1.40 -> 0.1.41 --- pkgs/by-name/la/lasuite-meet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lasuite-meet/package.nix b/pkgs/by-name/la/lasuite-meet/package.nix index 8ea69995ee86..98812a18cb67 100644 --- a/pkgs/by-name/la/lasuite-meet/package.nix +++ b/pkgs/by-name/la/lasuite-meet/package.nix @@ -13,14 +13,14 @@ in python.pkgs.buildPythonApplication rec { pname = "lasuite-meet"; - version = "0.1.40"; + version = "0.1.41"; pyproject = true; src = fetchFromGitHub { owner = "suitenumerique"; repo = "meet"; tag = "v${version}"; - hash = "sha256-jzMjLiNLLBBHo9/c/ufB59V6qMwjpx38sImFR+Q+wBE="; + hash = "sha256-QAzkRbAxtHa7Py4DDSc2/QHHyFHp+e+/uGmGzUPtFPI="; }; sourceRoot = "source/src/backend"; From a70b28a38816fb5529971cf2a6c97a6aa26b0bd3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 02:25:59 +0000 Subject: [PATCH 240/380] shh: 2025.9.22 -> 2025.10.22 --- pkgs/by-name/sh/shh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sh/shh/package.nix b/pkgs/by-name/sh/shh/package.nix index b8940661b542..bb3337716b20 100644 --- a/pkgs/by-name/sh/shh/package.nix +++ b/pkgs/by-name/sh/shh/package.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "shh"; - version = "2025.9.22"; + version = "2025.10.22"; src = fetchFromGitHub { owner = "desbma"; repo = "shh"; tag = "v${finalAttrs.version}"; - hash = "sha256-Esb6IR49YtGWvLmGLtviAyMLjoWZLQka2igC6yKJ3A0="; + hash = "sha256-OxiQOwoWytZvPVVurSckPSWcb88pyDHRdUV/87Dbb9Q="; }; - cargoHash = "sha256-CB0jhVDR40lZaYqNq43V/af1v3Ph+6Z9swSrrsNgA8k="; + cargoHash = "sha256-KRRBqRm6/TedzjGRTcbj0q4R9xOgj0PmKEm9rY2f4PM="; patches = [ ./fix_run_checks.patch From 99d62884386e62f420a13577e0f0658adfcb7406 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 02:54:52 +0000 Subject: [PATCH 241/380] server-box: 1.0.1262 -> 1.0.1270 --- pkgs/by-name/se/server-box/gitHashes.json | 6 +++--- pkgs/by-name/se/server-box/package.nix | 4 ++-- pkgs/by-name/se/server-box/pubspec.lock.json | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/se/server-box/gitHashes.json b/pkgs/by-name/se/server-box/gitHashes.json index d91645f03a29..a10caf0c8b05 100644 --- a/pkgs/by-name/se/server-box/gitHashes.json +++ b/pkgs/by-name/se/server-box/gitHashes.json @@ -1,11 +1,11 @@ { "circle_chart": "sha256-BcnL/hRf+Yv2U8Nkl7pc8BtncBW+M2by86jO5IbFIRk=", "computer": "sha256-qaD6jn78zDyZBktwJ4WTQa8oCvCWQJOBDaozBVsXNb8=", - "dartssh2": "sha256-XlbruyraMmZGNRppQdBLS89Qyd7mm5Noiap2BhZjEPw=", + "dartssh2": "sha256-Bl5eLrYU2YnpRcleff3wVXiTS9wuo2A1neiLUClvbGU=", "fl_build": "sha256-e2BUk4WmwFzFrA2iHg4dG8fRqWhNt8KFuTEZgWL7H4g=", - "fl_lib": "sha256-gK9eJ3GiM9fRVUew1xrd/WYf9ITHi++yR0Bt6qlFm98=", + "fl_lib": "sha256-0Dg21LBVIyTH5MLt/v+kGzfOK8PFVYfNiK6P/jcy2jI=", "gtk": "sha256-nt7d2MvIfizxezWhQNm2/yHEzYuPKDvfHGM9Bnq3f04=", "plain_notification_token": "sha256-Cy1/S8bAtKCBnjfDEeW4Q2nP4jtwyCstAC1GH1efu8I=", "watch_connectivity": "sha256-9TyuElr0PNoiUvbSTOakdw1/QwWp6J2GAwzVHsgYWtM=", - "xterm": "sha256-VxAWV40R+rSvYyS9LZoD7GL1K1gwjMnpoKd7hfb48Wo=" + "xterm": "sha256-ujR2aRB9TbaSoGB0vmx75X6683f/tu+Ptj+BFJ2WWVs=" } diff --git a/pkgs/by-name/se/server-box/package.nix b/pkgs/by-name/se/server-box/package.nix index 578c4625c31b..d1dda3c87e75 100644 --- a/pkgs/by-name/se/server-box/package.nix +++ b/pkgs/by-name/se/server-box/package.nix @@ -12,13 +12,13 @@ }: let - version = "1.0.1262"; + version = "1.0.1270"; src = fetchFromGitHub { owner = "lollipopkit"; repo = "flutter_server_box"; tag = "v${version}"; - hash = "sha256-2UJgqNLwVttmc/D4DEhC7oe2yhFNdkvFnOCRVV3WVFk="; + hash = "sha256-3erwb2e9iINe4MVuOQKzBuBdUJyBgW2zIImZwVyll6Q="; }; in flutter335.buildFlutterApplication { diff --git a/pkgs/by-name/se/server-box/pubspec.lock.json b/pkgs/by-name/se/server-box/pubspec.lock.json index a82576bebbd5..1cc8a74af475 100644 --- a/pkgs/by-name/se/server-box/pubspec.lock.json +++ b/pkgs/by-name/se/server-box/pubspec.lock.json @@ -466,8 +466,8 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "v1.0.285", - "resolved-ref": "18fb1ad15ee6d2c8c5ec67722bf8b90fe0f4746d", + "ref": "v1.0.293", + "resolved-ref": "3eedfd55916eede70aeb28605469a43623a9791b", "url": "https://github.com/lollipopkit/dartssh2" }, "source": "git", @@ -628,8 +628,8 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "v1.0.355", - "resolved-ref": "73d5f2603859a9f70459d798ed2d267b1d9a86e5", + "ref": "v1.0.358", + "resolved-ref": "c8e55d054875bb3ccdab9894a01fe82d173dc54e", "url": "https://github.com/lppcg/fl_lib" }, "source": "git", @@ -2322,8 +2322,8 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "v4.0.4", - "resolved-ref": "5747837cdb7b113ef733ce0104e4f2bfa1eb4a36", + "ref": "v4.0.13", + "resolved-ref": "6343b0e5f744d2c11090d34690ad5049ebbc599b", "url": "https://github.com/lollipopkit/xterm.dart" }, "source": "git", From d4bc75e4d497e1b4afc13fccb6797752ac02a065 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Thu, 23 Oct 2025 11:06:05 +0800 Subject: [PATCH 242/380] qq: disable auto updates --- pkgs/by-name/qq/qq/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix index f5933b5ae267..b96313a53e87 100644 --- a/pkgs/by-name/qq/qq/package.nix +++ b/pkgs/by-name/qq/qq/package.nix @@ -37,6 +37,7 @@ let pname = "qq"; inherit (source) version src; passthru = { + # nixpkgs-update: no auto update updateScript = ./update.sh; }; meta = { From 9a2c712f1c90d42e42a57ff0590591aa11e46a58 Mon Sep 17 00:00:00 2001 From: Michael Tibben Date: Thu, 23 Oct 2025 13:17:19 +1100 Subject: [PATCH 243/380] google-cloud-sdk: stop python bytecode from being written --- pkgs/by-name/go/google-cloud-sdk/package.nix | 5 +++-- pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/go/google-cloud-sdk/package.nix b/pkgs/by-name/go/google-cloud-sdk/package.nix index e5c4399649a0..e7014c1a0037 100644 --- a/pkgs/by-name/go/google-cloud-sdk/package.nix +++ b/pkgs/by-name/go/google-cloud-sdk/package.nix @@ -87,6 +87,9 @@ stdenv.mkDerivation rec { ./gsutil-disable-updates.patch ]; + # Prevent Python from writing bytecode to ensure build determinism + PYTHONDONTWRITEBYTECODE = "1"; + installPhase = '' runHook preInstall @@ -161,8 +164,6 @@ stdenv.mkDerivation rec { installCheckPhase = '' # Avoid trying to write logs to homeless-shelter export HOME=$(mktemp -d) - # Prevent Python from writing bytecode to ensure build determinism - export PYTHONDONTWRITEBYTECODE=1 $out/bin/gcloud version --format json | jq '."Google Cloud SDK"' | grep "${version}" $out/bin/gsutil version | grep -w "$(cat platform/gsutil/VERSION)" ''; diff --git a/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix b/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix index e13ea25caac9..9d5a341105dc 100644 --- a/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix +++ b/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix @@ -78,11 +78,12 @@ symlinkJoin { ] ++ comps; + # Prevent Python from writing bytecode to ensure build determinism + PYTHONDONTWRITEBYTECODE = "1"; + postBuild = '' sed -i ';' $out/google-cloud-sdk/bin/.gcloud-wrapped sed -i -e "s#${google-cloud-sdk}#$out#" "$out/google-cloud-sdk/bin/gcloud" - # Prevent Python from writing bytecode to ensure build determinism - export PYTHONDONTWRITEBYTECODE=1 ${installCheck} ''; } From df0b96d06b829be5310e4826d98931aee5d5176d Mon Sep 17 00:00:00 2001 From: thattemperature <2719023332@qq.com> Date: Thu, 23 Oct 2025 11:47:22 +0800 Subject: [PATCH 244/380] emacsPackages.eaf-browser: add Python dependency. --- .../emacs/elisp-packages/manual-packages/eaf-browser/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-browser/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-browser/default.nix index f804b2a65d32..005323cf11f0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-browser/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-browser/default.nix @@ -60,6 +60,7 @@ melpaBuild (finalAttrs: { eafPythonDeps = ps: with ps; [ pysocks + pycookiecheat ]; }; From 991a9130504c96cbef862f7349f3ae2822e10c8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 04:14:43 +0000 Subject: [PATCH 245/380] polylith: 0.2.22 -> 0.3.30 --- pkgs/by-name/po/polylith/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/polylith/package.nix b/pkgs/by-name/po/polylith/package.nix index a91b3e4cecaa..7a33086ce54f 100644 --- a/pkgs/by-name/po/polylith/package.nix +++ b/pkgs/by-name/po/polylith/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "polylith"; - version = "0.2.22"; + version = "0.3.30"; src = fetchurl { url = "https://github.com/polyfy/polylith/releases/download/v${version}/poly-${version}.jar"; - sha256 = "sha256-DKJ669TeDFK/USi7UxraAqgqnSCkG/nSIGphvpsmUv8="; + sha256 = "sha256-G64sbV671fY+k/tYy8Kq/cAGXLzbZY1g+HyzOw29D24="; }; dontUnpack = true; From 752df2baf874fae065183ceba45766b775d1c30c Mon Sep 17 00:00:00 2001 From: kruziikrel13 Date: Sun, 19 Oct 2025 17:10:11 +1000 Subject: [PATCH 246/380] maintainers: add kruziikrel13 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0948524fc6a4..7065ddde4ea1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13989,6 +13989,12 @@ name = "Tomas Krupka"; matrix = "@krupkat:matrix.org"; }; + kruziikrel13 = { + github = "kruziikrel13"; + name = "Michael Petersen"; + email = "dev@michaelpetersen.io"; + githubId = 72793125; + }; krzaczek = { name = "Pawel Krzaczkowski"; email = "pawel@printu.pl"; From cfa2f785b1d141ef7a81f13d6f94777a1fc6a5a6 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Wed, 22 Oct 2025 23:50:06 -0600 Subject: [PATCH 247/380] nheko: fix build for Qt 6.10 --- pkgs/by-name/nh/nheko/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/nh/nheko/package.nix b/pkgs/by-name/nh/nheko/package.nix index c48c23697788..cd012dbd780b 100644 --- a/pkgs/by-name/nh/nheko/package.nix +++ b/pkgs/by-name/nh/nheko/package.nix @@ -43,6 +43,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-y8aiS6h5CSJYBdsAH4jYhAyrFug7aH2H8L6rBfULnQQ="; }) ./fix-darwin-build.patch + # Fix for Qt 6.10 + (fetchpatch { + url = "https://github.com/Nheko-Reborn/nheko/commit/af2ca72030deb14a920a888e807dc732d93e3714.patch"; + hash = "sha256-tlYrfEoUkdJoVzvfF34IhXdn1AxLO0MOlp9rzuFivws="; + }) ]; nativeBuildInputs = [ From c15126c336b7ccd9e75743746cea8684a2cb26b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Oct 2025 22:59:31 -0700 Subject: [PATCH 248/380] python3Packages.clarifai: unpin psutil --- pkgs/development/python-modules/clarifai/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index 56e2a74ca67f..c3efbb15880f 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { "clarifai-protocol" "click" "fsspec" + "psutil" "ruff" "schema" "uv" From 60080e9f64f5c44857a2d8bd07c31a9e399e7ec8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 06:15:52 +0000 Subject: [PATCH 249/380] libretro.mame2003: 0-unstable-2025-08-26 -> 0-unstable-2025-10-21 --- pkgs/applications/emulators/libretro/cores/mame2003.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/mame2003.nix b/pkgs/applications/emulators/libretro/cores/mame2003.nix index 57cce733e2ec..e20163bf9ff0 100644 --- a/pkgs/applications/emulators/libretro/cores/mame2003.nix +++ b/pkgs/applications/emulators/libretro/cores/mame2003.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mame2003"; - version = "0-unstable-2025-08-26"; + version = "0-unstable-2025-10-21"; src = fetchFromGitHub { owner = "libretro"; repo = "mame2003-libretro"; - rev = "dfddf4db86a3acd5997ce9419c7afd00ff6587a0"; - hash = "sha256-GJRawFdlHCfBRiErJJ3ZvZDF1gvYVkuQvKXV1qUCCRQ="; + rev = "3570605767a447c13b087a5946189bcbafe11e1d"; + hash = "sha256-BcPiNYEi6uE8aSpPDNgZ8vmzSnZJUparEM3CEdexbPo="; }; # Fix build with GCC 14 From 47281f1b0c68c86aa6822e67f9232c49376205fc Mon Sep 17 00:00:00 2001 From: wrvsrx Date: Thu, 23 Oct 2025 12:59:21 +0800 Subject: [PATCH 250/380] conky: fix build failure --- pkgs/os-specific/linux/conky/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 8f32a4310e89..7c6524367e1a 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -9,6 +9,7 @@ # dependencies glib, + libxfixes, libXinerama, catch2, gperf, @@ -129,6 +130,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional ncursesSupport ncurses ++ lib.optionals x11Support [ freetype + libxfixes xorg.libICE xorg.libX11 xorg.libXext From 81e87b9bd8a822a3ab9164831d8f176b4cd4ca3b Mon Sep 17 00:00:00 2001 From: Lan Tian Date: Sat, 18 Oct 2025 21:18:45 -0700 Subject: [PATCH 251/380] glauth: 2.3.2 -> 2.4.0 Changelog: https://github.com/glauth/glauth/releases/tag/v2.4.0 Also added versionCheckHook and switch to more commonly used finalAttrs structure. Using the go work vendor workaround from mattermost package, since building without go workspace fail with some mysterious errors. --- pkgs/by-name/gl/glauth/package.nix | 43 ++++++++++++++++-------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/gl/glauth/package.nix b/pkgs/by-name/gl/glauth/package.nix index 845080180656..5f07e0f79d90 100644 --- a/pkgs/by-name/gl/glauth/package.nix +++ b/pkgs/by-name/gl/glauth/package.nix @@ -2,53 +2,56 @@ lib, fetchFromGitHub, buildGoModule, - oath-toolkit, - openldap, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "glauth"; - version = "2.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "glauth"; repo = "glauth"; - rev = "v${version}"; - hash = "sha256-FOhtL8nIm5kuKRxFtkrDyUU2z1K22ZdHaes3GY0KmfQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-UUTL+ZnHRSYuD/TUYpsuo+Nu90kpA8ZL4XaGz6in3ME="; }; - vendorHash = "sha256-MfauZRufl3kxr1fqatxTmiIvLJ+5JhbpSnbTHiujME8="; + vendorHash = "sha256-Lijy0LFy0PgWogdzYRNPFOkLym6Gf9qG4R+Bm91eYJg="; - nativeCheckInputs = [ - oath-toolkit - openldap - ]; + postPatch = '' + substituteInPlace v2/internal/version/const.go \ + --replace-fail '"v2.3.1"' '"v${finalAttrs.version}"' + ''; - modRoot = "v2"; + # Builds without go workspace fail with mysterious errors + overrideModAttrs = _: { + buildPhase = '' + go work vendor -e -v + ''; + }; - # Disable go workspaces to fix build. - env.GOWORK = "off"; - - # Based on ldflags in /Makefile. ldflags = [ "-s" "-w" - "-X main.GitClean=1" - "-X main.LastGitTag=v${version}" - "-X main.GitTagIsCommit=1" ]; # Tests fail in the sandbox. doCheck = false; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgramArg = "--version"; + meta = with lib; { description = "Lightweight LDAP server for development, home use, or CI"; homepage = "https://github.com/glauth/glauth"; + changelog = "https://github.com/glauth/glauth/releases/tag/v${finalAttrs.version}"; license = licenses.mit; maintainers = with maintainers; [ bjornfor christoph-heiss + xddxdd ]; mainProgram = "glauth"; }; -} +}) From 6e34ca27418bdbc560275f66cacc8771e3e22fe9 Mon Sep 17 00:00:00 2001 From: kruziikrel13 Date: Thu, 23 Oct 2025 16:48:23 +1000 Subject: [PATCH 252/380] keychron-udev-rules: init at 23-10-2025 --- .../ke/keychron-udev-rules/package.nix | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/ke/keychron-udev-rules/package.nix diff --git a/pkgs/by-name/ke/keychron-udev-rules/package.nix b/pkgs/by-name/ke/keychron-udev-rules/package.nix new file mode 100644 index 000000000000..374ef9ff2a57 --- /dev/null +++ b/pkgs/by-name/ke/keychron-udev-rules/package.nix @@ -0,0 +1,37 @@ +{ + lib, + stdenvNoCC, + udevCheckHook, + writeTextFile, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "keychron-udev-rules"; + version = "23-10-2025"; + + nativeBuildInputs = [ udevCheckHook ]; + + src = writeTextFile { + name = "69-keychron.rules"; + text = '' + KERNEL=="event*", SUBSYSTEM=="input", ENV{ID_VENDOR_ID}=="3434", ENV{ID_INPUT_JOYSTICK}=="*?", ENV{ID_INPUT_JOYSTICK}="" + ''; + }; + + dontConfigure = true; + dontUnpack = true; + dontBuild = true; + dontFixup = true; + + installPhase = '' + runHook preInstall + install -Dm644 $src $out/lib/udev/rules.d/69-keychron.rules + runHook postInstall + ''; + + meta = with lib; { + description = "Keychron Keyboard Udev Rules, fixes issues with keyboard detection on Linux"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ kruziikrel13 ]; + }; +}) From 5cd26d1051279ba434024457cf3dabb67a54a1b6 Mon Sep 17 00:00:00 2001 From: kruziikrel13 Date: Thu, 23 Oct 2025 16:48:31 +1000 Subject: [PATCH 253/380] nixos/qmk: add keychron support --- nixos/modules/hardware/keyboard/qmk.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/hardware/keyboard/qmk.nix b/nixos/modules/hardware/keyboard/qmk.nix index 6690deca3506..b3fb02858b1d 100644 --- a/nixos/modules/hardware/keyboard/qmk.nix +++ b/nixos/modules/hardware/keyboard/qmk.nix @@ -8,15 +8,18 @@ let cfg = config.hardware.keyboard.qmk; inherit (lib) mkEnableOption mkIf; - in { options.hardware.keyboard.qmk = { enable = mkEnableOption "non-root access to the firmware of QMK keyboards"; + keychronSupport = mkEnableOption "udev rules for keychron QMK based keyboards"; }; config = mkIf cfg.enable { - services.udev.packages = [ pkgs.qmk-udev-rules ]; + services.udev.packages = [ + pkgs.qmk-udev-rules + ] + ++ lib.optionals cfg.keychronSupport [ pkgs.keychron-udev-rules ]; users.groups.plugdev = { }; }; } From eacb4ac5f0c7f95f63b645ea1ed67fd543cc5a09 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Thu, 23 Oct 2025 14:51:49 +0800 Subject: [PATCH 254/380] pwvucontrol: 0.4.9 -> 0.5.1 Diff: https://github.com/saivert/pwvucontrol/compare/0.4.9...0.5.1 --- pkgs/by-name/pw/pwvucontrol/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pw/pwvucontrol/package.nix b/pkgs/by-name/pw/pwvucontrol/package.nix index 35dab5a2f0e9..699f37ee388f 100644 --- a/pkgs/by-name/pw/pwvucontrol/package.nix +++ b/pkgs/by-name/pw/pwvucontrol/package.nix @@ -43,18 +43,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "pwvucontrol"; - version = "0.4.9"; + version = "0.5.1"; src = fetchFromGitHub { owner = "saivert"; repo = "pwvucontrol"; tag = finalAttrs.version; - hash = "sha256-fmEXVUz3SerVgWijT/CAoelSUzq861AkBVjP5qwS0ao="; + hash = "sha256-21TBVDzjrBzNIPkAURGs2ngI8Vj6o/RL3Ael4wwE2Lk="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-oQSH4P9WxvkXZ53KM5ZoRAZyQFt60Zz7guBbgT1iiBk="; + hash = "sha256-FrPpLbfqM/DtjYu20pwr1AMUHaAuTEt60I3JlFZO4RI="; }; postPatch = '' From 17fd98922434bf66cdad4f01379d4e76178951e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 06:52:39 +0000 Subject: [PATCH 255/380] comrak: 0.44.0 -> 0.45.0 --- pkgs/by-name/co/comrak/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix index 8773e0922cdc..d704ccfb4132 100644 --- a/pkgs/by-name/co/comrak/package.nix +++ b/pkgs/by-name/co/comrak/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "comrak"; - version = "0.44.0"; + version = "0.45.0"; src = fetchFromGitHub { owner = "kivikakk"; repo = "comrak"; rev = "v${version}"; - sha256 = "sha256-qwwROwIFG9/pX8t92EHriaN3O4Z2IpQGylVKhbp/0IU="; + sha256 = "sha256-+87K5ITDrF/nH1H4z8zyqQlJnviOlRdNnV8v6xsS0uM="; }; - cargoHash = "sha256-Ybyrk+I0nzHFkEaWDovTOGPC26i7BXcNtFgFjmCHIwM="; + cargoHash = "sha256-efUiKSEsD+GguhriTpLmsyUxpQYzwr4rHJAC9FHMzdU="; meta = { description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter"; From a2d88e8b7b1a0237a484935adb1c863776d43c44 Mon Sep 17 00:00:00 2001 From: Sav Tripodi Date: Thu, 23 Oct 2025 09:10:31 +0200 Subject: [PATCH 256/380] maintainers: add savtrip --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0948524fc6a4..d3a59e2ad27e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -23072,6 +23072,11 @@ githubId = 99875823; name = "Michael Savedra"; }; + savtrip = { + github = "savtrip"; + githubId = 42227195; + name = "Sav Tripodi"; + }; savyajha = { email = "savya.jha@hawkradius.com"; github = "savyajha"; From 86c3b4dc4195c60a7cece3017a1d44cb03e7962b Mon Sep 17 00:00:00 2001 From: Sav Tripodi Date: Thu, 23 Oct 2025 09:12:43 +0200 Subject: [PATCH 257/380] python3Packages.copier: add savtrip as maintainer --- pkgs/development/python-modules/copier/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/copier/default.nix b/pkgs/development/python-modules/copier/default.nix index ccfd20310fb3..bc0e79c3867a 100644 --- a/pkgs/development/python-modules/copier/default.nix +++ b/pkgs/development/python-modules/copier/default.nix @@ -79,7 +79,10 @@ buildPythonPackage rec { homepage = "https://copier.readthedocs.io"; changelog = "https://github.com/copier-org/copier/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ greg ]; + maintainers = with lib.maintainers; [ + greg + savtrip + ]; mainProgram = "copier"; }; } From d18f7100272567f2d0a8956a54fa7b8611a7248b Mon Sep 17 00:00:00 2001 From: Sav Tripodi Date: Thu, 23 Oct 2025 09:13:45 +0200 Subject: [PATCH 258/380] hugo: add savtrip as maintainer --- pkgs/by-name/hu/hugo/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 075233ed7010..c29355592438 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -83,6 +83,7 @@ buildGoModule (finalAttrs: { maintainers = with lib.maintainers; [ Br1ght0ne Frostman + savtrip ]; }; }) From f9ff37cdc3ade4bc45f501af0e7f7520a9543f1c Mon Sep 17 00:00:00 2001 From: Sav Tripodi Date: Thu, 23 Oct 2025 09:15:11 +0200 Subject: [PATCH 259/380] maintainers: add savtrip to beam team --- maintainers/team-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index f23ccf22f840..89fcb5dc007e 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -115,6 +115,7 @@ with lib.maintainers; happysalada minijackson yurrriq + savtrip ]; github = "beam"; scope = "Maintain BEAM-related packages and modules."; From f19caec025a2b849442aae384f73705ebe1c72b1 Mon Sep 17 00:00:00 2001 From: Sav Tripodi Date: Thu, 23 Oct 2025 09:16:15 +0200 Subject: [PATCH 260/380] gum: add savtrip as maintainer --- pkgs/by-name/gu/gum/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gu/gum/package.nix b/pkgs/by-name/gu/gum/package.nix index afbcd246a4af..20858d53c588 100644 --- a/pkgs/by-name/gu/gum/package.nix +++ b/pkgs/by-name/gu/gum/package.nix @@ -48,7 +48,10 @@ buildGoModule rec { homepage = "https://github.com/charmbracelet/gum"; changelog = "https://github.com/charmbracelet/gum/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ maaslalani ]; + maintainers = with lib.maintainers; [ + maaslalani + savtrip + ]; mainProgram = "gum"; }; } From ee5be45861af29137e5b527b2f2e43895523fef3 Mon Sep 17 00:00:00 2001 From: Sav Tripodi Date: Thu, 23 Oct 2025 09:17:18 +0200 Subject: [PATCH 261/380] pre-commit: add savtrip as maintainer --- pkgs/by-name/pr/pre-commit/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix index 7e5f493deb05..31ffa0a866c6 100644 --- a/pkgs/by-name/pr/pre-commit/package.nix +++ b/pkgs/by-name/pr/pre-commit/package.nix @@ -222,7 +222,10 @@ python3Packages.buildPythonApplication rec { homepage = "https://pre-commit.com/"; changelog = "https://github.com/pre-commit/pre-commit/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ borisbabic ]; + maintainers = with lib.maintainers; [ + borisbabic + savtrip + ]; mainProgram = "pre-commit"; }; } From 3ce779cd41f2a81282122d634b87831a978028f4 Mon Sep 17 00:00:00 2001 From: David Morgan Date: Wed, 22 Oct 2025 17:19:18 +0100 Subject: [PATCH 262/380] msgpack-tools: Fix build Co-authored-by: Petr Zahradnik --- pkgs/by-name/ms/msgpack-tools/cmake-v4.patch | 8 +++ pkgs/by-name/ms/msgpack-tools/package.nix | 61 ++++++++++------- .../ms/msgpack-tools/use-nix-deps.patch | 67 +++++++++++++++++++ 3 files changed, 111 insertions(+), 25 deletions(-) create mode 100644 pkgs/by-name/ms/msgpack-tools/cmake-v4.patch create mode 100644 pkgs/by-name/ms/msgpack-tools/use-nix-deps.patch diff --git a/pkgs/by-name/ms/msgpack-tools/cmake-v4.patch b/pkgs/by-name/ms/msgpack-tools/cmake-v4.patch new file mode 100644 index 000000000000..7b2efd41bcb5 --- /dev/null +++ b/pkgs/by-name/ms/msgpack-tools/cmake-v4.patch @@ -0,0 +1,8 @@ +--- a/CMakeLists.txt 2025-10-23 07:12:12.766221736 +0100 ++++ b/CMakeLists.txt 2025-10-23 07:14:58.069499300 +0100 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 2.6...3.10) + + include(GNUInstallDirs) + include(CheckCCompilerFlag) diff --git a/pkgs/by-name/ms/msgpack-tools/package.nix b/pkgs/by-name/ms/msgpack-tools/package.nix index e62af58ae1c1..610b356ebd88 100644 --- a/pkgs/by-name/ms/msgpack-tools/package.nix +++ b/pkgs/by-name/ms/msgpack-tools/package.nix @@ -1,51 +1,62 @@ { lib, stdenv, - fetchurl, fetchFromGitHub, + fetchurl, cmake, + rapidjson, + replaceVars, + libb64, + versionCheckHook, }: - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "msgpack-tools"; version = "0.6"; src = fetchFromGitHub { owner = "ludocode"; repo = "msgpack-tools"; - rev = "v${version}"; - sha256 = "1ygjk25zlpqjckxgqmahnz999704zy2bd9id6hp5jych1szkjgs5"; - }; - - libb64 = fetchurl { - url = "mirror://sourceforge/libb64/libb64-1.2.1.zip"; - sha256 = "1chlcc8qggzxnbpy5wrda533xyz38dk20w9wl4srrzawm45ny410"; - }; - - rapidjson = fetchurl { - url = "https://github.com/miloyip/rapidjson/archive/99ba17bd66a85ec64a2f322b68c2b9c3b77a4391.tar.gz"; - sha256 = "0jxgyy5n0lf9w36dycwwgz2wici4z9dnxlsn0z6m23zaa47g3wyw"; + rev = "v${finalAttrs.version}"; + hash = "sha256-RT85vw6QeVkuNC2mtoT/BJyU0rdQVfz6ZBJf+ouY8vk="; }; mpack = fetchurl { url = "https://github.com/ludocode/mpack/archive/df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz"; - sha256 = "1br8g3rf86h8z8wbqkd50aq40953862lgn0xk7cy68m07fhqc3pg"; + hash = "sha256-hyiXygbAHnNgF4TIg+DemBvtdBnSgJ7fAhknVuL+T/c="; }; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + rapidjson + libb64 + ]; + + patches = [ + ./cmake-v4.patch + (replaceVars ./use-nix-deps.patch { + rapidjson = "${rapidjson}"; + libb64 = "${libb64}"; + }) + ]; + postUnpack = '' mkdir $sourceRoot/contrib - cp ${rapidjson} $sourceRoot/contrib/rapidjson-99ba17bd66a85ec64a2f322b68c2b9c3b77a4391.tar.gz - cp ${libb64} $sourceRoot/contrib/libb64-1.2.1.zip - cp ${mpack} $sourceRoot/contrib/mpack-df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz + cp ${finalAttrs.mpack} $sourceRoot/contrib/mpack-df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz ''; - nativeBuildInputs = [ cmake ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/json2msgpack"; + versionCheckProgramArg = "-v"; + doInstallCheck = true; - meta = with lib; { + meta = { description = "Command-line tools for converting between MessagePack and JSON"; homepage = "https://github.com/ludocode/msgpack-tools"; - license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; - maintainers = [ ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ deejayem ]; }; -} +}) diff --git a/pkgs/by-name/ms/msgpack-tools/use-nix-deps.patch b/pkgs/by-name/ms/msgpack-tools/use-nix-deps.patch new file mode 100644 index 000000000000..e9ea671cddd6 --- /dev/null +++ b/pkgs/by-name/ms/msgpack-tools/use-nix-deps.patch @@ -0,0 +1,67 @@ +--- a/CMakeLists.txt 2017-01-22 19:51:41.000000000 +0000 ++++ b/CMakeLists.txt 2025-10-04 14:08:24.934041902 +0100 +@@ -83,57 +83,21 @@ + + # rapidjson + +-set(RAPIDJSON_FILE "rapidjson-${RAPIDJSON_COMMIT}.tar.gz") +-set(RAPIDJSON_DIR "${CONTRIB_DIR}/rapidjson-${RAPIDJSON_COMMIT}") +-set(RAPIDJSON_URL "https://github.com/miloyip/rapidjson/archive/${RAPIDJSON_COMMIT}.tar.gz") +- +-if(EXISTS "${CMAKE_SOURCE_DIR}/contrib/${RAPIDJSON_FILE}") +- message(STATUS "Found package: ${RAPIDJSON_FILE}") +-else() +- message(STATUS "Downloading: ${RAPIDJSON_FILE}") +- file(DOWNLOAD ${RAPIDJSON_URL} "${CMAKE_SOURCE_DIR}/contrib/${RAPIDJSON_FILE}") +- if(NOT EXISTS "${CMAKE_SOURCE_DIR}/contrib/${RAPIDJSON_FILE}") +- message(FATAL_ERROR "\nFailed to download source file: ${RAPIDJSON_FILE}\nFrom: ${RAPIDJSON_URL}") +- endif() +-endif() +- +-execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf ${CMAKE_SOURCE_DIR}/contrib/${RAPIDJSON_FILE} WORKING_DIRECTORY ${CONTRIB_DIR}) +- +-include_directories(SYSTEM ${RAPIDJSON_DIR}/include) ++include_directories(SYSTEM @rapidjson@/include) + + + # libb64 + +-set(LIBB64_FILE "libb64-${LIBB64_VERSION}.zip") +-set(LIBB64_DIR "${CONTRIB_DIR}/libb64-${LIBB64_VERSION}") +-set(LIBB64_URL "http://downloads.sourceforge.net/project/libb64/libb64/libb64/${LIBB64_FILE}?use_mirror=autoselect") +- +-if(EXISTS "${CMAKE_SOURCE_DIR}/contrib/${LIBB64_FILE}") +- message(STATUS "Found package: ${LIBB64_FILE}") +-else() +- message(STATUS "Downloading: ${LIBB64_FILE}") +- file(DOWNLOAD ${LIBB64_URL} "${CMAKE_SOURCE_DIR}/contrib/${LIBB64_FILE}") +- if(NOT EXISTS "${CMAKE_SOURCE_DIR}/contrib/${LIBB64_FILE}") +- message(FATAL_ERROR "\nFailed to download source file: ${LIBB64_FILE}\nFrom: ${LIBB64_URL}") +- endif() +-endif() +- +-execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${CMAKE_SOURCE_DIR}/contrib/${LIBB64_FILE}" WORKING_DIRECTORY "${CONTRIB_DIR}") +- +-# Remove libb64's newlines +-set(LIBB64_CENCODE_FILE ${LIBB64_DIR}/src/cencode.c) +-file(READ ${LIBB64_CENCODE_FILE} LIBB64_CENCODE) +-string(REPLACE "*codechar++ = '\\n';" "/* *codechar++ = '\\n'; */" LIBB64_CENCODE "${LIBB64_CENCODE}") +-file(WRITE ${LIBB64_CENCODE_FILE} "${LIBB64_CENCODE}") +- +-file(GLOB_RECURSE LIBB64_SRCS ${LIBB64_DIR}/src/*.c) +-include_directories(SYSTEM ${LIBB64_DIR}/include) ++include_directories(SYSTEM @libb64@/include) + + + # executable targets + +-add_executable(msgpack2json src/msgpack2json.cpp ${MPACK_SRCS} ${LIBB64_SRCS}) +-add_executable(json2msgpack src/json2msgpack.cpp ${MPACK_SRCS} ${LIBB64_SRCS}) ++add_executable(msgpack2json src/msgpack2json.cpp ${MPACK_SRCS}) ++add_executable(json2msgpack src/json2msgpack.cpp ${MPACK_SRCS}) ++ ++target_link_libraries(msgpack2json b64) ++target_link_libraries(json2msgpack b64) + + install(TARGETS msgpack2json json2msgpack DESTINATION bin) + From 8b87a0cff195c3903df37eacfb3a737126210247 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 07:27:05 +0000 Subject: [PATCH 263/380] python3Packages.disposable-email-domains: 0.0.140 -> 0.0.143 --- .../python-modules/disposable-email-domains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/disposable-email-domains/default.nix b/pkgs/development/python-modules/disposable-email-domains/default.nix index a991f326bd7f..267bad65f450 100644 --- a/pkgs/development/python-modules/disposable-email-domains/default.nix +++ b/pkgs/development/python-modules/disposable-email-domains/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "disposable-email-domains"; - version = "0.0.140"; + version = "0.0.143"; pyproject = true; # No tags on GitHub src = fetchPypi { pname = "disposable_email_domains"; inherit version; - hash = "sha256-7BLx7zXb3JsdX8ty9wEfO4CW5zOxIrTyYW2C8k4ZkLg="; + hash = "sha256-AOQbmUHx6nQYnKzOlPSh+r/Fzn2r2CtsTGYswnJI05E="; }; build-system = [ From febb9368d3435025b39b9667de9817dc80cce9ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 04:09:57 +0000 Subject: [PATCH 264/380] cargo-tauri: 2.8.4 -> 2.9.1 --- pkgs/by-name/ca/cargo-tauri/package.nix | 6 +++--- pkgs/by-name/ca/cargo-tauri/test-app.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index dedff8b05ab8..119d6352fdfa 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tauri"; - version = "2.8.4"; + version = "2.9.1"; src = fetchFromGitHub { owner = "tauri-apps"; repo = "tauri"; tag = "tauri-cli-v${finalAttrs.version}"; - hash = "sha256-fp/ODsbZTQdMkkRu9QqTQfavq0RPfSzZm1l4sE1hacc="; + hash = "sha256-MOhcTG8r7kDVTg5PY1rmrkd8U94CqT7RdPSfaakqf2M="; }; - cargoHash = "sha256-l1IF9R+KeXAjs8Dy59mZNOCX0eoskotBPbltKU3nHQ8="; + cargoHash = "sha256-lWBCMS7xFEqXPpMpBzfZmdwQOq8Yaux83FGFaRyaBNg="; nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [ pkg-config diff --git a/pkgs/by-name/ca/cargo-tauri/test-app.nix b/pkgs/by-name/ca/cargo-tauri/test-app.nix index fd5f5f359972..ae91d53e172f 100644 --- a/pkgs/by-name/ca/cargo-tauri/test-app.nix +++ b/pkgs/by-name/ca/cargo-tauri/test-app.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ; fetcherVersion = 1; - hash = "sha256-7F2vk6WUeXunTuXX9J0rVhl2I0ENYagRdqTy+WAXBB8="; + hash = "sha256-gHniZv847JFrmKnTUZcgyWhFl/ovJ5IfKbbM5I21tZc="; }; nativeBuildInputs = [ From 93bacc97666e1601e9758d96080b4893b15b9fe4 Mon Sep 17 00:00:00 2001 From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com> Date: Thu, 23 Oct 2025 10:05:20 +0200 Subject: [PATCH 265/380] pcloud: 1.14.16 -> 1.14.17 Changelog: https://www.pcloud.com/release-notes/linux.html - 1.14.17 (22/10/2025) - Fixed high CPU usage when using VPN. --- pkgs/by-name/pc/pcloud/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix index 8569087b9db8..12dcb5eb4d2f 100644 --- a/pkgs/by-name/pc/pcloud/package.nix +++ b/pkgs/by-name/pc/pcloud/package.nix @@ -39,13 +39,13 @@ let pname = "pcloud"; - version = "1.14.16"; - code = "XZbJvD5ZfXtwygX5xg7F9ywtRup5H5sBvfhy"; + version = "1.14.17"; + code = "XZNtR95ZctUIq8zYVD7eSKotwGMx7kDWVtzV"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip"; - hash = "sha256-6K7QPr3MtZvRZt84N8+i8QZBaKHHeTY1bXMdO+wUCr0="; + hash = "sha256-Chh8obZHntkiG7IJAW96T9y3KcOwzI18/VALheLcxBA="; }; appimageContents = appimageTools.extractType2 { From 207f23bf08f0c30c0f30ae9054c2a6014b08d2aa Mon Sep 17 00:00:00 2001 From: Zhaith Izaliel Date: Wed, 22 Oct 2025 22:33:42 +0200 Subject: [PATCH 266/380] nixos/iio-niri: init module --- .../manual/release-notes/rl-2111.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/programs/iio-niri.nix | 59 +++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 nixos/modules/programs/iio-niri.nix diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index bf39afd98627..40a1a37483d7 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -166,6 +166,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [twingate](https://docs.twingate.com/docs/linux), a high performance, easy to use zero trust solution that enables access to private resources from any device with better security than a VPN. +- [iio-niri](https://github.com/Zhaith-Izaliel/iio-niri), a utils that listens to `iio-sensor-proxy` and updates Niri output orientation depending on the accelerometer orientation. + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} - The NixOS VM test framework, `pkgs.nixosTest`/`make-test-python.nix` (`pkgs.testers.nixosTest` since 22.05), now requires detaching commands such as `succeed("foo &")` and `succeed("foo | xclip -i")` to close stdout. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2b98c1cc23e1..0fb8a9220d75 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -240,6 +240,7 @@ ./programs/iay.nix ./programs/iftop.nix ./programs/iio-hyprland.nix + ./programs/iio-niri.nix ./programs/immersed.nix ./programs/iotop.nix ./programs/java.nix diff --git a/nixos/modules/programs/iio-niri.nix b/nixos/modules/programs/iio-niri.nix new file mode 100644 index 000000000000..2c2810b0ee0f --- /dev/null +++ b/nixos/modules/programs/iio-niri.nix @@ -0,0 +1,59 @@ +{ + config, + lib, + pkgs, + ... +}: +let + inherit (lib) + mkEnableOption + mkPackageOption + mkOption + types + mkIf + getExe + escapeShellArgs + mkDefault + ; + cfg = config.services.iio-niri; +in +{ + options.services.iio-niri = { + enable = mkEnableOption "IIO-Niri"; + + package = mkPackageOption pkgs "iio-niri" { }; + + niriUnit = mkOption { + type = types.nonEmptyStr; + default = "niri.service"; + description = "The Niri **user** service unit to bind IIO-Niri's **user** service unit to."; + }; + + extraArgs = mkOption { + type = types.listOf types.str; + default = [ ]; + description = "Extra arguments to pass to IIO-Niri."; + }; + }; + + config = mkIf cfg.enable { + hardware.sensor.iio.enable = mkDefault true; + + environment.systemPackages = [ cfg.package ]; + + systemd.user.services.iio-niri = { + description = "IIO-Niri"; + wantedBy = [ cfg.niriUnit ]; + bindsTo = [ cfg.niriUnit ]; + partOf = [ cfg.niriUnit ]; + after = [ cfg.niriUnit ]; + serviceConfig = { + Type = "simple"; + ExecStart = "${getExe cfg.package} ${escapeShellArgs cfg.extraArgs}"; + Restart = "on-failure"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ zhaithizaliel ]; +} From 592249e4960661d15f392615c7122a3fff228317 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 08:20:01 +0000 Subject: [PATCH 267/380] urn-timer: 0-unstable-2025-08-07 -> 0-unstable-2025-10-18 --- pkgs/by-name/ur/urn-timer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ur/urn-timer/package.nix b/pkgs/by-name/ur/urn-timer/package.nix index c56e8686fa98..f8e23e4da99a 100644 --- a/pkgs/by-name/ur/urn-timer/package.nix +++ b/pkgs/by-name/ur/urn-timer/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation { pname = "urn-timer"; - version = "0-unstable-2025-08-07"; + version = "0-unstable-2025-10-18"; src = fetchFromGitHub { owner = "paoloose"; repo = "urn"; - rev = "7acdab69eaec05f173d95eff190e5d7a03db8847"; - hash = "sha256-jFatHlkQr6O9E2pKroFWk6F2BccnfSr1pq43Q5qQbC4="; + rev = "cae0763f7d5c0d895faf6d2ab7448d1b05b60dff"; + hash = "sha256-jG+Xibdsu53/aycUf/TzsQtegGY/buwswJ9ediZIJ4w="; }; nativeBuildInputs = [ From ce9d71d3e051ee7a53a9f6ae9101d3516801b0aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 08:21:19 +0000 Subject: [PATCH 268/380] searxng: 0-unstable-2025-10-17 -> 0-unstable-2025-10-23 --- pkgs/by-name/se/searxng/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index 0a3d216255e5..745c3b3b087e 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -13,14 +13,14 @@ in python.pkgs.toPythonModule ( python.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "0-unstable-2025-10-17"; + version = "0-unstable-2025-10-23"; pyproject = true; src = fetchFromGitHub { owner = "searxng"; repo = "searxng"; - rev = "57622793bf80b90a651a566178ae139f64ea5d93"; - hash = "sha256-LKv/WS8aAgD8s1T7aHeHrkDMVy/E5FiuJEoM+80KLb4="; + rev = "e363db970c77e9cab8f3611bb6b6f8a59646a035"; + hash = "sha256-phJRQ+euSTEmsn1wS5dgO8UPwAJ8cr8ov3K3fSzWQVA="; }; nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ]; From 80edfe6d33b064087549928e0910f2e640106026 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Thu, 23 Oct 2025 12:10:14 +0300 Subject: [PATCH 269/380] twemoji-color-font: use fetchzip and replace `sha256` attr with `hash` --- pkgs/by-name/tw/twemoji-color-font/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tw/twemoji-color-font/package.nix b/pkgs/by-name/tw/twemoji-color-font/package.nix index d55af5b4b6e9..de84e1d07c88 100644 --- a/pkgs/by-name/tw/twemoji-color-font/package.nix +++ b/pkgs/by-name/tw/twemoji-color-font/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchzip, }: stdenv.mkDerivation (finalAttrs: { @@ -10,9 +10,9 @@ stdenv.mkDerivation (finalAttrs: { # We fetch the prebuilt font because building it takes 1.5 hours on hydra. # Relevant issue: https://github.com/NixOS/nixpkgs/issues/97871 - src = fetchurl { + src = fetchzip { url = "https://github.com/eosrei/twemoji-color-font/releases/download/v${finalAttrs.version}/TwitterColorEmoji-SVGinOT-Linux-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-yKUwLuTkwhiM54Xt2ExQxhagf26Z/huRrsuk4ds0EpU="; + hash = "sha256-Xy6Lkm340ldm9ssQWn/eRFIJ5kyhYaXPNy/Y/9vUt40="; }; dontBuild = true; From 1b60052baee28c92a5079e4bd060dca33d6cf017 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Thu, 23 Oct 2025 12:12:44 +0300 Subject: [PATCH 270/380] twemoji-color-font: improve phases - `dontBuild` is redundant, there's no Makefile in the source - run pre- and postInstall hooks --- pkgs/by-name/tw/twemoji-color-font/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tw/twemoji-color-font/package.nix b/pkgs/by-name/tw/twemoji-color-font/package.nix index de84e1d07c88..c4d9048f3ec5 100644 --- a/pkgs/by-name/tw/twemoji-color-font/package.nix +++ b/pkgs/by-name/tw/twemoji-color-font/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Xy6Lkm340ldm9ssQWn/eRFIJ5kyhYaXPNy/Y/9vUt40="; }; - dontBuild = true; - installPhase = '' + runHook preInstall install -Dm755 TwitterColorEmoji-SVGinOT.ttf $out/share/fonts/truetype/TwitterColorEmoji-SVGinOT.ttf install -Dm644 fontconfig/46-twemoji-color.conf $out/etc/fonts/conf.d/46-twemoji-color.conf + runHook postInstall ''; meta = with lib; { From 4234ac2686733c0a93a31b9469e18354ee3b4cf0 Mon Sep 17 00:00:00 2001 From: Angelo Delefortrie Date: Thu, 23 Oct 2025 11:02:58 +0200 Subject: [PATCH 271/380] swagger-typescript-api: 13.2.8 -> 13.2.16 --- .../missing-hashes.json | 136 +++++++++--------- .../sw/swagger-typescript-api/package.nix | 6 +- 2 files changed, 73 insertions(+), 69 deletions(-) diff --git a/pkgs/by-name/sw/swagger-typescript-api/missing-hashes.json b/pkgs/by-name/sw/swagger-typescript-api/missing-hashes.json index 4600a0aeaff9..e69a0ea7abd4 100644 --- a/pkgs/by-name/sw/swagger-typescript-api/missing-hashes.json +++ b/pkgs/by-name/sw/swagger-typescript-api/missing-hashes.json @@ -1,68 +1,72 @@ { - "@biomejs/cli-darwin-arm64@npm:2.1.4": "11ec854dec62d9ba34df3ce240a6baca6ff78d41d2bbcfed47741f3c13566007a93f60290eb043d6e4bc4b5f7997ebcbd843781d6cdadb74368bad788e7f8d86", - "@biomejs/cli-darwin-x64@npm:2.1.4": "e35434896cb45410cd2565d1c476526c6ac0421368d27624a84b12993ccb8afdd5b8b45eaec9b4fe92497a0718ecb6d0ff26de4d8d2647ac821906e8d77bdbea", - "@biomejs/cli-linux-arm64-musl@npm:2.1.4": "42f9e3ca494471875fd404c79d5fa19c01626aee48fde619861ebe695d40fd5ecca3a6d211eb165058ba2091e3e0df317e16e4c887794198291144de0d3742b3", - "@biomejs/cli-linux-arm64@npm:2.1.4": "49896343090353fdd1b5f1bdd109bcd2f93ce43a73d3d58bafbd58b5dfda2b1cde288adcd9d58603a9b34c2c83ba0471ee2bde06724b4388af940df9fb4ae4a0", - "@biomejs/cli-linux-x64-musl@npm:2.1.4": "11f30c976bd395e7cdaac88858055c06327bd20a4f7d499a799286c05c653d025ce2783b1ed741e07afb2757803dd324a8f217fc804d04859ab6f9650c050811", - "@biomejs/cli-linux-x64@npm:2.1.4": "3e9831d10f9113be37ecdd293a3fb54645e63edc3acae9d810a37e028ebe2061d71ba6e8589f6a2e41c31533fa011403366cadff7d1606765dd7363e1bf7cd14", - "@biomejs/cli-win32-arm64@npm:2.1.4": "44a1400a476e76c48d4522a723af594afb1c2d837b3bebcb084ce84fedd3cf58c7c848cff72c788ee7e428ff40954baefb54b754632cd41a3649e1dc5f027284", - "@biomejs/cli-win32-x64@npm:2.1.4": "2414e6b01d637739c851b08393a3298cfc6a6912037042f58ec63d789cdd6ccd2ad634d44613b09daa21ade9d880a0575d67486c0ed37668dab4746fb9ae519b", - "@esbuild/aix-ppc64@npm:0.25.8": "37fc14b17214c1f6bf41175029b62a43664a6a5a5b802614fe1d837bbf7abf5eaf2f6b735b6a446ebcfabb632e038c8ad9cccd87a259c45a1846689f8527874a", - "@esbuild/android-arm64@npm:0.25.8": "e367e989238292ccee72013511dde1aef2d2160d8d5d669a12272f693cf9a0970fac9d7835178b3c46ed6936a0c4b29d21d58ed11851a3697bf98b4320be4b74", - "@esbuild/android-arm@npm:0.25.8": "cbfa2c802d8931e5f4d06582f20573cb34774ab713b4712c37eb15bfab6f90b693878b661de2a3bb9c81eecf45b37e0ddf2e9c79ef4ff932bbc37da588c40183", - "@esbuild/android-x64@npm:0.25.8": "1d4b900dd2f43790415745d20ae6cadb53e9412911578aaf43462277169c22800eca1f49a9f8ce9c37236e1691279494f91967d28310720707911910ec765013", - "@esbuild/darwin-arm64@npm:0.25.8": "a8a50e303056e668e99370a88d1744de4a83e62e2f3f7fcf2ff611142346505229568b0ec5edda93ec96e33e842a585880a312790553202750f123d9636fa97d", - "@esbuild/darwin-x64@npm:0.25.8": "9806fe9d54f3228a01f535e7c51aea26bd1bab3c5d64d5f77f4606de44f361f049222776d32bfd262d45991b7aecca645ed576ea338edbf4f8044b22b3e331ad", - "@esbuild/freebsd-arm64@npm:0.25.8": "8e6cbdd45819390ecdb62a70a4f119a9269a90895f3e1237788b36a512248a756233ef59f55f9033658af372a196f0edc3567f078f1387e150238d2bd51f733b", - "@esbuild/freebsd-x64@npm:0.25.8": "3f920c686037f825859a2fe82104085f4b254b77821cc71a71db512ef0679dd01481c136c3f7057ba7250daff2458aa3ffd101cc28cb5fff2d55270ba5930ec8", - "@esbuild/linux-arm64@npm:0.25.8": "234edc9f815cdc74d21c6a90a3542c941deeaf3a24b408c74a4651616bd270383ba5a15eaef837ab347a374032c7028fc29e4f1da0becb33f0b8dd8f744934d7", - "@esbuild/linux-arm@npm:0.25.8": "dc6dc225ae278cb3383e11d9829d22f301e1b79f2ed4efde1a01896ae67e45efde98caa61f10cb425a809e9b61e9a4651b60d2b6a3e9ad6174519e8ce74bc02a", - "@esbuild/linux-ia32@npm:0.25.8": "1c780012035552e27adea34d11f959a3ddd4a4d576cddd03d320b1db18110e777c1adca2c6d10affd587a4454900d3ffcad9371956855e56739babdc2e4edcd3", - "@esbuild/linux-loong64@npm:0.25.8": "d3d39691d301d144c7d61f52163a2fe64caaf928f4117d906707dc1456f3d88d1a7a3b16fb988ccfc0b0bc203f4bcd56665a9c7405dc380b3165a26ab195b9ec", - "@esbuild/linux-mips64el@npm:0.25.8": "437e51b2be977cf7774114e04c141e3c0f1ceb7f12b961b7b3ac7f99c4e203afdd74c41e072ecdc4bab3cde4f14feedd78653727d1b2013ed3611bd89117ee8c", - "@esbuild/linux-ppc64@npm:0.25.8": "29d2e344b1c8b767518d25b23eb9e98d85deae1f2def2e01c1939536ac7d1fc9e92749a8d29b29277b3340d3613e4b0f96213c6aa2de7e06885a19d3d269870a", - "@esbuild/linux-riscv64@npm:0.25.8": "82b2ef7fd5a00b465da97bd797246269d7460ed710c0533517a1f8ad8e32527f405509b2ce27e29f8f3df1affa04e45cf5d1a71205f69dab5c1a27118cf10fb8", - "@esbuild/linux-s390x@npm:0.25.8": "74168a6e8927d12c883dba56006f5277f8888c7b1b5e4d132a3c235b8629c3015b4715968ba128a79ff55c9f08a23df84fe44047e8cda4366b9699c5c45f27a4", - "@esbuild/linux-x64@npm:0.25.8": "d531002ac2ead0bdb293ec1a4eceea687d37815e298196af2471107cdd4c1f76ef7d12417052b51852b80f66111abfb5ad8375c58b97da92306b975e9a8f0649", - "@esbuild/netbsd-arm64@npm:0.25.8": "55626924ae946a6225707062648aabb79c70d61e7e094b067338ea1adf72493b502e99e59440fe0d3abfe20eb36c33f78115815d63e72fa99f5e90146c2ee5d9", - "@esbuild/netbsd-x64@npm:0.25.8": "d03122aaa3e9a8bda686bc4120820805b5d9701099458a2c928ee1a292fabcc47df0cb178c8c428edb78a058e75cf7c0d80fa25b71fb91db43d73fe6e4062c41", - "@esbuild/openbsd-arm64@npm:0.25.8": "113ed8722788986b5b703c791bb9c954e80a861b92f453c66c79318d71cc6eac509c1dc79d20671b4af92165eee05a28eb7b3122537d8701447d30f58c428942", - "@esbuild/openbsd-x64@npm:0.25.8": "dfa68d80d68ae825de85aeccc118724ced6b232dcf25da6d862ba03abda2f55e75483dccbf8cb3a7338e7882a05e5425fcf5a902b7dced72c9f1a9c2650912bd", - "@esbuild/openharmony-arm64@npm:0.25.8": "8dab5710d93ad4a78a34a0016f6ea0bf2e16489845f9895ecaf354c1c3db209bed8f05a31309b95c358bfeaea53829605f4e315e9a53dae4d9fdb58e31ca4688", - "@esbuild/sunos-x64@npm:0.25.8": "ccc940bd687d1f6d320d2538ac594b7fe5e291e194380a8b392dd2348d738cf8d322f9f62bcea82b3809f98796a0a004cd02ba9c4d563e5e336665e1ec8e1e1d", - "@esbuild/win32-arm64@npm:0.25.8": "b0a9a86548d4a62e68b12a89e21aaadda3d6d3e96541a2714b74df370cc344e1a2d91604998a26951da28c2f932bd2ee033adc9346bb232622c3ac419107136a", - "@esbuild/win32-ia32@npm:0.25.8": "5880e933c8fb8dc1de1225128c171ea64f4b27fe52fc11ed9cfe6b0ca8ae091c2703d4cb629f08c06731810c46f48cf881516d0d54b3ac408dec34586ea84d27", - "@esbuild/win32-x64@npm:0.25.8": "9e98fe0e7eef7a0e774ab761c59d520ea1c997a7a6e4c7f9cbc967471a4a7ffb14bc27c60d2aa10796c4e945c3da2613fcc297054566fe3f5191e1250691d622", - "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.9-commit.d91dfb5": "a4636b96d36bfaccc655f9de258cef17daedd025463309657ed213b63b4226aeb6901eaa05d00d577e486bfb4d4ef99ee1457d8d7a8b5170afe07c86d2a5c18d", - "@rolldown/binding-darwin-x64@npm:1.0.0-beta.9-commit.d91dfb5": "a7b89d92f33ad9a718de70c56452dc481962e5396b32d66cbc08e588f45fa090ed6e3b7d8fc2ec641acf3de2a550b6d05416b14179ed4fcc8d336fdbd697d40b", - "@rolldown/binding-freebsd-x64@npm:1.0.0-beta.9-commit.d91dfb5": "7da382e43eeada73dec31bb63680432f129fa17efed7ed211da0c9915a89c9dfa2e8ec35aa7f07a4be99a36eb14df67059a375ac4bc5e6a5cdc16e02f7a9bd3c", - "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.9-commit.d91dfb5": "cb5a7635fc2c39049c1fba8376d3b23f58240dbe2cbdc127d0dc8f2b8900537298bb8b52abde5b6e941cf22d8f69466433048db573c683947bf797f92f28baee", - "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.9-commit.d91dfb5": "8ff267e66b1f59e9317d5b9d89e00a3e11172ae5b5cca17985e92cd52672ef59cd2d6292263700ff8edb02b53420865f655e6ed7f4b4ad8680e4ee0d99dcf5a7", - "@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.9-commit.d91dfb5": "7b320fbdc870cb7f2f75e89058ac50a675c05236df12739b98ce287ad07cce53474699bf19b729577c3de62d80c2fbd988cbbb8bc29e06c88fc42a8ece176b19", - "@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.9-commit.d91dfb5": "99679e1c7e290c7d747d6deb420357522fb0fab1fd022cf79f84534243af2eac15988c8ef5d1b50c679fdc915788360bf744c4e0c9e47952aa0985f23ee58e80", - "@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.9-commit.d91dfb5": "2ce172ea44980ca6b86636a13cce7d70104e25f75caaa0c4d6d9199721825a896a74b11bc32fecbc2756aa829d7e10f4701b2f3544b77cfa4da3c2cea0d72e1c", - "@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.9-commit.d91dfb5": "3516b21ab1982990435d550a23c153393ce1a2c9308b6df6614438c14ef1206d50c5e7dd214c403a42c9f4e695b574122abc8009df5171ebb79e685da14e7562", - "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "17086030865bbfb6668d04f882926035fc1f72db81c3415a8f81e6196b9f849eabd6f2a62066e83f87255fcec106fe274353c8f5ff9c782417b6eddc664a129c", - "@rolldown/binding-win32-ia32-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "ecd226ec05f9f863d97de98ca4d7cb9026bcb0cd2fff12e325209664eaca1fa131744ad72d1352b522567adfe4967ca73e50987f96ab475b50e9b96456dd50cf", - "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "9e50f65fb7ad451a6eb4f9305650605e7a4efdd6873ad9412520edb8fd4c7f0bb67aa9922dbf1bad055c01a0de677eace73abf4285409cb9defae93956a83b24", - "@rollup/rollup-android-arm-eabi@npm:4.45.1": "c8f4939edd5bdac2d846307e7accddd8d777accbc900757386feeb26b609813b1e6cb1860464700b8f724f0175701a52cfe35aaab40193e471d72967d2580cea", - "@rollup/rollup-android-arm64@npm:4.45.1": "f4a842bbd8ec08eea0a3d76381bf7441e0bd9cca34b83519044c9d30514639d6c9125234253705b14dcade1faef603829892627f3e5b3fb79ca2fffdb7f0a1dc", - "@rollup/rollup-darwin-arm64@npm:4.45.1": "9cd3c451dd4727ea97d67f7a1d19c16cd91b53509c2b7f0e123ca2ecfa5a542ac9e0d7ed5d4a2fc6e0e2636b2d783a5ea94d3d9b079e58094807f46af2d3b1f5", - "@rollup/rollup-darwin-x64@npm:4.45.1": "beff80194e9aa470f233783230e607c16c3180c479c630b1affb792ea94517305c7736f5bcc50bf7485532179713258b8688904ffd1a39b4cedbbd37a60fc676", - "@rollup/rollup-freebsd-arm64@npm:4.45.1": "92a873121ff3828a904ae5c073ac11206749cffaa2f0f717a0261318cda8992d951993ae57aae519ffd840fe74b8e4cb41a419996e4b7114007e163dafd24d28", - "@rollup/rollup-freebsd-x64@npm:4.45.1": "919ff2d364ddeb2c4ed717c772b9f9e4b616dbcb8db25123a9f48468b1777e0db0ab2a80a48674e0dad7036cbf5407de83532123b09986226ad3759806fe369e", - "@rollup/rollup-linux-arm-gnueabihf@npm:4.45.1": "f519dc61d585495502a81f10898eed4a1d7d3d3d7675c0e9082924622a68212d586dcc31ad6fff4562eacdf0420c3017e66c9960fc972b4c3605d2f7bc3d6581", - "@rollup/rollup-linux-arm-musleabihf@npm:4.45.1": "aad10aefd9142278a87f9d6489d1f14666ca4c9345b099942dee8e30fb5e1cc6bee630c8de48d4b11302315e8341bdc0664560388792db248823532eb81eee4a", - "@rollup/rollup-linux-arm64-gnu@npm:4.45.1": "2822750ecd8f9566095c3a51e2666c9e35d307fb322f730303259d035b3d2f3960441d9647cc3fd15b3bc5e37bc8190461c318a05c189dc95ff636024b0b4169", - "@rollup/rollup-linux-arm64-musl@npm:4.45.1": "372430e2ae57007b64358eb4c26720b1dcdd80fd2ee24688ceb4d6031158790039f9d1a48f60df7a57e17e82395609428eca90e5e467766d867a60104c73eed5", - "@rollup/rollup-linux-loongarch64-gnu@npm:4.45.1": "fb0063b86d3308eea4940798ea711867a8de1a7494070b55bbf86a03b401b41b75cb88868e13f45148653699a18b1d2363351801a5b0c0b653867e4e662daa98", - "@rollup/rollup-linux-powerpc64le-gnu@npm:4.45.1": "bc9f4c68939f98562864b5100a78a6f6e3d9597db2f459b99fa114e498c14f06171647be3d7a560781483ee1971122a7e3b3ab58e2584b960447994ba444eb4e", - "@rollup/rollup-linux-riscv64-gnu@npm:4.45.1": "bc0a285841a777e14836be0102d58ecaf064d0373fde1aae730844d27c7f2982ccdfc0cab41d3c689b1472258fdc93568ca71660423ed670d938e3583570f69b", - "@rollup/rollup-linux-riscv64-musl@npm:4.45.1": "2150cb74acb44af2a2ead9068006efc76201b651f0ee09061aebd4e6e22b75254b3e64a8e1684c422ef72ea4001049379110199126dac288602464c4432dbdb6", - "@rollup/rollup-linux-s390x-gnu@npm:4.45.1": "a11dad7ddd921104d33d1d5aed05beef4ac8d6e79b69e5afc3612d424a2e12e67c6cd67d916b4f0f981bdb5738fe7c59a5e342fe265bc989a2acc9c981d3e212", - "@rollup/rollup-linux-x64-gnu@npm:4.45.1": "baf9081b367a5f557cfcd17ae60b196c00a933e87c5b16045efa312cb142518c91706ae3e6a4be1d09f7fbf2b133d386fc4ff3f6dd2d5b7149ac139af4a63391", - "@rollup/rollup-linux-x64-musl@npm:4.45.1": "dd53812371c9e7c68d4a4d6d96993c3d2def5c91c7bd9f264d832263f5fb0b7601789cb394b4ee835ff5c828a02da7421bef43e31131c44eccb548cca576d886", - "@rollup/rollup-win32-arm64-msvc@npm:4.45.1": "5d336c675befca41c76b0529e194e30eca93465512db3a95afcb626cf3fe56664d9e1e9b124a29c02383f43fe8638c5a1652171bdd341d8ea65ebc8462050e3f", - "@rollup/rollup-win32-ia32-msvc@npm:4.45.1": "53e1aea2fb90f3704b272d3f89009a04891ce318d7cdf5dea85092b1f039499a8f916065e9775ddebaa1af411bf8213d656bd540eabfcd7f764eaf0d21c33b98", - "@rollup/rollup-win32-x64-msvc@npm:4.45.1": "801641e0ecef2e8fd0e616ba443b029adb9a2ed5303b8f7ad8caf23a6615ba5e221dbefb138d17ef77039e6a240c0ba1ea022cf1e116a5545ea518a6063c1e63" + "@biomejs/cli-darwin-arm64@npm:2.2.6": "38ade81bfc2cf3c981fc6c06f15d41faefec1eed3be7a9c856304db9d0010700769479e2df16f7f421bf335a910b72fa1bf5185f30dd8372d416972a623c7841", + "@biomejs/cli-darwin-x64@npm:2.2.6": "42d5a3ca874969d3e1d72a7151f1ef3a40cb887f8c6c315a1898cf53f8a825eeb1419fbc691adf1551ec06355cf4c11f5400ecb42720e63a44c5c5b0db6f1cbc", + "@biomejs/cli-linux-arm64-musl@npm:2.2.6": "866839019a2a5ad2e731a4f04c1effdeb41a2559e04639ecc33bbc119c0d217175dd8e972ec54d34f84edea8db00ee75fda7bca44bbdcba5495ebffbaf3dc709", + "@biomejs/cli-linux-arm64@npm:2.2.6": "18db4d7c04347b2095584b9ed851234aeb31599a112176418d8b29d3dcc73f6e2b4a759e3c20b3a0440d57b6656056c418f8b9f52aad5e1bbb02385f97792bee", + "@biomejs/cli-linux-x64-musl@npm:2.2.6": "b43573c8cda9b9026d911931b8fd517a0e1f661ff6529ad718852cc8716a68632361d06f1c14bcc73fd600c69aeb7542680ac66a46a2461f6a4a645e7cef1d9b", + "@biomejs/cli-linux-x64@npm:2.2.6": "06f32d1d001eb09d9783587318f94fa52c3055826c0b835f48c18fc480aecfd311bcc0ddac678c709949f3b99b1283450cb073bbcc8b1631c39877d7264ac62e", + "@biomejs/cli-win32-arm64@npm:2.2.6": "fbdbb024198c027edc2043e1f6416592263624a4534768a98a46b359bfa813e9b919e2bb89f10114b7bfd7e78d29b298773262a255c924555096b39df9d35323", + "@biomejs/cli-win32-x64@npm:2.2.6": "7ceac86065c5e7c765993d4b300fd29c710678d2c65ea4394ed68ccf6ae1fa5133730829a7db8915dfb2877792093b8d5fe6eaea3ed727826ee5e2ac11530274", + "@esbuild/aix-ppc64@npm:0.25.11": "46c2697b0e5bf6a1d1d57e80358ee04fcb0d59a1c6648759ec94e12a83af50d35ecf2469cf7c5643f85a9b2c5b2f91173bc6485ebec9bb9add4a6b30b5dab95c", + "@esbuild/android-arm64@npm:0.25.11": "cc45d931e813767a15ad6e7fd6071c97865a2e9aaa0d3a78374da452d303dbea71a4f13c63426b01f71ce3c10dd208f9382e6387505111adaf631e39749aa404", + "@esbuild/android-arm@npm:0.25.11": "b8ee90079d3d6c02b732529b04d2e6c017d12b2c401f2f8d6e60ec5fb1060d819edde5429acfbc7471b2224b4457de8cb99b97bea4164e94a3da2cbf121e60a4", + "@esbuild/android-x64@npm:0.25.11": "c03182ed17c50ab29973b19814cbdee85ff67ba00e13f001fafabcf7538d061fd737a783fc4131f96e22b2e7bed26936e5e730b717bb88ffb0b8c429fadd6536", + "@esbuild/darwin-arm64@npm:0.25.11": "67114421780e01c947d3a646d9737d5965e2bf39ea75a2440d614971b7b2565a8cc91c39780f5b86adc25cdc466bbf1ade79a05cef71827e3f3a2be00435d868", + "@esbuild/darwin-x64@npm:0.25.11": "da5612584d5fc2e714efc0876826fa45a48fa3b881be4a728516f2394c6aeb72f6ca8ce08272106c24ea6a9b040513afd847b4ea9bfcc5a6637e427a1634acd7", + "@esbuild/freebsd-arm64@npm:0.25.11": "8ad357e0b7605a320d428b10ab704a2f34383786bb43e663ebb62ded22297343c72149ab126257629308195cd18b4828f9b90579b224c26d2ca56f416dcb3e48", + "@esbuild/freebsd-x64@npm:0.25.11": "a42ea4c6801eb2ff09b0f1e67a04b2d4a00da9dc08233a8dc227b25468efa954ea13478bd2f2dad46bf78e8d1ec3cf11b1edbc1b50af7e61da05e715f0ea0fc7", + "@esbuild/linux-arm64@npm:0.25.11": "c8f87df1d15ff5c835d782e26213bb28653eed9388351e42c073431ffa8e3606fa8e0670ccb0df325f56a9695782b34c98af2fe30756953a883f9da63d1eb42a", + "@esbuild/linux-arm@npm:0.25.11": "122d069ed8332d3eb6e3f0d99c7f25d8920d6aff3655013d6bc2f3666fcba85ae074402b54f3a2ca9a3a3a9cd54350fac1f56252d84d466daefca7a8dc82975b", + "@esbuild/linux-ia32@npm:0.25.11": "dbd90c3efbbb33b920abb3f3def4a61fcff258b8a60289c61c0ba6d5210fae8fd569af991ff9aaebe03b3c24a0c67a5fd74d8e32e8fd7c5a0dbf1898aeeb2bf3", + "@esbuild/linux-loong64@npm:0.25.11": "c58d14d84cf4f024f5cc585efd759b161ec4122767d94500578cf32f9649542ab7e7b5e2b88389d774d4544d50a39ba1e0d791793170643645ec6a2eb8836ffe", + "@esbuild/linux-mips64el@npm:0.25.11": "5a3f4ccefe0d8ed30806a6984b7b6cee17e2f2a14d3f6d64c37f05f78f6dddd04821fd5ff4d61044ce23c0206a8fd4f1535a90d534e26cb5e90c8c04d1203a0a", + "@esbuild/linux-ppc64@npm:0.25.11": "e35d0a4e54f7d48aa931abe6211b7fc374291b26cd59849fff938499114b5b34e3da15b71e67b76f83c1d712d6f78a50255d8b96bacaad8df233771126544ebe", + "@esbuild/linux-riscv64@npm:0.25.11": "4e932cf5950d97aec76aa5c52d7d15e7135f2b865414c97cd4410adc3f8b26e1588cda7a09222b92f54fff8c888180219e822b9a633c833098bb876b1e66ac02", + "@esbuild/linux-s390x@npm:0.25.11": "af2b8a5c0a6147985b1d194a7c1323b4693b72ad5884de1292f045882b41436cf4e64828c18cdbf7b85763060404279cc070fbf74c00f9f82d8f35469b8c0073", + "@esbuild/linux-x64@npm:0.25.11": "1e1fe2d9c8ae8ed76f3090ff2e4d3d084d581cc9298e349daf8addd398ae9b466a1817d9640202956d72479a82e602979ca364035d10e8cb6e2c2baf6e850081", + "@esbuild/netbsd-arm64@npm:0.25.11": "03e86862f25a9d3ed05383031ab3430ba73b80e5a1617cf0b9f91ce2a4d5700125398722a4a6145299d6f3626caca556d30604bd24f88af1a289794822322814", + "@esbuild/netbsd-x64@npm:0.25.11": "af848a8e720c5ba4fb63a748c657e366770e4f00a249dd4a0eb996bdafa0fcad7f04c88df3ed29cb1b488f76c4f7c3355e192ff71392c81d641dd52bc453355c", + "@esbuild/openbsd-arm64@npm:0.25.11": "40d46a15da7643aa57ba7a61aa8174cc7ead37f67b3438eaeb407f6527712b848327a025484a57ce936debced507a2d405614e790491aa181f8178c09b8f2ad2", + "@esbuild/openbsd-x64@npm:0.25.11": "8ee73b8cfe0b5d24433400bddcb20c3ceb2cab3d11112ba01c5ee799e3629d24267f6dcfcb2f3aef89726ddc5d10592e35ec46b9725cc9e297af3d8d35a3122b", + "@esbuild/openharmony-arm64@npm:0.25.11": "bf2fa9985a1aaba0a4376657e72e73c7d5368d0a1972e12788ec276384e6a20637904c5d07b52a9f10306735898730dbebd55a6234cc0cd30962ee130c7b9a8b", + "@esbuild/sunos-x64@npm:0.25.11": "7ac357650fadc4ad44a0615a184920734ab5f4432ddd913bef2cf4e4ef7855f7ffd1995cfabb323c10cb9b876f252cf3f7938b4450cfa9ce3b1488e47d91b6cf", + "@esbuild/win32-arm64@npm:0.25.11": "01a7db317fecb784cd273ddfb0f3eb35871709904cc879adfbeca139cb33fbe8db6d33ee53ae4eb3b4185ef9fb6d6f140d9ac0fcbbe61518cf546487d7430dcb", + "@esbuild/win32-ia32@npm:0.25.11": "cdb90fcd780022685374b762b2f6fdd19501ff43c4b4b63b9b875cdb56d4c79b4747f36f4893ce57d3f0c520aaf30b0f31309e606bae14738300b22bbb30b1df", + "@esbuild/win32-x64@npm:0.25.11": "a7b6080abc4d575c0572e880cefcb24faf89f7e48057652d6ab11e2e5b3fbd4555d27246ee281d5a1ac1f744a29ff90573e7075310e171ade9e2838665caefce", + "@rolldown/binding-android-arm64@npm:1.0.0-beta.44": "3584478753a119db5c345c314b7a80a122fe1f4aa868773d5103942f62e81493f922f440c040af86902296b8343a418f8ff325f0336ca477c58a3f00a5fe92cd", + "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.44": "b3ffe5e3e54d7db2aa77ea24399016c934b68e3c4e7d5124ea90e85a7814e74ef933e07fd640ca0608fbf4a46f6db21087fa301ebf209883db8d0f43b97b5081", + "@rolldown/binding-darwin-x64@npm:1.0.0-beta.44": "ecad93425fde8cbc0ab451592887f068fbd3b2e6e7c6a54c12e4f02dceb499ec584a5ebd854b94691e78ad1a097846e0328485adc7c8f69a66531001dfd3afa0", + "@rolldown/binding-freebsd-x64@npm:1.0.0-beta.44": "4b397b3e5bf3ba2b3f4af648921bd027fbaf9859041b92aa36c9a60d4e25eb7f67da8812d61b80078957ffd2836d3a9618dfa6c4d1141e2c4eb1dd6d4b7a051c", + "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.44": "0d2be4daa7358490a081769efc6bf5a7ef8007706bf8a54d354950214b4eff91b367f21f4cb4d05d0e0a3dc759528bf8d7eab7e482754c74321d66d612997f43", + "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.44": "4a0d9d0e06fae39dcd984e5dcb858aa38d34d412e8472290593f3b907aac6e8c1e60b7659020b71063d469faa904dee78fb6678979292ddc7060e765cf0258a7", + "@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.44": "3dfb95b4663bc950d1ed5f93162ed1b7a2cb02281f1ee82901844a9e22e34369dece54d5a9bbf9d3d2381407ca363b8536d236421a793dbd72350dc65d7bfc46", + "@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.44": "d6329c568d9ccd363b215ebffff7b86df0a102d0dcf2b56e32a81e2d1961d052691d8a90e9df5dff3c819a0965635b3b5beb71e125fb7f385aebdf458b3f53a8", + "@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.44": "b0fd15a216b02ff03cb927e84802bc9d8454d5cafcc3561cb9f642997fd5869c6611bdbb5e3391d9d6866ea8b764876db8dcbab6a52017025f4f349c83c6a51f", + "@rolldown/binding-openharmony-arm64@npm:1.0.0-beta.44": "e367f21610a6daf111f337824334474213172f4050d67bf4c7a29f69ba43e35733911cf4c44906b3170cdcaf9fb96ba6386eff29e02650109e11130da46dc53a", + "@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.44": "a53092c1338dfc25fc0447a223748ef5048058ee420fefda15e846131b31c3c8fc6d3f2e975467190905f91abccf8de570653aed77a147513d3dae7ff0004931", + "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.44": "d985908536816c176699b21626ad57106af36a99d665437cf58f827f54491200763f2b47870c218ac3022d4a43c6ff5bb38438f81a18a1fc88fc837d9e53a459", + "@rolldown/binding-win32-ia32-msvc@npm:1.0.0-beta.44": "f247d3a00caa1238fed18d6d7f884d02291e3fd570d987f50bf77b0886e767529dae2586093bfd820320eb0548cbdba6784f5b49afd49032a883bfc3f1ea19b4", + "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.44": "9f13f6cd9f6ba17c79a7c398c1931cd2e8321703d30aea0de56e5c6175e4979d96988ca941576d0d424e928e873625c5802d081498e8111e52382ada737656f2", + "@rollup/rollup-android-arm-eabi@npm:4.52.5": "62451748fde2f4a8e8423b2e7f83fd0342e57433fa0f71d378ea38ed3f85dc6a0706ef9feae21d79428f4e274da45c07bc49eb1b3a82c08f6b98d8cf20de83f7", + "@rollup/rollup-android-arm64@npm:4.52.5": "d050880ec4e14c0d1ab7e32e6a843c3f39b4161ddd574532482807e6e559e34dee8bfe3862bf06a62e79e46a410afaa3dafedc5e0db41db5cf39c10bbcf32330", + "@rollup/rollup-darwin-arm64@npm:4.52.5": "4c7a2994ec5bb915b5b455a507b296c892c914ed0c0c3e8e1958d7e021dc47627a27c756f1628aca2e2ace8487dc93dd801483f0ec40f92603b6a788322e66ed", + "@rollup/rollup-darwin-x64@npm:4.52.5": "fcdc3b7954afea6dc191a6244e793a32e8373e1798020d1cfcaf5da48bd23c533b661763d2dbfb87412bf5b1a59377ec06560f64da869126ab8c995391de9047", + "@rollup/rollup-freebsd-arm64@npm:4.52.5": "f52788b616f5bc4c5edbc41ca2ac4fde7fbed678a0d2c3249111f4322a76550e682037563d07a0f07eb21f82289e9c5616c41797f3d9caa6d5b4261b8e1ce642", + "@rollup/rollup-freebsd-x64@npm:4.52.5": "8fcb45fd9b7ec02848230cefac866bca73f38071e2e85e1217627007df211e814743e3e2525b236dc410acea7f7c4484050e2338391bda509bac34e7e0bc9ca4", + "@rollup/rollup-linux-arm-gnueabihf@npm:4.52.5": "ff055f9efd2f8d1e1ced74a0defa0d089b54789f2b3d3d8f9261180059d6cd45fb895399c938c87467419ce1b37f7c50eaec333d5f140e7d8b53874cfba7bad9", + "@rollup/rollup-linux-arm-musleabihf@npm:4.52.5": "2932799d8e79831d1f79032d2bced666503466a5d3b87e98a12f577400bad80dfb5ce2883318059c038d061319ed51ed58213bc9b253b3c60a1ac5ca3807ba46", + "@rollup/rollup-linux-arm64-gnu@npm:4.52.5": "f2bf47b114856efd75e23baa3c3954fc2a8b864d678610fec5c2ecdab5736d1068fe3c813d29592a9de3f54c0de4055190670ef842333f5bc9e34e1221fb403e", + "@rollup/rollup-linux-arm64-musl@npm:4.52.5": "26c8ded405da1a31c414677de84c261d1139cd7bf568e979036d39c613a2783bff559ba9cd4ebeda06c517d709050fea97ed65ca482316322984a1bad51ccc05", + "@rollup/rollup-linux-loong64-gnu@npm:4.52.5": "3fec9dbb69d304495c40c26d49e736ae98ac173368ed0f0115fdf90b464e8bdd716b5a10f0458438a8ee31d5b13cb219ceff2ea0773537a87b597a3aaf6c0fbd", + "@rollup/rollup-linux-ppc64-gnu@npm:4.52.5": "542b1171f910f3298a1f326ca6dfb41463ac8a9291f21502830a75217d91c38a0701517c4424c1d114b7fcba06b5fdc1ac95b9814ff542fc1c5741c965a12fc0", + "@rollup/rollup-linux-riscv64-gnu@npm:4.52.5": "3f8a728b372d5cd2964281bdfe6184cd6dcff579681ea3a9bcb240d2fdaa0181a763f6f34930eae206d00c687cbecfa3d3b18b49bfdef0b772809fac80e007d8", + "@rollup/rollup-linux-riscv64-musl@npm:4.52.5": "26b5a6d0983aeea544421d697787a540de653a84f948389280cfde0add366fa0fb7af4a5e67ca490a63a8fabca801f04b23a70bb948cbe06d48aa0ab0b3fff73", + "@rollup/rollup-linux-s390x-gnu@npm:4.52.5": "6f4b1605d9cb191ec404ad2418f5fbc43d5585a83eeb33f8a8de6d2393e4ec85fb42a4e55da7d100bdd708e830e89b815d4e444f34b3002096370b1e1e80bee7", + "@rollup/rollup-linux-x64-gnu@npm:4.52.5": "70fdee240db9c56c9a2a202450f4fb2b8cad059bb001c10cfc37b8ba1a333f1ad61b4a9bc01df005d9d0eb9c7ae57103c70c4ba58ef89942e11b0eb449cb3fd8", + "@rollup/rollup-linux-x64-musl@npm:4.52.5": "871865574e0a5f79af49151685b1e243d43f0eb11100cffb9d835c4aa3423a471dfbb56ba7d16928eb11df7956e307c74d0b5cd872db711cd382bc36e487be9a", + "@rollup/rollup-openharmony-arm64@npm:4.52.5": "15150989aa46138a5675962f1bfb01640a212e26976e799be4b0029c2e6f0e7a21b32754457b13dac05d02aa04814b6d0a6ee43dbf3473dc9fce00c7d8c0155f", + "@rollup/rollup-win32-arm64-msvc@npm:4.52.5": "6433d349de33e71bb1cd11192ac58827630ef1b4eef79af40708cd7a8375922bfdcde69ed9e31309ae9b9224e3d9237ac00191a1c8406c7e3bbfa99d57baae00", + "@rollup/rollup-win32-ia32-msvc@npm:4.52.5": "0da2d66ad1bc046a601b9de5a1266ba61a08e211df670d056451a58ee92a1a1de3739cfae853bf133c4204802ec7c72d2fae607f7ef31789e6124c23441f3f07", + "@rollup/rollup-win32-x64-gnu@npm:4.52.5": "a7d3489e79f1cd8e4d34e784f3e32e9681170e4fc7d568cf43b31511c6b9c0e03db722c76baa595799c85ebd96a7e6ce66670ec00ed253e674d7e732a244c554", + "@rollup/rollup-win32-x64-msvc@npm:4.52.5": "eb1c823b1e13f27b49321ae56f4c35710194d674034820f6c0b66a2309cbefaff7bc4a58e6c3fbb2453f8913f4aa1cc173cf9f6e9085df47f1922626630260da" } diff --git a/pkgs/by-name/sw/swagger-typescript-api/package.nix b/pkgs/by-name/sw/swagger-typescript-api/package.nix index 55277421c6e6..b54a6c588812 100644 --- a/pkgs/by-name/sw/swagger-typescript-api/package.nix +++ b/pkgs/by-name/sw/swagger-typescript-api/package.nix @@ -8,7 +8,7 @@ }: let pname = "swagger-typescript-api"; - version = "13.2.8"; + version = "13.2.16"; yarn-berry = yarn-berry_4; in stdenv.mkDerivation (finalAttrs: { @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "acacode"; repo = "swagger-typescript-api"; rev = version; - hash = "sha256-3IPap3Ln8UheYD3/PE4y1ga1KXMNihm36bkMCKy6WuQ="; + hash = "sha256-SPvOCoxtf7x8MLPV8kylyaNXHaNtsHvs6liagd7iyF8="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-3vVaW9beLNuudq7RB8pnw6aMJ8nJ1YBFaYr1d9K/k5U="; + hash = "sha256-ZIF+sA/Wp2Rbu9CeERZo1X1oC00SjE64Mk5verb8IxU="; }; buildPhase = '' From db2a595e867948bbffa8446398be601921530986 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 23 Oct 2025 08:46:17 +0000 Subject: [PATCH 272/380] python3Packages.fedora-messaging: skip failing test --- .../fedora-messaging/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/development/python-modules/fedora-messaging/default.nix b/pkgs/development/python-modules/fedora-messaging/default.nix index 6e2af5d98c43..b6a10c0c5059 100644 --- a/pkgs/development/python-modules/fedora-messaging/default.nix +++ b/pkgs/development/python-modules/fedora-messaging/default.nix @@ -1,8 +1,13 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, + + # build-system poetry-core, + + # dependencies blinker, click, crochet, @@ -13,6 +18,8 @@ service-identity, tomli, twisted, + + # tests pytest-mock, pytest-twisted, pytestCheckHook, @@ -55,6 +62,18 @@ buildPythonPackage rec { enabledTestPaths = [ "tests/unit" ]; + disabledTests = [ + # Broken since click was updated to 8.2.1 in https://github.com/NixOS/nixpkgs/pull/448189 + # AssertionError + "test_no_conf" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # AttributeError: module 'errno' has no attribute 'EREMOTEIO'. Did you mean: 'EREMOTE'? + "test_publish_rejected_message" + ]; + + __darwinAllowLocalNetworking = true; + meta = { description = "Library for sending AMQP messages with JSON schema in Fedora infrastructure"; homepage = "https://github.com/fedora-infra/fedora-messaging"; From d69f2a5605c0bf0850e2b43911ec8edbc09d948a Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Thu, 23 Oct 2025 12:16:29 +0300 Subject: [PATCH 273/380] twemoji-color-font: remove `with lib` --- pkgs/by-name/tw/twemoji-color-font/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tw/twemoji-color-font/package.nix b/pkgs/by-name/tw/twemoji-color-font/package.nix index c4d9048f3ec5..8b52c440708b 100644 --- a/pkgs/by-name/tw/twemoji-color-font/package.nix +++ b/pkgs/by-name/tw/twemoji-color-font/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { description = "Color emoji SVGinOT font using Twitter Unicode 10 emoji with diversity and country flags"; longDescription = '' A color and B&W emoji SVGinOT font built from the Twitter Emoji for @@ -37,10 +37,10 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/eosrei/twemoji-color-font"; downloadPage = "https://github.com/eosrei/twemoji-color-font/releases"; - license = with licenses; [ + license = with lib.licenses; [ cc-by-40 mit ]; - maintainers = [ maintainers.fgaz ]; + maintainers = [ lib.maintainers.fgaz ]; }; }) From e10a344e5d4565528e9b378187d6c0b6cbfc8fc7 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Thu, 23 Oct 2025 12:18:08 +0300 Subject: [PATCH 274/380] twemoji-color-font: update source URL The repo was transferred from `eosrei` to `13rac1` --- pkgs/by-name/tw/twemoji-color-font/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tw/twemoji-color-font/package.nix b/pkgs/by-name/tw/twemoji-color-font/package.nix index 8b52c440708b..da0e38087b39 100644 --- a/pkgs/by-name/tw/twemoji-color-font/package.nix +++ b/pkgs/by-name/tw/twemoji-color-font/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { # We fetch the prebuilt font because building it takes 1.5 hours on hydra. # Relevant issue: https://github.com/NixOS/nixpkgs/issues/97871 src = fetchzip { - url = "https://github.com/eosrei/twemoji-color-font/releases/download/v${finalAttrs.version}/TwitterColorEmoji-SVGinOT-Linux-${finalAttrs.version}.tar.gz"; + url = "https://github.com/13rac1/twemoji-color-font/releases/download/v${finalAttrs.version}/TwitterColorEmoji-SVGinOT-Linux-${finalAttrs.version}.tar.gz"; hash = "sha256-Xy6Lkm340ldm9ssQWn/eRFIJ5kyhYaXPNy/Y/9vUt40="; }; @@ -35,8 +35,8 @@ stdenv.mkDerivation (finalAttrs: { systems and applications. Regular B&W outline emoji are included for backwards/fallback compatibility. ''; - homepage = "https://github.com/eosrei/twemoji-color-font"; - downloadPage = "https://github.com/eosrei/twemoji-color-font/releases"; + homepage = "https://github.com/13rac1/twemoji-color-font"; + downloadPage = "https://github.com/13rac1/twemoji-color-font/releases"; license = with lib.licenses; [ cc-by-40 mit From 2a00280a2477bf1e5ad74d71854e373e8023a191 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 09:20:03 +0000 Subject: [PATCH 275/380] ghmap: 1.0.4 -> 1.0.6 --- pkgs/by-name/gh/ghmap/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gh/ghmap/package.nix b/pkgs/by-name/gh/ghmap/package.nix index 42ee79085f7f..79113ee6a440 100644 --- a/pkgs/by-name/gh/ghmap/package.nix +++ b/pkgs/by-name/gh/ghmap/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "ghmap"; - version = "1.0.4"; + version = "1.0.6"; pyproject = true; src = fetchFromGitHub { owner = "uhourri"; repo = "ghmap"; tag = "v${version}"; - hash = "sha256-liwkJfNp2Ozph3ummrh2GEshIlmVsG8Y8Pmm4lw2Ya8="; + hash = "sha256-mNWBClKs5QnjwMMWS/OaxgD0g0D0bWRx8ecyG3+zy+s="; }; build-system = with python3Packages; [ From 07d18ecce71e16f9bda7b88a84e50a6057d8719a Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Thu, 23 Oct 2025 12:21:30 +0300 Subject: [PATCH 276/380] twemoji-color-font: add updateScript --- pkgs/by-name/tw/twemoji-color-font/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/tw/twemoji-color-font/package.nix b/pkgs/by-name/tw/twemoji-color-font/package.nix index da0e38087b39..570630b5a683 100644 --- a/pkgs/by-name/tw/twemoji-color-font/package.nix +++ b/pkgs/by-name/tw/twemoji-color-font/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchzip, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -22,6 +23,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Color emoji SVGinOT font using Twitter Unicode 10 emoji with diversity and country flags"; longDescription = '' From d161cb06fe4b7173a782e212ece4837f03da1e0a Mon Sep 17 00:00:00 2001 From: HHR2020 <76608828+HHR2020@users.noreply.github.com> Date: Thu, 23 Oct 2025 14:29:44 +0800 Subject: [PATCH 277/380] linyaps: fix build for Qt 6.10 https://doc-snapshots.qt.io/qt6-6.10/whatsnew610.html#build-system-changes --- pkgs/by-name/li/linyaps/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/li/linyaps/package.nix b/pkgs/by-name/li/linyaps/package.nix index 0feed2bdd45e..b1fdeae4014d 100644 --- a/pkgs/by-name/li/linyaps/package.nix +++ b/pkgs/by-name/li/linyaps/package.nix @@ -50,6 +50,11 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./fix-host-path.patch + # Fix for Qt 6.10 + (fetchpatch { + url = "https://github.com/OpenAtom-Linyaps/linyaps/commit/c49e6cfab304ffa2b5b1657da247a6eda6f46c3a.patch"; + hash = "sha256-lFyPb8YiaXJl2yzPElUR1jYwdOxA0h+db4sv/N70N4E="; + }) ]; postPatch = '' From cecb26c2a79e8e3e4cc4fdb7f1688ba6f674db05 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Oct 2025 11:35:15 +0200 Subject: [PATCH 278/380] python313Packages.google-cloud-webrisk: 1.18.1 -> 1.19.0 Removed pythonOlder dependency and its usage. --- .../python-modules/google-cloud-webrisk/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-webrisk/default.nix b/pkgs/development/python-modules/google-cloud-webrisk/default.nix index 43db35398b72..81a1af721fb0 100644 --- a/pkgs/development/python-modules/google-cloud-webrisk/default.nix +++ b/pkgs/development/python-modules/google-cloud-webrisk/default.nix @@ -9,7 +9,6 @@ protobuf, pytest-asyncio, pytestCheckHook, - pythonOlder, setuptools, }: @@ -18,8 +17,6 @@ buildPythonPackage rec { version = "1.19.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { pname = "google_cloud_webrisk"; inherit version; From 17fe21e593235a33916e13042cf80bd601302f1a Mon Sep 17 00:00:00 2001 From: Nikita Uvarov Date: Thu, 23 Oct 2025 11:24:45 +0200 Subject: [PATCH 279/380] python3Packages.pymitsubishi: 0.3.0 -> 0.4.0 Diff: https://github.com/pymitsubishi/pymitsubishi/compare/v0.3.0...v0.4.0 Changelog: https://github.com/pymitsubishi/pymitsubishi/releases/tag/v0.4.0 --- pkgs/development/python-modules/pymitsubishi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymitsubishi/default.nix b/pkgs/development/python-modules/pymitsubishi/default.nix index 241556be6829..dfc4b6ff41e4 100644 --- a/pkgs/development/python-modules/pymitsubishi/default.nix +++ b/pkgs/development/python-modules/pymitsubishi/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pymitsubishi"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "pymitsubishi"; repo = "pymitsubishi"; tag = "v${version}"; - hash = "sha256-cfLKFvhzLN9dM0cMogCL93LVfRd8jDFo9x+nnEWInSc="; + hash = "sha256-oMv+GKdl1H1S5mYUYfTUHuLM5yvkvD44dy9DEsQVAyg="; }; build-system = [ setuptools ]; From 727e8a98d0702a93c0d9bbc62172042955855584 Mon Sep 17 00:00:00 2001 From: Nikita Uvarov Date: Thu, 23 Oct 2025 11:25:23 +0200 Subject: [PATCH 280/380] home-assistant-custom-components.mitsubishi: 0.2.0 -> 0.4.0 Diff: https://github.com/pymitsubishi/homeassistant-mitsubishi/compare/v0.2.0...v0.4.0 Changelog: https://github.com/pymitsubishi/homeassistant-mitsubishi/releases/tag/v0.4.0 --- .../home-assistant/custom-components/mitsubishi/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix index 67d80f81a247..8fd8dcde5d3c 100644 --- a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix +++ b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix @@ -11,19 +11,21 @@ buildHomeAssistantComponent rec { owner = "pymitsubishi"; domain = "mitsubishi"; - version = "0.2.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "pymitsubishi"; repo = "homeassistant-mitsubishi"; tag = "v${version}"; - hash = "sha256-V8fT/w7a/uUN4yKJ+jB6UUQDP6dif80MvlqV9n4KENc="; + hash = "sha256-VEV+HOzXrxX2rsStjwXD4ZWclP2oF6zZHv0MuzL8DE4="; }; dependencies = [ pymitsubishi ]; + doCheck = false; # TODO: remove in the next release after 0.4.0 + nativeCheckInputs = [ pytest-cov-stub pytestCheckHook From 636104f2d93f1b777bb97f898d2603db51d90f76 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Thu, 23 Oct 2025 01:52:22 -0700 Subject: [PATCH 281/380] macvim: work around Xcode 26.0 bug Xcode 26.0 sets `*_DEPLOYMENT_TARGET` env vars for all platforms in shell script build phases, which breaks invocations of clang from those phases, as they target the wrong platform. --- pkgs/applications/editors/vim/macvim.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index fcb8a7de920e..a4c87e2283bd 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -92,6 +92,13 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' echo "Patching file src/MacVim/MacVim.xcodeproj/project.pbxproj" sed -e '/Sparkle\.framework/d' -i src/MacVim/MacVim.xcodeproj/project.pbxproj + '' + # Xcode 26.0 sets *_DEPLOYMENT_TARGET env vars for all platforms in shell script build phases. + # This breaks invocations of clang in those phases, as they target the wrong platform. + # Note: The shell script build phase in question uses /bin/zsh. + + '' + substituteInPlace src/MacVim/MacVim.xcodeproj/project.pbxproj \ + --replace-fail 'make \' $'for x in ''${(k)parameters}; do if [[ $x = *_DEPLOYMENT_TARGET ]]; then [[ $x = MACOSX_DEPLOYMENT_TARGET ]] || unset $x; fi; done\nmake \\' ''; # This is unfortunate, but we need to use the same compiler as Xcode, but Xcode doesn't provide a @@ -149,9 +156,9 @@ stdenv.mkDerivation (finalAttrs: { # Xcode project or pass it as a flag to xcodebuild as well. postConfigure = '' substituteInPlace src/auto/config.mk \ - --replace " -L${stdenv.cc.libc}/lib" "" \ - --replace " -L${darwin.libunwind}/lib" "" \ - --replace " -L${libiconv}/lib" "" + --replace-warn " -L${stdenv.cc.libc}/lib" "" \ + --replace-warn " -L${darwin.libunwind}/lib" "" \ + --replace-warn " -L${libiconv}/lib" "" # All the libraries we stripped have -osx- in their name as of this time. # Assert now that this pattern no longer appears in config.mk. From 427a98e1292d7cb6a1693af54b8176fb184e6cc6 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Thu, 23 Oct 2025 01:52:22 -0700 Subject: [PATCH 282/380] macvim: delete incorrect manpages We don't provide `eview` so we need to get rid of that manpage, and there's also a bad `man/man1/mvim.1` symlink that goes nowhere. --- pkgs/applications/editors/vim/macvim.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index a4c87e2283bd..cb6c36d51451 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -203,7 +203,8 @@ stdenv.mkDerivation (finalAttrs: { install_name_tool -add_rpath ${ruby}/lib $exe # Remove manpages from tools we aren't providing - find $out/Applications/MacVim.app/Contents/man -name evim.1 -delete + find $out/Applications/MacVim.app/Contents/man \( -name evim.1 -or -name eview.1 \) -delete + rm $out/Applications/MacVim.app/Contents/man/man1/mvim.1 ''; # We rely on the user's Xcode install to build. It may be located in an arbitrary place, and From 3693c2dc20c98f22c05bd43130079d14bd68ad39 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Thu, 23 Oct 2025 01:52:22 -0700 Subject: [PATCH 283/380] macvim: ensure we can change install names Pass `-headerpad_max_install_names` again. This is something we used to do, and then the flag got removed at some point. For some reason we need to provide it both to configure and to Xcode. --- pkgs/applications/editors/vim/macvim.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index cb6c36d51451..85aab70ef948 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { let # ideally we'd recurse, but we don't need that right now inputs = [ ncurses ] ++ perl.propagatedBuildInputs; - ldflags = map (drv: "-L${lib.getLib drv}/lib") inputs; + ldflags = map (drv: "-L${lib.getLib drv}/lib") inputs ++ [ "-headerpad_max_install_names" ]; cppflags = map (drv: "-isystem ${lib.getDev drv}/include") inputs; in '' @@ -138,7 +138,7 @@ stdenv.mkDerivation (finalAttrs: { # as the scheme seems to have the wrong default. + '' configureFlagsArray+=( - XCODEFLAGS="-scheme MacVim -derivedDataPath $NIX_BUILD_TOP/derivedData" + XCODEFLAGS="-scheme MacVim -derivedDataPath $NIX_BUILD_TOP/derivedData LDFLAGS='\$(inherited) -headerpad_max_install_names' ENABLE_CODE_COVERAGE=NO" --with-xcodecfg="Release" ) ''; From f7c3c92c7a4b2180c0a50abad7f6e0e65c79da03 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Thu, 23 Oct 2025 01:52:22 -0700 Subject: [PATCH 284/380] macvim: resign the binary on aarch64-darwin We need to resign the binary after running `install_name_tool` or it will have an invalid code signature. --- pkgs/applications/editors/vim/macvim.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 85aab70ef948..9b0dcb4df47c 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -14,8 +14,13 @@ darwin, libiconv, python3, + rcodesign, }: +let + inherit (lib) optional optionalString; +in + # Try to match MacVim's documented script interface compatibility let #perl = perl540; @@ -49,7 +54,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config buildSymlinks - ]; + ] + ++ optional stdenv.isAarch64 rcodesign; buildInputs = [ gettext ncurses @@ -205,6 +211,10 @@ stdenv.mkDerivation (finalAttrs: { # Remove manpages from tools we aren't providing find $out/Applications/MacVim.app/Contents/man \( -name evim.1 -or -name eview.1 \) -delete rm $out/Applications/MacVim.app/Contents/man/man1/mvim.1 + '' + + optionalString stdenv.isAarch64 '' + # Resign the binary and set the linker-signed flag. + rcodesign sign --code-signature-flags linker-signed $exe ''; # We rely on the user's Xcode install to build. It may be located in an arbitrary place, and From c06af958dcdd1dd05f2b3ef0ac9505bcbce5470d Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Thu, 23 Oct 2025 01:43:22 -0700 Subject: [PATCH 285/380] macvim: disable python support by default MacVim currently fails to link against nixpkgs python because Xcode's clang doesn't understand the LLVM bitcode in the `libpython${pythonVersion}.a` static library. I'm not sure what this static library is for when `lib/libpython${pythonVersion}.dylib` exists, but I don't know of a way to tell MacVim to ignore it. Linking against python works if we rebuild python to skip the static library but that doesn't seem like a proper solution, so until a permanent solution is found, just disable python by default. Also mark macvim as no longer broken. --- pkgs/applications/editors/vim/macvim.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 9b0dcb4df47c..a3c7dabf9b37 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -14,11 +14,12 @@ darwin, libiconv, python3, + enablePython ? false, rcodesign, }: let - inherit (lib) optional optionalString; + inherit (lib) optional optionals optionalString; in # Try to match MacVim's documented script interface compatibility @@ -64,8 +65,8 @@ stdenv.mkDerivation (finalAttrs: { ruby tcl perl - python3 - ]; + ] + ++ optional enablePython python3; patches = [ ./macvim.patch ]; @@ -77,14 +78,22 @@ stdenv.mkDerivation (finalAttrs: { "--enable-multibyte" "--enable-nls" "--enable-luainterp=dynamic" + ] + ++ optionals enablePython [ "--enable-python3interp=dynamic" + ] + ++ [ "--enable-perlinterp=dynamic" "--enable-rubyinterp=dynamic" "--enable-tclinterp=yes" "--without-local-dir" "--with-luajit" "--with-lua-prefix=${luajit}" + ] + ++ optionals enablePython [ "--with-python3-command=${python3}/bin/python3" + ] + ++ [ "--with-ruby-command=${ruby}/bin/ruby" "--with-tclsh=${tcl}/bin/tclsh" "--with-tlib=ncurses" @@ -204,7 +213,11 @@ stdenv.mkDerivation (finalAttrs: { libperl=$(dirname $(find ${perl} -name "libperl.dylib")) install_name_tool -add_rpath ${luajit}/lib $exe install_name_tool -add_rpath ${tcl}/lib $exe + '' + + optionalString enablePython '' install_name_tool -add_rpath ${python3}/lib $exe + '' + + '' install_name_tool -add_rpath $libperl $exe install_name_tool -add_rpath ${ruby}/lib $exe @@ -233,8 +246,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ ]; platforms = platforms.darwin; hydraPlatforms = [ ]; # hydra can't build this as long as we rely on Xcode and sandboxProfile - # Needs updating to a newer MacVim for Python and Ruby version support - broken = true; knownVulnerabilities = [ "CVE-2023-46246" "CVE-2023-48231" From 5ece9f37b1b90898002ee777972b2d1684f84dae Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Thu, 23 Oct 2025 02:31:45 -0700 Subject: [PATCH 286/380] macvim: 179 -> 181 Updates macvim to r181, including bumping the Ruby version to 3.4 since that's what MacVim r181 is built against. There's still 3 CVEs in the `knownVulnerabilities` list that are newer than this release, but this is the latest MacVim release available right now. --- pkgs/applications/editors/vim/macvim.nix | 32 ++++------------------ pkgs/applications/editors/vim/macvim.patch | 13 --------- 2 files changed, 5 insertions(+), 40 deletions(-) diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index a3c7dabf9b37..668604968f72 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -7,7 +7,7 @@ gettext, pkg-config, cscope, - ruby, + ruby_3_4, tcl, perl, luajit, @@ -24,9 +24,8 @@ in # Try to match MacVim's documented script interface compatibility let - #perl = perl540; - # Ruby 3.3 - #ruby = ruby_3_3; + # Ruby 3.4 + ruby = ruby_3_4; # Building requires a few system tools to be in PATH. # Some of these we could patch into the relevant source files (such as xcodebuild and @@ -41,13 +40,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "macvim"; - version = "179"; + version = "181"; src = fetchFromGitHub { owner = "macvim-dev"; repo = "macvim"; rev = "release-${finalAttrs.version}"; - hash = "sha256-L9LVXyeA09aMtNf+b/Oo+eLpeVEKTD1/oNWCiFn5FbU="; + hash = "sha256-Wdq+eXSaGs+y+75ZbxoNAcyopRkWRHHRm05T0SHBrow="; }; enableParallelBuilding = true; @@ -247,27 +246,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.darwin; hydraPlatforms = [ ]; # hydra can't build this as long as we rely on Xcode and sandboxProfile knownVulnerabilities = [ - "CVE-2023-46246" - "CVE-2023-48231" - "CVE-2023-48232" - "CVE-2023-48233" - "CVE-2023-48234" - "CVE-2023-48235" - "CVE-2023-48236" - "CVE-2023-48237" - "CVE-2023-48706" - "CVE-2023-5344" - "CVE-2023-5441" - "CVE-2023-5535" - "CVE-2024-22667" - "CVE-2024-41957" - "CVE-2024-41965" - "CVE-2024-43374" - "CVE-2024-47814" - "CVE-2025-1215" - "CVE-2025-22134" - "CVE-2025-24014" - "CVE-2025-26603" "CVE-2025-29768" "CVE-2025-53905" "CVE-2025-53906" diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch index 223778acf60c..767c59bd154c 100644 --- a/pkgs/applications/editors/vim/macvim.patch +++ b/pkgs/applications/editors/vim/macvim.patch @@ -199,16 +199,3 @@ index 6e33142..6185f45 100644 #ifdef AMIGA # include "os_amiga.h" #endif -diff --git a/src/vimtutor b/src/vimtutor -index 3b154f2..e89f260 100755 ---- a/src/vimtutor -+++ b/src/vimtutor -@@ -16,7 +16,7 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" - if test "$1" = "-g"; then - # Try to use the GUI version of Vim if possible, it will fall back - # on Vim if Gvim is not installed. -- seq="gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" -+ seq="mvim gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" - shift - fi - From 8b45a0a4f0cea1b9c9e932aca579e75afbac0eb5 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Thu, 23 Oct 2025 02:58:18 -0700 Subject: [PATCH 287/380] maintainers: add lilyball --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0948524fc6a4..dd68132569b4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14728,6 +14728,13 @@ githubId = 54189319; name = "Lilly Cham"; }; + lilyball = { + email = "lily@ballards.net"; + github = "lilyball"; + githubId = 714; + matrix = "@esperlily:matrix.org"; + name = "Lily Ballard"; + }; limeytexan = { email = "limeytexan@gmail.com"; github = "limeytexan"; From f20cb87b0a864f5cfb7af71fbab7e31ae470ec2f Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Thu, 23 Oct 2025 02:59:56 -0700 Subject: [PATCH 288/380] macvim: add lilyball as maintainer --- pkgs/applications/editors/vim/macvim.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 668604968f72..943fd5b3b29e 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -242,7 +242,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Vim - the text editor - for macOS"; homepage = "https://macvim.org/"; license = licenses.vim; - maintainers = [ ]; + maintainers = with maintainers; [ lilyball ]; platforms = platforms.darwin; hydraPlatforms = [ ]; # hydra can't build this as long as we rely on Xcode and sandboxProfile knownVulnerabilities = [ From bd8890b4f81363865a380c0c48d3f3dfdcb6728f Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Thu, 23 Oct 2025 13:07:43 +0300 Subject: [PATCH 289/380] birdtray: move to `pkgs/by-name` --- .../default.nix => by-name/bi/birdtray/package.nix} | 11 +++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 8 deletions(-) rename pkgs/{applications/misc/birdtray/default.nix => by-name/bi/birdtray/package.nix} (89%) diff --git a/pkgs/applications/misc/birdtray/default.nix b/pkgs/by-name/bi/birdtray/package.nix similarity index 89% rename from pkgs/applications/misc/birdtray/default.nix rename to pkgs/by-name/bi/birdtray/package.nix index ce8673ed6c09..09321955a62f 100644 --- a/pkgs/applications/misc/birdtray/default.nix +++ b/pkgs/by-name/bi/birdtray/package.nix @@ -1,16 +1,14 @@ { - mkDerivation, + stdenv, lib, fetchFromGitHub, cmake, pkg-config, - qtbase, - qttools, - qtx11extras, + libsForQt5, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "birdtray"; version = "1.11.4"; @@ -24,8 +22,9 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + libsForQt5.wrapQtAppsHook ]; - buildInputs = [ + buildInputs = with libsForQt5; [ qtbase qttools qtx11extras diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3525f46c6f9..575246f33a3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1765,8 +1765,6 @@ with pkgs; biliass = with python3.pkgs; toPythonApplication biliass; - birdtray = libsForQt5.callPackage ../applications/misc/birdtray { }; - charles = charles5; inherit (callPackages ../applications/networking/charles { }) charles3 From 0daa3ea1757c9b8f7be45a7da8c4ba28d4c82618 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Thu, 23 Oct 2025 13:09:08 +0300 Subject: [PATCH 290/380] birdtray: refresh the recipe to the current guidelines - remove `with lib` - use `tag` and `hash` in source - replace `rec` with `finalAttrs` --- pkgs/by-name/bi/birdtray/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/bi/birdtray/package.nix b/pkgs/by-name/bi/birdtray/package.nix index 09321955a62f..17fd18702428 100644 --- a/pkgs/by-name/bi/birdtray/package.nix +++ b/pkgs/by-name/bi/birdtray/package.nix @@ -8,15 +8,15 @@ libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "birdtray"; version = "1.11.4"; src = fetchFromGitHub { owner = "gyunaev"; repo = "birdtray"; - rev = "v${version}"; - sha256 = "sha256-rj8tPzZzgW0hXmq8c1LiunIX1tO/tGAaqDGJgCQda5M="; + tag = "v${finalAttrs.version}"; + hash = "sha256-rj8tPzZzgW0hXmq8c1LiunIX1tO/tGAaqDGJgCQda5M="; }; nativeBuildInputs = [ @@ -40,12 +40,12 @@ stdenv.mkDerivation rec { # https://github.com/gyunaev/birdtray/issues/113#issuecomment-621742315 qtWrapperArgs = [ "--set QT_QPA_PLATFORM xcb" ]; - meta = with lib; { + meta = { description = "Mail system tray notification icon for Thunderbird"; mainProgram = "birdtray"; homepage = "https://github.com/gyunaev/birdtray"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ Flakebi ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ Flakebi ]; + platforms = lib.platforms.linux; }; -} +}) From 26d63c2b6c2da048c6558bc01e953c84a2a04a0b Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Thu, 23 Oct 2025 13:11:42 +0300 Subject: [PATCH 291/380] birdtray: add update script --- pkgs/by-name/bi/birdtray/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/bi/birdtray/package.nix b/pkgs/by-name/bi/birdtray/package.nix index 17fd18702428..73cd238cd10c 100644 --- a/pkgs/by-name/bi/birdtray/package.nix +++ b/pkgs/by-name/bi/birdtray/package.nix @@ -6,6 +6,8 @@ cmake, pkg-config, libsForQt5, + + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -40,6 +42,8 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/gyunaev/birdtray/issues/113#issuecomment-621742315 qtWrapperArgs = [ "--set QT_QPA_PLATFORM xcb" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Mail system tray notification icon for Thunderbird"; mainProgram = "birdtray"; From d957aa3f8b73bdf65253b0a67fa858ac73155d4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 10:24:28 +0000 Subject: [PATCH 292/380] python3Packages.google-cloud-os-config: 1.21.0 -> 1.22.0 --- .../python-modules/google-cloud-os-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 16fa3d531908..3bf88361e6cd 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.21.0"; + version = "1.22.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_os_config"; inherit version; - hash = "sha256-NKdb/E9CO1Zp98kHcvqYNIr0L27C+ijQ1ulT3p58qSk="; + hash = "sha256-15oxD2+hznRwqqCExw443AXZhTH0aPghs6Um5NM6cOQ="; }; build-system = [ setuptools ]; From 7a185ce09e810aa9a0811fc762476e29a721dc10 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Wed, 15 Oct 2025 12:00:00 +0000 Subject: [PATCH 293/380] nixseparatedebuginfod2: v1.0.0 -> v1.0.1 --- pkgs/by-name/ni/nixseparatedebuginfod2/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix b/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix index 548618f311a5..42f9613df285 100644 --- a/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix +++ b/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "nixseparatedebuginfod2"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "symphorien"; repo = "nixseparatedebuginfod2"; tag = "v${version}"; - hash = "sha256-r/lmnYdnqyc0Mx1ZVzebiz8V04bmKb8lJBv/ndIzQYM="; + hash = "sha256-INY9mLJ+7i3BoShqFZMELm9aXiDbZkuLyokgm42kEbo="; }; - cargoHash = "sha256-bj5OOj/PpoBU745hbhN1YqiVBikNIzT6/WrNGklRqy4="; + cargoHash = "sha256-6JyC0CLGnkbQWp8l27DXZ04Gt0nsNNSBFfcvAQtllE4="; buildInputs = [ libarchive @@ -41,6 +41,9 @@ rustPlatform.buildRustPackage rec { passthru.tests = { inherit (nixosTests) nixseparatedebuginfod2; }; + # flaky tests + checkFlags = [ "--skip substituter::http" ]; + meta = { description = "Downloads and provides debug symbols and source code for nix derivations to gdb and other debuginfod-capable debuggers as needed"; homepage = "https://github.com/symphorien/nixseparatedebuginfod2"; From 689bb003be33e8558ca159f104925df8d5b7795b Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 28 Aug 2025 02:05:17 +0200 Subject: [PATCH 294/380] ibus-engines.kkc: drop --- .../ibus-engines/ibus-kkc/default.nix | 46 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 48 deletions(-) delete mode 100644 pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix deleted file mode 100644 index 93cc1b9daa4a..000000000000 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - vala, - intltool, - pkg-config, - libkkc, - ibus, - skkDictionaries, - gtk3, -}: - -stdenv.mkDerivation rec { - pname = "ibus-kkc"; - version = "1.5.22"; - - src = fetchurl { - url = "${meta.homepage}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1kj74c9zy9yxkjx7pz96mzqc13cf10yfmlgprr8sfd4ay192bzi2"; - }; - - nativeBuildInputs = [ - vala - intltool - pkg-config - ]; - - buildInputs = [ - libkkc - ibus - gtk3 - ]; - - postInstall = '' - ln -s ${skkDictionaries.l}/share/skk $out/share/skk - ''; - - meta = with lib; { - isIbusEngine = true; - description = "Libkkc (Japanese Kana Kanji input method) engine for ibus"; - homepage = "https://github.com/ueno/ibus-kkc"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9a1f523aa80..6c0d7da1edb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2474,8 +2474,6 @@ with pkgs; hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { }; - kkc = callPackage ../tools/inputmethods/ibus-engines/ibus-kkc { }; - libpinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-libpinyin { }; libthai = callPackage ../tools/inputmethods/ibus-engines/ibus-libthai { }; From d0ec96e6f29710a67129ad83c44dcc2d76987ac5 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 28 Aug 2025 02:08:54 +0200 Subject: [PATCH 295/380] libkkc-data: drop --- pkgs/by-name/li/libkkc-data/package.nix | 38 ------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 pkgs/by-name/li/libkkc-data/package.nix diff --git a/pkgs/by-name/li/libkkc-data/package.nix b/pkgs/by-name/li/libkkc-data/package.nix deleted file mode 100644 index 85e9f3e7d256..000000000000 --- a/pkgs/by-name/li/libkkc-data/package.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - fetchpatch, - python3, - libkkc, -}: - -stdenv.mkDerivation rec { - pname = "libkkc-data"; - version = "0.2.7"; - - src = fetchurl { - url = "${meta.homepage}/releases/download/v${libkkc.version}/${pname}-${version}.tar.xz"; - sha256 = "16avb50jasq2f1n9xyziky39dhlnlad0991pisk3s11hl1aqfrwy"; - }; - - patches = [ - (fetchpatch { - name = "build-python3.patch"; - url = "https://github.com/ueno/libkkc/commit/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch"; - relative = "data/templates/libkkc-data"; - hash = "sha256-q4zUclJtDQ1E5v2PW00zRZz6GXllLUcp2h3tugufrRU="; - }) - ]; - - nativeBuildInputs = [ python3.pkgs.marisa ]; - - strictDeps = true; - - meta = with lib; { - description = "Language model data package for libkkc"; - homepage = "https://github.com/ueno/libkkc"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1a09ca02c33f..d76cbfa469b4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1379,6 +1379,7 @@ mapAliases { libiconv-darwin = darwin.libiconv; # Added 2024-09-22 libixp_hg = libixp; # Added 2022-04-25 libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17 + libkkc-data = throw "'libkkc-data' has been removed as it depended on libkkc which was removed"; # Added 2025-08-28 liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17 liblinphone = throw "'liblinphone' has been moved to 'linphonePackages.liblinphone'"; # Added 2025-09-20 libmp3splt = throw "'libmp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17 From 84aad828626d38c01f8ca89d6a99ffefe89a4b3c Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 28 Aug 2025 01:57:04 +0200 Subject: [PATCH 296/380] libkkc: drop --- pkgs/by-name/li/libkkc/package.nix | 67 ------------------------------ pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 pkgs/by-name/li/libkkc/package.nix diff --git a/pkgs/by-name/li/libkkc/package.nix b/pkgs/by-name/li/libkkc/package.nix deleted file mode 100644 index 0788ab0cc610..000000000000 --- a/pkgs/by-name/li/libkkc/package.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - fetchpatch, - vala, - gobject-introspection, - intltool, - python3, - glib, - pkg-config, - libgee, - json-glib, - marisa, - libkkc-data, -}: - -stdenv.mkDerivation rec { - pname = "libkkc"; - version = "0.3.5"; - - src = fetchurl { - url = "${meta.homepage}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "89b07b042dae5726d306aaa1296d1695cb75c4516f4b4879bc3781fe52f62aef"; - }; - - patches = [ - (fetchpatch { - name = "build-python3.patch"; - url = "https://github.com/ueno/libkkc/commit/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch"; - hash = "sha256-4IVpcJJFrxmxJGNiRHteleAa6trOwbvMHRTE/qyjOPY="; - }) - ]; - - nativeBuildInputs = [ - vala - gobject-introspection - python3 - python3.pkgs.marisa - intltool - glib - pkg-config - ]; - - buildInputs = [ - marisa - libkkc-data - ]; - enableParallelBuilding = true; - - propagatedBuildInputs = [ - libgee - json-glib - ]; - - postInstall = '' - ln -s ${libkkc-data}/lib/libkkc/models $out/share/libkkc/models - ''; - - meta = with lib; { - broken = true; - description = "Japanese Kana Kanji conversion input method library"; - homepage = "https://github.com/ueno/libkkc"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d76cbfa469b4..bd97176bbf12 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1379,6 +1379,7 @@ mapAliases { libiconv-darwin = darwin.libiconv; # Added 2024-09-22 libixp_hg = libixp; # Added 2022-04-25 libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17 + libkkc = throw "'libkkc' has been removed due to lack of maintenance. Consider using anthy instead"; # added 2025-08-28 libkkc-data = throw "'libkkc-data' has been removed as it depended on libkkc which was removed"; # Added 2025-08-28 liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17 liblinphone = throw "'liblinphone' has been moved to 'linphonePackages.liblinphone'"; # Added 2025-09-20 From 6332c09ecef12b203a8c09ef8acd9767132937dc Mon Sep 17 00:00:00 2001 From: l1npengtul Date: Thu, 23 Oct 2025 19:43:25 +0900 Subject: [PATCH 297/380] sonobus: general cleanup, add desktop item, add nix-update-script --- pkgs/by-name/so/sonobus/package.nix | 38 +++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/so/sonobus/package.nix b/pkgs/by-name/so/sonobus/package.nix index c3de44a3f59f..c300bf7ce724 100644 --- a/pkgs/by-name/so/sonobus/package.nix +++ b/pkgs/by-name/so/sonobus/package.nix @@ -17,8 +17,10 @@ libopus, curl, gtk3, + nix-update-script, + copyDesktopItems, + makeDesktopItem, }: - stdenv.mkDerivation (finalAttrs: { pname = "sonobus"; version = "1.7.2"; @@ -31,10 +33,26 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = "sonobus"; + desktopName = "Sonobus"; + comment = "High-quality network audio streaming"; + icon = "sonobus"; + exec = "sonobus"; + categories = [ + "Audio" + "AudioVideo" + ]; + }) + ]; + nativeBuildInputs = [ autoPatchelfHook cmake pkg-config + copyDesktopItems ]; buildInputs = [ @@ -44,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: { libopus curl gtk3 - # webkitgtk_4_0 ]; runtimeDependencies = [ @@ -71,17 +88,22 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall cd ../linux ./install.sh "$out" + + install -Dm444 $src/images/sonobus_logo_96.png $out/share/pixmaps/sonobus.png + runHook postInstall ''; - meta = with lib; { - # webkitgtk_4_0 was removed - broken = true; + passthru.updateScript = nix-update-script { }; + + meta = { description = "High-quality network audio streaming"; homepage = "https://sonobus.net/"; - license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ PowerUser64 ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + PowerUser64 + ]; + platforms = lib.platforms.unix; mainProgram = "sonobus"; }; }) From 01354e86ae44d76666446f2e0dab5a1ffa3c4609 Mon Sep 17 00:00:00 2001 From: l1npengtul Date: Thu, 23 Oct 2025 19:43:45 +0900 Subject: [PATCH 298/380] sonobus: add l1npengtul as maintainer --- pkgs/by-name/so/sonobus/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/so/sonobus/package.nix b/pkgs/by-name/so/sonobus/package.nix index c300bf7ce724..ccff9bc0cb01 100644 --- a/pkgs/by-name/so/sonobus/package.nix +++ b/pkgs/by-name/so/sonobus/package.nix @@ -102,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ PowerUser64 + l1npengtul ]; platforms = lib.platforms.unix; mainProgram = "sonobus"; From 6898384e71123caed119cc8536381ab910f5d6d6 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Thu, 23 Oct 2025 12:52:52 +0200 Subject: [PATCH 299/380] netlify-cli: 19.0.2 -> 23.9.2 Upgrades for netlify-cli were broken for a while because postinstall script was changed to not build the packages into dist directory ahead of time, but rather expect the user to do this. Add an workaround to not run postinstall logic entirely. Also disable edge functions in tests using an internal flag, because they try to download Deno, some types definitions, and maybe other stuff at runtime. --- pkgs/by-name/ne/netlify-cli/package.nix | 12 +++++++++--- pkgs/by-name/ne/netlify-cli/test.nix | 9 +++++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ne/netlify-cli/package.nix b/pkgs/by-name/ne/netlify-cli/package.nix index e913e4bb00a7..ceda6d70bf65 100644 --- a/pkgs/by-name/ne/netlify-cli/package.nix +++ b/pkgs/by-name/ne/netlify-cli/package.nix @@ -11,16 +11,22 @@ buildNpmPackage rec { pname = "netlify-cli"; - version = "19.0.2"; + version = "23.9.2"; src = fetchFromGitHub { owner = "netlify"; repo = "cli"; tag = "v${version}"; - hash = "sha256-+P+hS/g/xRFNvzESZ5LyxyQSSRZ7BzCg9ZX/ndNLeDg="; + hash = "sha256-rjxm/TrKsvYCKwoHkZRZXFpFTfLd0s0D/H6p5Bull0E="; }; - npmDepsHash = "sha256-3C+tTqLJCm48pAbQMiIq2SsHmb4bcCaf3IU/cTeR5BA="; + # Prevent postinstall script from running before package is built + # See https://github.com/netlify/cli/blob/v23.9.2/scripts/postinstall.js#L70 + postPatch = '' + touch .git + ''; + + npmDepsHash = "sha256-itzEmCOBXxspGiwxt8t6di7/EuCo2Qkl5JVSkMfUemI="; inherit nodejs; diff --git a/pkgs/by-name/ne/netlify-cli/test.nix b/pkgs/by-name/ne/netlify-cli/test.nix index 2d311105a094..cb36c91fb253 100644 --- a/pkgs/by-name/ne/netlify-cli/test.nix +++ b/pkgs/by-name/ne/netlify-cli/test.nix @@ -27,10 +27,15 @@ runCommand "netlify-cli-test" echo '/with-redirect /' >_redirects # Start a local server and wait for it to respond - netlify dev --offline --port 8888 2>&1 | tee log & + # Edge functions require specific version of Deno and internet access for other Netlify stuff + netlify dev --offline --internal-disable-edge-functions --port 8888 --debug 2>&1 | tee log & sleep 0.1 || true for (( i=0; i<300; i++ )); do - if grep --ignore-case 'Server now ready' /dev/null; then + echo "Server died before starting" >&2 + exit 1 + fi + if grep --ignore-case 'Local dev server ready' Date: Thu, 23 Oct 2025 17:51:01 +0800 Subject: [PATCH 300/380] qtcreator: Compile fixes for Qt 6.10 fix: https://github.com/NixOS/nixpkgs/issues/454783 --- pkgs/development/tools/qtcreator/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index cabba61c97cc..98ab72525ac1 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchurl, + fetchpatch, cmake, pkg-config, ninja, @@ -39,6 +40,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-sOEY+fuJvnF2KLP5JRwpX6bfQfqLfYEhbi6tg1XlWhM="; }; + patches = [ + # QmlDesigner: Compile fixes for Qt 6.10 private API changes + (fetchpatch { + url = "https://github.com/qt-creator/qt-creator/commit/5a4c700ccefc76c7c531c834734e6fefa14b5364.patch"; + hash = "sha256-BnS0HOqP5b7ZsVtuRpCK+TtoJj0yhodDuVtp+C3btIA="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config From e1e356e70387b7c2dfcecd96b2afc2078f325493 Mon Sep 17 00:00:00 2001 From: Casey Link Date: Thu, 23 Oct 2025 13:07:44 +0200 Subject: [PATCH 301/380] tailwindcss_4: 4.1.14 -> 4.1.16 --- pkgs/by-name/ta/tailwindcss_4/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix index da963b1858d1..107239a1850f 100644 --- a/pkgs/by-name/ta/tailwindcss_4/package.nix +++ b/pkgs/by-name/ta/tailwindcss_4/package.nix @@ -7,7 +7,7 @@ makeWrapper, }: let - version = "4.1.14"; + version = "4.1.16"; inherit (stdenv.hostPlatform) system; throwSystem = throw "tailwindcss has not been packaged for ${system} yet."; @@ -22,10 +22,10 @@ let hash = { - aarch64-darwin = "sha256-5yK3UvUd74bULohrTBFx8tCaS+GnSHoKUeSv+OdgPOM="; - aarch64-linux = "sha256-MUlB9fbhQ+dOdAxYetH7qu3lRiVy3TMLvgk35hHpZts="; - x86_64-darwin = "sha256-Z7JbYQP6dndjflpd4zJ/7DM12jFtkNP9saTNcr2kHAo="; - x86_64-linux = "sha256-vDTDAbCAtua5jtJBGEGYM/lm9vNH5VaUXWVX02pEpW4="; + aarch64-darwin = "sha256-5s1EuBZ/V0bKMuVPahQR3RpsDdFdJqnCc7Oy7Z2H330="; + aarch64-linux = "sha256-ln60NPTWocDf2hBt7MZGy3QuBNdFqkhHJgI83Ua6jto="; + x86_64-darwin = "sha256-/eKu0JvyScq5+Yb9byCJ486anOHHhi/dv6gHxBfg9dM="; + x86_64-linux = "sha256-CeaHamPOsJzNflhn49uystxlw6Ly4v4hDWjqO8BDIFA="; } .${system} or throwSystem; in From 6961589f103d9d2f2e4d37e1c1a7471bc36e8f5a Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 23 Oct 2025 13:28:25 +0200 Subject: [PATCH 302/380] signal-desktop: 7.75.1 -> 7.76.0 Changelog: https://github.com/signalapp/Signal-Desktop/releases/tag/v7.76.0 --- pkgs/by-name/si/signal-desktop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index e4f94e63f7c7..028c523da7e5 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -52,13 +52,13 @@ let ''; }); - version = "7.75.1"; + version = "7.76.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-l5fMVXwuXHaGcBuemkwzUcEuktTseGL2k13oxoo81+0="; + hash = "sha256-zwywpQ/1LYSofXPMLtYt7c0PLlzgNedRGqslPJur61g="; }; sticker-creator = stdenv.mkDerivation (finalAttrs: { @@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: { env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1760633959; + SOURCE_DATE_EPOCH = 1761172657; }; preBuild = '' From a8204745e51ab28628d555c9665edde63e48d755 Mon Sep 17 00:00:00 2001 From: Jon Hermansen Date: Tue, 22 Jul 2025 16:10:38 -0400 Subject: [PATCH 303/380] treewide: remove packages which depend on freeimage freeimage support was dropped in 608422bd4ba43, so these no longer build. Removing the most obvious dependents of the library. --- pkgs/by-name/ar/arrayfire/no-assets.patch | 35 --- pkgs/by-name/ar/arrayfire/no-download.patch | 31 --- pkgs/by-name/ar/arrayfire/package.nix | 248 ------------------ .../001-add-nixpkgs-retroarch-cores.patch | 12 - .../em/emulationstation-de/package.nix | 74 ------ pkgs/by-name/em/emulationstation/package.nix | 87 ------ pkgs/by-name/em/emulationstation/sources.nix | 35 --- pkgs/by-name/fo/forge/no-download-glad.patch | 31 --- pkgs/by-name/fo/forge/package.nix | 86 ------ pkgs/by-name/ga/gamecube-tools/package.nix | 33 --- pkgs/by-name/pe/perceptualdiff/package.nix | 31 --- pkgs/by-name/pg/pgf_graphics/package.nix | 43 --- pkgs/by-name/po/posterazor/package.nix | 58 ---- pkgs/by-name/ru/rucksack/package.nix | 37 --- pkgs/by-name/tr/trenchbroom/package.nix | 175 ------------ pkgs/top-level/aliases.nix | 10 + 16 files changed, 10 insertions(+), 1016 deletions(-) delete mode 100644 pkgs/by-name/ar/arrayfire/no-assets.patch delete mode 100644 pkgs/by-name/ar/arrayfire/no-download.patch delete mode 100644 pkgs/by-name/ar/arrayfire/package.nix delete mode 100644 pkgs/by-name/em/emulationstation-de/001-add-nixpkgs-retroarch-cores.patch delete mode 100644 pkgs/by-name/em/emulationstation-de/package.nix delete mode 100644 pkgs/by-name/em/emulationstation/package.nix delete mode 100644 pkgs/by-name/em/emulationstation/sources.nix delete mode 100644 pkgs/by-name/fo/forge/no-download-glad.patch delete mode 100644 pkgs/by-name/fo/forge/package.nix delete mode 100644 pkgs/by-name/ga/gamecube-tools/package.nix delete mode 100644 pkgs/by-name/pe/perceptualdiff/package.nix delete mode 100644 pkgs/by-name/pg/pgf_graphics/package.nix delete mode 100644 pkgs/by-name/po/posterazor/package.nix delete mode 100644 pkgs/by-name/ru/rucksack/package.nix delete mode 100644 pkgs/by-name/tr/trenchbroom/package.nix diff --git a/pkgs/by-name/ar/arrayfire/no-assets.patch b/pkgs/by-name/ar/arrayfire/no-assets.patch deleted file mode 100644 index b8820f8aa55b..000000000000 --- a/pkgs/by-name/ar/arrayfire/no-assets.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 12d6e557c..cc004555d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -321,11 +321,6 @@ if(NOT TARGET nonstd::span-lite) - - endif() - --af_dep_check_and_populate(${assets_prefix} -- URI https://github.com/arrayfire/assets.git -- REF master --) --set(ASSETS_DIR ${${assets_prefix}_SOURCE_DIR}) - - # when crosscompiling use the bin2cpp file from the native bin directory - if(CMAKE_CROSSCOMPILING) -@@ -473,18 +468,6 @@ install(FILES ${ArrayFire_BINARY_DIR}/include/af/version.h - DESTINATION "${AF_INSTALL_INC_DIR}/af/" - COMPONENT headers) - --# install the examples irrespective of the AF_BUILD_EXAMPLES value --# only the examples source files are installed, so the installation of these --# source files does not depend on AF_BUILD_EXAMPLES --# when AF_BUILD_EXAMPLES is OFF, the examples source is installed without --# building the example executables --install(DIRECTORY examples/ #NOTE The slash at the end is important -- DESTINATION ${AF_INSTALL_EXAMPLE_DIR} -- COMPONENT examples) -- --install(DIRECTORY ${ASSETS_DIR}/examples/ #NOTE The slash at the end is important -- DESTINATION ${AF_INSTALL_EXAMPLE_DIR} -- COMPONENT examples) - - install(DIRECTORY "${ArrayFire_SOURCE_DIR}/LICENSES/" - DESTINATION LICENSES diff --git a/pkgs/by-name/ar/arrayfire/no-download.patch b/pkgs/by-name/ar/arrayfire/no-download.patch deleted file mode 100644 index f7903e74112d..000000000000 --- a/pkgs/by-name/ar/arrayfire/no-download.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/CMakeModules/AFconfigure_deps_vars.cmake b/CMakeModules/AFconfigure_deps_vars.cmake -index aac332f5a..e9e711159 100644 ---- a/CMakeModules/AFconfigure_deps_vars.cmake -+++ b/CMakeModules/AFconfigure_deps_vars.cmake -@@ -94,7 +94,7 @@ macro(af_dep_check_and_populate dep_prefix) - URL ${adcp_args_URI} - URL_HASH ${adcp_args_REF} - DOWNLOAD_COMMAND \"\" -- UPDATE_DISCONNECTED ON -+ UPDATE_COMMAND \"\" - SOURCE_DIR "${ArrayFire_SOURCE_DIR}/extern/${dep_prefix}-src" - BINARY_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-build" - SUBBUILD_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-subbuild" -@@ -104,7 +104,7 @@ macro(af_dep_check_and_populate dep_prefix) - QUIET - URL ${adcp_args_URI} - DOWNLOAD_COMMAND \"\" -- UPDATE_DISCONNECTED ON -+ UPDATE_COMMAND \"\" - SOURCE_DIR "${ArrayFire_SOURCE_DIR}/extern/${dep_prefix}-src" - BINARY_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-build" - SUBBUILD_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-subbuild" -@@ -116,7 +116,7 @@ macro(af_dep_check_and_populate dep_prefix) - GIT_REPOSITORY ${adcp_args_URI} - GIT_TAG ${adcp_args_REF} - DOWNLOAD_COMMAND \"\" -- UPDATE_DISCONNECTED ON -+ UPDATE_COMMAND \"\" - SOURCE_DIR "${ArrayFire_SOURCE_DIR}/extern/${dep_prefix}-src" - BINARY_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-build" - SUBBUILD_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-subbuild" diff --git a/pkgs/by-name/ar/arrayfire/package.nix b/pkgs/by-name/ar/arrayfire/package.nix deleted file mode 100644 index 0cc0623a995d..000000000000 --- a/pkgs/by-name/ar/arrayfire/package.nix +++ /dev/null @@ -1,248 +0,0 @@ -{ - blas, - boost, - clblast, - cmake, - config, - cudaPackages, - fetchFromGitHub, - fftw, - fftwFloat, - fmt_9, - forge, - freeimage, - gtest, - lapack, - lib, - libGL, - mesa, - ocl-icd, - opencl-clhpp, - pkg-config, - python3, - span-lite, - stdenv, - # NOTE: We disable tests by default, because they cannot be run easily on - # non-NixOS systems when either CUDA or OpenCL support is enabled (CUDA and - # OpenCL need access to drivers that are installed outside of Nix on - # non-NixOS systems). - doCheck ? false, - cpuSupport ? true, - cudaSupport ? config.cudaSupport, - # OpenCL needs mesa which is broken on Darwin - openclSupport ? !stdenv.hostPlatform.isDarwin, - # This argument lets one run CUDA & OpenCL tests on non-NixOS systems by - # telling Nix where to find the drivers. If you know the version of the - # Nvidia driver that is installed on your system, you can do: - # - # arrayfire.override { - # nvidiaComputeDrivers = - # callPackage - # (prev.linuxPackages.nvidiaPackages.mkDriver { - # version = cudaVersion; # our driver version - # sha256_64bit = cudaHash; # sha256 of the .run binary - # useGLVND = false; - # useProfiles = false; - # useSettings = false; - # usePersistenced = false; - # ... - # }) - # { libsOnly = true; }; - # } - nvidiaComputeDrivers ? null, - fetchpatch, -}: - -# ArrayFire compiles with 64-bit BLAS, but some tests segfault or throw -# exceptions, which means that it isn't really supported yet... -assert blas.isILP64 == false; - -stdenv.mkDerivation rec { - pname = "arrayfire"; - version = "3.9.0"; - - src = fetchFromGitHub { - owner = "arrayfire"; - repo = "arrayfire"; - rev = "v3.9.0"; - hash = "sha256-80fxdkaeAQ5u0X/UGPaI/900cdkZ/vXNcOn5tkZ+C3Y="; - }; - - # We cannot use the clfft from Nixpkgs because ArrayFire maintain a fork - # of clfft where they've modified the CMake build system, and the - # CMakeLists.txt of ArrayFire assumes that we're using that fork. - # - # This can be removed once ArrayFire upstream their changes. - clfft = fetchFromGitHub { - owner = "arrayfire"; - repo = "clfft"; - rev = "760096b37dcc4f18ccd1aac53f3501a83b83449c"; - sha256 = "sha256-vJo1YfC2AJIbbRj/zTfcOUmi0Oj9v64NfA9MfK8ecoY="; - }; - glad = fetchFromGitHub { - owner = "arrayfire"; - repo = "glad"; - rev = "ef8c5508e72456b714820c98e034d9a55b970650"; - sha256 = "sha256-u9Vec7XLhE3xW9vzM7uuf+b18wZsh/VMtGbB6nMVlno="; - }; - threads = fetchFromGitHub { - owner = "arrayfire"; - repo = "threads"; - rev = "4d4a4f0384d1ac2f25b2c4fc1d57b9e25f4d6818"; - sha256 = "sha256-qqsT9woJDtQvzuV323OYXm68pExygYs/+zZNmg2sN34="; - }; - test-data = fetchFromGitHub { - owner = "arrayfire"; - repo = "arrayfire-data"; - rev = "a5f533d7b864a4d8f0dd7c9aaad5ff06018c4867"; - sha256 = "sha256-AWzhsrDXyZrQN2bd0Ng/XlE8v02x7QWTiFTyaAuRXSw="; - }; - # ArrayFire fails to compile with newer versions of spdlog, so we can't use - # the one in Nixpkgs. Once they upgrade, we can switch to using spdlog from - # Nixpkgs. - spdlog = fetchFromGitHub { - owner = "gabime"; - repo = "spdlog"; - rev = "v1.9.2"; - hash = "sha256-GSUdHtvV/97RyDKy8i+ticnSlQCubGGWHg4Oo+YAr8Y="; - }; - - cmakeFlags = [ - "-DBUILD_TESTING=ON" - # We do not build examples, because building tests already takes long enough... - "-DAF_BUILD_EXAMPLES=OFF" - # No need to build forge, because it's a separate package - "-DAF_BUILD_FORGE=OFF" - "-DAF_COMPUTE_LIBRARY='FFTW/LAPACK/BLAS'" - # Prevent ArrayFire from trying to download some matrices from the Internet - "-DAF_TEST_WITH_MTX_FILES=OFF" - # Have to use the header-only version, because we're not using the version - # from Nixpkgs. Otherwise, libaf.so won't be able to find the shared - # library, because ArrayFire's CMake files do not run the install step of - # spdlog. - "-DAF_WITH_SPDLOG_HEADER_ONLY=ON" - (if cpuSupport then "-DAF_BUILD_CPU=ON" else "-DAF_BUILD_CPU=OFF") - (if openclSupport then "-DAF_BUILD_OPENCL=ON" else "-DAF_BUILD_OPENCL=OFF") - (if cudaSupport then "-DAF_BUILD_CUDA=ON" else "-DAF_BUILD_CUDA=OFF") - ] - ++ lib.optionals cudaSupport [ - # ArrayFire use deprecated FindCUDA in their CMake files, so we help CMake - # locate cudatoolkit. - "-DCUDA_LIBRARIES_PATH=${cudaPackages.cudatoolkit}/lib" - ]; - - # ArrayFire have a repo with assets for the examples. Since we don't build - # the examples anyway, remove the dependency on assets. - patches = [ - ./no-assets.patch - ./no-download.patch - # Fix for newer opencl-clhpp. Remove with the next release. - (fetchpatch { - url = "https://github.com/arrayfire/arrayfire/pull/3562.patch"; - hash = "sha256-AdWlpcRTn9waNAaVpZfK6sJ/xBQLiBC4nBeEYiGNN50"; - }) - ]; - - postPatch = '' - mkdir -p ./extern/af_glad-src - mkdir -p ./extern/af_threads-src - mkdir -p ./extern/af_test_data-src - mkdir -p ./extern/ocl_clfft-src - mkdir -p ./extern/spdlog-src - cp -R --no-preserve=mode,ownership ${glad}/* ./extern/af_glad-src/ - cp -R --no-preserve=mode,ownership ${threads}/* ./extern/af_threads-src/ - cp -R --no-preserve=mode,ownership ${test-data}/* ./extern/af_test_data-src/ - cp -R --no-preserve=mode,ownership ${clfft}/* ./extern/ocl_clfft-src/ - cp -R --no-preserve=mode,ownership ${spdlog}/* ./extern/spdlog-src/ - - # libaf.so (the unified backend) tries to load the right shared library at - # runtime, and the search paths are hard-coded... We tweak them to point to - # the installation directory in the Nix store. - substituteInPlace src/api/unified/symbol_manager.cpp \ - --replace '"/opt/arrayfire-3/lib/",' \ - "\"$out/lib/\", \"/opt/arrayfire-3/lib/\"," - ''; - - inherit doCheck; - checkPhase = - let - LD_LIBRARY_PATH = builtins.concatStringsSep ":" ( - [ - "${forge}/lib" - "${freeimage}/lib" - ] - ++ lib.optional cudaSupport "${cudaPackages.cudatoolkit}/lib64" - # On non-NixOS systems, help the tests find Nvidia drivers - ++ lib.optional (nvidiaComputeDrivers != null) "${nvidiaComputeDrivers}/lib" - ); - ctestFlags = builtins.concatStringsSep " " ( - # We have to run with "-j1" otherwise various segfaults occur on non-NixOS systems. - [ - "--output-on-errors" - "-j1" - ] - # See https://github.com/arrayfire/arrayfire/issues/3484 - ++ lib.optional openclSupport "-E '(inverse_dense|cholesky_dense)'" - ); - in - '' - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} - '' - + - # On non-NixOS systems, help the tests find Nvidia drivers - lib.optionalString (openclSupport && nvidiaComputeDrivers != null) '' - export OCL_ICD_VENDORS=${nvidiaComputeDrivers}/etc/OpenCL/vendors - '' - + '' - # Note: for debugging, enable AF_TRACE=all - AF_PRINT_ERRORS=1 ctest ${ctestFlags} - ''; - - buildInputs = [ - blas - boost.dev - boost.out - clblast - fftw - fftwFloat - # We need fmt_9 because ArrayFire fails to compile with newer versions. - fmt_9 - forge - freeimage - gtest - lapack - libGL - ocl-icd - opencl-clhpp - span-lite - ] - ++ lib.optionals cudaSupport [ - cudaPackages.cudatoolkit - cudaPackages.cudnn - cudaPackages.cuda_cccl - ] - ++ lib.optionals openclSupport [ - mesa - ]; - - nativeBuildInputs = [ - cmake - pkg-config - python3 - ]; - - meta = with lib; { - description = "General-purpose library for parallel and massively-parallel computations"; - longDescription = '' - A general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices."; - ''; - license = licenses.bsd3; - homepage = "https://arrayfire.com/"; - platforms = platforms.linux; - maintainers = with maintainers; [ - chessai - twesterhout - ]; - broken = true; - }; -} diff --git a/pkgs/by-name/em/emulationstation-de/001-add-nixpkgs-retroarch-cores.patch b/pkgs/by-name/em/emulationstation-de/001-add-nixpkgs-retroarch-cores.patch deleted file mode 100644 index 5c9b3d194392..000000000000 --- a/pkgs/by-name/em/emulationstation-de/001-add-nixpkgs-retroarch-cores.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/resources/systems/linux/es_find_rules.xml 2024-09-13 16:19:36.000000000 +0300 -+++ b/resources/systems/linux/es_find_rules.xml 2024-11-26 23:08:49.204498848 +0200 -@@ -41,6 +41,9 @@ - /usr/lib64/libretro - - /usr/lib/libretro -+ -+ /run/current-system/sw/lib/retroarch/cores -+ ~/.nix-profile/lib/retroarch/cores - - - diff --git a/pkgs/by-name/em/emulationstation-de/package.nix b/pkgs/by-name/em/emulationstation-de/package.nix deleted file mode 100644 index 7646b0754512..000000000000 --- a/pkgs/by-name/em/emulationstation-de/package.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - lib, - stdenv, - fetchzip, - cmake, - pkg-config, - alsa-lib, - bluez, - curl, - ffmpeg, - freeimage, - freetype, - gettext, - harfbuzz, - icu, - libgit2, - poppler, - pugixml, - SDL2, - libGL, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "emulationstation-de"; - version = "3.2.0"; - - src = fetchzip { - url = "https://gitlab.com/es-de/emulationstation-de/-/archive/v${finalAttrs.version}/emulationstation-de-v${finalAttrs.version}.tar.gz"; - hash = "sha256-tW8+7ImcJ3mBhoIHVE8h4cba+4SQLP55kiFYE7N8jyI="; - }; - - patches = [ - ./001-add-nixpkgs-retroarch-cores.patch - ]; - - postPatch = '' - # ldd-based detection fails for cross builds - substituteInPlace CMake/Packages/FindPoppler.cmake \ - --replace-fail 'GET_PREREQUISITES("''${POPPLER_LIBRARY}" POPPLER_PREREQS 1 0 "" "")' "" - ''; - - nativeBuildInputs = [ - cmake - gettext # msgfmt - pkg-config - ]; - - buildInputs = [ - alsa-lib - bluez - curl - ffmpeg - freeimage - freetype - harfbuzz - icu - libgit2 - poppler - pugixml - SDL2 - libGL - ]; - - cmakeFlags = [ (lib.cmakeBool "APPLICATION_UPDATER" false) ]; - - meta = { - description = "ES-DE (EmulationStation Desktop Edition) is a frontend for browsing and launching games from your multi-platform collection"; - homepage = "https://es-de.org"; - maintainers = with lib.maintainers; [ ivarmedi ]; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - mainProgram = "es-de"; - }; -}) diff --git a/pkgs/by-name/em/emulationstation/package.nix b/pkgs/by-name/em/emulationstation/package.nix deleted file mode 100644 index eb8c048d4ea1..000000000000 --- a/pkgs/by-name/em/emulationstation/package.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ - lib, - SDL2, - alsa-lib, - boost, - callPackage, - cmake, - curl, - freeimage, - freetype, - libGL, - libGLU, - libvlc, - pkg-config, - rapidjson, - stdenv, -}: - -let - sources = callPackage ./sources.nix { }; -in -stdenv.mkDerivation { - inherit (sources.emulationstation) pname version src; - - postUnpack = '' - pushd $sourceRoot/external/pugixml - cp --verbose --archive ${sources.pugixml.src}/* . - chmod --recursive 744 . - popd - ''; - - nativeBuildInputs = [ - SDL2 - cmake - pkg-config - ]; - - buildInputs = [ - SDL2 - alsa-lib - boost - curl - freeimage - freetype - libGL - libGLU - libvlc - rapidjson - ]; - - cmakeFlags = [ (lib.cmakeBool "GL" true) ]; - - strictDeps = true; - - installPhase = '' - runHook preInstall - - install -Dm755 ../emulationstation $out/bin/emulationstation - mkdir -p $out/share/emulationstation/ - cp -r ../resources $out/share/emulationstation/ - - runHook postInstall - ''; - - # es-core/src/resources/ResourceManager.cpp: resources are searched at the - # same place of binaries. - postFixup = '' - pushd $out - ln -s $out/share/emulationstation/resources $out/bin/ - popd - ''; - - passthru = { - inherit sources; - }; - - meta = { - homepage = "https://github.com/RetroPie/EmulationStation"; - description = "Flexible emulator front-end supporting keyboardless navigation and custom system themes (forked by RetroPie)"; - license = with lib.licenses; [ mit ]; - mainProgram = "emulationstation"; - maintainers = with lib.maintainers; [ - edwtjo - ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/by-name/em/emulationstation/sources.nix b/pkgs/by-name/em/emulationstation/sources.nix deleted file mode 100644 index 88273e845fee..000000000000 --- a/pkgs/by-name/em/emulationstation/sources.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ fetchFromGitHub }: - -{ - emulationstation = - let - self = { - pname = "emulationstation"; - version = "2.11.2"; - - src = fetchFromGitHub { - owner = "RetroPie"; - repo = "EmulationStation"; - rev = "v${self.version}"; - hash = "sha256-f2gRkp+3Pp2qnvg2RBzaHPpzhAnwx0+5x1Pe3kD90xE="; - }; - }; - in - self; - - pugixml = - let - self = { - pname = "pugixml"; - version = "1.8.1"; - - src = fetchFromGitHub { - owner = "zeux"; - repo = "pugixml"; - rev = "v${self.version}"; - hash = "sha256-LbjTN1hnIbqI79C+gCdwuDG0+B/5yXf7hg0Q+cDFIf4="; - }; - }; - in - self; -} diff --git a/pkgs/by-name/fo/forge/no-download-glad.patch b/pkgs/by-name/fo/forge/no-download-glad.patch deleted file mode 100644 index 0957be82a3b7..000000000000 --- a/pkgs/by-name/fo/forge/no-download-glad.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/CMakeModules/ForgeConfigureDepsVars.cmake b/CMakeModules/ForgeConfigureDepsVars.cmake -index ee5c2fc..2f75181 100644 ---- a/CMakeModules/ForgeConfigureDepsVars.cmake -+++ b/CMakeModules/ForgeConfigureDepsVars.cmake -@@ -84,7 +84,7 @@ macro(fg_dep_check_and_populate dep_prefix) - URL ${fdcp_args_URI} - URL_HASH ${fdcp_args_REF} - DOWNLOAD_COMMAND \"\" -- UPDATE_DISCONNECTED ON -+ UPDATE_COMMAND \"\" - SOURCE_DIR "${Forge_SOURCE_DIR}/extern/${dep_prefix}-src" - BINARY_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-build" - SUBBUILD_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-subbuild" -@@ -94,7 +94,7 @@ macro(fg_dep_check_and_populate dep_prefix) - QUIET - URL ${fdcp_args_URI} - DOWNLOAD_COMMAND \"\" -- UPDATE_DISCONNECTED ON -+ UPDATE_COMMAND \"\" - SOURCE_DIR "${Forge_SOURCE_DIR}/extern/${dep_prefix}-src" - BINARY_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-build" - SUBBUILD_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-subbuild" -@@ -106,7 +106,7 @@ macro(fg_dep_check_and_populate dep_prefix) - GIT_REPOSITORY ${fdcp_args_URI} - GIT_TAG ${fdcp_args_REF} - DOWNLOAD_COMMAND \"\" -- UPDATE_DISCONNECTED ON -+ UPDATE_COMMAND \"\" - SOURCE_DIR "${Forge_SOURCE_DIR}/extern/${dep_prefix}-src" - BINARY_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-build" - SUBBUILD_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-subbuild" diff --git a/pkgs/by-name/fo/forge/package.nix b/pkgs/by-name/fo/forge/package.nix deleted file mode 100644 index 653f33eab53c..000000000000 --- a/pkgs/by-name/fo/forge/package.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ - boost, - cmake, - expat, - fetchFromGitHub, - fontconfig, - freeimage, - freetype, - glfw3, - glm, - lib, - libGLU, - libGL, - libgbm, - opencl-clhpp, - pkg-config, - stdenv, - SDL2, -}: - -stdenv.mkDerivation rec { - pname = "forge"; - version = "1.0.8"; - - src = fetchFromGitHub { - owner = "arrayfire"; - repo = "forge"; - rev = "v1.0.8"; - sha256 = "sha256-lSZAwcqAHiuZkpYcVfwvZCfNmEF3xGN9S/HuZQrGeKU="; - }; - glad = fetchFromGitHub { - owner = "arrayfire"; - repo = "glad"; - rev = "b94680aee5b8ce01ae1644c5f2661769366c765a"; - hash = "sha256-CrZy76gOGMpy9f1NuMK4tokZ57U//zYeNH5ZYY0SC2U="; - }; - - # This patch ensures that Forge does not try to fetch glad from GitHub and - # uses our sources that we've checked out via Nix. - patches = [ ./no-download-glad.patch ]; - - postPatch = '' - mkdir -p ./extern - cp -R --no-preserve=mode,ownership ${glad} ./extern/fg_glad-src - ln -s ${opencl-clhpp} ./extern/cl2hpp - ''; - - cmakeFlags = [ "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - boost.out - boost.dev - expat - fontconfig - freeimage - freetype - glfw3 - glm - libGL - libGLU - opencl-clhpp - SDL2 - libgbm - ]; - - meta = with lib; { - description = "OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend"; - longDescription = '' - An OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend. - The goal of Forge is to provide high performance OpenGL visualizations for C/C++ applications that use CUDA/OpenCL. - Forge uses OpenGL >=3.3 forward compatible contexts, so please make sure you have capable hardware before trying it out. - ''; - license = licenses.bsd3; - homepage = "https://arrayfire.com/"; - platforms = platforms.linux; - maintainers = with maintainers; [ - chessai - twesterhout - ]; - }; -} diff --git a/pkgs/by-name/ga/gamecube-tools/package.nix b/pkgs/by-name/ga/gamecube-tools/package.nix deleted file mode 100644 index edf3e5b21684..000000000000 --- a/pkgs/by-name/ga/gamecube-tools/package.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - autoreconfHook, - freeimage, - libGL, -}: - -stdenv.mkDerivation rec { - version = "1.0.6"; - pname = "gamecube-tools"; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ - freeimage - libGL - ]; - - src = fetchFromGitHub { - owner = "devkitPro"; - repo = "gamecube-tools"; - rev = "v${version}"; - sha256 = "sha256-GsTmwyxBc36Qg+UGy+cRAjGW1eh1XxV0s94B14ZJAjU="; - }; - - meta = with lib; { - description = "Tools for gamecube/wii projects"; - homepage = "https://github.com/devkitPro/gamecube-tools/"; - license = licenses.gpl2; - maintainers = with maintainers; [ tomsmeets ]; - }; -} diff --git a/pkgs/by-name/pe/perceptualdiff/package.nix b/pkgs/by-name/pe/perceptualdiff/package.nix deleted file mode 100644 index 0f2154629c3d..000000000000 --- a/pkgs/by-name/pe/perceptualdiff/package.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - freeimage, -}: - -stdenv.mkDerivation rec { - pname = "perceptualdiff"; - version = "2.1"; - - src = fetchFromGitHub { - owner = "myint"; - repo = "perceptualdiff"; - rev = "v${version}"; - sha256 = "176n518xv0pczf1yyz9r5a8zw5r6sh5ym596kmvw30qznp8n4a8j"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ freeimage ]; - - meta = with lib; { - description = "Program that compares two images using a perceptually based image metric"; - homepage = "https://github.com/myint/perceptualdiff"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ uri-canva ]; - platforms = platforms.unix; - mainProgram = "perceptualdiff"; - }; -} diff --git a/pkgs/by-name/pg/pgf_graphics/package.nix b/pkgs/by-name/pg/pgf_graphics/package.nix deleted file mode 100644 index f92be10a6307..000000000000 --- a/pkgs/by-name/pg/pgf_graphics/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - stdenv, - fetchzip, - autoreconfHook, - dos2unix, - doxygen, - freeimage, - libpgf, -}: - -stdenv.mkDerivation rec { - pname = "pgf"; - version = "7.21.7"; - - src = fetchzip { - url = "mirror://sourceforge/libpgf/libpgf/${version}/pgf-console.zip"; - hash = "sha256-W9eXYhbynLtvZQsn724Uw0SZ5TuyK2MwREwYKGFhJj0="; - }; - - postPatch = '' - find . -type f | xargs dos2unix - mv README.txt README - ''; - - nativeBuildInputs = [ - autoreconfHook - dos2unix - doxygen - ]; - - buildInputs = [ - freeimage - libpgf - ]; - - meta = { - homepage = "https://www.libpgf.org/"; - description = "Progressive Graphics Format command line program"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/by-name/po/posterazor/package.nix b/pkgs/by-name/po/posterazor/package.nix deleted file mode 100644 index 300f959bb0f2..000000000000 --- a/pkgs/by-name/po/posterazor/package.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - cmake, - unzip, - pkg-config, - libXpm, - fltk13, - freeimage, -}: - -stdenv.mkDerivation rec { - pname = "posterazor"; - version = "1.5.1"; - - src = fetchurl { - url = "mirror://sourceforge/posterazor/${version}/PosteRazor-${version}-Source.zip"; - hash = "sha256-BbujA2ASyqQelb3iFAwgeJC0OhzXqufIa1UD+tFsF7c="; - }; - - hardeningDisable = [ "format" ]; - - nativeBuildInputs = [ - cmake - pkg-config - unzip - ]; - buildInputs = [ - libXpm - fltk13 - freeimage - ]; - - unpackPhase = '' - unzip $src -d posterazor - cd posterazor/src - ''; - - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667328 - patchPhase = '' - sed "s/\(#define CASESENSITIVESTRCMP strcasecmp\)/#include \n\1/" -i FlPosteRazorDialog.cpp - ''; - - installPhase = '' - mkdir -p $out/bin - cp PosteRazor $out/bin - ''; - - meta = with lib; { - homepage = "http://posterazor.sourceforge.net/"; - description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = [ maintainers.madjar ]; - mainProgram = "PosteRazor"; - }; -} diff --git a/pkgs/by-name/ru/rucksack/package.nix b/pkgs/by-name/ru/rucksack/package.nix deleted file mode 100644 index c6d84a6f2961..000000000000 --- a/pkgs/by-name/ru/rucksack/package.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - liblaxjson, - cmake, - freeimage, -}: - -stdenv.mkDerivation rec { - version = "3.1.0"; - pname = "rucksack"; - - src = fetchFromGitHub { - owner = "andrewrk"; - repo = "rucksack"; - rev = version; - sha256 = "0bcm20hqxqnq1j0zghb9i7z9frri6bbf7rmrv5g8dd626sq07vyv"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ - liblaxjson - freeimage - ]; - - meta = with lib; { - description = "Texture packer and resource bundler"; - platforms = [ - "i686-linux" - "x86_64-linux" - ]; # fails on Darwin and AArch64 - homepage = "https://github.com/andrewrk/rucksack"; - license = licenses.mit; - maintainers = [ maintainers.andrewrk ]; - }; -} diff --git a/pkgs/by-name/tr/trenchbroom/package.nix b/pkgs/by-name/tr/trenchbroom/package.nix deleted file mode 100644 index bc7a43919e18..000000000000 --- a/pkgs/by-name/tr/trenchbroom/package.nix +++ /dev/null @@ -1,175 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - writeText, - cmake, - ninja, - curl, - git, - pandoc, - pkg-config, - unzip, - zip, - libGL, - libGLU, - freeimage, - freetype, - assimp, - catch2, - fmt, - glew, - miniz, - tinyxml-2, - xorg, - qt6, - copyDesktopItems, - makeDesktopItem, -}: - -stdenv.mkDerivation rec { - pname = "TrenchBroom"; - version = "2025.2"; - - src = fetchFromGitHub { - owner = "TrenchBroom"; - repo = "TrenchBroom"; - tag = "v${version}"; - hash = "sha256-aOHhL0yBDgFTMcDY7RKZXRrReRiThcQdf7QMHEpRuks="; - fetchSubmodules = true; - }; - - # Manually simulate a vcpkg installation so that it can link the libraries - # properly. - postUnpack = - let - vcpkg_target = "x64-linux"; - - vcpkg_pkgs = [ - "assimp" - "catch2" - "fmt" - "freeimage" - "freetype" - "glew" - "miniz" - "tinyxml2" - ]; - - updates_vcpkg_file = writeText "update_vcpkg_trenchbroom" ( - lib.concatMapStringsSep "\n" (name: '' - Package : ${name} - Architecture : ${vcpkg_target} - Version : 1.0 - Status : is installed - '') vcpkg_pkgs - ); - in - '' - export VCPKG_ROOT="$TMP/vcpkg" - - mkdir -p $VCPKG_ROOT/.vcpkg-root - mkdir -p $VCPKG_ROOT/installed/${vcpkg_target}/lib - mkdir -p $VCPKG_ROOT/installed/vcpkg/updates - ln -s ${updates_vcpkg_file} $VCPKG_ROOT/installed/vcpkg/status - mkdir -p $VCPKG_ROOT/installed/vcpkg/info - ${lib.concatMapStrings (name: '' - touch $VCPKG_ROOT/installed/vcpkg/info/${name}_1.0_${vcpkg_target}.list - '') vcpkg_pkgs} - - ln -s ${assimp.lib}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ - ln -s ${catch2}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ - ln -s ${fmt}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ - ln -s ${freeimage}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ - ln -s ${freetype}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ - ln -s ${glew.out}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ - ln -s ${miniz}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ - ln -s ${tinyxml-2}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ - ''; - - postPatch = '' - substituteInPlace common/src/Version.h.in \ - --subst-var-by APP_VERSION_YEAR ${lib.versions.major version} \ - --subst-var-by APP_VERSION_NUMBER ${lib.versions.minor version} \ - --subst-var-by GIT_DESCRIBE v${version} - substituteInPlace app/CMakeLists.txt \ - --replace-fail 'set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")' 'set(CPACK_PACKAGING_INSTALL_PREFIX "'$out'")' - ''; - - nativeBuildInputs = [ - cmake - ninja - curl - git - pandoc - qt6.wrapQtAppsHook - copyDesktopItems - pkg-config - unzip - zip - ]; - - buildInputs = [ - libGL - libGLU - xorg.libXxf86vm - xorg.libSM - freeimage - freetype - qt6.qtbase - qt6.qtwayland - qt6.qtsvg - catch2 - fmt - glew - miniz - tinyxml-2 - assimp - ]; - - QT_PLUGIN_PATH = "${qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}"; - - QT_QPA_PLATFORM = "offscreen"; - - cmakeFlags = [ - "-DCMAKE_MAKE_PROGRAM=ninja" - "-DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake" - "-DVCPKG_MANIFEST_INSTALL=OFF" - # https://github.com/TrenchBroom/TrenchBroom/issues/4002#issuecomment-1125390780 - "-DCMAKE_PREFIX_PATH=cmake/packages" - ]; - - ninjaFlags = [ "TrenchBroom" ]; - - postInstall = '' - pushd ../app/resources/linux/icons - - for F in icon_*.png; do - SIZE=$(echo $F|sed -e s/icon_// -e s/.png//) - DIR=$out/share/icons/hicolor/$SIZE"x"$SIZE/apps - install -Dm644 $F $DIR/trenchbroom.png - done - - popd - ''; - - desktopItems = [ - (makeDesktopItem { - name = "TrenchBroom"; - desktopName = "TrenchBroom level editor"; - icon = "trenchbroom"; - comment = meta.description; - categories = [ "Development" ]; - exec = "trenchbroom"; - }) - ]; - - meta = { - homepage = "https://trenchbroom.github.io/"; - changelog = "https://github.com/TrenchBroom/TrenchBroom/releases/tag/v${version}"; - description = "Level editor for Quake-engine based games"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ astro ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9f8b8dd7d5ae..30eb6aa12ea8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -478,6 +478,7 @@ mapAliases { aria = aria2; # Added 2024-03-26 artim-dark = aritim-dark; # Added 2025-07-27 armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11 + arrayfire = throw "arrayfire was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 aseprite-unfree = aseprite; # Added 2023-08-26 asitop = macpm; # 'macpm' is a better-maintained downstream; keep 'asitop' for backwards-compatibility async = throw "'async' has been removed due to lack of upstream maintenance"; # Added 2025-01-26 @@ -863,6 +864,8 @@ mapAliases { embree2 = throw "embree2 has been removed, as it is unmaintained upstream and depended on tbb_2020"; # Added 2025-09-14 EmptyEpsilon = empty-epsilon; # Added 2024-07-14 + emulationstation = throw "emulationstation was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 + emulationstation-de = throw "emulationstation-de was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 enyo-doom = enyo-launcher; # Added 2022-09-09 eolie = throw "'eolie' has been removed due to being unmaintained"; # Added 2025-04-15 epapirus-icon-theme = throw "'epapirus-icon-theme' has been removed because 'papirus-icon-theme' no longer supports building with elementaryOS icon support"; # Added 2025-06-15 @@ -955,6 +958,7 @@ mapAliases { fntsample = throw "fntsample has been removed as it is unmaintained upstream"; # Added 2025-04-21 foldingathome = throw "'foldingathome' has been renamed to/replaced by 'fahclient'"; # Converted to throw 2024-10-17 follow = lib.warnOnInstantiate "follow has been renamed to folo" folo; # Added 2025-05-18 + forge = throw "forge was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 forgejo-actions-runner = forgejo-runner; # Added 2024-04-04 fornalder = throw "'fornalder' has been removed as it is unmaintained upstream"; # Added 2025-01-25 foundationdb71 = throw "foundationdb71 has been removed; please upgrade to foundationdb73"; # Added 2024-12-28 @@ -984,6 +988,7 @@ mapAliases { g4music = gapless; # Added 2024-07-26 g4py = throw "'g4py' has been renamed to/replaced by 'python3Packages.geant4'"; # Converted to throw 2024-10-17 + gamecube-tools = throw "gamecube-tools was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 gamin = throw "'gamin' has been removed as it is unmaintained upstream"; # Added 2024-04-19 garage_0_8 = throw "'garage_0_8' has been removed as it is unmaintained upstream"; # Added 2025-06-23 garage_0_8_7 = throw "'garage_0_8_7' has been removed as it is unmaintained upstream"; # Added 2025-06-23 @@ -2073,6 +2078,7 @@ mapAliases { pds = lib.warnOnInstantiate "'pds' has been renamed to 'bluesky-pds'" bluesky-pds; # Added 2025-08-20 pdsadmin = lib.warnOnInstantiate "'pdsadmin' has been renamed to 'bluesky-pdsadmin'" bluesky-pdsadmin; # Added 2025-08-20 peach = asouldocs; # Added 2022-08-28 + perceptual-diff = throw "perceptual-diff was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 percona-server_innovation = lib.warnOnInstantiate "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-server; # Added 2024-10-13 percona-server_lts = percona-server; # Added 2024-10-13 percona-xtrabackup_innovation = lib.warnOnInstantiate "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-xtrabackup; # Added 2024-10-13 @@ -2085,6 +2091,7 @@ mapAliases { petrinizer = throw "'petrinizer' has been removed, as it was broken and unmaintained"; # added 2024-05-09 pg-gvm = throw "pg-gvm has been moved to postgresql.pkgs.pg-gvm to make it work with all versions of PostgreSQL"; # added 2024-11-30 pgadmin = pgadmin4; # Added 2022-01-14 + pgf_graphics = throw "pgf_graphics was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 pharo-spur64 = pharo; # Added 2022-08-03 phlare = throw "'phlare' has been removed as the upstream project was archived."; # Added 2025-03-27 php81 = throw "php81 is EOL"; @@ -2124,6 +2131,7 @@ mapAliases { polypane = throw "'polypane' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-25 poretools = throw "poretools has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-03 posix_man_pages = throw "'posix_man_pages' has been renamed to/replaced by 'man-pages-posix'"; # Converted to throw 2024-10-17 + posterazor = throw "posterazor was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 powerdns = pdns; # Added 2022-03-28 postfixadmin = throw "'postfixadmin' has been removed due to lack of maintenance and missing support for PHP >8.1"; # Added 2025-10-03 presage = throw "presage has been removed, as it has been unmaintained since 2018"; # Added 2024-03-24 @@ -2341,6 +2349,7 @@ mapAliases { rubyPackages_3_1 = throw "rubyPackages_3_1 has been removed, as it is has reached end‐of‐life upstream"; # Added 2025-10-12 rubyPackages_3_2 = throw "rubyPackages_3_2 has been removed, as it will reach end‐of‐life upstream during Nixpkgs 25.11’s support cycle"; # Added 2025-10-12 ruby-zoom = throw "'ruby-zoom' has been removed due to lack of maintaince and had not been updated since 2020"; # Added 2025-08-24 + rucksack = throw "rucksack was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 runCommandNoCC = runCommand; # Added 2021-08-15 runCommandNoCCLocal = runCommandLocal; # Added 2021-08-15 run-scaled = throw "run-scaled has been removed due to being deprecated. Consider using run_scaled from 'xpra' instead"; # Added 2025-03-17 @@ -2633,6 +2642,7 @@ mapAliases { transcode = throw "transcode has been removed as it is unmaintained"; # Added 2024-12-11 transfig = fig2dev; # Added 2022-02-15 transifex-client = transifex-cli; # Added 2023-12-29 + trenchbroom = throw "trenchbroom was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 trfl = throw "trfl has been removed, because it has not received an update for 3 years and was broken"; # Added 2024-07-25 trezor_agent = trezor-agent; # Added 2024-01-07 trilium-next-desktop = trilium-desktop; # Added 2025-08-30 From 6ebd17550c1323650ef2f80d80dd1e0d633d57b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 11:48:38 +0000 Subject: [PATCH 304/380] vcpkg: 2025.09.17 -> 2025.10.17 --- pkgs/by-name/vc/vcpkg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix index 9be733374954..8fbbcd9b3b4a 100644 --- a/pkgs/by-name/vc/vcpkg/package.nix +++ b/pkgs/by-name/vc/vcpkg/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "vcpkg"; - version = "2025.09.17"; + version = "2025.10.17"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg"; tag = finalAttrs.version; - hash = "sha256-DySLGZrsUwXEW3NbcG6hEvcJZyPHub+oI9HWiKvYIpM="; + hash = "sha256-prWpMtvXWZ53y2gzr7IIqL/5kQZRfErnynEHMqi15/A="; leaveDotGit = true; postFetch = '' cd "$out" From a25c8a70458c252f3a11929d9637ed9fb12df7c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 11:51:38 +0000 Subject: [PATCH 305/380] python3Packages.weblate-language-data: 2025.8 -> 2025.9 --- .../python-modules/weblate-language-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weblate-language-data/default.nix b/pkgs/development/python-modules/weblate-language-data/default.nix index de9f99097797..e9f957ebfe89 100644 --- a/pkgs/development/python-modules/weblate-language-data/default.nix +++ b/pkgs/development/python-modules/weblate-language-data/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "weblate-language-data"; - version = "2025.8"; + version = "2025.9"; pyproject = true; src = fetchPypi { pname = "weblate_language_data"; inherit version; - hash = "sha256-buZNp7iWF7Ppx5RcTRs2kawwmzCPmwXSqarRbmgP0i8="; + hash = "sha256-sk53eGLPSfYoe4+BExIxINkFt/vcvkIIO5611hwx9uU="; }; build-system = [ setuptools ]; From 3e505de718c840728e2c84890a5ed99eee8f26cd Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 23 Oct 2025 13:40:15 +0200 Subject: [PATCH 306/380] freeimage: drop Very insecure. --- lib/licenses.nix | 5 - .../by-name/fr/freeimage/CVE-2020-24292.patch | 13 - .../by-name/fr/freeimage/CVE-2020-24293.patch | 14 - .../by-name/fr/freeimage/CVE-2020-24295.patch | 21 - .../by-name/fr/freeimage/CVE-2021-33367.patch | 19 - .../by-name/fr/freeimage/CVE-2021-40263.patch | 15 - .../by-name/fr/freeimage/CVE-2021-40266.patch | 14 - .../by-name/fr/freeimage/CVE-2023-47995.patch | 14 - .../by-name/fr/freeimage/CVE-2023-47997.patch | 16 - pkgs/by-name/fr/freeimage/libtiff-4.4.0.diff | 15 - pkgs/by-name/fr/freeimage/package.nix | 170 ----- pkgs/by-name/fr/freeimage/unbundle.diff | 584 ------------------ pkgs/by-name/im/imv/package.nix | 3 +- pkgs/by-name/li/libtiff/package.nix | 2 - pkgs/by-name/me/megacmd/package.nix | 9 +- pkgs/development/lisp-modules/ql.nix | 3 - pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 - 18 files changed, 5 insertions(+), 917 deletions(-) delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2020-24292.patch delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2020-24293.patch delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2020-24295.patch delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2021-33367.patch delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2021-40263.patch delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2021-40266.patch delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2023-47995.patch delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2023-47997.patch delete mode 100644 pkgs/by-name/fr/freeimage/libtiff-4.4.0.diff delete mode 100644 pkgs/by-name/fr/freeimage/package.nix delete mode 100644 pkgs/by-name/fr/freeimage/unbundle.diff diff --git a/lib/licenses.nix b/lib/licenses.nix index 9e2edd69836a..b3d4a82b87c8 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -620,11 +620,6 @@ lib.mapAttrs mkLicense ( fullName = "Unspecified free software license"; }; - freeimage = { - spdxId = "FreeImage"; - fullName = "FreeImage Public License v1.0"; - }; - fsl11Mit = { fullName = "Functional Source License, Version 1.1, MIT Future License"; spdxId = "FSL-1.1-MIT"; diff --git a/pkgs/by-name/fr/freeimage/CVE-2020-24292.patch b/pkgs/by-name/fr/freeimage/CVE-2020-24292.patch deleted file mode 100644 index 059bb5a520c2..000000000000 --- a/pkgs/by-name/fr/freeimage/CVE-2020-24292.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginICO.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginICO.cpp ---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginICO.cpp 2023-09-28 19:34:45.524031668 +0200 -+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginICO.cpp 2023-09-28 19:34:47.717009813 +0200 -@@ -301,6 +301,9 @@ LoadStandardIcon(FreeImageIO *io, fi_han - int width = bmih.biWidth; - int height = bmih.biHeight / 2; // height == xor + and mask - unsigned bit_count = bmih.biBitCount; -+ if (bit_count != 1 && bit_count != 2 && bit_count != 4 && bit_count != 8 && bit_count != 16 && bit_count != 24 && bit_count != 32) { -+ return NULL; -+ } - unsigned line = CalculateLine(width, bit_count); - unsigned pitch = CalculatePitch(line); - diff --git a/pkgs/by-name/fr/freeimage/CVE-2020-24293.patch b/pkgs/by-name/fr/freeimage/CVE-2020-24293.patch deleted file mode 100644 index d457ae51fe07..000000000000 --- a/pkgs/by-name/fr/freeimage/CVE-2020-24293.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp ---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp 2023-09-28 19:34:47.287014100 +0200 -+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp 2023-09-28 19:34:47.832008666 +0200 -@@ -780,6 +780,10 @@ int psdThumbnail::Read(FreeImageIO *io, - FreeImage_Unload(_dib); - } - -+ if (_WidthBytes != _Width * _BitPerPixel / 8) { -+ throw "Invalid PSD image"; -+ } -+ - if(_Format == 1) { - // kJpegRGB thumbnail image - _dib = FreeImage_LoadFromHandle(FIF_JPEG, io, handle); diff --git a/pkgs/by-name/fr/freeimage/CVE-2020-24295.patch b/pkgs/by-name/fr/freeimage/CVE-2020-24295.patch deleted file mode 100644 index 2f3bac236737..000000000000 --- a/pkgs/by-name/fr/freeimage/CVE-2020-24295.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp ---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp 2023-09-28 19:34:47.936007630 +0200 -+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp 2023-09-28 19:34:47.940007590 +0200 -@@ -1466,6 +1466,7 @@ FIBITMAP* psdParser::ReadImageData(FreeI - const unsigned dstBpp = (depth == 1) ? 1 : FreeImage_GetBPP(bitmap)/8; - const unsigned dstLineSize = FreeImage_GetPitch(bitmap); - BYTE* const dst_first_line = FreeImage_GetScanLine(bitmap, nHeight - 1);//<*** flipped -+ const unsigned dst_buffer_size = dstLineSize * nHeight; - - BYTE* line_start = new BYTE[lineSize]; //< fileline cache - -@@ -1481,6 +1482,9 @@ FIBITMAP* psdParser::ReadImageData(FreeI - const unsigned channelOffset = GetChannelOffset(bitmap, c) * bytes; - - BYTE* dst_line_start = dst_first_line + channelOffset; -+ if (channelOffset + lineSize > dst_buffer_size) { -+ throw "Invalid PSD image"; -+ } - for(unsigned h = 0; h < nHeight; ++h, dst_line_start -= dstLineSize) {//<*** flipped - io->read_proc(line_start, lineSize, 1, handle); - ReadImageLine(dst_line_start, line_start, lineSize, dstBpp, bytes); diff --git a/pkgs/by-name/fr/freeimage/CVE-2021-33367.patch b/pkgs/by-name/fr/freeimage/CVE-2021-33367.patch deleted file mode 100644 index 655a8e7f70cc..000000000000 --- a/pkgs/by-name/fr/freeimage/CVE-2021-33367.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/Metadata/Exif.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/Metadata/Exif.cpp ---- freeimage-svn-r1909-FreeImage-trunk/Source/Metadata/Exif.cpp 2023-09-28 19:34:45.003036859 +0200 -+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/Metadata/Exif.cpp 2023-09-28 19:34:47.505011926 +0200 -@@ -770,8 +770,13 @@ jpeg_read_exif_dir(FIBITMAP *dib, const - // - - const WORD entriesCount0th = ReadUint16(msb_order, ifd0th); -- -- DWORD next_offset = ReadUint32(msb_order, DIR_ENTRY_ADDR(ifd0th, entriesCount0th)); -+ -+ const BYTE* de_addr = DIR_ENTRY_ADDR(ifd0th, entriesCount0th); -+ if(de_addr+4 >= (BYTE*)(dwLength + ifd0th - tiffp)) { -+ return TRUE; //< no thumbnail -+ } -+ -+ DWORD next_offset = ReadUint32(msb_order, de_addr); - if((next_offset == 0) || (next_offset >= dwLength)) { - return TRUE; //< no thumbnail - } diff --git a/pkgs/by-name/fr/freeimage/CVE-2021-40263.patch b/pkgs/by-name/fr/freeimage/CVE-2021-40263.patch deleted file mode 100644 index 11681c372be3..000000000000 --- a/pkgs/by-name/fr/freeimage/CVE-2021-40263.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp ---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp 2023-09-28 19:34:47.713009853 +0200 -+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp 2023-09-28 19:34:48.043006563 +0200 -@@ -2142,6 +2142,11 @@ Load(FreeImageIO *io, fi_handle handle, - uint32_t tileRowSize = (uint32_t)TIFFTileRowSize(tif); - uint32_t imageRowSize = (uint32_t)TIFFScanlineSize(tif); - -+ if (width / tileWidth * tileRowSize * 8 > bitspersample * samplesperpixel * width) { -+ free(tileBuffer); -+ throw "Corrupted tiled TIFF file"; -+ } -+ - - // In the tiff file the lines are saved from up to down - // In a DIB the lines must be saved from down to up diff --git a/pkgs/by-name/fr/freeimage/CVE-2021-40266.patch b/pkgs/by-name/fr/freeimage/CVE-2021-40266.patch deleted file mode 100644 index 8526f9814851..000000000000 --- a/pkgs/by-name/fr/freeimage/CVE-2021-40266.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp ---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp 2023-09-28 19:34:47.501011966 +0200 -+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp 2023-09-28 19:34:47.610010879 +0200 -@@ -372,6 +372,10 @@ static void - ReadPalette(TIFF *tiff, uint16_t photometric, uint16_t bitspersample, FIBITMAP *dib) { - RGBQUAD *pal = FreeImage_GetPalette(dib); - -+ if (!pal) { -+ return; -+ } -+ - switch(photometric) { - case PHOTOMETRIC_MINISBLACK: // bitmap and greyscale image types - case PHOTOMETRIC_MINISWHITE: diff --git a/pkgs/by-name/fr/freeimage/CVE-2023-47995.patch b/pkgs/by-name/fr/freeimage/CVE-2023-47995.patch deleted file mode 100644 index ccd623b81fa1..000000000000 --- a/pkgs/by-name/fr/freeimage/CVE-2023-47995.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginJPEG.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginJPEG.cpp ---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginJPEG.cpp 2024-03-10 14:22:17.818579271 +0100 -+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginJPEG.cpp 2024-03-10 14:22:18.776573816 +0100 -@@ -1086,6 +1086,10 @@ Load(FreeImageIO *io, fi_handle handle, - - jpeg_read_header(&cinfo, TRUE); - -+ if (cinfo.image_width > JPEG_MAX_DIMENSION || cinfo.image_height > JPEG_MAX_DIMENSION) { -+ throw FI_MSG_ERROR_DIB_MEMORY; -+ } -+ - // step 4: set parameters for decompression - - unsigned int scale_denom = 1; // fraction by which to scale image diff --git a/pkgs/by-name/fr/freeimage/CVE-2023-47997.patch b/pkgs/by-name/fr/freeimage/CVE-2023-47997.patch deleted file mode 100644 index 2969c738c509..000000000000 --- a/pkgs/by-name/fr/freeimage/CVE-2023-47997.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp ---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp 2024-03-10 14:22:18.669574426 +0100 -+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp 2024-03-10 14:22:18.673574403 +0100 -@@ -1484,6 +1484,12 @@ Load(FreeImageIO *io, fi_handle handle, - (int)bitspersample, (int)samplesperpixel, (int)photometric); - throw (char*)NULL; - } -+ if (planar_config == PLANARCONFIG_SEPARATE && bitspersample < 8) { -+ FreeImage_OutputMessageProc(s_format_id, -+ "Unable to handle this format: bitspersample = 8, TIFFTAG_PLANARCONFIG = PLANARCONFIG_SEPARATE" -+ ); -+ throw (char*)NULL; -+ } - - // --------------------------------------------------------------------------------- - diff --git a/pkgs/by-name/fr/freeimage/libtiff-4.4.0.diff b/pkgs/by-name/fr/freeimage/libtiff-4.4.0.diff deleted file mode 100644 index 13abd5dd7089..000000000000 --- a/pkgs/by-name/fr/freeimage/libtiff-4.4.0.diff +++ /dev/null @@ -1,15 +0,0 @@ -Fix build with libtiff 4.4.0 by not using a private libtiff API. -Patch by Kurt Schwehr: https://sourceforge.net/p/freeimage/discussion/36109/thread/2018fdc6e7/ - -diff -ru a/Source/Metadata/XTIFF.cpp b/Source/Metadata/XTIFF.cpp ---- a/Source/Metadata/XTIFF.cpp -+++ b/Source/Metadata/XTIFF.cpp -@@ -749,7 +749,7 @@ - continue; - } - // type of storage may differ (e.g. rationnal array vs float array type) -- if((unsigned)_TIFFDataSize(tif_tag_type) != FreeImage_TagDataWidth(tag_type)) { -+ if((unsigned)TIFFFieldSetGetSize(fld) != FreeImage_TagDataWidth(tag_type)) { - // skip tag or _TIFFmemcpy will fail - continue; - } diff --git a/pkgs/by-name/fr/freeimage/package.nix b/pkgs/by-name/fr/freeimage/package.nix deleted file mode 100644 index e541840df2b5..000000000000 --- a/pkgs/by-name/fr/freeimage/package.nix +++ /dev/null @@ -1,170 +0,0 @@ -{ - lib, - stdenv, - fetchsvn, - cctools, - libtiff, - libpng, - zlib, - libwebp, - libraw, - openexr, - openjpeg, - libjpeg, - jxrlib, - pkg-config, - fixDarwinDylibNames, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "freeimage"; - version = "3.18.0-unstable-2024-04-18"; - - src = fetchsvn { - url = "svn://svn.code.sf.net/p/freeimage/svn/"; - rev = "1911"; - hash = "sha256-JznVZUYAbsN4FplnuXxCd/ITBhH7bfGKWXep2A6mius="; - }; - - sourceRoot = "${finalAttrs.src.name}/FreeImage/trunk"; - - # Ensure that the bundled libraries are not used at all - prePatch = '' - rm -rf Source/Lib* Source/OpenEXR Source/ZLib - ''; - - # Tell patch to work with trailing carriage returns - patchFlags = [ - "-p1" - "--binary" - ]; - - patches = [ - ./unbundle.diff - ./CVE-2020-24292.patch - ./CVE-2020-24293.patch - ./CVE-2020-24295.patch - ./CVE-2021-33367.patch - ./CVE-2021-40263.patch - ./CVE-2021-40266.patch - ./CVE-2023-47995.patch - ./CVE-2023-47997.patch - ]; - - postPatch = '' - # To support cross compilation, use the correct `pkg-config`. - substituteInPlace Makefile.fip \ - --replace "pkg-config" "$PKG_CONFIG" - substituteInPlace Makefile.gnu \ - --replace "pkg-config" "$PKG_CONFIG" - '' - + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' - # Upstream Makefile hardcodes i386 and x86_64 architectures only - substituteInPlace Makefile.osx --replace "x86_64" "arm64" - ''; - - nativeBuildInputs = [ - pkg-config - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cctools - fixDarwinDylibNames - ]; - - buildInputs = [ - libtiff - libtiff.dev_private - libpng - zlib - libwebp - libraw - openexr - openjpeg - libjpeg - libjpeg.dev_private - jxrlib - ]; - - postBuild = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - make -f Makefile.fip - ''; - - INCDIR = "${placeholder "out"}/include"; - INSTALLDIR = "${placeholder "out"}/lib"; - - preInstall = '' - mkdir -p $INCDIR $INSTALLDIR - '' - # Workaround for Makefiles.osx not using ?= - + lib.optionalString stdenv.hostPlatform.isDarwin '' - makeFlagsArray+=( "INCDIR=$INCDIR" "INSTALLDIR=$INSTALLDIR" ) - ''; - - postInstall = - lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - make -f Makefile.fip install - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - ln -s $out/lib/libfreeimage.3.dylib $out/lib/libfreeimage.dylib - ''; - - enableParallelBuilding = true; - - meta = { - description = "Open Source library for accessing popular graphics image file formats"; - homepage = "http://freeimage.sourceforge.net/"; - license = with lib.licenses; [ - freeimage - gpl2Only - gpl3Only - ]; - knownVulnerabilities = [ - "CVE-2024-31570" - "CVE-2024-28584" - "CVE-2024-28583" - "CVE-2024-28582" - "CVE-2024-28581" - "CVE-2024-28580" - "CVE-2024-28579" - "CVE-2024-28578" - "CVE-2024-28577" - "CVE-2024-28576" - "CVE-2024-28575" - "CVE-2024-28574" - "CVE-2024-28573" - "CVE-2024-28572" - "CVE-2024-28571" - "CVE-2024-28570" - "CVE-2024-28569" - "CVE-2024-28568" - "CVE-2024-28567" - "CVE-2024-28566" - "CVE-2024-28565" - "CVE-2024-28564" - "CVE-2024-28563" - "CVE-2024-28562" - "CVE-2024-9029" - # "CVE-2023-47997" - "CVE-2023-47996" - # "CVE-2023-47995" - "CVE-2023-47994" - "CVE-2023-47993" - "CVE-2023-47992" - # "CVE-2021-40266" - "CVE-2021-40265" - "CVE-2021-40264" - # "CVE-2021-40263" - "CVE-2021-40262" - # "CVE-2021-33367" - # "CVE-2020-24295" - "CVE-2020-24294" - # "CVE-2020-24293" - # "CVE-2020-24292" - "CVE-2020-21426" - "CVE-2019-12214" - "CVE-2019-12212" - ]; - maintainers = [ ]; - platforms = with lib.platforms; unix; - }; -}) diff --git a/pkgs/by-name/fr/freeimage/unbundle.diff b/pkgs/by-name/fr/freeimage/unbundle.diff deleted file mode 100644 index 66df1176bca9..000000000000 --- a/pkgs/by-name/fr/freeimage/unbundle.diff +++ /dev/null @@ -1,584 +0,0 @@ -diff --git a/Makefile.fip b/Makefile.fip -index 660a0265..86b30401 100644 ---- a/Makefile.fip -+++ b/Makefile.fip -@@ -11,32 +11,21 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib - # Converts cr/lf to just lf - DOS2UNIX = dos2unix - --LIBRARIES = -lstdc++ -+LIBRARIES = -lstdc++ $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) - - MODULES = $(SRCS:.c=.o) - MODULES := $(MODULES:.cpp=.o) - -+INCLUDE += $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) -+ - # C flags - CFLAGS ?= -std=c99 -O3 -fPIC -fexceptions -fvisibility=hidden --# OpenJPEG --CFLAGS += -DOPJ_STATIC --# LibRaw --CFLAGS += -DNO_LCMS --# LibJXR --CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__ - CFLAGS += $(INCLUDE) - - # C++ flags - CXXFLAGS ?= -std=c++0x -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy --# LibJXR --CXXFLAGS += -D__ANSI__ - CXXFLAGS += $(INCLUDE) - --ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) -- CFLAGS += -fPIC -- CXXFLAGS += -fPIC --endif -- - TARGET = freeimageplus - STATICLIB = lib$(TARGET).a - SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so -@@ -76,10 +65,10 @@ $(SHAREDLIB): $(MODULES) - - install: - install -d $(INCDIR) $(INSTALLDIR) -- install -m 644 -o root -g root $(HEADER) $(INCDIR) -- install -m 644 -o root -g root $(HEADERFIP) $(INCDIR) -- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) -- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) -+ install -m 644 $(HEADER) $(INCDIR) -+ install -m 644 $(HEADERFIP) $(INCDIR) -+ install -m 644 $(STATICLIB) $(INSTALLDIR) -+ install -m 755 $(SHAREDLIB) $(INSTALLDIR) - ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) - ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) - -diff --git a/Makefile.gnu b/Makefile.gnu -index a4f26013..be954761 100644 ---- a/Makefile.gnu -+++ b/Makefile.gnu -@@ -11,32 +11,21 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib - # Converts cr/lf to just lf - DOS2UNIX = dos2unix - --LIBRARIES = -lstdc++ -+LIBRARIES = -lstdc++ $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) - - MODULES = $(SRCS:.c=.o) - MODULES := $(MODULES:.cpp=.o) - -+INCLUDE += $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) -+ - # C flags - CFLAGS ?= -std=c99 -O3 -fPIC -fexceptions -fvisibility=hidden --# OpenJPEG --CFLAGS += -DOPJ_STATIC --# LibRaw --CFLAGS += -DNO_LCMS --# LibJXR --CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__ - CFLAGS += $(INCLUDE) - - # C++ flags - CXXFLAGS ?= -std=c++0x -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy --# LibJXR --CXXFLAGS += -D__ANSI__ - CXXFLAGS += $(INCLUDE) - --ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) -- CFLAGS += -fPIC -- CXXFLAGS += -fPIC --endif -- - TARGET = freeimage - STATICLIB = lib$(TARGET).a - SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so -@@ -75,12 +64,11 @@ $(SHAREDLIB): $(MODULES) - - install: - install -d $(INCDIR) $(INSTALLDIR) -- install -m 644 -o root -g root $(HEADER) $(INCDIR) -- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) -- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) -+ install -m 644 $(HEADER) $(INCDIR) -+ install -m 644 $(STATICLIB) $(INSTALLDIR) -+ install -m 755 $(SHAREDLIB) $(INSTALLDIR) - ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) - ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) --# ldconfig - - clean: - rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) -diff --git a/Makefile.osx b/Makefile.osx -index c39121db..3800e39d 100644 ---- a/Makefile.osx -+++ b/Makefile.osx -@@ -10,24 +10,25 @@ MACOSX_SYSROOT = $(shell xcrun --show-sdk-path) - MACOSX_DEPLOYMENT_TARGET = 10.11 - - # General configuration variables: --CC_I386 = $(shell xcrun -find clang) --CC_X86_64 = $(shell xcrun -find clang) --CPP_I386 = $(shell xcrun -find clang++) --CPP_X86_64 = $(shell xcrun -find clang++) -+CC_I386 = clang -+CC_X86_64 = clang -+CPP_I386 = clang++ -+CPP_X86_64 = clang++ - MACOSX_DEPLOY = -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET) - COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS -D__ANSI__ - COMPILERFLAGS_I386 = -arch i386 - COMPILERFLAGS_X86_64 = -arch x86_64 - COMPILERPPFLAGS = -Wno-ctor-dtor-privacy -D__ANSI__ -std=c++11 -stdlib=libc++ -Wc++11-narrowing --INCLUDE += --INCLUDE_I386 = -isysroot $(MACOSX_SYSROOT) --INCLUDE_X86_64 = -isysroot $(MACOSX_SYSROOT) -+INCLUDE += $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) -+INCLUDE_I386 = -+INCLUDE_X86_64 = - CFLAGS_I386 = $(COMPILERFLAGS) $(COMPILERFLAGS_I386) $(INCLUDE) $(INCLUDE_I386) $(MACOSX_DEPLOY) - CFLAGS_X86_64 = $(COMPILERFLAGS) $(COMPILERFLAGS_X86_64) $(INCLUDE) $(INCLUDE_X86_64) $(MACOSX_DEPLOY) - CPPFLAGS_I386 = $(COMPILERPPFLAGS) $(CFLAGS_I386) - CPPFLAGS_X86_64 = $(COMPILERPPFLAGS) $(CFLAGS_X86_64) --LIBRARIES_I386 = $(MACOSX_DEPLOY) -Wl,-syslibroot $(MACOSX_SYSROOT) --LIBRARIES_X86_64 = $(MACOSX_DEPLOY) -Wl,-syslibroot $(MACOSX_SYSROOT) -+LIBS = $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) -+LIBRARIES_I386 = $(LIBS) $(MACOSX_DEPLOY) -+LIBRARIES_X86_64 = $(LIBS) $(MACOSX_DEPLOY) - LIBTOOL = libtool - LIPO = lipo - -@@ -57,7 +58,7 @@ dist: FreeImage - cp *.a Dist - cp Source/FreeImage.h Dist - --FreeImage: $(STATICLIB) -+FreeImage: $(STATICLIB) $(SHAREDLIB) - - $(STATICLIB): $(STATICLIB)-x86_64 - cp -p $(STATICLIB)-x86_64 $(STATICLIB) -@@ -84,13 +85,10 @@ $(STATICLIB)-i386: $(MODULES_I386) - $(STATICLIB)-x86_64: $(MODULES_X86_64) - $(LIBTOOL) -arch_only x86_64 -o $@ $(MODULES_X86_64) - --$(SHAREDLIB): $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -- $(LIPO) -create $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -output $(SHAREDLIB) -- - $(SHAREDLIB)-i386: $(MODULES_I386) - $(CPP_I386) -arch i386 -dynamiclib $(LIBRARIES_I386) -o $@ $(MODULES_I386) - --$(SHAREDLIB)-x86_64: $(MODULES_X86_64) -+$(SHAREDLIB): $(MODULES_X86_64) - $(CPP_X86_64) -arch x86_64 -dynamiclib $(LIBRARIES_X86_64) -o $@ $(MODULES_X86_64) - - .c.o-i386: -@@ -106,9 +104,8 @@ $(SHAREDLIB)-x86_64: $(MODULES_X86_64) - $(CPP_X86_64) $(CPPFLAGS_X86_64) -c $< -o $@ - - install: -- install -d -m 755 -o root -g wheel $(INCDIR) $(INSTALLDIR) -- install -m 644 -o root -g wheel $(HEADER) $(INCDIR) -- install -m 644 -o root -g wheel $(SHAREDLIB) $(STATICLIB) $(INSTALLDIR) -+ install $(HEADER) $(INCDIR) -+ install $(SHAREDLIB) $(STATICLIB) $(INSTALLDIR) - ranlib -sf $(INSTALLDIR)/$(STATICLIB) - ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(LIBNAME) - -diff --git a/Makefile.srcs b/Makefile.srcs -index 692c6e56..212195b2 100644 ---- a/Makefile.srcs -+++ b/Makefile.srcs -@@ -1,6 +1,6 @@ - VER_MAJOR = 3 - VER_MINOR = 19.0 --SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibJPEG/jaricom.c Source/LibJPEG/jcapimin.c Source/LibJPEG/jcapistd.c Source/LibJPEG/jcarith.c Source/LibJPEG/jccoefct.c Source/LibJPEG/jccolor.c Source/LibJPEG/jcdctmgr.c Source/LibJPEG/jchuff.c Source/LibJPEG/jcinit.c Source/LibJPEG/jcmainct.c Source/LibJPEG/jcmarker.c Source/LibJPEG/jcmaster.c Source/LibJPEG/jcomapi.c Source/LibJPEG/jcparam.c Source/LibJPEG/jcprepct.c Source/LibJPEG/jcsample.c Source/LibJPEG/jctrans.c Source/LibJPEG/jdapimin.c Source/LibJPEG/jdapistd.c Source/LibJPEG/jdarith.c Source/LibJPEG/jdatadst.c Source/LibJPEG/jdatasrc.c Source/LibJPEG/jdcoefct.c Source/LibJPEG/jdcolor.c Source/LibJPEG/jddctmgr.c Source/LibJPEG/jdhuff.c Source/LibJPEG/jdinput.c Source/LibJPEG/jdmainct.c Source/LibJPEG/jdmarker.c Source/LibJPEG/jdmaster.c Source/LibJPEG/jdmerge.c Source/LibJPEG/jdpostct.c Source/LibJPEG/jdsample.c Source/LibJPEG/jdtrans.c Source/LibJPEG/jerror.c Source/LibJPEG/jfdctflt.c Source/LibJPEG/jfdctfst.c Source/LibJPEG/jfdctint.c Source/LibJPEG/jidctflt.c Source/LibJPEG/jidctfst.c Source/LibJPEG/jidctint.c Source/LibJPEG/jmemmgr.c Source/LibJPEG/jmemnobs.c Source/LibJPEG/jquant1.c Source/LibJPEG/jquant2.c Source/LibJPEG/jutils.c Source/LibJPEG/transupp.c Source/LibPNG/png.c Source/LibPNG/pngerror.c Source/LibPNG/pngget.c Source/LibPNG/pngmem.c Source/LibPNG/pngpread.c Source/LibPNG/pngread.c Source/LibPNG/pngrio.c Source/LibPNG/pngrtran.c Source/LibPNG/pngrutil.c Source/LibPNG/pngset.c Source/LibPNG/pngtrans.c Source/LibPNG/pngwio.c Source/LibPNG/pngwrite.c Source/LibPNG/pngwtran.c Source/LibPNG/pngwutil.c Source/LibTIFF4/tif_aux.c Source/LibTIFF4/tif_close.c Source/LibTIFF4/tif_codec.c Source/LibTIFF4/tif_color.c Source/LibTIFF4/tif_compress.c Source/LibTIFF4/tif_dir.c Source/LibTIFF4/tif_dirinfo.c Source/LibTIFF4/tif_dirread.c Source/LibTIFF4/tif_dirwrite.c Source/LibTIFF4/tif_dumpmode.c Source/LibTIFF4/tif_error.c Source/LibTIFF4/tif_extension.c Source/LibTIFF4/tif_fax3.c Source/LibTIFF4/tif_fax3sm.c Source/LibTIFF4/tif_flush.c Source/LibTIFF4/tif_getimage.c Source/LibTIFF4/tif_jpeg.c Source/LibTIFF4/tif_lerc.c Source/LibTIFF4/tif_luv.c Source/LibTIFF4/tif_lzw.c Source/LibTIFF4/tif_next.c Source/LibTIFF4/tif_ojpeg.c Source/LibTIFF4/tif_open.c Source/LibTIFF4/tif_packbits.c Source/LibTIFF4/tif_pixarlog.c Source/LibTIFF4/tif_predict.c Source/LibTIFF4/tif_print.c Source/LibTIFF4/tif_read.c Source/LibTIFF4/tif_strip.c Source/LibTIFF4/tif_swab.c Source/LibTIFF4/tif_thunder.c Source/LibTIFF4/tif_tile.c Source/LibTIFF4/tif_version.c Source/LibTIFF4/tif_warning.c Source/LibTIFF4/tif_webp.c Source/LibTIFF4/tif_write.c Source/LibTIFF4/tif_zip.c Source/ZLib/adler32.c Source/ZLib/compress.c Source/ZLib/crc32.c Source/ZLib/deflate.c Source/ZLib/gzclose.c Source/ZLib/gzlib.c Source/ZLib/gzread.c Source/ZLib/gzwrite.c Source/ZLib/infback.c Source/ZLib/inffast.c Source/ZLib/inflate.c Source/ZLib/inftrees.c Source/ZLib/trees.c Source/ZLib/uncompr.c Source/ZLib/zutil.c Source/LibOpenJPEG/bio.c Source/LibOpenJPEG/cio.c Source/LibOpenJPEG/dwt.c Source/LibOpenJPEG/event.c Source/LibOpenJPEG/function_list.c Source/LibOpenJPEG/image.c Source/LibOpenJPEG/invert.c Source/LibOpenJPEG/j2k.c Source/LibOpenJPEG/jp2.c Source/LibOpenJPEG/mct.c Source/LibOpenJPEG/mqc.c Source/LibOpenJPEG/openjpeg.c Source/LibOpenJPEG/opj_clock.c Source/LibOpenJPEG/pi.c Source/LibOpenJPEG/raw.c Source/LibOpenJPEG/t1.c Source/LibOpenJPEG/t2.c Source/LibOpenJPEG/tcd.c Source/LibOpenJPEG/tgt.c Source/OpenEXR/IexMath/IexMathFpu.cpp Source/OpenEXR/IlmImf/b44ExpLogTable.cpp Source/OpenEXR/IlmImf/ImfAcesFile.cpp Source/OpenEXR/IlmImf/ImfAttribute.cpp Source/OpenEXR/IlmImf/ImfB44Compressor.cpp Source/OpenEXR/IlmImf/ImfBoxAttribute.cpp Source/OpenEXR/IlmImf/ImfChannelList.cpp Source/OpenEXR/IlmImf/ImfChannelListAttribute.cpp Source/OpenEXR/IlmImf/ImfChromaticities.cpp Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.cpp Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.cpp Source/OpenEXR/IlmImf/ImfCompressionAttribute.cpp Source/OpenEXR/IlmImf/ImfCompressor.cpp Source/OpenEXR/IlmImf/ImfConvert.cpp Source/OpenEXR/IlmImf/ImfCRgbaFile.cpp Source/OpenEXR/IlmImf/ImfDeepCompositing.cpp Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfDoubleAttribute.cpp Source/OpenEXR/IlmImf/ImfDwaCompressor.cpp Source/OpenEXR/IlmImf/ImfEnvmap.cpp Source/OpenEXR/IlmImf/ImfEnvmapAttribute.cpp Source/OpenEXR/IlmImf/ImfFastHuf.cpp Source/OpenEXR/IlmImf/ImfFloatAttribute.cpp Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfFramesPerSecond.cpp Source/OpenEXR/IlmImf/ImfGenericInputFile.cpp Source/OpenEXR/IlmImf/ImfGenericOutputFile.cpp Source/OpenEXR/IlmImf/ImfHeader.cpp Source/OpenEXR/IlmImf/ImfHuf.cpp Source/OpenEXR/IlmImf/ImfInputFile.cpp Source/OpenEXR/IlmImf/ImfInputPart.cpp Source/OpenEXR/IlmImf/ImfInputPartData.cpp Source/OpenEXR/IlmImf/ImfIntAttribute.cpp Source/OpenEXR/IlmImf/ImfIO.cpp Source/OpenEXR/IlmImf/ImfKeyCode.cpp Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfLineOrderAttribute.cpp Source/OpenEXR/IlmImf/ImfLut.cpp Source/OpenEXR/IlmImf/ImfMatrixAttribute.cpp Source/OpenEXR/IlmImf/ImfMisc.cpp Source/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp Source/OpenEXR/IlmImf/ImfMultiView.cpp Source/OpenEXR/IlmImf/ImfOpaqueAttribute.cpp Source/OpenEXR/IlmImf/ImfOutputFile.cpp Source/OpenEXR/IlmImf/ImfOutputPart.cpp Source/OpenEXR/IlmImf/ImfOutputPartData.cpp Source/OpenEXR/IlmImf/ImfPartType.cpp Source/OpenEXR/IlmImf/ImfPizCompressor.cpp Source/OpenEXR/IlmImf/ImfPreviewImage.cpp Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.cpp Source/OpenEXR/IlmImf/ImfPxr24Compressor.cpp Source/OpenEXR/IlmImf/ImfRational.cpp Source/OpenEXR/IlmImf/ImfRationalAttribute.cpp Source/OpenEXR/IlmImf/ImfRgbaFile.cpp Source/OpenEXR/IlmImf/ImfRgbaYca.cpp Source/OpenEXR/IlmImf/ImfRle.cpp Source/OpenEXR/IlmImf/ImfRleCompressor.cpp Source/OpenEXR/IlmImf/ImfScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfStandardAttributes.cpp Source/OpenEXR/IlmImf/ImfStdIO.cpp Source/OpenEXR/IlmImf/ImfStringAttribute.cpp Source/OpenEXR/IlmImf/ImfStringVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp Source/OpenEXR/IlmImf/ImfTestFile.cpp Source/OpenEXR/IlmImf/ImfThreading.cpp Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.cpp Source/OpenEXR/IlmImf/ImfTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfTiledMisc.cpp Source/OpenEXR/IlmImf/ImfTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfTiledRgbaFile.cpp Source/OpenEXR/IlmImf/ImfTileOffsets.cpp Source/OpenEXR/IlmImf/ImfTimeCode.cpp Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfVecAttribute.cpp Source/OpenEXR/IlmImf/ImfVersion.cpp Source/OpenEXR/IlmImf/ImfWav.cpp Source/OpenEXR/IlmImf/ImfZip.cpp Source/OpenEXR/IlmImf/ImfZipCompressor.cpp Source/OpenEXR/Imath/ImathBox.cpp Source/OpenEXR/Imath/ImathColorAlgo.cpp Source/OpenEXR/Imath/ImathFun.cpp Source/OpenEXR/Imath/ImathMatrixAlgo.cpp Source/OpenEXR/Imath/ImathRandom.cpp Source/OpenEXR/Imath/ImathShear.cpp Source/OpenEXR/Imath/ImathVec.cpp Source/OpenEXR/Iex/IexBaseExc.cpp Source/OpenEXR/Iex/IexThrowErrnoExc.cpp Source/OpenEXR/Half/half.cpp Source/OpenEXR/IlmThread/IlmThread.cpp Source/OpenEXR/IlmThread/IlmThreadMutex.cpp Source/OpenEXR/IlmThread/IlmThreadPool.cpp Source/OpenEXR/IlmThread/IlmThreadSemaphore.cpp Source/OpenEXR/IexMath/IexMathFloatExc.cpp Source/LibRawLite/src/decoders/canon_600.cpp Source/LibRawLite/src/decoders/crx.cpp Source/LibRawLite/src/decoders/decoders_dcraw.cpp Source/LibRawLite/src/decoders/decoders_libraw.cpp Source/LibRawLite/src/decoders/decoders_libraw_dcrdefs.cpp Source/LibRawLite/src/decoders/dng.cpp Source/LibRawLite/src/decoders/fp_dng.cpp Source/LibRawLite/src/decoders/fuji_compressed.cpp Source/LibRawLite/src/decoders/generic.cpp Source/LibRawLite/src/decoders/kodak_decoders.cpp Source/LibRawLite/src/decoders/load_mfbacks.cpp Source/LibRawLite/src/decoders/smal.cpp Source/LibRawLite/src/decoders/unpack.cpp Source/LibRawLite/src/decoders/unpack_thumb.cpp Source/LibRawLite/src/demosaic/aahd_demosaic.cpp Source/LibRawLite/src/demosaic/ahd_demosaic.cpp Source/LibRawLite/src/demosaic/dcb_demosaic.cpp Source/LibRawLite/src/demosaic/dht_demosaic.cpp Source/LibRawLite/src/demosaic/misc_demosaic.cpp Source/LibRawLite/src/demosaic/xtrans_demosaic.cpp Source/LibRawLite/src/integration/dngsdk_glue.cpp Source/LibRawLite/src/integration/rawspeed_glue.cpp Source/LibRawLite/src/libraw_datastream.cpp Source/LibRawLite/src/metadata/adobepano.cpp Source/LibRawLite/src/metadata/canon.cpp Source/LibRawLite/src/metadata/ciff.cpp Source/LibRawLite/src/metadata/cr3_parser.cpp Source/LibRawLite/src/metadata/epson.cpp Source/LibRawLite/src/metadata/exif_gps.cpp Source/LibRawLite/src/metadata/fuji.cpp Source/LibRawLite/src/metadata/hasselblad_model.cpp Source/LibRawLite/src/metadata/identify.cpp Source/LibRawLite/src/metadata/identify_tools.cpp Source/LibRawLite/src/metadata/kodak.cpp Source/LibRawLite/src/metadata/leica.cpp Source/LibRawLite/src/metadata/makernotes.cpp Source/LibRawLite/src/metadata/mediumformat.cpp Source/LibRawLite/src/metadata/minolta.cpp Source/LibRawLite/src/metadata/misc_parsers.cpp Source/LibRawLite/src/metadata/nikon.cpp Source/LibRawLite/src/metadata/normalize_model.cpp Source/LibRawLite/src/metadata/olympus.cpp Source/LibRawLite/src/metadata/p1.cpp Source/LibRawLite/src/metadata/pentax.cpp Source/LibRawLite/src/metadata/samsung.cpp Source/LibRawLite/src/metadata/sony.cpp Source/LibRawLite/src/metadata/tiff.cpp Source/LibRawLite/src/postprocessing/aspect_ratio.cpp Source/LibRawLite/src/postprocessing/dcraw_process.cpp Source/LibRawLite/src/postprocessing/mem_image.cpp Source/LibRawLite/src/postprocessing/postprocessing_aux.cpp Source/LibRawLite/src/postprocessing/postprocessing_utils.cpp Source/LibRawLite/src/postprocessing/postprocessing_utils_dcrdefs.cpp Source/LibRawLite/src/preprocessing/ext_preprocess.cpp Source/LibRawLite/src/preprocessing/raw2image.cpp Source/LibRawLite/src/preprocessing/subtract_black.cpp Source/LibRawLite/src/tables/cameralist.cpp Source/LibRawLite/src/tables/colorconst.cpp Source/LibRawLite/src/tables/colordata.cpp Source/LibRawLite/src/tables/wblists.cpp Source/LibRawLite/src/utils/curves.cpp Source/LibRawLite/src/utils/decoder_info.cpp Source/LibRawLite/src/utils/init_close_utils.cpp Source/LibRawLite/src/utils/open.cpp Source/LibRawLite/src/utils/phaseone_processing.cpp Source/LibRawLite/src/utils/read_utils.cpp Source/LibRawLite/src/utils/thumb_utils.cpp Source/LibRawLite/src/utils/utils_dcraw.cpp Source/LibRawLite/src/utils/utils_libraw.cpp Source/LibRawLite/src/write/file_write.cpp Source/LibRawLite/src/x3f/x3f_parse_process.cpp Source/LibRawLite/src/x3f/x3f_utils_patched.cpp Source/LibWebP/src/dec/alpha_dec.c Source/LibWebP/src/dec/buffer_dec.c Source/LibWebP/src/dec/frame_dec.c Source/LibWebP/src/dec/idec_dec.c Source/LibWebP/src/dec/io_dec.c Source/LibWebP/src/dec/quant_dec.c Source/LibWebP/src/dec/tree_dec.c Source/LibWebP/src/dec/vp8l_dec.c Source/LibWebP/src/dec/vp8_dec.c Source/LibWebP/src/dec/webp_dec.c Source/LibWebP/src/demux/anim_decode.c Source/LibWebP/src/demux/demux.c Source/LibWebP/src/dsp/alpha_processing.c Source/LibWebP/src/dsp/alpha_processing_mips_dsp_r2.c Source/LibWebP/src/dsp/alpha_processing_neon.c Source/LibWebP/src/dsp/alpha_processing_sse2.c Source/LibWebP/src/dsp/alpha_processing_sse41.c Source/LibWebP/src/dsp/cost.c Source/LibWebP/src/dsp/cost_mips32.c Source/LibWebP/src/dsp/cost_mips_dsp_r2.c Source/LibWebP/src/dsp/cost_neon.c Source/LibWebP/src/dsp/cost_sse2.c Source/LibWebP/src/dsp/cpu.c Source/LibWebP/src/dsp/dec.c Source/LibWebP/src/dsp/dec_clip_tables.c Source/LibWebP/src/dsp/dec_mips32.c Source/LibWebP/src/dsp/dec_mips_dsp_r2.c Source/LibWebP/src/dsp/dec_msa.c Source/LibWebP/src/dsp/dec_neon.c Source/LibWebP/src/dsp/dec_sse2.c Source/LibWebP/src/dsp/dec_sse41.c Source/LibWebP/src/dsp/enc.c Source/LibWebP/src/dsp/enc_avx2.c Source/LibWebP/src/dsp/enc_mips32.c Source/LibWebP/src/dsp/enc_mips_dsp_r2.c Source/LibWebP/src/dsp/enc_msa.c Source/LibWebP/src/dsp/enc_neon.c Source/LibWebP/src/dsp/enc_sse2.c Source/LibWebP/src/dsp/enc_sse41.c Source/LibWebP/src/dsp/filters.c Source/LibWebP/src/dsp/filters_mips_dsp_r2.c Source/LibWebP/src/dsp/filters_msa.c Source/LibWebP/src/dsp/filters_neon.c Source/LibWebP/src/dsp/filters_sse2.c Source/LibWebP/src/dsp/lossless.c Source/LibWebP/src/dsp/lossless_enc.c Source/LibWebP/src/dsp/lossless_enc_mips32.c Source/LibWebP/src/dsp/lossless_enc_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_enc_msa.c Source/LibWebP/src/dsp/lossless_enc_neon.c Source/LibWebP/src/dsp/lossless_enc_sse2.c Source/LibWebP/src/dsp/lossless_enc_sse41.c Source/LibWebP/src/dsp/lossless_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_msa.c Source/LibWebP/src/dsp/lossless_neon.c Source/LibWebP/src/dsp/lossless_sse2.c Source/LibWebP/src/dsp/lossless_sse41.c Source/LibWebP/src/dsp/rescaler.c Source/LibWebP/src/dsp/rescaler_mips32.c Source/LibWebP/src/dsp/rescaler_mips_dsp_r2.c Source/LibWebP/src/dsp/rescaler_msa.c Source/LibWebP/src/dsp/rescaler_neon.c Source/LibWebP/src/dsp/rescaler_sse2.c Source/LibWebP/src/dsp/ssim.c Source/LibWebP/src/dsp/ssim_sse2.c Source/LibWebP/src/dsp/upsampling.c Source/LibWebP/src/dsp/upsampling_mips_dsp_r2.c Source/LibWebP/src/dsp/upsampling_msa.c Source/LibWebP/src/dsp/upsampling_neon.c Source/LibWebP/src/dsp/upsampling_sse2.c Source/LibWebP/src/dsp/upsampling_sse41.c Source/LibWebP/src/dsp/yuv.c Source/LibWebP/src/dsp/yuv_mips32.c Source/LibWebP/src/dsp/yuv_mips_dsp_r2.c Source/LibWebP/src/dsp/yuv_neon.c Source/LibWebP/src/dsp/yuv_sse2.c Source/LibWebP/src/dsp/yuv_sse41.c Source/LibWebP/src/enc/alpha_enc.c Source/LibWebP/src/enc/analysis_enc.c Source/LibWebP/src/enc/backward_references_cost_enc.c Source/LibWebP/src/enc/backward_references_enc.c Source/LibWebP/src/enc/config_enc.c Source/LibWebP/src/enc/cost_enc.c Source/LibWebP/src/enc/filter_enc.c Source/LibWebP/src/enc/frame_enc.c Source/LibWebP/src/enc/histogram_enc.c Source/LibWebP/src/enc/iterator_enc.c Source/LibWebP/src/enc/near_lossless_enc.c Source/LibWebP/src/enc/picture_csp_enc.c Source/LibWebP/src/enc/picture_enc.c Source/LibWebP/src/enc/picture_psnr_enc.c Source/LibWebP/src/enc/picture_rescale_enc.c Source/LibWebP/src/enc/picture_tools_enc.c Source/LibWebP/src/enc/predictor_enc.c Source/LibWebP/src/enc/quant_enc.c Source/LibWebP/src/enc/syntax_enc.c Source/LibWebP/src/enc/token_enc.c Source/LibWebP/src/enc/tree_enc.c Source/LibWebP/src/enc/vp8l_enc.c Source/LibWebP/src/enc/webp_enc.c Source/LibWebP/src/mux/anim_encode.c Source/LibWebP/src/mux/muxedit.c Source/LibWebP/src/mux/muxinternal.c Source/LibWebP/src/mux/muxread.c Source/LibWebP/src/utils/bit_reader_utils.c Source/LibWebP/src/utils/bit_writer_utils.c Source/LibWebP/src/utils/color_cache_utils.c Source/LibWebP/src/utils/filters_utils.c Source/LibWebP/src/utils/huffman_encode_utils.c Source/LibWebP/src/utils/huffman_utils.c Source/LibWebP/src/utils/quant_levels_dec_utils.c Source/LibWebP/src/utils/quant_levels_utils.c Source/LibWebP/src/utils/random_utils.c Source/LibWebP/src/utils/rescaler_utils.c Source/LibWebP/src/utils/thread_utils.c Source/LibWebP/src/utils/utils.c Source/LibJXR/image/decode/decode.c Source/LibJXR/image/decode/JXRTranscode.c Source/LibJXR/image/decode/postprocess.c Source/LibJXR/image/decode/segdec.c Source/LibJXR/image/decode/strdec.c Source/LibJXR/image/decode/strdec_x86.c Source/LibJXR/image/decode/strInvTransform.c Source/LibJXR/image/decode/strPredQuantDec.c Source/LibJXR/image/encode/encode.c Source/LibJXR/image/encode/segenc.c Source/LibJXR/image/encode/strenc.c Source/LibJXR/image/encode/strenc_x86.c Source/LibJXR/image/encode/strFwdTransform.c Source/LibJXR/image/encode/strPredQuantEnc.c Source/LibJXR/image/sys/adapthuff.c Source/LibJXR/image/sys/image.c Source/LibJXR/image/sys/strcodec.c Source/LibJXR/image/sys/strPredQuant.c Source/LibJXR/image/sys/strTransform.c Source/LibJXR/jxrgluelib/JXRGlue.c Source/LibJXR/jxrgluelib/JXRGlueJxr.c Source/LibJXR/jxrgluelib/JXRGluePFC.c Source/LibJXR/jxrgluelib/JXRMeta.c --INCLS = ./Dist/x64/FreeImage.h ./Examples/Generic/FIIO_Mem.h ./Examples/OpenGL/TextureManager/TextureManager.h ./Examples/Plugin/PluginCradle.h ./Source/CacheFile.h ./Source/FreeImage/J2KHelper.h ./Source/FreeImage/PSDParser.h ./Source/FreeImage.h ./Source/FreeImageIO.h ./Source/FreeImageToolkit/Filters.h ./Source/FreeImageToolkit/Resize.h ./Source/LibJPEG/cderror.h ./Source/LibJPEG/cdjpeg.h ./Source/LibJPEG/jconfig.h ./Source/LibJPEG/jdct.h ./Source/LibJPEG/jerror.h ./Source/LibJPEG/jinclude.h ./Source/LibJPEG/jmemsys.h ./Source/LibJPEG/jmorecfg.h ./Source/LibJPEG/jpegint.h ./Source/LibJPEG/jpeglib.h ./Source/LibJPEG/jversion.h ./Source/LibJPEG/transupp.h ./Source/LibJXR/common/include/guiddef.h ./Source/LibJXR/common/include/wmsal.h ./Source/LibJXR/common/include/wmspecstring.h ./Source/LibJXR/common/include/wmspecstrings_adt.h ./Source/LibJXR/common/include/wmspecstrings_strict.h ./Source/LibJXR/common/include/wmspecstrings_undef.h ./Source/LibJXR/image/decode/decode.h ./Source/LibJXR/image/encode/encode.h ./Source/LibJXR/image/sys/ansi.h ./Source/LibJXR/image/sys/common.h ./Source/LibJXR/image/sys/perfTimer.h ./Source/LibJXR/image/sys/strcodec.h ./Source/LibJXR/image/sys/strTransform.h ./Source/LibJXR/image/sys/windowsmediaphoto.h ./Source/LibJXR/image/sys/xplatform_image.h ./Source/LibJXR/image/x86/x86.h ./Source/LibJXR/jxrgluelib/JXRGlue.h ./Source/LibJXR/jxrgluelib/JXRMeta.h ./Source/LibOpenJPEG/bio.h ./Source/LibOpenJPEG/cidx_manager.h ./Source/LibOpenJPEG/cio.h ./Source/LibOpenJPEG/dwt.h ./Source/LibOpenJPEG/event.h ./Source/LibOpenJPEG/function_list.h ./Source/LibOpenJPEG/image.h ./Source/LibOpenJPEG/indexbox_manager.h ./Source/LibOpenJPEG/invert.h ./Source/LibOpenJPEG/j2k.h ./Source/LibOpenJPEG/jp2.h ./Source/LibOpenJPEG/mct.h ./Source/LibOpenJPEG/mqc.h ./Source/LibOpenJPEG/openjpeg.h ./Source/LibOpenJPEG/opj_clock.h ./Source/LibOpenJPEG/opj_codec.h ./Source/LibOpenJPEG/opj_config.h ./Source/LibOpenJPEG/opj_config_private.h ./Source/LibOpenJPEG/opj_includes.h ./Source/LibOpenJPEG/opj_intmath.h ./Source/LibOpenJPEG/opj_inttypes.h ./Source/LibOpenJPEG/opj_malloc.h ./Source/LibOpenJPEG/opj_stdint.h ./Source/LibOpenJPEG/pi.h ./Source/LibOpenJPEG/raw.h ./Source/LibOpenJPEG/t1.h ./Source/LibOpenJPEG/t1_luts.h ./Source/LibOpenJPEG/t2.h ./Source/LibOpenJPEG/tcd.h ./Source/LibOpenJPEG/tgt.h ./Source/LibPNG/png.h ./Source/LibPNG/pngconf.h ./Source/LibPNG/pngdebug.h ./Source/LibPNG/pnginfo.h ./Source/LibPNG/pnglibconf.h ./Source/LibPNG/pngpriv.h ./Source/LibPNG/pngstruct.h ./Source/LibRawLite/internal/dcraw_defs.h ./Source/LibRawLite/internal/dcraw_fileio_defs.h ./Source/LibRawLite/internal/defines.h ./Source/LibRawLite/internal/dmp_include.h ./Source/LibRawLite/internal/libraw_cameraids.h ./Source/LibRawLite/internal/libraw_cxx_defs.h ./Source/LibRawLite/internal/libraw_internal_funcs.h ./Source/LibRawLite/internal/var_defines.h ./Source/LibRawLite/internal/x3f_tools.h ./Source/LibRawLite/libraw/libraw.h ./Source/LibRawLite/libraw/libraw_alloc.h ./Source/LibRawLite/libraw/libraw_const.h ./Source/LibRawLite/libraw/libraw_datastream.h ./Source/LibRawLite/libraw/libraw_internal.h ./Source/LibRawLite/libraw/libraw_types.h ./Source/LibRawLite/libraw/libraw_version.h ./Source/LibTIFF4/t4.h ./Source/LibTIFF4/tiff.h ./Source/LibTIFF4/tiffconf.h ./Source/LibTIFF4/tiffconf.vc.h ./Source/LibTIFF4/tiffconf.wince.h ./Source/LibTIFF4/tiffio.h ./Source/LibTIFF4/tiffiop.h ./Source/LibTIFF4/tiffvers.h ./Source/LibTIFF4/tif_config.h ./Source/LibTIFF4/tif_config.vc.h ./Source/LibTIFF4/tif_config.wince.h ./Source/LibTIFF4/tif_dir.h ./Source/LibTIFF4/tif_fax3.h ./Source/LibTIFF4/tif_predict.h ./Source/LibTIFF4/uvcode.h ./Source/LibWebP/src/dec/alphai_dec.h ./Source/LibWebP/src/dec/common_dec.h ./Source/LibWebP/src/dec/vp8i_dec.h ./Source/LibWebP/src/dec/vp8li_dec.h ./Source/LibWebP/src/dec/vp8_dec.h ./Source/LibWebP/src/dec/webpi_dec.h ./Source/LibWebP/src/dsp/common_sse2.h ./Source/LibWebP/src/dsp/common_sse41.h ./Source/LibWebP/src/dsp/dsp.h ./Source/LibWebP/src/dsp/lossless.h ./Source/LibWebP/src/dsp/lossless_common.h ./Source/LibWebP/src/dsp/mips_macro.h ./Source/LibWebP/src/dsp/msa_macro.h ./Source/LibWebP/src/dsp/neon.h ./Source/LibWebP/src/dsp/quant.h ./Source/LibWebP/src/dsp/yuv.h ./Source/LibWebP/src/enc/backward_references_enc.h ./Source/LibWebP/src/enc/cost_enc.h ./Source/LibWebP/src/enc/histogram_enc.h ./Source/LibWebP/src/enc/vp8i_enc.h ./Source/LibWebP/src/enc/vp8li_enc.h ./Source/LibWebP/src/mux/animi.h ./Source/LibWebP/src/mux/muxi.h ./Source/LibWebP/src/utils/bit_reader_inl_utils.h ./Source/LibWebP/src/utils/bit_reader_utils.h ./Source/LibWebP/src/utils/bit_writer_utils.h ./Source/LibWebP/src/utils/color_cache_utils.h ./Source/LibWebP/src/utils/endian_inl_utils.h ./Source/LibWebP/src/utils/filters_utils.h ./Source/LibWebP/src/utils/huffman_encode_utils.h ./Source/LibWebP/src/utils/huffman_utils.h ./Source/LibWebP/src/utils/quant_levels_dec_utils.h ./Source/LibWebP/src/utils/quant_levels_utils.h ./Source/LibWebP/src/utils/random_utils.h ./Source/LibWebP/src/utils/rescaler_utils.h ./Source/LibWebP/src/utils/thread_utils.h ./Source/LibWebP/src/utils/utils.h ./Source/LibWebP/src/webp/decode.h ./Source/LibWebP/src/webp/demux.h ./Source/LibWebP/src/webp/encode.h ./Source/LibWebP/src/webp/format_constants.h ./Source/LibWebP/src/webp/mux.h ./Source/LibWebP/src/webp/mux_types.h ./Source/LibWebP/src/webp/types.h ./Source/MapIntrospector.h ./Source/Metadata/FIRational.h ./Source/Metadata/FreeImageTag.h ./Source/OpenEXR/Half/eLut.h ./Source/OpenEXR/Half/half.h ./Source/OpenEXR/Half/halfExport.h ./Source/OpenEXR/Half/halfFunction.h ./Source/OpenEXR/Half/halfLimits.h ./Source/OpenEXR/Half/toFloat.h ./Source/OpenEXR/Iex/Iex.h ./Source/OpenEXR/Iex/IexBaseExc.h ./Source/OpenEXR/Iex/IexErrnoExc.h ./Source/OpenEXR/Iex/IexExport.h ./Source/OpenEXR/Iex/IexForward.h ./Source/OpenEXR/Iex/IexMacros.h ./Source/OpenEXR/Iex/IexMathExc.h ./Source/OpenEXR/Iex/IexNamespace.h ./Source/OpenEXR/Iex/IexThrowErrnoExc.h ./Source/OpenEXR/IexMath/IexMathFloatExc.h ./Source/OpenEXR/IexMath/IexMathFpu.h ./Source/OpenEXR/IexMath/IexMathIeeeExc.h ./Source/OpenEXR/IlmBaseConfig.h ./Source/OpenEXR/IlmImf/b44ExpLogTable.h ./Source/OpenEXR/IlmImf/dwaLookups.h ./Source/OpenEXR/IlmImf/ImfAcesFile.h ./Source/OpenEXR/IlmImf/ImfArray.h ./Source/OpenEXR/IlmImf/ImfAttribute.h ./Source/OpenEXR/IlmImf/ImfAutoArray.h ./Source/OpenEXR/IlmImf/ImfB44Compressor.h ./Source/OpenEXR/IlmImf/ImfBoxAttribute.h ./Source/OpenEXR/IlmImf/ImfChannelList.h ./Source/OpenEXR/IlmImf/ImfChannelListAttribute.h ./Source/OpenEXR/IlmImf/ImfCheckedArithmetic.h ./Source/OpenEXR/IlmImf/ImfChromaticities.h ./Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.h ./Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.h ./Source/OpenEXR/IlmImf/ImfCompression.h ./Source/OpenEXR/IlmImf/ImfCompressionAttribute.h ./Source/OpenEXR/IlmImf/ImfCompressor.h ./Source/OpenEXR/IlmImf/ImfConvert.h ./Source/OpenEXR/IlmImf/ImfCRgbaFile.h ./Source/OpenEXR/IlmImf/ImfDeepCompositing.h ./Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.h ./Source/OpenEXR/IlmImf/ImfDeepImageState.h ./Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.h ./Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.h ./Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.h ./Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.h ./Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.h ./Source/OpenEXR/IlmImf/ImfDoubleAttribute.h ./Source/OpenEXR/IlmImf/ImfDwaCompressor.h ./Source/OpenEXR/IlmImf/ImfDwaCompressorSimd.h ./Source/OpenEXR/IlmImf/ImfEnvmap.h ./Source/OpenEXR/IlmImf/ImfEnvmapAttribute.h ./Source/OpenEXR/IlmImf/ImfExport.h ./Source/OpenEXR/IlmImf/ImfFastHuf.h ./Source/OpenEXR/IlmImf/ImfFloatAttribute.h ./Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.h ./Source/OpenEXR/IlmImf/ImfForward.h ./Source/OpenEXR/IlmImf/ImfFrameBuffer.h ./Source/OpenEXR/IlmImf/ImfFramesPerSecond.h ./Source/OpenEXR/IlmImf/ImfGenericInputFile.h ./Source/OpenEXR/IlmImf/ImfGenericOutputFile.h ./Source/OpenEXR/IlmImf/ImfHeader.h ./Source/OpenEXR/IlmImf/ImfHuf.h ./Source/OpenEXR/IlmImf/ImfInputFile.h ./Source/OpenEXR/IlmImf/ImfInputPart.h ./Source/OpenEXR/IlmImf/ImfInputPartData.h ./Source/OpenEXR/IlmImf/ImfInputStreamMutex.h ./Source/OpenEXR/IlmImf/ImfInt64.h ./Source/OpenEXR/IlmImf/ImfIntAttribute.h ./Source/OpenEXR/IlmImf/ImfIO.h ./Source/OpenEXR/IlmImf/ImfKeyCode.h ./Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfLineOrder.h ./Source/OpenEXR/IlmImf/ImfLineOrderAttribute.h ./Source/OpenEXR/IlmImf/ImfLut.h ./Source/OpenEXR/IlmImf/ImfMatrixAttribute.h ./Source/OpenEXR/IlmImf/ImfMisc.h ./Source/OpenEXR/IlmImf/ImfMultiPartInputFile.h ./Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.h ./Source/OpenEXR/IlmImf/ImfMultiView.h ./Source/OpenEXR/IlmImf/ImfName.h ./Source/OpenEXR/IlmImf/ImfNamespace.h ./Source/OpenEXR/IlmImf/ImfOpaqueAttribute.h ./Source/OpenEXR/IlmImf/ImfOptimizedPixelReading.h ./Source/OpenEXR/IlmImf/ImfOutputFile.h ./Source/OpenEXR/IlmImf/ImfOutputPart.h ./Source/OpenEXR/IlmImf/ImfOutputPartData.h ./Source/OpenEXR/IlmImf/ImfOutputStreamMutex.h ./Source/OpenEXR/IlmImf/ImfPartHelper.h ./Source/OpenEXR/IlmImf/ImfPartType.h ./Source/OpenEXR/IlmImf/ImfPixelType.h ./Source/OpenEXR/IlmImf/ImfPizCompressor.h ./Source/OpenEXR/IlmImf/ImfPreviewImage.h ./Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.h ./Source/OpenEXR/IlmImf/ImfPxr24Compressor.h ./Source/OpenEXR/IlmImf/ImfRational.h ./Source/OpenEXR/IlmImf/ImfRationalAttribute.h ./Source/OpenEXR/IlmImf/ImfRgba.h ./Source/OpenEXR/IlmImf/ImfRgbaFile.h ./Source/OpenEXR/IlmImf/ImfRgbaYca.h ./Source/OpenEXR/IlmImf/ImfRle.h ./Source/OpenEXR/IlmImf/ImfRleCompressor.h ./Source/OpenEXR/IlmImf/ImfScanLineInputFile.h ./Source/OpenEXR/IlmImf/ImfSimd.h ./Source/OpenEXR/IlmImf/ImfStandardAttributes.h ./Source/OpenEXR/IlmImf/ImfStdIO.h ./Source/OpenEXR/IlmImf/ImfStringAttribute.h ./Source/OpenEXR/IlmImf/ImfStringVectorAttribute.h ./Source/OpenEXR/IlmImf/ImfSystemSpecific.h ./Source/OpenEXR/IlmImf/ImfTestFile.h ./Source/OpenEXR/IlmImf/ImfThreading.h ./Source/OpenEXR/IlmImf/ImfTileDescription.h ./Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.h ./Source/OpenEXR/IlmImf/ImfTiledInputFile.h ./Source/OpenEXR/IlmImf/ImfTiledInputPart.h ./Source/OpenEXR/IlmImf/ImfTiledMisc.h ./Source/OpenEXR/IlmImf/ImfTiledOutputFile.h ./Source/OpenEXR/IlmImf/ImfTiledOutputPart.h ./Source/OpenEXR/IlmImf/ImfTiledRgbaFile.h ./Source/OpenEXR/IlmImf/ImfTileOffsets.h ./Source/OpenEXR/IlmImf/ImfTimeCode.h ./Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfVecAttribute.h ./Source/OpenEXR/IlmImf/ImfVersion.h ./Source/OpenEXR/IlmImf/ImfWav.h ./Source/OpenEXR/IlmImf/ImfXdr.h ./Source/OpenEXR/IlmImf/ImfZip.h ./Source/OpenEXR/IlmImf/ImfZipCompressor.h ./Source/OpenEXR/IlmThread/IlmThread.h ./Source/OpenEXR/IlmThread/IlmThreadExport.h ./Source/OpenEXR/IlmThread/IlmThreadForward.h ./Source/OpenEXR/IlmThread/IlmThreadMutex.h ./Source/OpenEXR/IlmThread/IlmThreadNamespace.h ./Source/OpenEXR/IlmThread/IlmThreadPool.h ./Source/OpenEXR/IlmThread/IlmThreadSemaphore.h ./Source/OpenEXR/Imath/ImathBox.h ./Source/OpenEXR/Imath/ImathBoxAlgo.h ./Source/OpenEXR/Imath/ImathColor.h ./Source/OpenEXR/Imath/ImathColorAlgo.h ./Source/OpenEXR/Imath/ImathEuler.h ./Source/OpenEXR/Imath/ImathExc.h ./Source/OpenEXR/Imath/ImathExport.h ./Source/OpenEXR/Imath/ImathForward.h ./Source/OpenEXR/Imath/ImathFrame.h ./Source/OpenEXR/Imath/ImathFrustum.h ./Source/OpenEXR/Imath/ImathFrustumTest.h ./Source/OpenEXR/Imath/ImathFun.h ./Source/OpenEXR/Imath/ImathGL.h ./Source/OpenEXR/Imath/ImathGLU.h ./Source/OpenEXR/Imath/ImathHalfLimits.h ./Source/OpenEXR/Imath/ImathInt64.h ./Source/OpenEXR/Imath/ImathInterval.h ./Source/OpenEXR/Imath/ImathLimits.h ./Source/OpenEXR/Imath/ImathLine.h ./Source/OpenEXR/Imath/ImathLineAlgo.h ./Source/OpenEXR/Imath/ImathMath.h ./Source/OpenEXR/Imath/ImathMatrix.h ./Source/OpenEXR/Imath/ImathMatrixAlgo.h ./Source/OpenEXR/Imath/ImathNamespace.h ./Source/OpenEXR/Imath/ImathPlane.h ./Source/OpenEXR/Imath/ImathPlatform.h ./Source/OpenEXR/Imath/ImathQuat.h ./Source/OpenEXR/Imath/ImathRandom.h ./Source/OpenEXR/Imath/ImathRoots.h ./Source/OpenEXR/Imath/ImathShear.h ./Source/OpenEXR/Imath/ImathSphere.h ./Source/OpenEXR/Imath/ImathVec.h ./Source/OpenEXR/Imath/ImathVecAlgo.h ./Source/OpenEXR/OpenEXRConfig.h ./Source/Plugin.h ./Source/Quantizers.h ./Source/ToneMapping.h ./Source/Utilities.h ./Source/ZLib/crc32.h ./Source/ZLib/deflate.h ./Source/ZLib/gzguts.h ./Source/ZLib/inffast.h ./Source/ZLib/inffixed.h ./Source/ZLib/inflate.h ./Source/ZLib/inftrees.h ./Source/ZLib/trees.h ./Source/ZLib/zconf.h ./Source/ZLib/zlib.h ./Source/ZLib/zutil.h ./TestAPI/TestSuite.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/FreeImageIO.Net.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/resource.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/Stdafx.h ./Wrapper/FreeImagePlus/dist/x64/FreeImagePlus.h ./Wrapper/FreeImagePlus/FreeImagePlus.h ./Wrapper/FreeImagePlus/test/fipTest.h -+SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp -+INCLS = ./Dist/FreeImage.h ./Examples/Generic/FIIO_Mem.h ./Examples/OpenGL/TextureManager/TextureManager.h ./Examples/Plugin/PluginCradle.h ./Source/CacheFile.h ./Source/FreeImage/J2KHelper.h ./Source/FreeImage/PSDParser.h ./Source/FreeImage.h ./Source/FreeImageIO.h ./Source/FreeImageToolkit/Filters.h ./Source/FreeImageToolkit/Resize.h ./Source/MapIntrospector.h ./Source/Metadata/FIRational.h ./Source/Metadata/FreeImageTag.h ./Source/Plugin.h ./Source/Quantizers.h ./Source/ToneMapping.h ./Source/Utilities.h ./TestAPI/TestSuite.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/FreeImageIO.Net.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/resource.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/Stdafx.h ./Wrapper/FreeImagePlus/FreeImagePlus.h ./Wrapper/FreeImagePlus/test/fipTest.h - --INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -ISource/LibJPEG -ISource/LibPNG -ISource/LibTIFF4 -ISource/ZLib -ISource/LibOpenJPEG -ISource/OpenEXR -ISource/OpenEXR/Half -ISource/OpenEXR/Iex -ISource/OpenEXR/IlmImf -ISource/OpenEXR/IlmThread -ISource/OpenEXR/Imath -ISource/OpenEXR/IexMath -ISource/LibRawLite -ISource/LibRawLite/dcraw -ISource/LibRawLite/internal -ISource/LibRawLite/libraw -ISource/LibRawLite/src -ISource/LibWebP -ISource/LibJXR -ISource/LibJXR/common/include -ISource/LibJXR/image/sys -ISource/LibJXR/jxrgluelib -+INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -diff --git a/Source/FreeImage.h b/Source/FreeImage.h -index 2dfb9ee2..d2d32322 100644 ---- a/Source/FreeImage.h -+++ b/Source/FreeImage.h -@@ -155,8 +155,8 @@ typedef uint8_t BYTE; - typedef uint16_t WORD; - typedef uint32_t DWORD; - typedef int32_t LONG; --typedef int64_t INT64; --typedef uint64_t UINT64; -+#define INT64 int64_t -+#define UINT64 uint64_t - #else - // MS is not C99 ISO compliant - typedef long BOOL; -diff --git a/Source/FreeImage/J2KHelper.cpp b/Source/FreeImage/J2KHelper.cpp -index 062b49ee..0e79fbc5 100644 ---- a/Source/FreeImage/J2KHelper.cpp -+++ b/Source/FreeImage/J2KHelper.cpp -@@ -21,7 +21,7 @@ - - #include "FreeImage.h" - #include "Utilities.h" --#include "../LibOpenJPEG/openjpeg.h" -+#include - #include "J2KHelper.h" - - // -------------------------------------------------------------------------- -diff --git a/Source/FreeImage/PluginEXR.cpp b/Source/FreeImage/PluginEXR.cpp -index b2864303..9bf3ada9 100644 ---- a/Source/FreeImage/PluginEXR.cpp -+++ b/Source/FreeImage/PluginEXR.cpp -@@ -28,16 +28,16 @@ - #pragma warning (disable : 4800) // ImfVersion.h - 'const int' : forcing value to bool 'true' or 'false' (performance warning) - #endif - --#include "../OpenEXR/IlmImf/ImfIO.h" --#include "../OpenEXR/Iex/Iex.h" --#include "../OpenEXR/IlmImf/ImfOutputFile.h" --#include "../OpenEXR/IlmImf/ImfInputFile.h" --#include "../OpenEXR/IlmImf/ImfRgbaFile.h" --#include "../OpenEXR/IlmImf/ImfChannelList.h" --#include "../OpenEXR/IlmImf/ImfRgba.h" --#include "../OpenEXR/IlmImf/ImfArray.h" --#include "../OpenEXR/IlmImf/ImfPreviewImage.h" --#include "../OpenEXR/Half/half.h" -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include - - - // ========================================================== -diff --git a/Source/FreeImage/PluginG3.cpp b/Source/FreeImage/PluginG3.cpp -index 4680aa32..7d4b5ce6 100644 ---- a/Source/FreeImage/PluginG3.cpp -+++ b/Source/FreeImage/PluginG3.cpp -@@ -20,7 +20,7 @@ - // Use at your own risk! - // ========================================================== - --#include "../LibTIFF4/tiffiop.h" -+#include - - #include "FreeImage.h" - #include "Utilities.h" -diff --git a/Source/FreeImage/PluginJ2K.cpp b/Source/FreeImage/PluginJ2K.cpp -index b8bcfc8b..621a9037 100644 ---- a/Source/FreeImage/PluginJ2K.cpp -+++ b/Source/FreeImage/PluginJ2K.cpp -@@ -21,7 +21,7 @@ - - #include "FreeImage.h" - #include "Utilities.h" --#include "../LibOpenJPEG/openjpeg.h" -+#include - #include "J2KHelper.h" - - // ========================================================== -diff --git a/Source/FreeImage/PluginJP2.cpp b/Source/FreeImage/PluginJP2.cpp -index 742fe2c0..c57f6267 100644 ---- a/Source/FreeImage/PluginJP2.cpp -+++ b/Source/FreeImage/PluginJP2.cpp -@@ -21,7 +21,7 @@ - - #include "FreeImage.h" - #include "Utilities.h" --#include "../LibOpenJPEG/openjpeg.h" -+#include - #include "J2KHelper.h" - - // ========================================================== -diff --git a/Source/FreeImage/PluginJPEG.cpp b/Source/FreeImage/PluginJPEG.cpp -index 8db177d2..a7de6378 100644 ---- a/Source/FreeImage/PluginJPEG.cpp -+++ b/Source/FreeImage/PluginJPEG.cpp -@@ -35,9 +35,9 @@ extern "C" { - #undef FAR - #include - --#include "../LibJPEG/jinclude.h" --#include "../LibJPEG/jpeglib.h" --#include "../LibJPEG/jerror.h" -+#include -+#include -+#include - } - - #include "FreeImage.h" -@@ -484,116 +484,6 @@ marker_is_icc(jpeg_saved_marker_ptr marker) { - return FALSE; - } - --/** -- See if there was an ICC profile in the JPEG file being read; -- if so, reassemble and return the profile data. -- -- TRUE is returned if an ICC profile was found, FALSE if not. -- If TRUE is returned, *icc_data_ptr is set to point to the -- returned data, and *icc_data_len is set to its length. -- -- IMPORTANT: the data at **icc_data_ptr has been allocated with malloc() -- and must be freed by the caller with free() when the caller no longer -- needs it. (Alternatively, we could write this routine to use the -- IJG library's memory allocator, so that the data would be freed implicitly -- at jpeg_finish_decompress() time. But it seems likely that many apps -- will prefer to have the data stick around after decompression finishes.) -- -- NOTE: if the file contains invalid ICC APP2 markers, we just silently -- return FALSE. You might want to issue an error message instead. --*/ --static BOOL --jpeg_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr, unsigned *icc_data_len) { -- jpeg_saved_marker_ptr marker; -- int num_markers = 0; -- int seq_no; -- JOCTET *icc_data; -- unsigned total_length; -- -- const int MAX_SEQ_NO = 255; // sufficient since marker numbers are bytes -- BYTE marker_present[MAX_SEQ_NO+1]; // 1 if marker found -- unsigned data_length[MAX_SEQ_NO+1]; // size of profile data in marker -- unsigned data_offset[MAX_SEQ_NO+1]; // offset for data in marker -- -- *icc_data_ptr = NULL; // avoid confusion if FALSE return -- *icc_data_len = 0; -- -- /** -- this first pass over the saved markers discovers whether there are -- any ICC markers and verifies the consistency of the marker numbering. -- */ -- -- memset(marker_present, 0, (MAX_SEQ_NO + 1)); -- -- for(marker = cinfo->marker_list; marker != NULL; marker = marker->next) { -- if (marker_is_icc(marker)) { -- if (num_markers == 0) { -- // number of markers -- num_markers = GETJOCTET(marker->data[13]); -- } -- else if (num_markers != GETJOCTET(marker->data[13])) { -- return FALSE; // inconsistent num_markers fields -- } -- // sequence number -- seq_no = GETJOCTET(marker->data[12]); -- if (seq_no <= 0 || seq_no > num_markers) { -- return FALSE; // bogus sequence number -- } -- if (marker_present[seq_no]) { -- return FALSE; // duplicate sequence numbers -- } -- marker_present[seq_no] = 1; -- data_length[seq_no] = marker->data_length - ICC_HEADER_SIZE; -- } -- } -- -- if (num_markers == 0) -- return FALSE; -- -- /** -- check for missing markers, count total space needed, -- compute offset of each marker's part of the data. -- */ -- -- total_length = 0; -- for(seq_no = 1; seq_no <= num_markers; seq_no++) { -- if (marker_present[seq_no] == 0) { -- return FALSE; // missing sequence number -- } -- data_offset[seq_no] = total_length; -- total_length += data_length[seq_no]; -- } -- -- if (total_length <= 0) -- return FALSE; // found only empty markers ? -- -- // allocate space for assembled data -- icc_data = (JOCTET *) malloc(total_length * sizeof(JOCTET)); -- if (icc_data == NULL) -- return FALSE; // out of memory -- -- // and fill it in -- for (marker = cinfo->marker_list; marker != NULL; marker = marker->next) { -- if (marker_is_icc(marker)) { -- JOCTET FAR *src_ptr; -- JOCTET *dst_ptr; -- unsigned length; -- seq_no = GETJOCTET(marker->data[12]); -- dst_ptr = icc_data + data_offset[seq_no]; -- src_ptr = marker->data + ICC_HEADER_SIZE; -- length = data_length[seq_no]; -- while (length--) { -- *dst_ptr++ = *src_ptr++; -- } -- } -- } -- -- *icc_data_ptr = icc_data; -- *icc_data_len = total_length; -- -- return TRUE; --} -- - /** - Read JPEG_APPD marker (IPTC or Adobe Photoshop profile) - */ -diff --git a/Source/FreeImage/PluginJXR.cpp b/Source/FreeImage/PluginJXR.cpp -index 85c6ff3e..163a93bd 100644 ---- a/Source/FreeImage/PluginJXR.cpp -+++ b/Source/FreeImage/PluginJXR.cpp -@@ -23,7 +23,7 @@ - #include "Utilities.h" - #include "../Metadata/FreeImageTag.h" - --#include "../LibJXR/jxrgluelib/JXRGlue.h" -+#include - - // ========================================================== - // Plugin Interface -diff --git a/Source/FreeImage/PluginPNG.cpp b/Source/FreeImage/PluginPNG.cpp -index 661f1602..504fafe1 100644 ---- a/Source/FreeImage/PluginPNG.cpp -+++ b/Source/FreeImage/PluginPNG.cpp -@@ -40,8 +40,8 @@ - - // ---------------------------------------------------------- - --#include "../ZLib/zlib.h" --#include "../LibPNG/png.h" -+#include -+#include - - // ---------------------------------------------------------- - -diff --git a/Source/FreeImage/PluginRAW.cpp b/Source/FreeImage/PluginRAW.cpp -index 26134bcc..d7fa81e4 100644 ---- a/Source/FreeImage/PluginRAW.cpp -+++ b/Source/FreeImage/PluginRAW.cpp -@@ -19,12 +19,16 @@ - // Use at your own risk! - // ========================================================== - --#include "../LibRawLite/libraw/libraw.h" -+#include - - #include "FreeImage.h" - #include "Utilities.h" - #include "../Metadata/FreeImageTag.h" - -+// What an ugly hack -+#undef INT64 -+#undef UINT64 -+ - // ========================================================== - // Plugin Interface - // ========================================================== -diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp -index 84554958..13a224dd 100644 ---- a/Source/FreeImage/PluginTIFF.cpp -+++ b/Source/FreeImage/PluginTIFF.cpp -@@ -37,9 +37,9 @@ - - #include "FreeImage.h" - #include "Utilities.h" --#include "../LibTIFF4/tiffiop.h" -+#include - #include "../Metadata/FreeImageTag.h" --#include "../OpenEXR/Half/half.h" -+#include - - #include "FreeImageIO.h" - #include "PSDParser.h" -diff --git a/Source/FreeImage/PluginWebP.cpp b/Source/FreeImage/PluginWebP.cpp -index 7c9f62fd..c4014473 100644 ---- a/Source/FreeImage/PluginWebP.cpp -+++ b/Source/FreeImage/PluginWebP.cpp -@@ -24,9 +24,9 @@ - - #include "../Metadata/FreeImageTag.h" - --#include "../LibWebP/src/webp/decode.h" --#include "../LibWebP/src/webp/encode.h" --#include "../LibWebP/src/webp/mux.h" -+#include -+#include -+#include - - // ========================================================== - // Plugin Interface -diff --git a/Source/FreeImage/ZLibInterface.cpp b/Source/FreeImage/ZLibInterface.cpp -index 3ab6d321..09734755 100644 ---- a/Source/FreeImage/ZLibInterface.cpp -+++ b/Source/FreeImage/ZLibInterface.cpp -@@ -19,10 +19,9 @@ - // Use at your own risk! - // ========================================================== - --#include "../ZLib/zlib.h" -+#include - #include "FreeImage.h" - #include "Utilities.h" --#include "../ZLib/zutil.h" /* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */ - - /** - Compresses a source buffer into a target buffer, using the ZLib library. -@@ -115,7 +114,8 @@ FreeImage_ZLibGZip(BYTE *target, DWORD target_size, BYTE *source, DWORD source_s - return 0; - case Z_OK: { - // patch header, setup crc and length (stolen from mod_trace_output) -- BYTE *p = target + 8; *p++ = 2; *p = OS_CODE; // xflags, os_code -+ // OS_CODE is 0x03 on unix it seems, not sure how important this is -+ BYTE *p = target + 8; *p++ = 2; *p = 0x03; // xflags, os_code - crc = crc32(crc, source, source_size); - memcpy(target + 4 + dest_len, &crc, 4); - memcpy(target + 8 + dest_len, &source_size, 4); -diff --git a/Source/FreeImageToolkit/JPEGTransform.cpp b/Source/FreeImageToolkit/JPEGTransform.cpp -index 6f9ba8e1..836bc901 100644 ---- a/Source/FreeImageToolkit/JPEGTransform.cpp -+++ b/Source/FreeImageToolkit/JPEGTransform.cpp -@@ -26,10 +26,10 @@ extern "C" { - #undef FAR - #include - --#include "../LibJPEG/jinclude.h" --#include "../LibJPEG/jpeglib.h" --#include "../LibJPEG/jerror.h" --#include "../LibJPEG/transupp.h" -+#include -+#include -+#include -+#include - } - - #include "FreeImage.h" -diff --git a/Source/Metadata/XTIFF.cpp b/Source/Metadata/XTIFF.cpp -index 6919a8e8..ce3d7c6b 100644 ---- a/Source/Metadata/XTIFF.cpp -+++ b/Source/Metadata/XTIFF.cpp -@@ -29,7 +29,7 @@ - #pragma warning (disable : 4786) // identifier was truncated to 'number' characters - #endif - --#include "../LibTIFF4/tiffiop.h" -+#include - - #include "FreeImage.h" - #include "Utilities.h" -diff --git a/fipMakefile.srcs b/fipMakefile.srcs -index cc75e5e0..bedc9e3e 100644 ---- a/fipMakefile.srcs -+++ b/fipMakefile.srcs -@@ -1,4 +1,4 @@ - VER_MAJOR = 3 - VER_MINOR = 19.0 --SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibJPEG/jaricom.c Source/LibJPEG/jcapimin.c Source/LibJPEG/jcapistd.c Source/LibJPEG/jcarith.c Source/LibJPEG/jccoefct.c Source/LibJPEG/jccolor.c Source/LibJPEG/jcdctmgr.c Source/LibJPEG/jchuff.c Source/LibJPEG/jcinit.c Source/LibJPEG/jcmainct.c Source/LibJPEG/jcmarker.c Source/LibJPEG/jcmaster.c Source/LibJPEG/jcomapi.c Source/LibJPEG/jcparam.c Source/LibJPEG/jcprepct.c Source/LibJPEG/jcsample.c Source/LibJPEG/jctrans.c Source/LibJPEG/jdapimin.c Source/LibJPEG/jdapistd.c Source/LibJPEG/jdarith.c Source/LibJPEG/jdatadst.c Source/LibJPEG/jdatasrc.c Source/LibJPEG/jdcoefct.c Source/LibJPEG/jdcolor.c Source/LibJPEG/jddctmgr.c Source/LibJPEG/jdhuff.c Source/LibJPEG/jdinput.c Source/LibJPEG/jdmainct.c Source/LibJPEG/jdmarker.c Source/LibJPEG/jdmaster.c Source/LibJPEG/jdmerge.c Source/LibJPEG/jdpostct.c Source/LibJPEG/jdsample.c Source/LibJPEG/jdtrans.c Source/LibJPEG/jerror.c Source/LibJPEG/jfdctflt.c Source/LibJPEG/jfdctfst.c Source/LibJPEG/jfdctint.c Source/LibJPEG/jidctflt.c Source/LibJPEG/jidctfst.c Source/LibJPEG/jidctint.c Source/LibJPEG/jmemmgr.c Source/LibJPEG/jmemnobs.c Source/LibJPEG/jquant1.c Source/LibJPEG/jquant2.c Source/LibJPEG/jutils.c Source/LibJPEG/transupp.c Source/LibPNG/png.c Source/LibPNG/pngerror.c Source/LibPNG/pngget.c Source/LibPNG/pngmem.c Source/LibPNG/pngpread.c Source/LibPNG/pngread.c Source/LibPNG/pngrio.c Source/LibPNG/pngrtran.c Source/LibPNG/pngrutil.c Source/LibPNG/pngset.c Source/LibPNG/pngtrans.c Source/LibPNG/pngwio.c Source/LibPNG/pngwrite.c Source/LibPNG/pngwtran.c Source/LibPNG/pngwutil.c Source/LibTIFF4/tif_aux.c Source/LibTIFF4/tif_close.c Source/LibTIFF4/tif_codec.c Source/LibTIFF4/tif_color.c Source/LibTIFF4/tif_compress.c Source/LibTIFF4/tif_dir.c Source/LibTIFF4/tif_dirinfo.c Source/LibTIFF4/tif_dirread.c Source/LibTIFF4/tif_dirwrite.c Source/LibTIFF4/tif_dumpmode.c Source/LibTIFF4/tif_error.c Source/LibTIFF4/tif_extension.c Source/LibTIFF4/tif_fax3.c Source/LibTIFF4/tif_fax3sm.c Source/LibTIFF4/tif_flush.c Source/LibTIFF4/tif_getimage.c Source/LibTIFF4/tif_jpeg.c Source/LibTIFF4/tif_lerc.c Source/LibTIFF4/tif_luv.c Source/LibTIFF4/tif_lzw.c Source/LibTIFF4/tif_next.c Source/LibTIFF4/tif_ojpeg.c Source/LibTIFF4/tif_open.c Source/LibTIFF4/tif_packbits.c Source/LibTIFF4/tif_pixarlog.c Source/LibTIFF4/tif_predict.c Source/LibTIFF4/tif_print.c Source/LibTIFF4/tif_read.c Source/LibTIFF4/tif_strip.c Source/LibTIFF4/tif_swab.c Source/LibTIFF4/tif_thunder.c Source/LibTIFF4/tif_tile.c Source/LibTIFF4/tif_version.c Source/LibTIFF4/tif_warning.c Source/LibTIFF4/tif_webp.c Source/LibTIFF4/tif_write.c Source/LibTIFF4/tif_zip.c Source/ZLib/adler32.c Source/ZLib/compress.c Source/ZLib/crc32.c Source/ZLib/deflate.c Source/ZLib/gzclose.c Source/ZLib/gzlib.c Source/ZLib/gzread.c Source/ZLib/gzwrite.c Source/ZLib/infback.c Source/ZLib/inffast.c Source/ZLib/inflate.c Source/ZLib/inftrees.c Source/ZLib/trees.c Source/ZLib/uncompr.c Source/ZLib/zutil.c Source/LibOpenJPEG/bio.c Source/LibOpenJPEG/cio.c Source/LibOpenJPEG/dwt.c Source/LibOpenJPEG/event.c Source/LibOpenJPEG/function_list.c Source/LibOpenJPEG/image.c Source/LibOpenJPEG/invert.c Source/LibOpenJPEG/j2k.c Source/LibOpenJPEG/jp2.c Source/LibOpenJPEG/mct.c Source/LibOpenJPEG/mqc.c Source/LibOpenJPEG/openjpeg.c Source/LibOpenJPEG/opj_clock.c Source/LibOpenJPEG/pi.c Source/LibOpenJPEG/raw.c Source/LibOpenJPEG/t1.c Source/LibOpenJPEG/t2.c Source/LibOpenJPEG/tcd.c Source/LibOpenJPEG/tgt.c Source/OpenEXR/IexMath/IexMathFpu.cpp Source/OpenEXR/IlmImf/b44ExpLogTable.cpp Source/OpenEXR/IlmImf/ImfAcesFile.cpp Source/OpenEXR/IlmImf/ImfAttribute.cpp Source/OpenEXR/IlmImf/ImfB44Compressor.cpp Source/OpenEXR/IlmImf/ImfBoxAttribute.cpp Source/OpenEXR/IlmImf/ImfChannelList.cpp Source/OpenEXR/IlmImf/ImfChannelListAttribute.cpp Source/OpenEXR/IlmImf/ImfChromaticities.cpp Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.cpp Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.cpp Source/OpenEXR/IlmImf/ImfCompressionAttribute.cpp Source/OpenEXR/IlmImf/ImfCompressor.cpp Source/OpenEXR/IlmImf/ImfConvert.cpp Source/OpenEXR/IlmImf/ImfCRgbaFile.cpp Source/OpenEXR/IlmImf/ImfDeepCompositing.cpp Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfDoubleAttribute.cpp Source/OpenEXR/IlmImf/ImfDwaCompressor.cpp Source/OpenEXR/IlmImf/ImfEnvmap.cpp Source/OpenEXR/IlmImf/ImfEnvmapAttribute.cpp Source/OpenEXR/IlmImf/ImfFastHuf.cpp Source/OpenEXR/IlmImf/ImfFloatAttribute.cpp Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfFramesPerSecond.cpp Source/OpenEXR/IlmImf/ImfGenericInputFile.cpp Source/OpenEXR/IlmImf/ImfGenericOutputFile.cpp Source/OpenEXR/IlmImf/ImfHeader.cpp Source/OpenEXR/IlmImf/ImfHuf.cpp Source/OpenEXR/IlmImf/ImfInputFile.cpp Source/OpenEXR/IlmImf/ImfInputPart.cpp Source/OpenEXR/IlmImf/ImfInputPartData.cpp Source/OpenEXR/IlmImf/ImfIntAttribute.cpp Source/OpenEXR/IlmImf/ImfIO.cpp Source/OpenEXR/IlmImf/ImfKeyCode.cpp Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfLineOrderAttribute.cpp Source/OpenEXR/IlmImf/ImfLut.cpp Source/OpenEXR/IlmImf/ImfMatrixAttribute.cpp Source/OpenEXR/IlmImf/ImfMisc.cpp Source/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp Source/OpenEXR/IlmImf/ImfMultiView.cpp Source/OpenEXR/IlmImf/ImfOpaqueAttribute.cpp Source/OpenEXR/IlmImf/ImfOutputFile.cpp Source/OpenEXR/IlmImf/ImfOutputPart.cpp Source/OpenEXR/IlmImf/ImfOutputPartData.cpp Source/OpenEXR/IlmImf/ImfPartType.cpp Source/OpenEXR/IlmImf/ImfPizCompressor.cpp Source/OpenEXR/IlmImf/ImfPreviewImage.cpp Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.cpp Source/OpenEXR/IlmImf/ImfPxr24Compressor.cpp Source/OpenEXR/IlmImf/ImfRational.cpp Source/OpenEXR/IlmImf/ImfRationalAttribute.cpp Source/OpenEXR/IlmImf/ImfRgbaFile.cpp Source/OpenEXR/IlmImf/ImfRgbaYca.cpp Source/OpenEXR/IlmImf/ImfRle.cpp Source/OpenEXR/IlmImf/ImfRleCompressor.cpp Source/OpenEXR/IlmImf/ImfScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfStandardAttributes.cpp Source/OpenEXR/IlmImf/ImfStdIO.cpp Source/OpenEXR/IlmImf/ImfStringAttribute.cpp Source/OpenEXR/IlmImf/ImfStringVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp Source/OpenEXR/IlmImf/ImfTestFile.cpp Source/OpenEXR/IlmImf/ImfThreading.cpp Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.cpp Source/OpenEXR/IlmImf/ImfTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfTiledMisc.cpp Source/OpenEXR/IlmImf/ImfTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfTiledRgbaFile.cpp Source/OpenEXR/IlmImf/ImfTileOffsets.cpp Source/OpenEXR/IlmImf/ImfTimeCode.cpp Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfVecAttribute.cpp Source/OpenEXR/IlmImf/ImfVersion.cpp Source/OpenEXR/IlmImf/ImfWav.cpp Source/OpenEXR/IlmImf/ImfZip.cpp Source/OpenEXR/IlmImf/ImfZipCompressor.cpp Source/OpenEXR/Imath/ImathBox.cpp Source/OpenEXR/Imath/ImathColorAlgo.cpp Source/OpenEXR/Imath/ImathFun.cpp Source/OpenEXR/Imath/ImathMatrixAlgo.cpp Source/OpenEXR/Imath/ImathRandom.cpp Source/OpenEXR/Imath/ImathShear.cpp Source/OpenEXR/Imath/ImathVec.cpp Source/OpenEXR/Iex/IexBaseExc.cpp Source/OpenEXR/Iex/IexThrowErrnoExc.cpp Source/OpenEXR/Half/half.cpp Source/OpenEXR/IlmThread/IlmThread.cpp Source/OpenEXR/IlmThread/IlmThreadMutex.cpp Source/OpenEXR/IlmThread/IlmThreadPool.cpp Source/OpenEXR/IlmThread/IlmThreadSemaphore.cpp Source/OpenEXR/IexMath/IexMathFloatExc.cpp Source/LibRawLite/src/decoders/canon_600.cpp Source/LibRawLite/src/decoders/crx.cpp Source/LibRawLite/src/decoders/decoders_dcraw.cpp Source/LibRawLite/src/decoders/decoders_libraw.cpp Source/LibRawLite/src/decoders/decoders_libraw_dcrdefs.cpp Source/LibRawLite/src/decoders/dng.cpp Source/LibRawLite/src/decoders/fp_dng.cpp Source/LibRawLite/src/decoders/fuji_compressed.cpp Source/LibRawLite/src/decoders/generic.cpp Source/LibRawLite/src/decoders/kodak_decoders.cpp Source/LibRawLite/src/decoders/load_mfbacks.cpp Source/LibRawLite/src/decoders/smal.cpp Source/LibRawLite/src/decoders/unpack.cpp Source/LibRawLite/src/decoders/unpack_thumb.cpp Source/LibRawLite/src/demosaic/aahd_demosaic.cpp Source/LibRawLite/src/demosaic/ahd_demosaic.cpp Source/LibRawLite/src/demosaic/dcb_demosaic.cpp Source/LibRawLite/src/demosaic/dht_demosaic.cpp Source/LibRawLite/src/demosaic/misc_demosaic.cpp Source/LibRawLite/src/demosaic/xtrans_demosaic.cpp Source/LibRawLite/src/integration/dngsdk_glue.cpp Source/LibRawLite/src/integration/rawspeed_glue.cpp Source/LibRawLite/src/libraw_datastream.cpp Source/LibRawLite/src/metadata/adobepano.cpp Source/LibRawLite/src/metadata/canon.cpp Source/LibRawLite/src/metadata/ciff.cpp Source/LibRawLite/src/metadata/cr3_parser.cpp Source/LibRawLite/src/metadata/epson.cpp Source/LibRawLite/src/metadata/exif_gps.cpp Source/LibRawLite/src/metadata/fuji.cpp Source/LibRawLite/src/metadata/hasselblad_model.cpp Source/LibRawLite/src/metadata/identify.cpp Source/LibRawLite/src/metadata/identify_tools.cpp Source/LibRawLite/src/metadata/kodak.cpp Source/LibRawLite/src/metadata/leica.cpp Source/LibRawLite/src/metadata/makernotes.cpp Source/LibRawLite/src/metadata/mediumformat.cpp Source/LibRawLite/src/metadata/minolta.cpp Source/LibRawLite/src/metadata/misc_parsers.cpp Source/LibRawLite/src/metadata/nikon.cpp Source/LibRawLite/src/metadata/normalize_model.cpp Source/LibRawLite/src/metadata/olympus.cpp Source/LibRawLite/src/metadata/p1.cpp Source/LibRawLite/src/metadata/pentax.cpp Source/LibRawLite/src/metadata/samsung.cpp Source/LibRawLite/src/metadata/sony.cpp Source/LibRawLite/src/metadata/tiff.cpp Source/LibRawLite/src/postprocessing/aspect_ratio.cpp Source/LibRawLite/src/postprocessing/dcraw_process.cpp Source/LibRawLite/src/postprocessing/mem_image.cpp Source/LibRawLite/src/postprocessing/postprocessing_aux.cpp Source/LibRawLite/src/postprocessing/postprocessing_utils.cpp Source/LibRawLite/src/postprocessing/postprocessing_utils_dcrdefs.cpp Source/LibRawLite/src/preprocessing/ext_preprocess.cpp Source/LibRawLite/src/preprocessing/raw2image.cpp Source/LibRawLite/src/preprocessing/subtract_black.cpp Source/LibRawLite/src/tables/cameralist.cpp Source/LibRawLite/src/tables/colorconst.cpp Source/LibRawLite/src/tables/colordata.cpp Source/LibRawLite/src/tables/wblists.cpp Source/LibRawLite/src/utils/curves.cpp Source/LibRawLite/src/utils/decoder_info.cpp Source/LibRawLite/src/utils/init_close_utils.cpp Source/LibRawLite/src/utils/open.cpp Source/LibRawLite/src/utils/phaseone_processing.cpp Source/LibRawLite/src/utils/read_utils.cpp Source/LibRawLite/src/utils/thumb_utils.cpp Source/LibRawLite/src/utils/utils_dcraw.cpp Source/LibRawLite/src/utils/utils_libraw.cpp Source/LibRawLite/src/write/file_write.cpp Source/LibRawLite/src/x3f/x3f_parse_process.cpp Source/LibRawLite/src/x3f/x3f_utils_patched.cpp Source/LibWebP/src/dec/alpha_dec.c Source/LibWebP/src/dec/buffer_dec.c Source/LibWebP/src/dec/frame_dec.c Source/LibWebP/src/dec/idec_dec.c Source/LibWebP/src/dec/io_dec.c Source/LibWebP/src/dec/quant_dec.c Source/LibWebP/src/dec/tree_dec.c Source/LibWebP/src/dec/vp8l_dec.c Source/LibWebP/src/dec/vp8_dec.c Source/LibWebP/src/dec/webp_dec.c Source/LibWebP/src/demux/anim_decode.c Source/LibWebP/src/demux/demux.c Source/LibWebP/src/dsp/alpha_processing.c Source/LibWebP/src/dsp/alpha_processing_mips_dsp_r2.c Source/LibWebP/src/dsp/alpha_processing_neon.c Source/LibWebP/src/dsp/alpha_processing_sse2.c Source/LibWebP/src/dsp/alpha_processing_sse41.c Source/LibWebP/src/dsp/cost.c Source/LibWebP/src/dsp/cost_mips32.c Source/LibWebP/src/dsp/cost_mips_dsp_r2.c Source/LibWebP/src/dsp/cost_neon.c Source/LibWebP/src/dsp/cost_sse2.c Source/LibWebP/src/dsp/cpu.c Source/LibWebP/src/dsp/dec.c Source/LibWebP/src/dsp/dec_clip_tables.c Source/LibWebP/src/dsp/dec_mips32.c Source/LibWebP/src/dsp/dec_mips_dsp_r2.c Source/LibWebP/src/dsp/dec_msa.c Source/LibWebP/src/dsp/dec_neon.c Source/LibWebP/src/dsp/dec_sse2.c Source/LibWebP/src/dsp/dec_sse41.c Source/LibWebP/src/dsp/enc.c Source/LibWebP/src/dsp/enc_avx2.c Source/LibWebP/src/dsp/enc_mips32.c Source/LibWebP/src/dsp/enc_mips_dsp_r2.c Source/LibWebP/src/dsp/enc_msa.c Source/LibWebP/src/dsp/enc_neon.c Source/LibWebP/src/dsp/enc_sse2.c Source/LibWebP/src/dsp/enc_sse41.c Source/LibWebP/src/dsp/filters.c Source/LibWebP/src/dsp/filters_mips_dsp_r2.c Source/LibWebP/src/dsp/filters_msa.c Source/LibWebP/src/dsp/filters_neon.c Source/LibWebP/src/dsp/filters_sse2.c Source/LibWebP/src/dsp/lossless.c Source/LibWebP/src/dsp/lossless_enc.c Source/LibWebP/src/dsp/lossless_enc_mips32.c Source/LibWebP/src/dsp/lossless_enc_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_enc_msa.c Source/LibWebP/src/dsp/lossless_enc_neon.c Source/LibWebP/src/dsp/lossless_enc_sse2.c Source/LibWebP/src/dsp/lossless_enc_sse41.c Source/LibWebP/src/dsp/lossless_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_msa.c Source/LibWebP/src/dsp/lossless_neon.c Source/LibWebP/src/dsp/lossless_sse2.c Source/LibWebP/src/dsp/lossless_sse41.c Source/LibWebP/src/dsp/rescaler.c Source/LibWebP/src/dsp/rescaler_mips32.c Source/LibWebP/src/dsp/rescaler_mips_dsp_r2.c Source/LibWebP/src/dsp/rescaler_msa.c Source/LibWebP/src/dsp/rescaler_neon.c Source/LibWebP/src/dsp/rescaler_sse2.c Source/LibWebP/src/dsp/ssim.c Source/LibWebP/src/dsp/ssim_sse2.c Source/LibWebP/src/dsp/upsampling.c Source/LibWebP/src/dsp/upsampling_mips_dsp_r2.c Source/LibWebP/src/dsp/upsampling_msa.c Source/LibWebP/src/dsp/upsampling_neon.c Source/LibWebP/src/dsp/upsampling_sse2.c Source/LibWebP/src/dsp/upsampling_sse41.c Source/LibWebP/src/dsp/yuv.c Source/LibWebP/src/dsp/yuv_mips32.c Source/LibWebP/src/dsp/yuv_mips_dsp_r2.c Source/LibWebP/src/dsp/yuv_neon.c Source/LibWebP/src/dsp/yuv_sse2.c Source/LibWebP/src/dsp/yuv_sse41.c Source/LibWebP/src/enc/alpha_enc.c Source/LibWebP/src/enc/analysis_enc.c Source/LibWebP/src/enc/backward_references_cost_enc.c Source/LibWebP/src/enc/backward_references_enc.c Source/LibWebP/src/enc/config_enc.c Source/LibWebP/src/enc/cost_enc.c Source/LibWebP/src/enc/filter_enc.c Source/LibWebP/src/enc/frame_enc.c Source/LibWebP/src/enc/histogram_enc.c Source/LibWebP/src/enc/iterator_enc.c Source/LibWebP/src/enc/near_lossless_enc.c Source/LibWebP/src/enc/picture_csp_enc.c Source/LibWebP/src/enc/picture_enc.c Source/LibWebP/src/enc/picture_psnr_enc.c Source/LibWebP/src/enc/picture_rescale_enc.c Source/LibWebP/src/enc/picture_tools_enc.c Source/LibWebP/src/enc/predictor_enc.c Source/LibWebP/src/enc/quant_enc.c Source/LibWebP/src/enc/syntax_enc.c Source/LibWebP/src/enc/token_enc.c Source/LibWebP/src/enc/tree_enc.c Source/LibWebP/src/enc/vp8l_enc.c Source/LibWebP/src/enc/webp_enc.c Source/LibWebP/src/mux/anim_encode.c Source/LibWebP/src/mux/muxedit.c Source/LibWebP/src/mux/muxinternal.c Source/LibWebP/src/mux/muxread.c Source/LibWebP/src/utils/bit_reader_utils.c Source/LibWebP/src/utils/bit_writer_utils.c Source/LibWebP/src/utils/color_cache_utils.c Source/LibWebP/src/utils/filters_utils.c Source/LibWebP/src/utils/huffman_encode_utils.c Source/LibWebP/src/utils/huffman_utils.c Source/LibWebP/src/utils/quant_levels_dec_utils.c Source/LibWebP/src/utils/quant_levels_utils.c Source/LibWebP/src/utils/random_utils.c Source/LibWebP/src/utils/rescaler_utils.c Source/LibWebP/src/utils/thread_utils.c Source/LibWebP/src/utils/utils.c Source/LibJXR/image/decode/decode.c Source/LibJXR/image/decode/JXRTranscode.c Source/LibJXR/image/decode/postprocess.c Source/LibJXR/image/decode/segdec.c Source/LibJXR/image/decode/strdec.c Source/LibJXR/image/decode/strdec_x86.c Source/LibJXR/image/decode/strInvTransform.c Source/LibJXR/image/decode/strPredQuantDec.c Source/LibJXR/image/encode/encode.c Source/LibJXR/image/encode/segenc.c Source/LibJXR/image/encode/strenc.c Source/LibJXR/image/encode/strenc_x86.c Source/LibJXR/image/encode/strFwdTransform.c Source/LibJXR/image/encode/strPredQuantEnc.c Source/LibJXR/image/sys/adapthuff.c Source/LibJXR/image/sys/image.c Source/LibJXR/image/sys/strcodec.c Source/LibJXR/image/sys/strPredQuant.c Source/LibJXR/image/sys/strTransform.c Source/LibJXR/jxrgluelib/JXRGlue.c Source/LibJXR/jxrgluelib/JXRGlueJxr.c Source/LibJXR/jxrgluelib/JXRGluePFC.c Source/LibJXR/jxrgluelib/JXRMeta.c Wrapper/FreeImagePlus/src/fipImage.cpp Wrapper/FreeImagePlus/src/fipMemoryIO.cpp Wrapper/FreeImagePlus/src/fipMetadataFind.cpp Wrapper/FreeImagePlus/src/fipMultiPage.cpp Wrapper/FreeImagePlus/src/fipTag.cpp Wrapper/FreeImagePlus/src/fipWinImage.cpp Wrapper/FreeImagePlus/src/FreeImagePlus.cpp --INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -ISource/LibJPEG -ISource/LibPNG -ISource/LibTIFF4 -ISource/ZLib -ISource/LibOpenJPEG -ISource/OpenEXR -ISource/OpenEXR/Half -ISource/OpenEXR/Iex -ISource/OpenEXR/IlmImf -ISource/OpenEXR/IlmThread -ISource/OpenEXR/Imath -ISource/OpenEXR/IexMath -ISource/LibRawLite -ISource/LibRawLite/dcraw -ISource/LibRawLite/internal -ISource/LibRawLite/libraw -ISource/LibRawLite/src -ISource/LibWebP -ISource/LibJXR -ISource/LibJXR/common/include -ISource/LibJXR/image/sys -ISource/LibJXR/jxrgluelib -IWrapper/FreeImagePlus -+SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Wrapper/FreeImagePlus/src/fipImage.cpp Wrapper/FreeImagePlus/src/fipMemoryIO.cpp Wrapper/FreeImagePlus/src/fipMetadataFind.cpp Wrapper/FreeImagePlus/src/fipMultiPage.cpp Wrapper/FreeImagePlus/src/fipTag.cpp Wrapper/FreeImagePlus/src/fipWinImage.cpp Wrapper/FreeImagePlus/src/FreeImagePlus.cpp -+INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -IWrapper/FreeImagePlus diff --git a/pkgs/by-name/im/imv/package.nix b/pkgs/by-name/im/imv/package.nix index 47e257e65e2e..656590150e2b 100644 --- a/pkgs/by-name/im/imv/package.nix +++ b/pkgs/by-name/im/imv/package.nix @@ -27,7 +27,6 @@ "libheif" "libnsgif" ], - freeimage, libtiff, libjpeg_turbo, libjxl, @@ -50,7 +49,6 @@ let backends = { inherit - freeimage libtiff libpng librsvg @@ -59,6 +57,7 @@ let libnsgif ; libjpeg = libjpeg_turbo; + freeimage = throw "freeimage backend not supported"; }; backendFlags = map ( diff --git a/pkgs/by-name/li/libtiff/package.nix b/pkgs/by-name/li/libtiff/package.nix index 7bbb16328344..a7930a49d2af 100644 --- a/pkgs/by-name/li/libtiff/package.nix +++ b/pkgs/by-name/li/libtiff/package.nix @@ -32,7 +32,6 @@ graphicsmagick, gdal, openimageio, - freeimage, testers, }: @@ -113,7 +112,6 @@ stdenv.mkDerivation (finalAttrs: { graphicsmagick gdal openimageio - freeimage ; inherit (python3Packages) pillow imread; diff --git a/pkgs/by-name/me/megacmd/package.nix b/pkgs/by-name/me/megacmd/package.nix index b8e02743871f..cbbdb84569f5 100644 --- a/pkgs/by-name/me/megacmd/package.nix +++ b/pkgs/by-name/me/megacmd/package.nix @@ -7,7 +7,6 @@ curl, fetchFromGitHub, ffmpeg, - freeimage, gcc-unwrapped, icu, libmediainfo, @@ -19,7 +18,6 @@ pkg-config, readline, sqlite, - withFreeImage ? false, # default to false because freeimage is insecure }: let @@ -71,8 +69,7 @@ stdenv.mkDerivation { pcre-cpp readline sqlite - ] - ++ lib.optionals withFreeImage [ freeimage ]; + ]; configureFlags = [ "--disable-examples" @@ -88,8 +85,8 @@ stdenv.mkDerivation { "--with-readline" "--with-sodium" "--with-termcap" - ] - ++ (if withFreeImage then [ "--with-freeimage" ] else [ "--without-freeimage" ]); + "--without-freeimage" + ]; # On darwin, some macros defined in AssertMacros.h (from apple-sdk) are conflicting. postConfigure = '' diff --git a/pkgs/development/lisp-modules/ql.nix b/pkgs/development/lisp-modules/ql.nix index 45ad78c4f236..725a6353f983 100644 --- a/pkgs/development/lisp-modules/ql.nix +++ b/pkgs/development/lisp-modules/ql.nix @@ -27,9 +27,6 @@ let cl-cairo2-xlib = super.cl-cairo2-xlib.overrideLispAttrs (o: { nativeLibs = [ pkgs.gtk2-x11 ]; }); - cl-freeimage = super.cl-freeimage.overrideLispAttrs (o: { - nativeLibs = [ pkgs.freeimage ]; - }); cl-freetype2 = super.cl-freetype2.overrideLispAttrs (o: { nativeLibs = [ pkgs.freetype ]; nativeBuildInputs = [ pkgs.freetype ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 30eb6aa12ea8..fce4d1cd6ac8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -968,6 +968,7 @@ mapAliases { francis = kdePackages.francis; # added 2024-07-13 freecad-qt6 = freecad; # added 2025-06-14 freecad-wayland = freecad; # added 2025-06-14 + freeimage = throw "freeimage was removed due to numerous vulnerabilities"; # Added 2025-10-23 freerdp3 = freerdp; # added 2025-03-25 freerdpUnstable = freerdp; # added 2025-03-25 frostwire = throw "frostwire was removed, as it was broken due to reproducibility issues, use `frostwire-bin` package instead."; # added 2024-05-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3847ee7ae46..64c1a5833818 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7225,10 +7225,6 @@ with pkgs; fplll = callPackage ../development/libraries/fplll { }; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix { }; - freeimage = callPackage ../by-name/fr/freeimage/package.nix { - openexr = openexr_2; - }; - freeipa = callPackage ../os-specific/linux/freeipa { # NOTE: freeipa and sssd need to be built with the same version of python kerberos = krb5.override { From f364b5a80766ce5287ae909fb5c1d6b8ed1d7ead Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 22 Oct 2025 22:09:53 +0000 Subject: [PATCH 307/380] python3Packages.kfactory: 1.14.4 -> 2.0.0 Diff: https://github.com/gdsfactory/kfactory/compare/v1.14.4...v2.0.0 Changelog: https://github.com/gdsfactory/kfactory/blob/v2.0.0/CHANGELOG.md --- .../python-modules/kfactory/default.nix | 74 +++++++++++++++++-- 1 file changed, 67 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/kfactory/default.nix b/pkgs/development/python-modules/kfactory/default.nix index 0e10841be1d9..5e0c219ee589 100644 --- a/pkgs/development/python-modules/kfactory/default.nix +++ b/pkgs/development/python-modules/kfactory/default.nix @@ -12,7 +12,6 @@ cachetools, klayout, loguru, - numpy, pydantic-extra-types, pydantic-settings, pydantic, @@ -21,26 +20,32 @@ rectangle-packer, requests, ruamel-yaml-string, - ruamel-yaml, scipy, semver, toolz, typer, # tests + pytest-regressions, pytestCheckHook, }: buildPythonPackage rec { pname = "kfactory"; - version = "1.14.4"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "gdsfactory"; repo = "kfactory"; tag = "v${version}"; - hash = "sha256-el3bGv57mAfxYG9tdLX5N6R76F+9GY9jdZaIUjMqcVU="; + # kfactory uses `.git` to infer the project directory. + # https://github.com/gdsfactory/kfactory/blob/v2.0.0/src/kfactory/conf.py#L318-L327 + # Otherwise, tests fail with: + # assert kf.config.project_dir is not None + # E AssertionError: assert None is not None + leaveDotGit = true; + hash = "sha256-eZRNUb2Qw2HcR2W1pf15ulEt7ZCJwi60SuGdte/cG8E="; }; build-system = [ @@ -48,12 +53,14 @@ buildPythonPackage rec { setuptools-scm ]; + pythonRelaxDeps = [ + "pydantic" + ]; dependencies = [ aenum cachetools klayout loguru - numpy pydantic pydantic-extra-types pydantic-settings @@ -61,7 +68,6 @@ buildPythonPackage rec { rapidfuzz rectangle-packer requests - ruamel-yaml ruamel-yaml-string scipy semver @@ -71,13 +77,67 @@ buildPythonPackage rec { pythonImportsCheck = [ "kfactory" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-regressions + pytestCheckHook + ]; + + disabledTests = [ + # AssertionError: Binary files ... and ... differ + "test_array" + "test_array_indexerror" + "test_autorename" + "test_cell_default_fallback" + "test_cell_in_threads" + "test_cell_yaml" + "test_circular_snapping" + "test_create" + "test_enclosure_name" + "test_euler_snapping" + "test_filter_layer_pt_reg" + "test_filter_regex" + "test_flatten" + "test_info" + "test_invalid_array" + "test_kcell_attributes" + "test_namecollision" + "test_nested_dic" + "test_nested_dict_list" + "test_netlist" + "test_netlist_equivalent" + "test_no_snap" + "test_overwrite" + "test_ports_cell" + "test_ports_in_cells" + "test_ports_instance" + "test_rename_clockwise" + "test_rename_clockwise_multi" + "test_schematic_anchor" + "test_schematic_create" + "test_schematic_create_cell" + "test_schematic_kcl_mix_netlist" + "test_schematic_mirror_connection" + "test_schematic_route" + "test_size_info" + "test_to_dtype" + ]; disabledTestPaths = [ # https://github.com/gdsfactory/kfactory/issues/511 "tests/test_pdk.py" # NameError "tests/test_session.py" + + # AssertionError: Binary files ... and ... differ + "tests/test_all_angle.py" + "tests/test_cells.py" + "tests/test_grid.py" + "tests/test_l2n.py" + "tests/test_packing.py" + "tests/test_pins.py" + "tests/test_rename.py" + "tests/test_routing.py" + "tests/test_spiral.py" ]; meta = { From 937b73dd4a1eae038c1deecfd3d631fdff1c019b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 23 Oct 2025 09:43:46 +0000 Subject: [PATCH 308/380] python3Packages.gdsfactory: 9.18.1 -> 9.20.1 Diff: https://github.com/gdsfactory/gdsfactory/compare/v9.18.1...v9.20.1 Changelog: https://github.com/gdsfactory/gdsfactory/blob/v9.20.1/CHANGELOG.md --- pkgs/development/python-modules/gdsfactory/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gdsfactory/default.nix b/pkgs/development/python-modules/gdsfactory/default.nix index 56914ec6fb4f..7e35b8d2decd 100644 --- a/pkgs/development/python-modules/gdsfactory/default.nix +++ b/pkgs/development/python-modules/gdsfactory/default.nix @@ -46,14 +46,14 @@ }: buildPythonPackage rec { pname = "gdsfactory"; - version = "9.18.1"; + version = "9.20.1"; pyproject = true; src = fetchFromGitHub { owner = "gdsfactory"; repo = "gdsfactory"; tag = "v${version}"; - hash = "sha256-PPps3BaQbU7PCq+tlvjlPOurgBYHx/eGDEmlUmaB+O4="; + hash = "sha256-TpMi0Rv6sQA8uAPGl6iR1qgTU7havBlWmdz98DROoSk="; }; build-system = [ flit-core ]; From a247e882f84b6cfde66a93e81758d39b88c7999f Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 23 Oct 2025 19:59:05 +0800 Subject: [PATCH 309/380] wlroots_0_18: 0.18.2 -> 0.18.3 --- pkgs/development/libraries/wlroots/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 7518d68b2fb1..4860f23d9fad 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -161,8 +161,8 @@ in }; wlroots_0_18 = generic { - version = "0.18.2"; - hash = "sha256-vKvMWRPPJ4PRKWVjmKKCdNSiqsQm+uQBoBnBUFElLNA="; + version = "0.18.3"; + hash = "sha256-D8RapSeH+5JpTtq+OU8PyVZubLhjcebbCBPuSO5Q7kU="; extraBuildInputs = [ lcms2 ]; From 242c50714dcac682450783e12720712291cdcfd0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 12:21:17 +0000 Subject: [PATCH 310/380] pixi: 0.57.0 -> 0.58.0 --- pkgs/by-name/pi/pixi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index 24531f410f2f..9c076d7cb760 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pixi"; - version = "0.57.0"; + version = "0.58.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "pixi"; tag = "v${finalAttrs.version}"; - hash = "sha256-nWN+SCxlDeSzbnJtSIVVYw5G2WULdzD5VQ+Jc1xnpwI="; + hash = "sha256-+Bhyt01gTNWVOL0WG6pdjzbRqIfm2MUEHnbTGg3nG2k="; }; - cargoHash = "sha256-YHLN6jPSsNxWQJI+uDYgfetQFnMk8v2ev/EPjSRrCJY="; + cargoHash = "sha256-b7/UiIkeLddo9hUipqd7zLGvFumAjFolf/jODZ0qOQw="; nativeBuildInputs = [ pkg-config From c6d501e3c5560825dd3b0a0d48e28014ac9aebe9 Mon Sep 17 00:00:00 2001 From: Thierry Delafontaine Date: Thu, 23 Oct 2025 11:41:11 +0200 Subject: [PATCH 311/380] opencode: 0.15.10 -> 0.15.14 https://github.com/sst/opencode/releases/tag/v0.15.11 https://github.com/sst/opencode/releases/tag/v0.15.12 https://github.com/sst/opencode/releases/tag/v0.15.13 https://github.com/sst/opencode/releases/tag/v0.15.14 --- pkgs/by-name/op/opencode/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 1d38172673f5..a3def7a3309d 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.15.10"; + version = "0.15.14"; src = fetchFromGitHub { owner = "sst"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-aP0CLHfuF21GXIvBTgs8RWpcCXOwy1oPW2P8jEU/4u4="; + hash = "sha256-K7TmsJm11uDNjN3fUaapM1A01FmHUSfXMiqOzhLzRI8="; }; tui = buildGoModule { @@ -111,10 +111,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { outputHash = { - x86_64-linux = "sha256-iJbflfKwDwKrJQgy5jxrEhkyCie2hsEMmiLf2btE60E="; - aarch64-linux = "sha256-wQ+ToXRi+l24WM24PHGCw6acD9cvLDldOv9WvOzHYGU="; - x86_64-darwin = "sha256-DyvteSN+mEFZojH8mY4LNQE2C6lCWwrIVbJUFn4lAh0="; - aarch64-darwin = "sha256-oICPefgikykFWNDlxCXH4tILdjv4NytgQdejdQBeQ+A="; + x86_64-linux = "sha256-8pJBLNPuF7+wcUCNoI9z68q5Pl6Mvm1ZvIDianLPdHo="; + aarch64-linux = "sha256-zODR/4mcE4Hh3I6Yh8ExUi3WdBttrRBf00ItQ4TmVMU="; + x86_64-darwin = "sha256-ZJFT0qY82UK9jXVMQweXXjZ4ohZLKVJEf+CjfRkJB9E="; + aarch64-darwin = "sha256-0bjdbPXm2TkOEsSyqvPJnFLIzmBJt5SH40hwYutWYBY="; } .${stdenv.hostPlatform.system}; outputHashAlgo = "sha256"; From 932c796fa26362357f696831b8c5c0c3b6ba2126 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sun, 19 Oct 2025 19:47:37 -0300 Subject: [PATCH 312/380] zandronum-alpha, zandronum-alpha-server: drop --- .../zandronum/alpha/add_gitinfo.patch | 15 --- .../doom-ports/zandronum/alpha/default.nix | 127 ------------------ .../zandronum/alpha/dont_update_gitinfo.patch | 19 --- .../alpha/zan_configure_impurity.patch | 69 ---------- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 6 - 6 files changed, 2 insertions(+), 236 deletions(-) delete mode 100644 pkgs/games/doom-ports/zandronum/alpha/add_gitinfo.patch delete mode 100644 pkgs/games/doom-ports/zandronum/alpha/default.nix delete mode 100644 pkgs/games/doom-ports/zandronum/alpha/dont_update_gitinfo.patch delete mode 100644 pkgs/games/doom-ports/zandronum/alpha/zan_configure_impurity.patch diff --git a/pkgs/games/doom-ports/zandronum/alpha/add_gitinfo.patch b/pkgs/games/doom-ports/zandronum/alpha/add_gitinfo.patch deleted file mode 100644 index fdf8e2e1a957..000000000000 --- a/pkgs/games/doom-ports/zandronum/alpha/add_gitinfo.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -r 89bccf7127ba src/gitinfo.h ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/src/gitinfo.h Fri Dec 01 10:18:23 2023 -0300 -@@ -0,0 +1,11 @@ -+// 89bccf7127ba1ebe92558f674be69549bf2c4bd4 -+// -+// This file was automatically generated by the -+// updaterevision tool. Do not edit by hand. -+ -+#define GIT_DESCRIPTION "ZA_3.1-404-89bccf7127ba" -+#define GIT_HASH "89bccf7127ba1ebe92558f674be69549bf2c4bd4" -+#define GIT_TIME "2023-07-09 15:14:38 -0400" -+#define HG_REVISION_NUMBER 1688930078 -+#define HG_REVISION_HASH_STRING "89bccf7127ba" -+#define HG_TIME "230709-1914" diff --git a/pkgs/games/doom-ports/zandronum/alpha/default.nix b/pkgs/games/doom-ports/zandronum/alpha/default.nix deleted file mode 100644 index 5298485df6b6..000000000000 --- a/pkgs/games/doom-ports/zandronum/alpha/default.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ - stdenv, - lib, - fetchhg, - cmake, - pkg-config, - makeWrapper, - callPackage, - soundfont-fluid, - SDL_compat, - libGL, - glew, - bzip2, - zlib, - libjpeg, - fluidsynth, - fmodex, - openssl, - gtk2, - python3, - game-music-emu, - serverOnly ? false, -}: - -let - suffix = lib.optionalString serverOnly "-server"; - fmod = fmodex; # fmodex is on nixpkgs now - sqlite = callPackage ../sqlite.nix { }; - clientLibPath = lib.makeLibraryPath [ fluidsynth ]; - -in -stdenv.mkDerivation { - pname = "zandronum-alpha${suffix}"; - version = "3.2-230709-1914"; - - src = fetchhg { - # expired ssl certificate - url = "http://hg.osdn.net/view/zandronum/zandronum-stable"; - rev = "89bccf7127ba"; - hash = "sha256-waD9hKk0A0zMPyqEvAKxaz2e2TBG2G0MJRrzjx1LyB0="; - }; - - # zandronum tries to download sqlite now when running cmake, don't let it - # it also needs the current mercurial revision info embedded in gitinfo.h - # otherwise, the client will fail to connect to servers because the - # protocol version doesn't match. - patches = [ - ./zan_configure_impurity.patch - ./dont_update_gitinfo.patch - ./add_gitinfo.patch - ]; - - # I have no idea why would SDL and libjpeg be needed for the server part! - # But they are. - buildInputs = [ - openssl - bzip2 - zlib - SDL_compat - libjpeg - sqlite - game-music-emu - ] - ++ lib.optionals (!serverOnly) [ - libGL - glew - fmod - fluidsynth - gtk2 - ]; - - nativeBuildInputs = [ - cmake - pkg-config - makeWrapper - python3 - ]; - - preConfigure = '' - ln -s ${sqlite}/* sqlite/ - sed -i -e 's| restrict| _restrict|g' dumb/include/dumb.h \ - dumb/src/it/*.c - '' - + lib.optionalString (!serverOnly) '' - sed -i \ - -e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \ - -e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \ - src/sound/music_fluidsynth_mididevice.cpp - ''; - - cmakeFlags = [ - "-DFORCE_INTERNAL_GME=OFF" - ] - ++ (if serverOnly then [ "-DSERVERONLY=ON" ] else [ "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" ]); - - hardeningDisable = [ "format" ]; - - # Won't work well without C or en_US. Setting LANG might not be enough if the user is making use of LC_* so wrap with LC_ALL instead - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/lib/zandronum - cp zandronum${suffix} \ - *.pk3 \ - ${lib.optionalString (!serverOnly) "liboutput_sdl.so"} \ - $out/lib/zandronum - makeWrapper $out/lib/zandronum/zandronum${suffix} $out/bin/zandronum-alpha${suffix} - wrapProgram $out/bin/zandronum-alpha${suffix} \ - --set LC_ALL="C" - ''; - - postFixup = lib.optionalString (!serverOnly) '' - patchelf --set-rpath $(patchelf --print-rpath $out/lib/zandronum/zandronum):$out/lib/zandronum:${clientLibPath} \ - $out/lib/zandronum/zandronum - ''; - - passthru = { - inherit fmod sqlite; - }; - - meta = with lib; { - homepage = "https://zandronum.com/"; - description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software"; - maintainers = with maintainers; [ lassulus ]; - license = licenses.sleepycat; - platforms = platforms.linux; - }; -} diff --git a/pkgs/games/doom-ports/zandronum/alpha/dont_update_gitinfo.patch b/pkgs/games/doom-ports/zandronum/alpha/dont_update_gitinfo.patch deleted file mode 100644 index 8d639c646738..000000000000 --- a/pkgs/games/doom-ports/zandronum/alpha/dont_update_gitinfo.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -r 89bccf7127ba src/CMakeLists.txt ---- a/src/CMakeLists.txt Sun Jul 09 15:14:38 2023 -0400 -+++ b/src/CMakeLists.txt Fri Dec 01 10:16:26 2023 -0300 -@@ -642,15 +642,6 @@ - add_definitions( -DBACKPATCH ) - endif( BACKPATCH ) - --# Update gitinfo.h -- --get_target_property( UPDATEREVISION_EXE updaterevision LOCATION ) -- --add_custom_target( revision_check ALL -- COMMAND ${UPDATEREVISION_EXE} src/gitinfo.h -- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} -- DEPENDS updaterevision ) -- - # Libraries ZDoom needs - - message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" ) diff --git a/pkgs/games/doom-ports/zandronum/alpha/zan_configure_impurity.patch b/pkgs/games/doom-ports/zandronum/alpha/zan_configure_impurity.patch deleted file mode 100644 index 4a85de520ac1..000000000000 --- a/pkgs/games/doom-ports/zandronum/alpha/zan_configure_impurity.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -r 89bccf7127ba sqlite/CMakeLists.txt ---- a/sqlite/CMakeLists.txt Sun Jul 09 15:14:38 2023 -0400 -+++ b/sqlite/CMakeLists.txt Fri Dec 01 10:10:35 2023 -0300 -@@ -1,65 +1,5 @@ - cmake_minimum_required( VERSION 2.4 ) - --# [BB/EP] Download SQLite archive and extract the sources if necessary. --set( ZAN_SQLITE_VERSION 3360000 ) # SQL version 3.36.0 --set( ZAN_SQLITE_YEAR 2021 ) --set( ZAN_SQLITE_SHA1 "a4bcf9e951bfb9745214241ba08476299fc2dc1e" ) --set( ZAN_SQLITE_DOWNLOAD_NAME "sqlite-autoconf-${ZAN_SQLITE_VERSION}" ) --set( ZAN_SQLITE_TEMP_ARCHIVE "${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME}.tar.gz" ) --set( ZAN_SQLITE_HASHED_ARCHIVE "${CMAKE_CURRENT_SOURCE_DIR}/sqlite-${ZAN_SQLITE_SHA1}.tar.gz" ) -- --if( IS_DIRECTORY ${ZAN_SQLITE_HASHED_ARCHIVE} OR IS_SYMLINK ${ZAN_SQLITE_HASHED_ARCHIVE} ) -- message( FATAL_ERROR "SQLite: ${ZAN_SQLITE_HASHED_ARCHIVE} must be a valid file.\n" -- "SQLite: Please remove it and try again." ) --elseif( ( NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/sqlite3.c ) OR ( NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/sqlite3.h ) OR ( NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/sqlite3ext.h ) ) -- -- if( NOT EXISTS ${ZAN_SQLITE_HASHED_ARCHIVE} ) -- if( IS_DIRECTORY ${ZAN_SQLITE_TEMP_ARCHIVE} OR IS_SYMLINK ${ZAN_SQLITE_TEMP_ARCHIVE} ) -- message( FATAL_ERROR "SQLite: ${ZAN_SQLITE_TEMP_ARCHIVE} must be a valid file.\n" -- "SQLite: Please remove it and try again." ) -- endif() -- -- message( STATUS "SQLite: downloading the archive..." ) -- -- file( DOWNLOAD https://www.sqlite.org/${ZAN_SQLITE_YEAR}/${ZAN_SQLITE_DOWNLOAD_NAME}.tar.gz ${ZAN_SQLITE_TEMP_ARCHIVE} -- SHOW_PROGRESS -- STATUS ZAN_SQLITE_DOWNLOAD_STATUS ) -- -- # Report any problem if present and abort immediately. -- list( GET ZAN_SQLITE_DOWNLOAD_STATUS 0 ZAN_SQLITE_DOWNLOAD_ERROR_CODE ) -- if( ZAN_SQLITE_DOWNLOAD_ERROR_CODE ) -- list( GET ZAN_SQLITE_DOWNLOAD_STATUS 1 ZAN_SQLITE_DOWNLOAD_ERROR_MESSAGE ) -- message( FATAL_ERROR "SQLite: download failed. Reason: ${ZAN_SQLITE_DOWNLOAD_ERROR_MESSAGE}" ) -- endif() -- -- # Check the hash. Abort immediately if it's not valid (something is wrong with the download) -- file( SHA1 ${ZAN_SQLITE_TEMP_ARCHIVE} ZAN_SQLITE_CURRENT_SHA1 ) -- if( NOT ZAN_SQLITE_CURRENT_SHA1 STREQUAL ZAN_SQLITE_SHA1 ) -- message( FATAL_ERROR "SQLite: download failed. The downloaded file has a different hash:\n" -- "SQLite: valid: ${ZAN_SQLITE_SHA1}\n" -- "SQLite: downloaded: ${ZAN_SQLITE_CURRENT_SHA1}" ) -- endif() -- -- # Rename the archive. -- execute_process( COMMAND ${CMAKE_COMMAND} -E rename ${ZAN_SQLITE_TEMP_ARCHIVE} ${ZAN_SQLITE_HASHED_ARCHIVE} ) -- endif() -- -- message( STATUS "SQLite: saving the source files into the 'sqlite' directory." ) -- -- # Extract the archive. -- execute_process( COMMAND ${CMAKE_COMMAND} -E tar xzf ${ZAN_SQLITE_HASHED_ARCHIVE} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) -- -- # Copy the required files. -- execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME}/sqlite3.c ${CMAKE_CURRENT_SOURCE_DIR} ) -- execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME}/sqlite3.h ${CMAKE_CURRENT_SOURCE_DIR} ) -- execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME}/sqlite3ext.h ${CMAKE_CURRENT_SOURCE_DIR} ) -- -- # Remove the extracted folder. -- execute_process( COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME} ) -- -- message( STATUS "SQLite: done." ) --endif() -- - # [BB] Silence all GCC warnings - IF ( CMAKE_COMPILER_IS_GNUCXX ) - ADD_DEFINITIONS ( -w ) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 909f5afde9a1..12de3ec40218 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2862,6 +2862,8 @@ mapAliases { z3_4_8 = throw "'z3_4_8' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18 zabbix50 = throw "'zabbix50' has been removed, it would have reached its End of Life a few days after the release of NixOS 25.05. Consider upgrading to 'zabbix60' or 'zabbix70'."; # Added 2025-04-22 zabbix64 = throw "'zabbix64' has been removed because it reached its End of Life. Consider upgrading to 'zabbix70'."; # Added 2025-04-22 + zandronum-alpha = throw "'zandronum-alpha' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19 + zandronum-alpha-server = throw "'zandronum-alpha-server' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19 zbackup = throw "'zbackup' has been removed due to being unmaintained upstream"; # Added 2025-08-22 zeal-qt5 = lib.warnOnInstantiate "'zeal-qt5' has been removed from nixpkgs. Please use 'zeal' instead" zeal; # Added 2025-08-31 zeal-qt6 = lib.warnOnInstantiate "'zeal-qt6' has been renamed to 'zeal'" zeal; # Added 2025-08-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 486b519307ce..8473007e29d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13245,12 +13245,6 @@ with pkgs; serverOnly = true; }; - zandronum-alpha = callPackage ../games/doom-ports/zandronum/alpha { }; - - zandronum-alpha-server = zandronum-alpha.override { - serverOnly = true; - }; - fmodex = callPackage ../games/doom-ports/zandronum/fmod.nix { }; pro-office-calculator = libsForQt5.callPackage ../games/pro-office-calculator { }; From 1f6186dd9ad4b8836553db163e25ae6ffe39a10f Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Thu, 23 Oct 2025 14:33:47 +0200 Subject: [PATCH 313/380] php82Extensions.dom: fix build with libxml 2.15.0 --- pkgs/top-level/php-packages.nix | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 2e3fe3d68310..fd753977bf87 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -447,14 +447,25 @@ lib.makeScope pkgs.newScope ( configureFlags = [ "--enable-dom" ]; - patches = lib.optionals (lib.versionAtLeast php.version "8.4") [ - # Fix build of ext-dom. - # https://github.com/php/php-src/pull/20023 (will be part of 8.4.14) - (fetchpatch { - url = "https://github.com/php/php-src/commit/4fe040290da2822c70d3b60d30a2c1256264735d.patch"; - hash = "sha256-hCs59X5gCApXMjU9dKEtgdTJBHYq3BcKr9tlQjRCTIA="; - }) - ]; + patches = + lib.optionals (lib.versionAtLeast php.version "8.4") [ + # Fix build of ext-dom. + # https://github.com/php/php-src/pull/20023 (will be part of 8.4.14) + (fetchpatch { + url = "https://github.com/php/php-src/commit/4fe040290da2822c70d3b60d30a2c1256264735d.patch"; + hash = "sha256-hCs59X5gCApXMjU9dKEtgdTJBHYq3BcKr9tlQjRCTIA="; + }) + ] + ++ lib.optionals (lib.versionOlder php.version "8.3") [ + # Fix gh10234 test with libxml 2.15.0 + (fetchpatch { + url = "https://github.com/php/php-src/commit/d6e70e705323a50b616ffee9402245ab97de3e4e.patch"; + hash = "sha256-Axu09l3uQ83qe30aDsR+Bt29cJiF4mLknwDyQf94vic="; + includes = [ + "ext/dom/tests/gh10234.phpt" + ]; + }) + ]; } { name = "enchant"; From 3803a1f3279a55a42e50f3dfaec5ff947bafcdae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 12:47:00 +0000 Subject: [PATCH 314/380] trdl-client: 0.12.1 -> 0.12.2 --- pkgs/by-name/tr/trdl-client/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trdl-client/package.nix b/pkgs/by-name/tr/trdl-client/package.nix index 03d81f653c1c..ea0a7e425e12 100644 --- a/pkgs/by-name/tr/trdl-client/package.nix +++ b/pkgs/by-name/tr/trdl-client/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "trdl-client"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "werf"; repo = "trdl"; tag = "v${finalAttrs.version}"; - hash = "sha256-Wu4PRFJDT6SvWPHOaOmBBVX1wvkDrjigxah5ZCq8NsY="; + hash = "sha256-0hyo32LjPG/Zu0n1WHg7O3f9blxiGUkfUD1i/80UIRE="; }; sourceRoot = "${finalAttrs.src.name}/client"; From d7b902e0d4477238782f408292edccb93817b45f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 22 Oct 2025 07:46:49 +0300 Subject: [PATCH 315/380] python3Packages.pyglossary: init at 5.1.1 --- .../python-modules/pyglossary/default.nix | 72 ++++++++++++++ .../pyglossary/fix-install-issues.patch | 93 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 167 insertions(+) create mode 100644 pkgs/development/python-modules/pyglossary/default.nix create mode 100644 pkgs/development/python-modules/pyglossary/fix-install-issues.patch diff --git a/pkgs/development/python-modules/pyglossary/default.nix b/pkgs/development/python-modules/pyglossary/default.nix new file mode 100644 index 000000000000..eb52c2d127c8 --- /dev/null +++ b/pkgs/development/python-modules/pyglossary/default.nix @@ -0,0 +1,72 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + + # build-system + setuptools, + + # tests + versionCheckHook, + + # dependencies (required for most functionality) + pyicu, + lxml, +}: + +buildPythonPackage rec { + pname = "pyglossary"; + version = "5.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ilius"; + repo = "pyglossary"; + tag = version; + hash = "sha256-OrySbbStVSz+WF8D+ODK++lKfYJOm9KCfOxDP3snuKY="; + }; + + patches = [ + # Fixes a few install issues, can be removed in the next release. See: + # https://github.com/ilius/pyglossary/pull/684 + (fetchpatch { + url = "https://github.com/ilius/pyglossary/commit/f86c91ed987579cd8a1c7f7f278452901ce725ac.patch"; + hash = "sha256-ewYeNwD3/aSsNbMazgW/3tBpYAPBZdnVu9LCh7tQZjg="; + }) + ]; + + build-system = [ + setuptools + ]; + + dependencies = [ + pyicu + lxml + ]; + + # Many issues with the tests: They require `cd tests` in `preCheck`; Some of + # them depend upon files in `tests/deprecated`; Even with workarounds to + # these 2 issues, many tests require network access. We don't enable the + # tests by not adding pytestCheckHook to this list. + nativeCheckInputs = [ + versionCheckHook + ]; + env = { + # The default --help creates permission errors that may be confusing when + # observed in the build log. + versionCheckProgramArg = "--version"; + }; + + pythonImportsCheck = [ + "pyglossary" + ]; + + meta = { + description = "Tool for converting dictionary files aka glossaries. Mainly to help use our offline glossaries in any Open Source dictionary we like on any operating system / device"; + homepage = "https://github.com/ilius/pyglossary"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ doronbehar ]; + mainProgram = "pyglossary"; + }; +} diff --git a/pkgs/development/python-modules/pyglossary/fix-install-issues.patch b/pkgs/development/python-modules/pyglossary/fix-install-issues.patch new file mode 100644 index 000000000000..d9e5db1a8111 --- /dev/null +++ b/pkgs/development/python-modules/pyglossary/fix-install-issues.patch @@ -0,0 +1,93 @@ +diff --git c/pyproject.toml w/pyproject.toml +index abfb59ac..8f9c2121 100644 +--- c/pyproject.toml ++++ w/pyproject.toml +@@ -416,11 +416,10 @@ version = "5.1.1" + description = "A tool for converting dictionary files aka glossaries." + readme = "README.md" + authors = [{ name = "Saeed Rasooli", email = "saeed.gnu@gmail.com" }] +-license = { text = "GPLv3+" } ++license = "GPL-3.0-or-later" + keywords = ["dictionary", "glossary"] + classifiers = [ + "Development Status :: 5 - Production/Stable", +- "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", + "Operating System :: OS Independent", + "Typing :: Typed", + "Programming Language :: Python :: 3.11", +@@ -430,6 +429,9 @@ classifiers = [ + requires-python = ">= 3.11" + dependencies = [] + ++[project.scripts] ++pyglossary = "pyglossary.ui.main:main" ++ + [project.optional-dependencies] + all = ["PyICU", "lxml", "beautifulsoup4"] + +diff --git c/setup.py w/setup.py +index fd38a060..19df9ee3 100755 +--- c/setup.py ++++ w/setup.py +@@ -8,8 +8,7 @@ import sys + from glob import glob + from os.path import dirname, exists, isdir, join + +-from setuptools import setup +-from setuptools.command.install import install ++from setuptools import setup, find_packages + + VERSION = "5.1.1" + log = logging.getLogger("root") +@@ -46,29 +45,6 @@ def getPipSafeVersion() -> str: + return VERSION + + +-class my_install(install): +- def run(self) -> None: +- install.run(self) +- if os.sep == "/": +- binPath = join(self.install_scripts, "pyglossary") +- log.info(f"creating script file {binPath!r}") +- if not exists(self.install_scripts): +- os.makedirs(self.install_scripts) +- # let it fail on wrong permissions. +- elif not isdir(self.install_scripts): +- raise OSError( +- "installation path already exists " +- f"but is not a directory: {self.install_scripts}", +- ) +- open(binPath, "w", encoding="ascii").write("""#!/usr/bin/env -S python3 -O +-import sys +-from os.path import dirname +-sys.path.insert(0, dirname(__file__)) +-from pyglossary.ui.main import main +-main()""") +- os.chmod(binPath, 0o755) +- +- + root_data_file_names = [ + "about", + "LICENSE", +@@ -146,19 +122,14 @@ setup( + name="pyglossary", + version=getPipSafeVersion(), + python_requires=">=3.10.0", +- cmdclass={ +- "install": my_install, +- }, + description="A tool for converting dictionary files aka glossaries.", + long_description_content_type="text/markdown", + long_description=long_description, + author="Saeed Rasooli", + author_email="saeed.gnu@gmail.com", +- license="GPLv3+", ++ license="GPL-3.0-or-later", + url="https://github.com/ilius/pyglossary", +- packages=[ +- "pyglossary", +- ], ++ packages=find_packages(), + entry_points={ + "console_scripts": [ + "pyglossary = pyglossary.ui.main:main", diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9523371a1569..73f3196fbf82 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13124,6 +13124,8 @@ self: super: with self; { pyglm = callPackage ../development/python-modules/pyglm { }; + pyglossary = callPackage ../development/python-modules/pyglossary { }; + pygls = callPackage ../development/python-modules/pygls { }; pygltflib = callPackage ../development/python-modules/pygltflib { }; From 1d1ce10813f73dc514fb53bad4dedcb02fe172e6 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 22 Oct 2025 10:51:15 +0300 Subject: [PATCH 316/380] pyglossary: init at 5.1.1 --- pkgs/by-name/py/pyglossary/package.nix | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 pkgs/by-name/py/pyglossary/package.nix diff --git a/pkgs/by-name/py/pyglossary/package.nix b/pkgs/by-name/py/pyglossary/package.nix new file mode 100644 index 000000000000..8c96c385d8a2 --- /dev/null +++ b/pkgs/by-name/py/pyglossary/package.nix @@ -0,0 +1,5 @@ +{ + python3, +}: + +python3.pkgs.toPythonApplication python3.pkgs.pyglossary From 97354a1b5a9cb3d6f2459470e6b9d22fb7a996fe Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 22 Oct 2025 10:51:32 +0300 Subject: [PATCH 317/380] pyglossary-gui: init at 5.1.1 --- pkgs/by-name/py/pyglossary-gui/package.nix | 9 +++++++++ .../python-modules/pyglossary/default.nix | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/by-name/py/pyglossary-gui/package.nix diff --git a/pkgs/by-name/py/pyglossary-gui/package.nix b/pkgs/by-name/py/pyglossary-gui/package.nix new file mode 100644 index 000000000000..b9f68d286190 --- /dev/null +++ b/pkgs/by-name/py/pyglossary-gui/package.nix @@ -0,0 +1,9 @@ +{ + python3, +}: + +python3.pkgs.toPythonApplication ( + python3.pkgs.pyglossary.override { + enableGui = true; + } +) diff --git a/pkgs/development/python-modules/pyglossary/default.nix b/pkgs/development/python-modules/pyglossary/default.nix index eb52c2d127c8..9f9012c06d4a 100644 --- a/pkgs/development/python-modules/pyglossary/default.nix +++ b/pkgs/development/python-modules/pyglossary/default.nix @@ -10,9 +10,17 @@ # tests versionCheckHook, + # nativeBuildInputs for GUI + gobject-introspection, + wrapGAppsHook3, + # dependencies (required for most functionality) pyicu, lxml, + enableGui ? false, + # for GUI only + pygobject3, + gtk3, }: buildPythonPackage rec { @@ -38,11 +46,22 @@ buildPythonPackage rec { build-system = [ setuptools + ] + ++ lib.optionals enableGui [ + gobject-introspection + wrapGAppsHook3 ]; dependencies = [ pyicu lxml + ] + ++ lib.optionals enableGui [ + pygobject3 + ]; + + buildInputs = lib.optionals enableGui [ + gtk3 ]; # Many issues with the tests: They require `cd tests` in `preCheck`; Some of From f940a6d6fb8db8e4e9cd97c271fce55325ee249c Mon Sep 17 00:00:00 2001 From: Onni Hakala Date: Fri, 19 Sep 2025 08:21:07 +0300 Subject: [PATCH 318/380] duckdb: 1.3.2 -> 1.4.1 Co-authored-by: sikmir <688044+sikmir@users.noreply.github.com> --- pkgs/by-name/du/duckdb/package.nix | 13 +++++-------- pkgs/by-name/du/duckdb/versions.json | 6 +++--- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/du/duckdb/package.nix b/pkgs/by-name/du/duckdb/package.nix index 3cfd451a4681..8a5b6700476d 100644 --- a/pkgs/by-name/du/duckdb/package.nix +++ b/pkgs/by-name/du/duckdb/package.nix @@ -13,7 +13,6 @@ }: let - enableFeature = yes: if yes then "ON" else "OFF"; versions = lib.importJSON ./versions.json; in stdenv.mkDerivation (finalAttrs: { @@ -47,14 +46,12 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withOdbc [ unixODBC ]; cmakeFlags = [ - "-DDUCKDB_EXTENSION_CONFIGS=${finalAttrs.src}/.github/config/in_tree_extensions.cmake" - "-DBUILD_ODBC_DRIVER=${enableFeature withOdbc}" - "-DJDBC_DRIVER=${enableFeature withJdbc}" - "-DOVERRIDE_GIT_DESCRIBE=v${finalAttrs.version}-0-g${finalAttrs.rev}" - ] - ++ lib.optionals finalAttrs.doInstallCheck [ + (lib.cmakeFeature "DUCKDB_EXTENSION_CONFIGS" "${finalAttrs.src}/.github/config/in_tree_extensions.cmake") + (lib.cmakeBool "BUILD_ODBC_DRIVER" withOdbc) + (lib.cmakeBool "JDBC_DRIVER" withJdbc) + (lib.cmakeFeature "OVERRIDE_GIT_DESCRIBE" "v${finalAttrs.version}-0-g${finalAttrs.rev}") # development settings - "-DBUILD_UNITTESTS=ON" + (lib.cmakeBool "BUILD_UNITTESTS" finalAttrs.doInstallCheck) ]; doInstallCheck = true; diff --git a/pkgs/by-name/du/duckdb/versions.json b/pkgs/by-name/du/duckdb/versions.json index a6127ebe6d3e..0bbd61cd8bbc 100644 --- a/pkgs/by-name/du/duckdb/versions.json +++ b/pkgs/by-name/du/duckdb/versions.json @@ -1,5 +1,5 @@ { - "version": "1.3.2", - "rev": "0b83e5d2f68bc02dfefde74b846bd039f078affa", - "hash": "sha256-6NMQ893g+nOiH8dnb63oa+fZMNXs8N6tJv+Er4x547U=" + "version": "1.4.1", + "rev": "b390a7c3760bd95926fe8aefde20d04b349b472e", + "hash": "sha256-w/mELyRs4B9hJngi1MLed0fHRq/ldkkFV+SDkSxs3O8=" } From 61aacedd9286d768b2999e8a7ac7cfb32c8bf3ed Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Tue, 21 Oct 2025 22:52:44 -0400 Subject: [PATCH 319/380] python3Packages.duckdb: 1.3.2 -> 1.4.1 Co-authored-by: sikmir <688044+sikmir@users.noreply.github.com> Co-authored-by: harvidsen <62279738+harvidsen@users.noreply.github.com> --- .../python-modules/duckdb/default.nix | 94 ++++++++++++++----- 1 file changed, 71 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index 38e87cef209a..cc87702bb703 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -2,14 +2,21 @@ lib, stdenv, buildPythonPackage, + fetchFromGitHub, + pythonOlder, + cmake, + ninja, duckdb, fsspec, google-cloud-storage, + ipython, numpy, openssl, pandas, psutil, + pyarrow, pybind11, + scikit-build-core, setuptools-scm, pytest-reraise, pytestCheckHook, @@ -17,43 +24,79 @@ buildPythonPackage rec { inherit (duckdb) - patches pname - rev - src version ; pyproject = true; - postPatch = (duckdb.postPatch or "") + '' - # we can't use sourceRoot otherwise patches don't apply, because the patches apply to the C++ library - cd tools/pythonpkg + src = fetchFromGitHub { + owner = "duckdb"; + repo = "duckdb-python"; + tag = "v${version}"; + hash = "sha256-cZyiTqu5iW/cqEo42b/XnOG7hJqtQs1h2RXXL392ujA="; + }; - # 1. let nix control build cores - # 2. default to extension autoload & autoinstall disabled - substituteInPlace setup.py \ - --replace-fail "ParallelCompile()" 'ParallelCompile("NIX_BUILD_CORES")' \ - --replace-fail "define_macros.extend([('DUCKDB_EXTENSION_AUTOLOAD_DEFAULT', '1'), ('DUCKDB_EXTENSION_AUTOINSTALL_DEFAULT', '1')])" "pass" + postPatch = '' + # patch cmake to ignore absence of git submodule copy of duckdb + substituteInPlace cmake/duckdb_loader.cmake \ + --replace-fail '"''${CMAKE_CURRENT_SOURCE_DIR}/external/duckdb"' \ + '"${duckdb.src}"' + # replace pybind11[global] with pybind11 substituteInPlace pyproject.toml \ - --replace-fail 'setuptools_scm>=6.4,<8.0' 'setuptools_scm' + --replace-fail "pybind11[global]" "pybind11" + + # replace custom build backend with standard scikit-build-core + substituteInPlace pyproject.toml \ + --replace-fail 'build-backend = "duckdb_packaging.build_backend"' \ + 'build-backend = "scikit_build_core.build"' \ + --replace-fail 'backend-path = ["./"]' \ + '# backend-path removed' ''; - env = { - DUCKDB_BUILD_UNITY = 1; - OVERRIDE_GIT_DESCRIBE = "v${version}-0-g${rev}"; - }; + nativeBuildInputs = [ + cmake + ninja + ]; + + dontUseCmakeConfigure = true; build-system = [ pybind11 + scikit-build-core setuptools-scm ]; - buildInputs = [ openssl ]; + buildInputs = [ + duckdb + openssl + ]; - dependencies = [ - numpy - pandas + optional-dependencies = { + # Note: ipython and adbc_driver_manager currently excluded despite inclusion in upstream + # https://github.com/duckdb/duckdb-python/blob/v1.4.0/pyproject.toml#L44-L52 + all = [ + ipython + fsspec + numpy + ] + ++ lib.optionals (pythonOlder "3.14") [ + # https://github.com/duckdb/duckdb-python/blob/0ee500cfa35fc07bf81ed02e8ab6984ea1f665fd/pyproject.toml#L49-L51 + # adbc_driver_manager noted for migration to duckdb C source + pandas + pyarrow + ]; + }; + + env = { + DUCKDB_BUILD_UNITY = 1; + # default to disabled extension autoload/autoinstall + CMAKE_DEFINE_DUCKDB_EXTENSION_AUTOLOAD_DEFAULT = "0"; + CMAKE_DEFINE_DUCKDB_EXTENSION_AUTOINSTALL_DEFAULT = "0"; + }; + + cmakeFlags = [ + (lib.cmakeFeature "OVERRIDE_GIT_DESCRIBE" "v${version}-0-g${duckdb.rev}") ]; nativeCheckInputs = [ @@ -62,7 +105,8 @@ buildPythonPackage rec { psutil pytest-reraise pytestCheckHook - ]; + ] + ++ optional-dependencies.all; pytestFlags = [ "--verbose" ]; @@ -71,8 +115,12 @@ buildPythonPackage rec { enabledTestPaths = if stdenv.hostPlatform.isDarwin then [ "tests/fast" ] else [ "tests" ]; disabledTestPaths = [ - # avoid dependency on mypy - "tests/stubs/test_stubs.py" + # avoid dependency on adbc_driver_manager + "tests/fast/adbc" + # avoid dependency on pyotp + "tests/fast/test_pypi_cleanup.py" + # avoid test data download requiring network access + "tests/slow/test_h2oai_arrow.py" ]; disabledTests = [ From 4006d2988c95c79f0246bbb6a72b04897a727765 Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Sun, 12 Oct 2025 09:05:07 -0400 Subject: [PATCH 320/380] python3Packages.sqlglot: add missing test dependencies sqlglot tests require numpy and pandas, which were previously provided transitively through duckdb. After duckdb update to 1.4.1, these became optional dependencies and are no longer available to sqlglot tests. --- pkgs/development/python-modules/sqlglot/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/sqlglot/default.nix b/pkgs/development/python-modules/sqlglot/default.nix index 5b6bb1ceec67..0499fd11382d 100644 --- a/pkgs/development/python-modules/sqlglot/default.nix +++ b/pkgs/development/python-modules/sqlglot/default.nix @@ -13,6 +13,8 @@ # tests pytestCheckHook, duckdb, + numpy, + pandas, }: buildPythonPackage rec { @@ -40,6 +42,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook duckdb + numpy + pandas ]; pythonImportsCheck = [ "sqlglot" ]; From c578ecfdc3f6d0e8d8aab6912c242eb929847d58 Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Wed, 22 Oct 2025 15:17:21 -0400 Subject: [PATCH 321/380] python3Packages.narwhals: disable tests failing with duckdb 1.4.x DuckDB 1.4.x introduces breaking changes in how empty results are converted to PyArrow tables, causing test failures in narwhals. Disabled tests: - test_skew_expr: PyArrow conversion fails with empty DuckDB results Error: ValueError: Must pass schema, or at least one RecordBatch - test_empty_scalar_reduction_with_columns: XPASS(strict) failure Test expected to fail with ibis now passes due to ibis improvements - test_collect_empty: XPASS(strict) failure Test expected to fail with ibis now passes due to ibis improvements These are known compatibility issues that should be addressed upstream in narwhals for DuckDB 1.4.x support. The failures don't affect actual functionality, only test compatibility. This unblocks 42 dependent packages that were failing due to narwhals build failure. --- pkgs/development/python-modules/narwhals/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/narwhals/default.nix b/pkgs/development/python-modules/narwhals/default.nix index 9c7c61b74527..abb7a87dac64 100644 --- a/pkgs/development/python-modules/narwhals/default.nix +++ b/pkgs/development/python-modules/narwhals/default.nix @@ -75,6 +75,11 @@ buildPythonPackage rec { "test_lazy" # Incompatible with ibis 11 "test_unique_3069" + # DuckDB 1.4.x compatibility - empty result schema handling with PyArrow + "test_skew_expr" + # ibis improvements cause strict XPASS failures (tests expected to fail now pass) + "test_empty_scalar_reduction_with_columns" + "test_collect_empty" ]; pytestFlags = [ From 13f1da4b65b0cc35b6d7e24b1eba80e765c93ea2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Oct 2025 04:16:19 +0000 Subject: [PATCH 322/380] python3Packages.torchao: 0.13.0 -> 0.14.1 --- pkgs/development/python-modules/torchao/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchao/default.nix b/pkgs/development/python-modules/torchao/default.nix index 5c301da0ffba..e92454771c3d 100644 --- a/pkgs/development/python-modules/torchao/default.nix +++ b/pkgs/development/python-modules/torchao/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "ao"; - version = "0.13.0"; + version = "0.14.1"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "ao"; tag = "v${version}"; - hash = "sha256-R9H4+KkKuOzsunM3A5LT8upH1TfkHrD+BZerToCHwjo="; + hash = "sha256-L9Eoul7Nar/+gS44+hA8JbfxCgkMH5xAMCleggAZn7c="; }; build-system = [ From ff4ea44ce41b9028ae6d75b9c5ce8f08ef3c629f Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Thu, 23 Oct 2025 10:02:39 -0300 Subject: [PATCH 323/380] ngt: 1.12.3-alpha -> 2.5.0 --- pkgs/by-name/ng/ngt/package.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ng/ngt/package.nix b/pkgs/by-name/ng/ngt/package.nix index 44f3bb1d69e9..76427d914f1c 100644 --- a/pkgs/by-name/ng/ngt/package.nix +++ b/pkgs/by-name/ng/ngt/package.nix @@ -4,22 +4,26 @@ fetchFromGitHub, cmake, llvmPackages, + openblas, enableAVX ? stdenv.hostPlatform.avxSupport, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "NGT"; - version = "1.12.3-alpha"; + version = "2.5.0"; src = fetchFromGitHub { owner = "yahoojapan"; repo = "NGT"; - rev = "29c88ff6cd5824d3196986d1f50b834565b6c9dd"; - sha256 = "sha256-nu0MJNpaenOB4+evoSVLKmPIuZXVj1Rm9x53+TfhezY="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-2cCuVeg7y3butTIAQaYIgx+DPqIFEA2qqVe3exAoAY8="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ llvmPackages.openmp ]; + buildInputs = [ + llvmPackages.openmp + openblas + ]; NIX_ENFORCE_NO_NATIVE = !enableAVX; __AVX2__ = if enableAVX then 1 else 0; @@ -31,4 +35,4 @@ stdenv.mkDerivation { license = licenses.asl20; maintainers = with maintainers; [ tomberek ]; }; -} +}) From af240623517bb27bb340153dbf8c18002db0ffc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 23 Oct 2025 15:05:29 +0200 Subject: [PATCH 324/380] ngtcp2-gnutls.tests: add curlWithGnuTls It's another consumer of this library and now used in a dozen packages. --- pkgs/development/libraries/ngtcp2/gnutls.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix index fce288b44b58..7461fdfaeb3c 100644 --- a/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -8,6 +8,7 @@ cunit, ncurses, knot-dns, + curlWithGnuTls, }: stdenv.mkDerivation rec { @@ -38,7 +39,9 @@ stdenv.mkDerivation rec { doCheck = true; nativeCheckInputs = [ cunit ] ++ lib.optional stdenv.hostPlatform.isDarwin ncurses; - passthru.tests = knot-dns.passthru.tests; # the only consumer so far + passthru.tests = knot-dns.passthru.tests // { + inherit curlWithGnuTls; + }; meta = with lib; { homepage = "https://github.com/ngtcp2/ngtcp2"; From d1a5c248176a9292e60b2dcd0f4201c6192a0c0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 13:06:20 +0000 Subject: [PATCH 325/380] typescript-go: 0-unstable-2025-10-17 -> 0-unstable-2025-10-22 --- pkgs/by-name/ty/typescript-go/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix index 5e5012860ba0..92b1ad63fdf7 100644 --- a/pkgs/by-name/ty/typescript-go/package.nix +++ b/pkgs/by-name/ty/typescript-go/package.nix @@ -10,13 +10,13 @@ let in buildGoModule { pname = "typescript-go"; - version = "0-unstable-2025-10-17"; + version = "0-unstable-2025-10-22"; src = fetchFromGitHub { owner = "microsoft"; repo = "typescript-go"; - rev = "20b1482ea8b55d51fc21c60718dc934d763c918b"; - hash = "sha256-+sfewMFnvq4zJO6KCvii9qF8LdAd+5Rqk2GJcJrJAeI="; + rev = "42241ec50d438ce9ef1f2b90a7b2cdd1bfa5f51d"; + hash = "sha256-5vm9ht3nZ3ELODN+J5PfAOWrxIUCyvsIxbf29geSYrA="; fetchSubmodules = false; }; From 84704f3ecb46931a3e4caf12faf823bfa1db22a4 Mon Sep 17 00:00:00 2001 From: Louis Chan Date: Thu, 23 Oct 2025 21:14:17 +0800 Subject: [PATCH 326/380] vimPlugins.vim-hy: init at 2024-10-06 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index e577027973d4..73bf6c5e54ee 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -18552,6 +18552,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + vim-hy = buildVimPlugin { + pname = "vim-hy"; + version = "2024-10-06"; + src = fetchFromGitHub { + owner = "hylang"; + repo = "vim-hy"; + rev = "ab1699bfa636e7355ac0030189331251c49c7d61"; + sha256 = "09v83a6ybj73043acpm2nps5s56sqg2pz456b4qgz2r7zjlgx5r9"; + }; + meta.homepage = "https://github.com/hylang/vim-hy/"; + meta.hydraPlatforms = [ ]; + }; + vim-hybrid = buildVimPlugin { pname = "vim-hybrid"; version = "2016-01-05"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 0605761caae9..fade945e948b 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1424,6 +1424,7 @@ https://github.com/ntk148v/vim-horizon/,, https://github.com/jonsmithers/vim-html-template-literals/,, https://github.com/humanoid-colors/vim-humanoid-colorscheme/,, https://github.com/vim-utils/vim-husk/,, +https://github.com/hylang/vim-hy/,HEAD, https://github.com/w0ng/vim-hybrid/,, https://github.com/kristijanhusak/vim-hybrid-material/,, https://github.com/noc7c9/vim-iced-coffee-script/,, From 372a6a1e4d365b55b853dbcdb46488c3fa9475f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 13:17:52 +0000 Subject: [PATCH 327/380] bash-pinyin-completion-rs: 0.3.2 -> 1.0.0 --- pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix b/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix index 400d318dbfdb..5a6efefcef0a 100644 --- a/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix +++ b/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "bash-pinyin-completion-rs"; - version = "0.3.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "AOSC-Dev"; repo = "bash-pinyin-completion-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-r+B11TgMOhwslqygv72S9uhF7v79MAzUu5XHlD/P3HY="; + hash = "sha256-VXIIG+ZGb4fS3LSIkGW744ui4AKTdQCjrNlObH/YZVY="; }; strictDeps = true; From e770359fd70c77f8f789f274899bf89a17dd1141 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 13:23:52 +0000 Subject: [PATCH 328/380] okteto: 3.12.0 -> 3.12.1 --- pkgs/by-name/ok/okteto/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix index 431db2635b18..e4d05a1fc448 100644 --- a/pkgs/by-name/ok/okteto/package.nix +++ b/pkgs/by-name/ok/okteto/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "okteto"; - version = "3.12.0"; + version = "3.12.1"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; tag = finalAttrs.version; - hash = "sha256-EL1xWrxI7W2iXb0syb/53BgW22kqOSJCHyzBHGdQOm4="; + hash = "sha256-TtRLTZ/CnhJZYFrMUYAvRksSbQywP5P0dlYhT74yju8="; }; vendorHash = "sha256-wkuCUMzmYAWf8RjM6DkTTHaY7qEIjGNYiT4grtCbYs8="; From 7aa6e24987f1634212b1075a3b0c44f81707dbaf Mon Sep 17 00:00:00 2001 From: Sergey Volkov Date: Thu, 9 Oct 2025 12:36:19 +0200 Subject: [PATCH 329/380] julia_112-bin: init at 1.12.1 --- pkgs/development/compilers/julia/default.nix | 11 +++++++++++ pkgs/development/compilers/julia/generic-bin.nix | 13 ++++++++++--- pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 6f8b92d7a34b..4013c2196cf6 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -51,6 +51,17 @@ in }; }) { } ); + julia_112-bin = wrapJulia ( + callPackage (import ./generic-bin.nix { + version = "1.12.1"; + sha256 = { + x86_64-linux = "7d2add9ee74ee2f12b5c268bc194794cc52ea440f8687fbab29db6afefbf69b7"; + aarch64-linux = "2e3d6ca07e251721fa3e0cd3460fc240e60f2a9bd97bae0ea2144f586da19297"; + x86_64-darwin = "7dd841cd853ad64f5e90a4b459631b49ee388891ceaba81857f5b8959392c4b2"; + aarch64-darwin = "cc65620b71a725380e59d0e31dc0b4140f30229b70a4b8eec8e32c222bc54fc1"; + }; + }) { } + ); julia_19 = wrapJulia ( callPackage (import ./generic.nix { version = "1.9.4"; diff --git a/pkgs/development/compilers/julia/generic-bin.nix b/pkgs/development/compilers/julia/generic-bin.nix index b6622dfc4b3d..5190ba3226bf 100644 --- a/pkgs/development/compilers/julia/generic-bin.nix +++ b/pkgs/development/compilers/julia/generic-bin.nix @@ -15,9 +15,6 @@ let skip_tests = [ # Test flaky on ofborg "channels" - # Test flaky because of our RPATH patching - # https://github.com/NixOS/nixpkgs/pull/230965#issuecomment-1545336489 - "compiler/codegen" # Test flaky "read" ] @@ -34,6 +31,16 @@ let "loading" "cmdlineargs" ] + ++ lib.optionals (lib.versionAtLeast version "1.12") [ + # Test flaky because of our RPATH patching + # https://github.com/NixOS/nixpkgs/pull/230965#issuecomment-1545336489 + "Compiler/codegen" + "precompile" + "compileall" + ] + ++ lib.optionals (lib.versionOlder version "1.12") [ + "compiler/codegen" # older versions' test was in lowercase + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Test flaky on ofborg "FileWatching" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a1c7a5c4ce0..c8dc5dce144a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5180,6 +5180,7 @@ with pkgs; julia_19-bin julia_110-bin julia_111-bin + julia_112-bin julia_19 julia_110 julia_111 @@ -5190,7 +5191,7 @@ with pkgs; julia = julia-stable; julia-lts-bin = julia_110-bin; - julia-stable-bin = julia_111-bin; + julia-stable-bin = julia_112-bin; julia-bin = julia-stable-bin; kotlin = callPackage ../development/compilers/kotlin { }; From f99dc0652eb0110395c7629cfd4f2ee1531172ad Mon Sep 17 00:00:00 2001 From: Sergey Volkov Date: Fri, 10 Oct 2025 10:07:56 +0200 Subject: [PATCH 330/380] julia_112: init at 1.12.1 --- pkgs/development/compilers/julia/default.nix | 9 +++++++ pkgs/development/compilers/julia/generic.nix | 5 ++++ .../0001-skip-failing-and-flaky-tests.patch | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/julia/patches/1.12/0001-skip-failing-and-flaky-tests.patch diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 4013c2196cf6..80fcfd5a0add 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -97,4 +97,13 @@ in ]; }) { } ); + julia_112 = wrapJulia ( + callPackage (import ./generic.nix { + version = "1.12.1"; + hash = "sha256-iR0Wu5HIqU1aY1WoLBf6PCRY64kWDUKEQ6CyobhB6lI="; + patches = [ + ./patches/1.12/0001-skip-failing-and-flaky-tests.patch + ]; + }) { } + ); } diff --git a/pkgs/development/compilers/julia/generic.nix b/pkgs/development/compilers/julia/generic.nix index 469e0206514d..f1ef721d346c 100644 --- a/pkgs/development/compilers/julia/generic.nix +++ b/pkgs/development/compilers/julia/generic.nix @@ -60,6 +60,11 @@ stdenv.mkDerivation rec { substituteInPlace deps/curl.mk \ --replace-fail 'cd $(dir $<) && $(TAR) jxf $(notdir $<)' \ 'cd $(dir $<) && $(TAR) jxf $(notdir $<) && sed -i "s|/usr/bin/env perl|${lib.getExe buildPackages.perl}|" curl-$(CURL_VER)/scripts/cd2nroff' + '' + + lib.optionalString (lib.versionAtLeast version "1.12") '' + substituteInPlace deps/openssl.mk \ + --replace-fail 'cd $(dir $<) && $(TAR) -zxf $<' \ + 'cd $(dir $<) && $(TAR) -zxf $< && sed -i "s|/usr/bin/env perl|${lib.getExe buildPackages.perl}|" openssl-$(OPENSSL_VER)/Configure' ''; makeFlags = [ diff --git a/pkgs/development/compilers/julia/patches/1.12/0001-skip-failing-and-flaky-tests.patch b/pkgs/development/compilers/julia/patches/1.12/0001-skip-failing-and-flaky-tests.patch new file mode 100644 index 000000000000..4ab76c9fa642 --- /dev/null +++ b/pkgs/development/compilers/julia/patches/1.12/0001-skip-failing-and-flaky-tests.patch @@ -0,0 +1,25 @@ +From e26b82d0c162b6c22b65b2a5d2cd03d98fd9f5d4 Mon Sep 17 00:00:00 2001 +From: Sergey Volkov +Date: Thu, 9 Oct 2025 13:00:31 +0200 +Subject: [PATCH] disable failing and flaky tests + +--- + test/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/Makefile b/test/Makefile +index 69b7ad1451..583e64a287 100644 +--- a/test/Makefile ++++ b/test/Makefile +@@ -30,7 +30,7 @@ default: + + $(TESTS): + @cd $(SRCDIR) && \ +- $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl $@) ++ $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl --skip NetworkOptions REPL channels FileWatching ccall loading cmdlineargs Distributed precompile compileall $@) + + $(addprefix revise-, $(TESTS)): revise-% : + @cd $(SRCDIR) && \ +-- +2.51.0 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8dc5dce144a..ba165a8c4f3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5184,10 +5184,11 @@ with pkgs; julia_19 julia_110 julia_111 + julia_112 ; julia-lts = julia_110-bin; - julia-stable = julia_111; + julia-stable = julia_112; julia = julia-stable; julia-lts-bin = julia_110-bin; From e9fc04cf0f23058802175f595165905c6e6b6b9a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 22 Oct 2025 20:57:00 +0200 Subject: [PATCH 331/380] =?UTF-8?q?ocamlPackages.camlp5:=208.03.2=20?= =?UTF-8?q?=E2=86=92=208.04.00?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/ocaml/camlp5/default.nix | 153 +++++++++--------- pkgs/top-level/ocaml-packages.nix | 11 +- 2 files changed, 82 insertions(+), 82 deletions(-) diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 49f70b69960a..38fd24135427 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -14,92 +14,83 @@ legacy ? false, }: -if lib.versionOlder ocaml.version "4.02" then - throw "camlp5 is not available for OCaml ${ocaml.version}" -else - +stdenv.mkDerivation ( + finalAttrs: let - params = - if lib.versionAtLeast ocaml.version "4.12" && !legacy then - rec { - version = "8.03.02"; - - src = fetchFromGitHub { - owner = "camlp5"; - repo = "camlp5"; - rev = version; - hash = "sha256-nz+VfGR/6FdBvMzPPpVpviAXXBWNqM3Ora96Yzx964o="; - }; - - nativeBuildInputs = [ - makeWrapper - ocaml - findlib - perl - ]; - buildInputs = [ - bos - pcre2 - re - rresult - ]; - propagatedBuildInputs = [ camlp-streams ]; - postInstall = '' - for prog in camlp5 camlp5o camlp5r camlp5sch mkcamlp5 ocpp5 - do - wrapProgram $out/bin/$prog \ - --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH" - done - ''; - - } - else - rec { - version = "7.14"; - src = fetchFromGitHub { - owner = "camlp5"; - repo = "camlp5"; - rev = "rel${builtins.replaceStrings [ "." ] [ "" ] version}"; - sha256 = "1dd68bisbpqn5lq2pslm582hxglcxnbkgfkwhdz67z4w9d5nvr7w"; - }; - nativeBuildInputs = [ - ocaml - perl - ]; - }; + recent = lib.versionAtLeast (lib.versions.major finalAttrs.version) "8"; in + { - stdenv.mkDerivation ( - params - // { + version = if lib.versionAtLeast ocaml.version "4.12" && !legacy then "8.04.00" else "7.14"; - pname = "ocaml${ocaml.version}-camlp5"; + pname = "ocaml${ocaml.version}-camlp5"; - strictDeps = true; + src = fetchFromGitHub { + owner = "camlp5"; + repo = "camlp5"; + tag = + if recent then + finalAttrs.version + else + "rel${builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version}"; + hash = + { + "8.04.00" = "sha256-5IQVGm/tqEzXmZmSYGbGqX+KN9nQLQgw+sBP+F2keXo="; + "8.03.2" = "sha256-nz+VfGR/6FdBvMzPPpVpviAXXBWNqM3Ora96Yzx964o="; + "7.14" = "sha256-/ORtS0uc/GN+g3y6N5ftjL4OBSqV6iswLRbfpeNCprU="; + } + ."${finalAttrs.version}"; + }; + nativeBuildInputs = [ + ocaml + perl + ] + ++ lib.optionals recent [ + makeWrapper + findlib + ]; - prefixKey = "-prefix "; + buildInputs = lib.optionals recent [ + bos + pcre2 + re + rresult + ]; - preConfigure = '' - configureFlagsArray=(--strict --libdir $out/lib/ocaml/${ocaml.version}/site-lib) - patchShebangs ./config/find_stuffversion.pl etc/META.pl + propagatedBuildInputs = lib.optional recent camlp-streams; + + strictDeps = true; + + prefixKey = "-prefix "; + + preConfigure = '' + configureFlagsArray=(--strict --libdir $out/lib/ocaml/${ocaml.version}/site-lib) + patchShebangs ./config/find_stuffversion.pl etc/META.pl tools/ ocaml_src/tools/ + ''; + + buildFlags = [ "world.opt" ]; + + postInstall = lib.optionalString recent '' + for prog in camlp5 camlp5o camlp5r camlp5sch mkcamlp5 ocpp5 + do + wrapProgram $out/bin/$prog \ + --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH" + done + ''; + dontStrip = true; + + meta = { + broken = + lib.versionAtLeast ocaml.version "5.04" && !lib.versionAtLeast finalAttrs.version "8.04.00"; + description = "Preprocessor-pretty-printer for OCaml"; + longDescription = '' + Camlp5 is a preprocessor and pretty-printer for OCaml programs. + It also provides parsing and printing tools. ''; - - buildFlags = [ "world.opt" ]; - - dontStrip = true; - - meta = with lib; { - description = "Preprocessor-pretty-printer for OCaml"; - longDescription = '' - Camlp5 is a preprocessor and pretty-printer for OCaml programs. - It also provides parsing and printing tools. - ''; - homepage = "https://camlp5.github.io/"; - license = licenses.bsd3; - platforms = ocaml.meta.platforms or [ ]; - maintainers = with maintainers; [ - vbgl - ]; - }; - } - ) + homepage = "https://camlp5.github.io/"; + license = lib.licenses.bsd3; + platforms = ocaml.meta.platforms or [ ]; + maintainers = [ lib.maintainers.vbgl ]; + }; + } +) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 290ed9741029..7ad37e506046 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -2245,7 +2245,16 @@ let google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; - hol_light = callPackage ../applications/science/logic/hol_light { }; + hol_light = callPackage ../applications/science/logic/hol_light { + camlp5 = + if lib.versionAtLeast camlp5.version "8.04.00" then + camlp5.overrideAttrs { + version = "8.03.2"; + __intentionallyOverridingVersion = true; + } + else + camlp5; + }; ### End ### From 78b67e628929f227d0f3e81b703f24a7ae08e9bf Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Wed, 22 Oct 2025 21:02:01 -0400 Subject: [PATCH 332/380] python3Packages.frictionless: disable console CLI tests failing with Click 8.2.1 Disable console CLI test paths due to CliRunner output capture issues: - frictionless/console/__spec__/test_console.py (2 tests) - frictionless/console/commands/__spec__/test_summary.py (3 tests) These tests expect error messages in result.stdout but it's empty, likely due to Click CliRunner API changes in how output is captured or redirected. All 1676 functional tests pass, including: - DuckDB adapter tests (frictionless/formats/sql/__spec__/duckdb/) - All other format adapters - Data validation and transformation tests The failure is in tests only. --- pkgs/development/python-modules/frictionless/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/frictionless/default.nix b/pkgs/development/python-modules/frictionless/default.nix index 95847eab78a1..95962afd69f0 100644 --- a/pkgs/development/python-modules/frictionless/default.nix +++ b/pkgs/development/python-modules/frictionless/default.nix @@ -200,6 +200,11 @@ buildPythonPackage rec { # The tests of other unavailable formats are auto-skipped "frictionless/formats/excel" "frictionless/formats/spss" + # Console CLI tests fail due to typer/Click CliRunner output capture issues + # result.stdout is empty when error messages are expected + # All 1690 functional tests pass (including duckdb adapter tests) + "frictionless/console/__spec__/test_console.py" + "frictionless/console/commands/__spec__/test_summary.py" ]; pythonImportsCheck = [ From be5d4d6107b4e658c745b008923b58f413c0de24 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 22 Oct 2025 08:42:52 +0000 Subject: [PATCH 333/380] python3Packages.torchao: fix build on darwin --- .../python-modules/torchao/default.nix | 61 +++++++++++++++++++ .../torchao/use-llvm-openmp.patch | 13 ++++ .../torchao/use-system-cpuinfo.patch | 22 +++++++ 3 files changed, 96 insertions(+) create mode 100644 pkgs/development/python-modules/torchao/use-llvm-openmp.patch create mode 100644 pkgs/development/python-modules/torchao/use-system-cpuinfo.patch diff --git a/pkgs/development/python-modules/torchao/default.nix b/pkgs/development/python-modules/torchao/default.nix index e92454771c3d..2af60a2115b0 100644 --- a/pkgs/development/python-modules/torchao/default.nix +++ b/pkgs/development/python-modules/torchao/default.nix @@ -3,10 +3,18 @@ stdenv, buildPythonPackage, fetchFromGitHub, + replaceVars, # build-system setuptools, + # nativeBuildInputs + cmake, + + # buildInputs + cpuinfo, + llvmPackages, + # dependencies torch, @@ -34,10 +42,33 @@ buildPythonPackage rec { hash = "sha256-L9Eoul7Nar/+gS44+hA8JbfxCgkMH5xAMCleggAZn7c="; }; + patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + ./use-system-cpuinfo.patch + (replaceVars ./use-llvm-openmp.patch { + inherit (llvmPackages) openmp; + }) + ]; + build-system = [ setuptools ]; + nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + cmake + ]; + dontUseCmakeConfigure = true; + + buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + cpuinfo + ]; + + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + # Otherwise, torch will fail to include `omp.h`: + # torch._inductor.exc.InductorError: CppCompileError: C++ compile error + # OpenMP support not found. + llvmPackages.openmp + ]; + dependencies = [ torch ]; @@ -90,6 +121,36 @@ buildPythonPackage rec { "test_save_load_int4woqtensors_2_cpu" "test_save_load_int8woqtensors_0_cpu" "test_save_load_int8woqtensors_1_cpu" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + # AssertionError: Scalars are not equal! + "test_comm" + "test_fsdp2" + "test_fsdp2_correctness" + "test_precompute_bitnet_scale" + "test_qlora_fsdp2" + "test_uneven_shard" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + # RuntimeError: No packed_weights_format was selected + "TestIntxOpaqueTensor" + "test_accuracy_kleidiai" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # Flaky: [gw0] node down: keyboard-interrupt + "test_int8_weight_only_quant_with_freeze_0_cpu" + "test_int8_weight_only_quant_with_freeze_1_cpu" + "test_int8_weight_only_quant_with_freeze_2_cpu" + ]; + + disabledTestPaths = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + # Require unpackaged 'coremltools' + "test/prototype/test_groupwise_lowbit_weight_lut_quantizer.py" + + # AttributeError: '_OpNamespace' 'mkldnn' object has no attribute '_is_mkldnn_acl_supported' + "test/quantization/pt2e/test_arm_inductor_quantizer.py" + "test/quantization/pt2e/test_x86inductor_fusion.py" + "test/quantization/pt2e/test_x86inductor_quantizer.py" ]; meta = { diff --git a/pkgs/development/python-modules/torchao/use-llvm-openmp.patch b/pkgs/development/python-modules/torchao/use-llvm-openmp.patch new file mode 100644 index 000000000000..b399b347da39 --- /dev/null +++ b/pkgs/development/python-modules/torchao/use-llvm-openmp.patch @@ -0,0 +1,13 @@ +diff --git a/torchao/csrc/cpu/shared_kernels/Utils.cmake b/torchao/csrc/cpu/shared_kernels/Utils.cmake +index be7004784..0e1a2ed0e 100644 +--- a/torchao/csrc/cpu/shared_kernels/Utils.cmake ++++ b/torchao/csrc/cpu/shared_kernels/Utils.cmake +@@ -21,7 +21,7 @@ function(target_link_torchao_parallel_backend target_name torchao_parallel_backe + target_link_libraries(${target_name} PRIVATE "${TORCH_LIBRARIES}") + + target_compile_definitions(${target_name} PRIVATE TORCHAO_PARALLEL_ATEN=1 AT_PARALLEL_OPENMP=1 INTRA_OP_PARALLEL=1) +- target_link_libraries(${target_name} PRIVATE ${TORCH_INSTALL_PREFIX}/lib/libomp${CMAKE_SHARED_LIBRARY_SUFFIX}) ++ target_link_libraries(${target_name} PRIVATE @openmp@/lib/libomp${CMAKE_SHARED_LIBRARY_SUFFIX}) + + elseif(TORCHAO_PARALLEL_BACKEND_TOUPPER STREQUAL "EXECUTORCH") + message(STATUS "Building with TORCHAO_PARALLEL_BACKEND=TORCHAO_PARALLEL_EXECUTORCH") diff --git a/pkgs/development/python-modules/torchao/use-system-cpuinfo.patch b/pkgs/development/python-modules/torchao/use-system-cpuinfo.patch new file mode 100644 index 000000000000..25b08a6dcde9 --- /dev/null +++ b/pkgs/development/python-modules/torchao/use-system-cpuinfo.patch @@ -0,0 +1,22 @@ +diff --git a/torchao/csrc/cpu/CMakeLists.txt b/torchao/csrc/cpu/CMakeLists.txt +index aaea27ec7..53dee80fd 100644 +--- a/torchao/csrc/cpu/CMakeLists.txt ++++ b/torchao/csrc/cpu/CMakeLists.txt +@@ -49,16 +49,7 @@ if (NOT TARGET cpuinfo) + add_compile_options(-Wno-unused-function -Wno-unused-variable) + + # set(CMAKE_POLICY_VERSION_MINIMUM 3.5) +- include(FetchContent) +- set(CPUINFO_BUILD_UNIT_TESTS OFF CACHE BOOL "" FORCE) +- set(CPUINFO_BUILD_MOCK_TESTS OFF CACHE BOOL "" FORCE) +- set(CPUINFO_BUILD_BENCHMARKS OFF CACHE BOOL "" FORCE) +- FetchContent_Declare(cpuinfo +- GIT_REPOSITORY https://github.com/pytorch/cpuinfo.git +- GIT_TAG c61fe919607bbc534d7a5a5707bdd7041e72c5ff +- ) +- FetchContent_MakeAvailable( +- cpuinfo) ++ find_package(cpuinfo REQUIRED) + + cmake_policy(POP) + endif() From 7eebd4369e1947832394a78044bc170eee5e96e0 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Thu, 23 Oct 2025 14:38:48 +0000 Subject: [PATCH 334/380] ty: 0.0.1-alpha.23 -> 0.0.1-alpha.24 --- pkgs/by-name/ty/ty/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index eff2d73ceac5..31297822df3b 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.1-alpha.23"; + version = "0.0.1-alpha.24"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-gkHKccY2EfcdPI44A3u3c0JwAxSKtno6/kI/+a0e+FY="; + hash = "sha256-QcWYrXWKxoqaaVNXgsrL05DyCbewltlVHgd7xQWd0g4="; }; # For Darwin platforms, remove the integration test for file notifications, @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=ty" ]; - cargoHash = "sha256-ZHapUIdpplKWNGi20QeBEQKgHCiR5laNUBzEDyxSEfI="; + cargoHash = "sha256-fo1he5WyQK4qu1gz50snah49GMopfQtbtJRwSimT1Fg="; nativeBuildInputs = [ installShellFiles ]; From 5154bca56e9a68d60c64cc7918b07133733f4f6a Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Thu, 23 Oct 2025 11:47:19 -0300 Subject: [PATCH 335/380] niftyreg: fix build with cmake4 --- pkgs/by-name/ni/niftyreg/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ni/niftyreg/package.nix b/pkgs/by-name/ni/niftyreg/package.nix index f71fa0132586..3f981df10c2d 100644 --- a/pkgs/by-name/ni/niftyreg/package.nix +++ b/pkgs/by-name/ni/niftyreg/package.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8.0)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { homepage = "http://cmictig.cs.ucl.ac.uk/wiki/index.php/NiftyReg"; description = "Medical image registration software"; From 18528cfe2ce74ddf4a1d7a6e91dd3784f62c2e9d Mon Sep 17 00:00:00 2001 From: cinereal Date: Thu, 23 Oct 2025 16:47:49 +0200 Subject: [PATCH 336/380] terraform_providers.e-breuninger_netbox: init at 5.0.0 adds Terraform provider [`netbox`](https://registry.terraform.io/providers/e-breuninger/netbox), which allows one to interact with our existing `services.netbox`. Signed-off-by: cinereal --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 42ce809bcd18..a9c2baab64d6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -353,6 +353,15 @@ "spdx": "MPL-2.0", "vendorHash": "sha256-u/ycUCnEYlCBrDcI0VCkob4CGXrXYdGWwiw5EeJyuiw=" }, + "e-breuninger_netbox": { + "hash": "sha256-iCaCt8ZbkxCk43QEyj3PeHYuKPCPVU2oQ78aumH/l6k=", + "homepage": "https://registry.terraform.io/providers/e-breuninger/netbox", + "owner": "e-breuninger", + "repo": "terraform-provider-netbox", + "rev": "v5.0.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-Q3H/6mpkWn1Gw0NRMtKtkBRGHjPJZGBFdGwfalyQ4Z0=" + }, "equinix_equinix": { "hash": "sha256-QE8ukiQHZqhSsZyFnInIpnGvsSlFuFMun7paK/Z3HTM=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", From cded73442f0f98588e04189cb1c06e1c37ef6936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mladen=20Brankovi=C4=87?= Date: Mon, 8 Sep 2025 16:31:49 +0200 Subject: [PATCH 337/380] maintainers: add imatpot --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 94f4899b4d51..b89ca4c30921 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10956,6 +10956,12 @@ githubId = 993484; name = "Greg Hale"; }; + imatpot = { + email = "nixpkgs@brnk.vc"; + github = "imatpot"; + githubId = 39416660; + name = "Mladen Branković"; + }; imgabe = { email = "gabrielpmonte@hotmail.com"; github = "ImGabe"; From 370e97de6cd51a308de8827cd74e269e0c3af600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mladen=20Brankovi=C4=87?= Date: Sun, 21 Sep 2025 01:14:32 +0200 Subject: [PATCH 338/380] hyperglot: init at 0.7.3 --- .../python-modules/hyperglot/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/hyperglot/default.nix diff --git a/pkgs/development/python-modules/hyperglot/default.nix b/pkgs/development/python-modules/hyperglot/default.nix new file mode 100644 index 000000000000..1722f06a28ce --- /dev/null +++ b/pkgs/development/python-modules/hyperglot/default.nix @@ -0,0 +1,45 @@ +{ + lib, + nix-update-script, + fetchPypi, + buildPythonApplication, + setuptools, + click, + fonttools, + uharfbuzz, + pyyaml, + colorlog, +}: +buildPythonApplication rec { + pname = "hyperglot"; + version = "0.7.3"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Pd9Yxmv9a1T2xV03q2U1m1laHE3WifHwmnGBfTTCSxM="; + }; + + dependencies = [ + click + fonttools + uharfbuzz + pyyaml + colorlog + ]; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "hyperglot" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Database and tools for detecting language support in fonts"; + homepage = "https://hyperglot.rosettatype.com"; + changelog = "https://github.com/rosettatype/hyperglot/blob/${version}/CHANGELOG.md"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ imatpot ]; + mainProgram = "hyperglot"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f7d72bf5914..b50a7f879110 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11341,6 +11341,8 @@ with pkgs; hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { }; + hyperglot = with python3Packages; toPythonApplication hyperglot; + jackline = callPackage ../applications/networking/instant-messengers/jackline { ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 44fef07a0ef2..c96ff21556da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6884,6 +6884,8 @@ self: super: with self; { hyperframe = callPackage ../development/python-modules/hyperframe { }; + hyperglot = callPackage ../development/python-modules/hyperglot { }; + hyperion-py = callPackage ../development/python-modules/hyperion-py { }; hyperlink = callPackage ../development/python-modules/hyperlink { }; From 50c7612fa4b4889ce083b172cf71ab9b94897765 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Thu, 23 Oct 2025 16:16:00 +0100 Subject: [PATCH 339/380] =?UTF-8?q?clickhouse:=2025.9.2.1=20=E2=86=92=2025?= =?UTF-8?q?.9.4.58?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/cl/clickhouse/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clickhouse/package.nix b/pkgs/by-name/cl/clickhouse/package.nix index 1fc35212e7d4..50f05896dd39 100644 --- a/pkgs/by-name/cl/clickhouse/package.nix +++ b/pkgs/by-name/cl/clickhouse/package.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "25.9.2.1-stable"; - hash = "sha256-BygRxiDhhs91/UPWY7f3jAGyTtyAj98RdDXLwjs8Abo="; + version = "25.9.4.58-stable"; + hash = "sha256-HRbqVSyDuvhkv0+PSgps9AXKdLlukrLA65OLx5gZ3c0="; lts = false; nixUpdateExtraArgs = [ "--version-regex" From 6784ffd6051cf535d5e9905112f1ff238146b4bd Mon Sep 17 00:00:00 2001 From: David Sierra DiazGranados Date: Wed, 22 Oct 2025 16:02:30 +0000 Subject: [PATCH 340/380] copyq: 11.0.0 -> 13.0.0 --- pkgs/applications/misc/copyq/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 5d97c06610a3..d0f69520f4cc 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, cmake, ninja, qtbase, @@ -19,13 +20,13 @@ stdenv.mkDerivation rec { pname = "CopyQ"; - version = "11.0.0"; + version = "13.0.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - hash = "sha256-/t+8YsqeX0tlxwQDDNTalttCDIgGhpLbzYe3UqY04xM="; + hash = "sha256-wxjUL5mGXAMNVGP+dAh1NrE9tw71cJW9zmLsaCVphTo="; }; nativeBuildInputs = [ @@ -48,12 +49,21 @@ stdenv.mkDerivation rec { kdePackages.kconfig kdePackages.kstatusnotifieritem kdePackages.knotifications + kdePackages.kguiaddons ]; cmakeFlags = [ (lib.cmakeBool "WITH_QT6" true) ]; + patches = [ + # https://github.com/hluk/CopyQ/pull/3268 + (fetchpatch2 { + url = "https://github.com/hluk/CopyQ/commit/103903593c37c9db5406d276e0097fbf18d2a8c4.patch?full_index=1"; + hash = "sha256-zywE6ntMw+WvTyilXwvd4lfQRAAB9R/AGpwtwwPFZZE="; + }) + ]; + meta = { homepage = "https://hluk.github.io/CopyQ"; description = "Clipboard Manager with Advanced Features"; From 3efe5715cfc845a7d7a2490f1df02fb86b7ff18c Mon Sep 17 00:00:00 2001 From: Eric Helgeson Date: Thu, 23 Oct 2025 10:48:16 -0500 Subject: [PATCH 341/380] kiwix: fix build error with latest qt --- pkgs/applications/misc/kiwix/default.nix | 4 ++++ pkgs/applications/misc/kiwix/remove-Werror.patch | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/applications/misc/kiwix/remove-Werror.patch diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 4f05aa627d64..fd7690db657a 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { hash = "sha256-B3RcYr/b8pZTJV35BWuqmWbq+C2WkkcwBR0oNaUXPRw="; }; + patches = [ + ./remove-Werror.patch + ]; + nativeBuildInputs = [ qmake pkg-config diff --git a/pkgs/applications/misc/kiwix/remove-Werror.patch b/pkgs/applications/misc/kiwix/remove-Werror.patch new file mode 100644 index 000000000000..da035478b99f --- /dev/null +++ b/pkgs/applications/misc/kiwix/remove-Werror.patch @@ -0,0 +1,12 @@ +diff --git a/kiwix-desktop.pro b/kiwix-desktop.pro +index c1f4f93..bf10828 100644 +--- a/kiwix-desktop.pro ++++ b/kiwix-desktop.pro +@@ -27,7 +27,6 @@ QMAKE_CXXFLAGS += -std=c++17 + QMAKE_LFLAGS += -std=c++17 + + !win32 { +- QMAKE_CXXFLAGS += -Werror + equals(QT_MAJOR_VERSION, 6):equals(QT_MINOR_VERSION, 6) { + # Fail the build on errors, except for 'template-id-cdtor' due to a problem with Qt headers. + # This can be removed when the Ubuntu package is fixed. From f45d7d6cde32dd06321018540a2080a4413936ce Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Thu, 23 Oct 2025 17:22:15 +0200 Subject: [PATCH 342/380] dolphin-emu: fix build with Qt 6.10 Signed-off-by: Marcin Serwin --- pkgs/by-name/do/dolphin-emu/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/do/dolphin-emu/package.nix b/pkgs/by-name/do/dolphin-emu/package.nix index 92da789dbf6b..205fcf578325 100644 --- a/pkgs/by-name/do/dolphin-emu/package.nix +++ b/pkgs/by-name/do/dolphin-emu/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, # nativeBuildInputs cmake, @@ -71,6 +72,13 @@ stdenv.mkDerivation (finalAttrs: { ''; }; + patches = [ + (fetchpatch2 { + url = "https://github.com/dolphin-emu/dolphin/commit/8edef722ce1aae65d5a39faf58753044de48b6e0.patch?full_index=1"; + hash = "sha256-QEG0p+AzrExWrOxL0qRPa+60GlL0DlLyVBrbG6pGuog="; + }) + ]; + strictDeps = true; nativeBuildInputs = [ From b48f55f989d9ef010e27ec9a201ddf5c06c414bd Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 23 Oct 2025 17:57:08 +0200 Subject: [PATCH 343/380] melonDS: 1.0-unstable-2025-08-10 -> 1.0-unstable-2025-10-13 --- pkgs/by-name/me/melonDS/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index dd612f49c779..831f12648b4e 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -5,6 +5,7 @@ enet, extra-cmake-modules, fetchFromGitHub, + faad2, libGL, libarchive, libpcap, @@ -28,13 +29,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "1.0-unstable-2025-08-10"; + version = "1.0-unstable-2025-10-13"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "f9e46fdc29f8e55aca6bc121c424890faee2e51d"; - hash = "sha256-g5TVvnCoWQej9v2aii5klx7gRzUrokiwy0By0G3LkiI="; + rev = "91ab68090c0aa588aabaeaa5e2c62564fd661ccc"; + hash = "sha256-04Wr7xUwz6Q9JDiEfTQh6Vx5q71dFVI9rScIpt6ywGY="; }; nativeBuildInputs = [ @@ -47,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 enet + faad2 libarchive libslirp libGL From ee59f881961ce367c047fa450dbec4398d151f1c Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 23 Oct 2025 18:04:28 +0200 Subject: [PATCH 344/380] melonDS: fix build with Qt 6.10 --- pkgs/by-name/me/melonDS/fix-build-qt-6.10.patch | 15 +++++++++++++++ pkgs/by-name/me/melonDS/package.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/by-name/me/melonDS/fix-build-qt-6.10.patch diff --git a/pkgs/by-name/me/melonDS/fix-build-qt-6.10.patch b/pkgs/by-name/me/melonDS/fix-build-qt-6.10.patch new file mode 100644 index 000000000000..a7138372240e --- /dev/null +++ b/pkgs/by-name/me/melonDS/fix-build-qt-6.10.patch @@ -0,0 +1,15 @@ +diff --git a/src/frontend/qt_sdl/CMakeLists.txt b/src/frontend/qt_sdl/CMakeLists.txt +index 1afa856f..dcd36f84 100644 +--- a/src/frontend/qt_sdl/CMakeLists.txt ++++ b/src/frontend/qt_sdl/CMakeLists.txt +@@ -65,6 +65,10 @@ option(USE_QT6 "Use Qt 6 instead of Qt 5" ON) + if (USE_QT6) + find_package(Qt6 COMPONENTS Core Gui Widgets Network Multimedia OpenGL OpenGLWidgets Svg REQUIRED) + set(QT_LINK_LIBS Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Network Qt6::Multimedia Qt6::OpenGL Qt6::OpenGLWidgets) ++ if(Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10") ++ find_package(Qt6 COMPONENTS GuiPrivate REQUIRED) ++ list(APPEND QT_LINK_LIBS Qt6::GuiPrivate) ++ endif() + else() + find_package(Qt5 COMPONENTS Core Gui Widgets Network Multimedia Svg REQUIRED) + set(QT_LINK_LIBS Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia) diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 831f12648b4e..bde7555c6e54 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-04Wr7xUwz6Q9JDiEfTQh6Vx5q71dFVI9rScIpt6ywGY="; }; + patches = [ ./fix-build-qt-6.10.patch ]; + nativeBuildInputs = [ cmake extra-cmake-modules From 7e25e67f6b2444d59a772b9e094d975db8de3ee5 Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 23 Oct 2025 18:01:41 +0200 Subject: [PATCH 345/380] openbao: 2.4.1 -> 2.4.3 2.4.2 was skipped because of issues upstream had with their CI. https://github.com/openbao/openbao/releases/tag/v2.4.3 diff: https://github.com/openbao/openbao/compare/v2.4.1...v2.4.3 --- pkgs/by-name/op/openbao/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix index 1c57ce5a4e69..7fafe1f938b9 100644 --- a/pkgs/by-name/op/openbao/package.nix +++ b/pkgs/by-name/op/openbao/package.nix @@ -14,16 +14,16 @@ buildGoModule (finalAttrs: { pname = "openbao"; - version = "2.4.1"; + version = "2.4.3"; src = fetchFromGitHub { owner = "openbao"; repo = "openbao"; tag = "v${finalAttrs.version}"; - hash = "sha256-HfPkjeScegylpA/i8KlS3t468pmD5sRwp2Ct164fkTo="; + hash = "sha256-gutZATBAaMXOZM/fDwU+T1fajFI/OIuKX/Na217r5y4="; }; - vendorHash = "sha256-4SWpWGWoesUCgSpgOpblkxOpPbBC/grC2S1m7R9qasY="; + vendorHash = "sha256-YxpWdwaPCk5mX8ZYJVNIG9end6/HkhXeGvgEq14cErY="; proxyVendor = true; From df215cd8113ec4b1c7bd3de36c9ba193d7b6300a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 16:10:33 +0000 Subject: [PATCH 346/380] crush: 0.11.2 -> 0.12.1 --- pkgs/by-name/cr/crush/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix index 24285d6948df..0d4ec7a3bd24 100644 --- a/pkgs/by-name/cr/crush/package.nix +++ b/pkgs/by-name/cr/crush/package.nix @@ -9,16 +9,16 @@ buildGo125Module (finalAttrs: { pname = "crush"; - version = "0.11.2"; + version = "0.12.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "crush"; tag = "v${finalAttrs.version}"; - hash = "sha256-vBjyykNSQ6Mq7OMRS0cCSHa8LUrIcfk9cr66ViU9z54="; + hash = "sha256-uESS76cPJ/sYGbsTpaUKlF8g0y2+LYbF4zd7dAoKWWU="; }; - vendorHash = "sha256-KaEPF4h5XqCjh91/KmB+AoiQK+fUmGEP0Lnyfe2qEZc="; + vendorHash = "sha256-lqoAPp8EW2tW+QjwCuBgxZDbKT3XMvP3qwx/yES1mx4="; # rename TestMain to prevent it from running, as it panics in the sandbox. postPatch = '' From e1fcdad9243603fda81718b825175f6d4d53f78f Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Thu, 23 Oct 2025 11:08:56 -0400 Subject: [PATCH 347/380] forgejo-lts: fix check failure Uses upstream fix from v11 branch due to go 1.25.2 changes --- pkgs/by-name/fo/forgejo/generic.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index 1db5124e8fd5..b0820560c1e1 100644 --- a/pkgs/by-name/fo/forgejo/generic.nix +++ b/pkgs/by-name/fo/forgejo/generic.nix @@ -12,6 +12,7 @@ bash, brotli, buildGoModule, + fetchpatch, forgejo, git, gzip, @@ -83,6 +84,14 @@ buildGoModule rec { patches = [ ./static-root-path.patch + ] + ++ lib.optionals lts [ + (fetchpatch { + # fix for go 1.25.2 stricter ipv6 parsing, remove for LTS > 11.0.6 + name = "fix-test-ipv6-go125.patch"; + url = "https://codeberg.org/forgejo/forgejo/commit/0d9a8e3fa2cf9228290ed1a9a5767e6ba204edd7.patch"; + hash = "sha256-AM4/kgCXSU5Bj8aOObm6qyeL1SEpeFhmlT42lMJ2o08="; + }) ]; postPatch = '' From dd207a94bea4679948e37183fb6ad89c40dd79f1 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Wed, 15 Oct 2025 15:18:48 +0000 Subject: [PATCH 348/380] pcsx2: fix build with Qt 6.10 Signed-off-by: Marcin Serwin --- pkgs/by-name/pc/pcsx2/fix-qt-6.10.patch | 25 +++++++++++++++++++++++++ pkgs/by-name/pc/pcsx2/package.nix | 3 +++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/by-name/pc/pcsx2/fix-qt-6.10.patch diff --git a/pkgs/by-name/pc/pcsx2/fix-qt-6.10.patch b/pkgs/by-name/pc/pcsx2/fix-qt-6.10.patch new file mode 100644 index 000000000000..06341689c453 --- /dev/null +++ b/pkgs/by-name/pc/pcsx2/fix-qt-6.10.patch @@ -0,0 +1,25 @@ +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index 504b7a3..100a024 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -107,7 +107,7 @@ disable_compiler_warnings_for_target(cubeb) + disable_compiler_warnings_for_target(speex) + + # Find the Qt components that we need. +-find_package(Qt6 6.7.3 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED) ++find_package(Qt6 6.7.3 COMPONENTS CoreTools Core CorePrivate GuiTools Gui GuiPrivate WidgetsTools Widgets WidgetsPrivate LinguistTools REQUIRED) + + if(WIN32) + add_subdirectory(3rdparty/rainterface EXCLUDE_FROM_ALL) +diff --git a/pcsx2-qt/CMakeLists.txt b/pcsx2-qt/CMakeLists.txt +index a62df95..4883c64 100644 +--- a/pcsx2-qt/CMakeLists.txt ++++ b/pcsx2-qt/CMakeLists.txt +@@ -266,6 +266,7 @@ target_link_libraries(pcsx2-qt PRIVATE + Qt6::Core + Qt6::Gui + Qt6::Widgets ++ Qt6::GuiPrivate + KDAB::kddockwidgets + ) + diff --git a/pkgs/by-name/pc/pcsx2/package.nix b/pkgs/by-name/pc/pcsx2/package.nix index 16e9aeabf1f6..daddd2f377eb 100644 --- a/pkgs/by-name/pc/pcsx2/package.nix +++ b/pkgs/by-name/pc/pcsx2/package.nix @@ -63,6 +63,9 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { ./0000-define-rev.patch ./remove-cubeb-vendor.patch + + # Based on https://github.com/PCSX2/pcsx2/commit/8dffc857079e942ca77b091486c20c3c6530e4ed which doesn't apply cleanly + ./fix-qt-6.10.patch ]; cmakeFlags = [ From 742b1d432c3659a0cb76d1ba316cb724b0f32977 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 16:59:41 +0000 Subject: [PATCH 349/380] shogihome: 1.25.0 -> 1.25.1 --- pkgs/by-name/sh/shogihome/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sh/shogihome/package.nix b/pkgs/by-name/sh/shogihome/package.nix index e90d2b63b645..71e9ce12297d 100644 --- a/pkgs/by-name/sh/shogihome/package.nix +++ b/pkgs/by-name/sh/shogihome/package.nix @@ -22,16 +22,16 @@ let in buildNpmPackage (finalAttrs: { pname = "shogihome"; - version = "1.25.0"; + version = "1.25.1"; src = fetchFromGitHub { owner = "sunfish-shogi"; repo = "shogihome"; tag = "v${finalAttrs.version}"; - hash = "sha256-Qa8ykN514Moc/PpBhD/X+mzfclQPp3yiriwTJCtmMA8="; + hash = "sha256-CRPZmycYaKtqjjiISKVGLf2jUvM6Xk6cUryKZcFX3tc="; }; - npmDepsHash = "sha256-rcrj3dG96oNbmp3cXw1qRJPi1SZdBcG9paAShSfb/0E="; + npmDepsHash = "sha256-8v6r3DAUzNeMQqLl99mp5rUytbUe7wFj3jkHb6lbwFI="; postPatch = '' substituteInPlace package.json \ From 13c33dc3659cb6a73bca87232207d2d44ec01e74 Mon Sep 17 00:00:00 2001 From: SandaruKasa Date: Thu, 23 Oct 2025 19:59:49 +0300 Subject: [PATCH 350/380] ncdu: fix infinite loop on Zig 0.15.2 --- pkgs/by-name/nc/ncdu/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/nc/ncdu/package.nix b/pkgs/by-name/nc/ncdu/package.nix index 850f03521303..ddc2ab69c617 100644 --- a/pkgs/by-name/nc/ncdu/package.nix +++ b/pkgs/by-name/nc/ncdu/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch2, ncurses, pkg-config, zig_0_15, @@ -20,6 +21,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-v9EJThQA7onP1ZIA6rlA8CXM3AwjgGcQXJhKPEhXv34="; }; + patches = [ + (fetchpatch2 { + # Fix infinite loop when reading config file on Zig 0.15.2 + url = "https://code.blicky.net/yorhel/ncdu/commit/f45224457687a55aa885aca8e7300f1fbf0af59b.patch"; + hash = "sha256-80Igx1MOINdeufCsNoisNo3dJ2iUTpZIxyXy/KzQ1Ng="; + }) + ]; + nativeBuildInputs = [ zig_0_15.hook installShellFiles From 6016da54d8a4c468cab330247aaaa435e35369bf Mon Sep 17 00:00:00 2001 From: Qiming Chu Date: Wed, 10 Sep 2025 15:33:46 +0800 Subject: [PATCH 351/380] ieda: 0-unstable-2025-06-30 -> 0.1.0-unstable-2025-09-10 - iEDA released v0.1.0 at 2025-07-02: https://gitee.com/oscc-project/iEDA/releases/tag/v0.1.0 - Remove postPatch to patches and update patches - Add pkg-config, curl and tbb_2021 as dependencies Signed-off-by: Qiming Chu --- pkgs/by-name/ie/ieda/fix-cmake-require.patch | 96 ++++++++++++++++++++ pkgs/by-name/ie/ieda/package.nix | 43 +++++---- 2 files changed, 119 insertions(+), 20 deletions(-) create mode 100644 pkgs/by-name/ie/ieda/fix-cmake-require.patch diff --git a/pkgs/by-name/ie/ieda/fix-cmake-require.patch b/pkgs/by-name/ie/ieda/fix-cmake-require.patch new file mode 100644 index 000000000000..0810e40f6c08 --- /dev/null +++ b/pkgs/by-name/ie/ieda/fix-cmake-require.patch @@ -0,0 +1,96 @@ +diff --git a/src/operation/iPNP/CMakeLists.txt b/src/operation/iPNP/CMakeLists.txt +index b8f308a6e..4749d5024 100644 +--- a/src/operation/iPNP/CMakeLists.txt ++++ b/src/operation/iPNP/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.5) + set (CMAKE_CXX_STANDARD 20) + + add_subdirectory(api) +diff --git a/src/third_party/pybind11/CMakeLists.txt b/src/third_party/pybind11/CMakeLists.txt +index 0d9320388..5b5967713 100644 +--- a/src/third_party/pybind11/CMakeLists.txt ++++ b/src/third_party/pybind11/CMakeLists.txt +@@ -5,7 +5,7 @@ + # All rights reserved. Use of this source code is governed by a + # BSD-style license that can be found in the LICENSE file. + +-cmake_minimum_required(VERSION 3.4) ++cmake_minimum_required(VERSION 3.5) + + # The `cmake_minimum_required(VERSION 3.4...3.22)` syntax does not work with + # some versions of VS that have a patched CMake 3.11. This forces us to emulate +diff --git a/src/third_party/pybind11/tests/CMakeLists.txt b/src/third_party/pybind11/tests/CMakeLists.txt +index 9beb268ed..417cd04d0 100644 +--- a/src/third_party/pybind11/tests/CMakeLists.txt ++++ b/src/third_party/pybind11/tests/CMakeLists.txt +@@ -5,7 +5,7 @@ + # All rights reserved. Use of this source code is governed by a + # BSD-style license that can be found in the LICENSE file. + +-cmake_minimum_required(VERSION 3.4) ++cmake_minimum_required(VERSION 3.5) + + # The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with + # some versions of VS that have a patched CMake 3.11. This forces us to emulate +diff --git a/src/third_party/pybind11/tests/test_cmake_build/installed_embed/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/installed_embed/CMakeLists.txt +index f7d693998..2847142a4 100644 +--- a/src/third_party/pybind11/tests/test_cmake_build/installed_embed/CMakeLists.txt ++++ b/src/third_party/pybind11/tests/test_cmake_build/installed_embed/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.4) ++cmake_minimum_required(VERSION 3.5) + + # The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with + # some versions of VS that have a patched CMake 3.11. This forces us to emulate +diff --git a/src/third_party/pybind11/tests/test_cmake_build/installed_function/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/installed_function/CMakeLists.txt +index d7ca4db55..74322f598 100644 +--- a/src/third_party/pybind11/tests/test_cmake_build/installed_function/CMakeLists.txt ++++ b/src/third_party/pybind11/tests/test_cmake_build/installed_function/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.4) ++cmake_minimum_required(VERSION 3.5) + project(test_installed_module CXX) + + # The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with +diff --git a/src/third_party/pybind11/tests/test_cmake_build/installed_target/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/installed_target/CMakeLists.txt +index bc5e101f1..2d21a21de 100644 +--- a/src/third_party/pybind11/tests/test_cmake_build/installed_target/CMakeLists.txt ++++ b/src/third_party/pybind11/tests/test_cmake_build/installed_target/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.4) ++cmake_minimum_required(VERSION 3.5) + + # The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with + # some versions of VS that have a patched CMake 3.11. This forces us to emulate +diff --git a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt +index 58cdd7cfd..f9835f31e 100644 +--- a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt ++++ b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.4) ++cmake_minimum_required(VERSION 3.5) + + # The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with + # some versions of VS that have a patched CMake 3.11. This forces us to emulate +diff --git a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_function/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_function/CMakeLists.txt +index 01557c439..6d96cc3b3 100644 +--- a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_function/CMakeLists.txt ++++ b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_function/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.4) ++cmake_minimum_required(VERSION 3.5) + + # The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with + # some versions of VS that have a patched CMake 3.11. This forces us to emulate +diff --git a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt +index ba82fdee2..6f8e04429 100644 +--- a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt ++++ b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.4) ++cmake_minimum_required(VERSION 3.5) + + # The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with + # some versions of VS that have a patched CMake 3.11. This forces us to emulate diff --git a/pkgs/by-name/ie/ieda/package.nix b/pkgs/by-name/ie/ieda/package.nix index 9efef4c1c61e..b33a3cefa371 100644 --- a/pkgs/by-name/ie/ieda/package.nix +++ b/pkgs/by-name/ie/ieda/package.nix @@ -21,38 +21,38 @@ gmp, python3, onnxruntime, + pkg-config, + curl, + onetbb, }: let rootSrc = stdenv.mkDerivation { pname = "iEDA-src"; - version = "2025-06-30"; + version = "2025-09-10"; src = fetchgit { url = "https://gitee.com/oscc-project/iEDA"; - rev = "689f172c726c3934d49577f09adb5b09804f11e5"; - sha256 = "sha256-JJePIn+NUScb+3o67vT31BoKHcfBuE9osV4SrcicFds="; + rev = "614a91b4d18ba7dc561315f2d5fdae4a5451f486"; + sha256 = "sha256-xn1hpnSyO+jauYYhlsKjBkkD3RJ1GqbHtnWRe/My1R0="; }; patches = [ # This patch is to fix the build error caused by the missing of the header file, # and remove some libs or path that they hard-coded in the source code. - # Should be removed after we upstream these changes. + # Due to the way they organized the source code, it's hard to upstream this patch. + # So we have to maintain this patch locally. (fetchpatch { - url = "https://github.com/Emin017/iEDA/commit/c17e42a3673afd9c7ace9374f85290a85354bb78.patch"; - hash = "sha256-xa1oSy3OZ5r0TigGywzpVPvpPnA7L6RIcNktfFen4AA="; + url = "https://github.com/Emin017/iEDA/commit/c6b642f3db6c156eaf4f1203612592c86e49e1b5.patch"; + hash = "sha256-L0bmW7kadmLLng9rZOT1NpvniBpuD8SUqCfeH2cCrdg="; }) - # This patch is to fix the compile error on the newer version of gcc/g++ - # We remove some forward declarations which are not allowed in newer versions of gcc/g++ - # Should be removed after we upstream these changes. - (fetchpatch { - url = "https://github.com/Emin017/iEDA/commit/f5464cc40a2c671c5d405f16b509e2fa8d54f7f1.patch"; - hash = "sha256-uVMV/CjkX9oLexHJbQvnEDOET/ZqsEPreI6EQb3Z79s="; - }) - ]; - - postPatch = '' # Comment out the iCTS test cases that will fail due to some linking issues on aarch64-linux - sed -i '17,28s/^/# /' src/operation/iCTS/test/CMakeLists.txt - ''; + (fetchpatch { + url = "https://github.com/Emin017/iEDA/commit/87c5dded74bc452249e8e69f4a77dd1bed7445c2.patch"; + hash = "sha256-1Hd0DYnB5lVAoAcB1la5tDlox4cuQqApWDiiWtqWN0Q="; + }) + # Fix CMake version requirement to support newer CMake versions, + # Should be removed once upstream fixed it. + ./fix-cmake-require.patch + ]; dontBuild = true; dontFixup = true; @@ -66,7 +66,7 @@ let in stdenv.mkDerivation { pname = "iEDA"; - version = "0-unstable-2025-06-30"; + version = "0.1.0-unstable-2025-09-10"; src = rootSrc; @@ -77,6 +77,7 @@ stdenv.mkDerivation { bison python3 tcl + pkg-config ]; cmakeFlags = [ @@ -108,6 +109,8 @@ stdenv.mkDerivation { gmp tcl zlib + curl + onetbb ]; postInstall = '' @@ -128,7 +131,7 @@ stdenv.mkDerivation { runHook postInstallCheck ''; - doInstallCheck = true; + doInstallCheck = !stdenv.hostPlatform.isAarch64; # Tests will fail on aarch64-linux, wait for upstream fix: https://github.com/microsoft/onnxruntime/issues/10038 enableParallelBuild = true; From a21632529169c453417161151697318658d4c66d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Thu, 23 Oct 2025 18:26:57 +0100 Subject: [PATCH 352/380] esphome: 2025.9.3 -> 2025.10.2 --- pkgs/by-name/es/esphome/dashboard.nix | 6 +++--- pkgs/by-name/es/esphome/package.nix | 9 +++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/es/esphome/dashboard.nix b/pkgs/by-name/es/esphome/dashboard.nix index 301bb8ae675b..56fe472dba8d 100644 --- a/pkgs/by-name/es/esphome/dashboard.nix +++ b/pkgs/by-name/es/esphome/dashboard.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20250814.0"; + version = "20251013.0"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "dashboard"; rev = "refs/tags/${version}"; - hash = "sha256-WQsyv3s3LKKOwYEkX5GcAPnbH061q1ts7TU4HU6I8CI="; + hash = "sha256-PZf9YLtHqeR+5BRVv1yOMVt6NVlbJTj98ukGnO0RV0Q="; }; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-ShuJPS7qP2XZ3lwJrFeKRkQwX7tvyiC/0L7sGn0cMn8="; + hash = "sha256-wWDM4ODlZAjjDonzS4czdBPBaRS0Px2KUlE4AfsqNIQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index 5cc5a34e8202..15b30e08b904 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -34,14 +34,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2025.9.3"; + version = "2025.10.2"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "esphome"; tag = version; - hash = "sha256-9x4uf0gHCGYLq0gr0MoAp0sk9p82zdH41PaELph0fv0="; + hash = "sha256-aHDBRZ6o671zriV/rwgsZ57y91Z8Lwx/iiPhIHPzKbs="; }; patches = [ @@ -171,6 +171,11 @@ python.pkgs.buildPythonApplication rec { # tries to import platformio, which is wrapped in an fhsenv "test_clean_build" "test_clean_build_empty_cache_dir" + "test_clean_all" + "test_clean_all_partial_exists" + # tries to use esptool, which is wrapped in an fhsenv + "test_upload_using_esptool_path_conversion" + "test_upload_using_esptool_with_file_path" # AssertionError: Expected 'run_external_command' to have been called once. Called 0 times. "test_run_platformio_cli_sets_environment_variables" ]; From 23040405a3e3119643b5a31975471f208796b331 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 23 Oct 2025 19:29:41 +0200 Subject: [PATCH 353/380] lasuite-meet{,-frontend}: 0.1.40 -> 0.1.41 https://github.com/suitenumerique/meet/releases/tag/v0.1.41 --- pkgs/by-name/la/lasuite-meet-frontend/package.nix | 6 +++--- pkgs/by-name/la/lasuite-meet/package.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/la/lasuite-meet-frontend/package.nix b/pkgs/by-name/la/lasuite-meet-frontend/package.nix index 26692e8ae380..4ef971de43d3 100644 --- a/pkgs/by-name/la/lasuite-meet-frontend/package.nix +++ b/pkgs/by-name/la/lasuite-meet-frontend/package.nix @@ -7,13 +7,13 @@ buildNpmPackage rec { pname = "lasuite-meet-frontend"; - version = "0.1.40"; + version = "0.1.41"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "meet"; tag = "v${version}"; - hash = "sha256-jzMjLiNLLBBHo9/c/ufB59V6qMwjpx38sImFR+Q+wBE="; + hash = "sha256-QAzkRbAxtHa7Py4DDSc2/QHHyFHp+e+/uGmGzUPtFPI="; }; sourceRoot = "source/src/frontend"; @@ -21,7 +21,7 @@ buildNpmPackage rec { npmDeps = fetchNpmDeps { inherit version src; sourceRoot = "source/src/frontend"; - hash = "sha256-RtzLa0SPd76/8ml8R55Hx1MMwFcfDIt6wtcjKAGMDuI="; + hash = "sha256-UJMyOCtjr7e6YaRdIrlL+p3alw4k/MzgqqFreLesAaE="; }; buildPhase = '' diff --git a/pkgs/by-name/la/lasuite-meet/package.nix b/pkgs/by-name/la/lasuite-meet/package.nix index 8ea69995ee86..98812a18cb67 100644 --- a/pkgs/by-name/la/lasuite-meet/package.nix +++ b/pkgs/by-name/la/lasuite-meet/package.nix @@ -13,14 +13,14 @@ in python.pkgs.buildPythonApplication rec { pname = "lasuite-meet"; - version = "0.1.40"; + version = "0.1.41"; pyproject = true; src = fetchFromGitHub { owner = "suitenumerique"; repo = "meet"; tag = "v${version}"; - hash = "sha256-jzMjLiNLLBBHo9/c/ufB59V6qMwjpx38sImFR+Q+wBE="; + hash = "sha256-QAzkRbAxtHa7Py4DDSc2/QHHyFHp+e+/uGmGzUPtFPI="; }; sourceRoot = "source/src/backend"; From 40ef6070f47b125e58907a3e9cabd874f0f898cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Thu, 23 Oct 2025 16:55:48 +0200 Subject: [PATCH 354/380] haskellPackages.{clay,openapi3-code-generator}: Add turion as maintainer --- .../haskell-modules/configuration-hackage2nix/main.yaml | 2 ++ pkgs/development/haskell-modules/hackage-packages.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 977e75c6aa59..07a8abeb2963 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -656,6 +656,7 @@ package-maintainers: turion: - Agda - cabal-gild + - clay - dunai - essence-of-live-coding - essence-of-live-coding-gloss @@ -667,6 +668,7 @@ package-maintainers: - monad-bayes - monad-schedule - pulse-simple + - openapi3-code-generator - rhine - rhine-gloss - simple-affine-space diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 63160da06f2b..be9f813fe453 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -142305,6 +142305,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "CSS preprocessor as embedded Haskell"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.turion ]; } ) { }; @@ -490320,6 +490321,7 @@ self: { description = "OpenAPI3 Haskell Client Code Generator"; license = lib.licenses.mit; mainProgram = "openapi3-code-generator-exe"; + maintainers = [ lib.maintainers.turion ]; } ) { }; From 55fa66ffe932e49ad2d51c9df375713a9eacbd79 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 20 Oct 2025 16:31:26 +0200 Subject: [PATCH 355/380] julia_110: fix build with cmake 4 --- pkgs/development/compilers/julia/generic.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/compilers/julia/generic.nix b/pkgs/development/compilers/julia/generic.nix index f1ef721d346c..0bd32f379562 100644 --- a/pkgs/development/compilers/julia/generic.nix +++ b/pkgs/development/compilers/julia/generic.nix @@ -61,6 +61,10 @@ stdenv.mkDerivation rec { --replace-fail 'cd $(dir $<) && $(TAR) jxf $(notdir $<)' \ 'cd $(dir $<) && $(TAR) jxf $(notdir $<) && sed -i "s|/usr/bin/env perl|${lib.getExe buildPackages.perl}|" curl-$(CURL_VER)/scripts/cd2nroff' '' + + lib.optionalString (lib.versionOlder version "1.12") '' + substituteInPlace deps/tools/common.mk \ + --replace-fail "CMAKE_COMMON := " "CMAKE_COMMON := ${lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10"} " + '' + lib.optionalString (lib.versionAtLeast version "1.12") '' substituteInPlace deps/openssl.mk \ --replace-fail 'cd $(dir $<) && $(TAR) -zxf $<' \ From a252a82264ffeac466de02b672eb96b04c7532d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 18:35:37 +0000 Subject: [PATCH 356/380] parca-agent: 0.42.0 -> 0.43.0 --- pkgs/by-name/pa/parca-agent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/parca-agent/package.nix b/pkgs/by-name/pa/parca-agent/package.nix index 5945245a6fb6..14e88c000fea 100644 --- a/pkgs/by-name/pa/parca-agent/package.nix +++ b/pkgs/by-name/pa/parca-agent/package.nix @@ -8,18 +8,18 @@ buildGoModule (finalAttrs: { pname = "parca-agent"; - version = "0.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "parca-dev"; repo = "parca-agent"; tag = "v${finalAttrs.version}"; - hash = "sha256-Q/F7BzkeoZQfGROHVYF9n3SGidy4EhCLSRz2xa8eSKY="; + hash = "sha256-xIe3s/7/raZuunR+Gx/icLHhT5VUNhcfBGbTqHybxu4="; fetchSubmodules = true; }; proxyVendor = true; - vendorHash = "sha256-nKLHe0MGdV05oSdDaaGN9elsAAzG6mfoT/ZZt+LcbI4="; + vendorHash = "sha256-UQnIGTZQOgPWqJcc75pyaMFh8P8JKvtvlGneo5F3NEM="; buildInputs = [ stdenv.cc.libc.static From 088c4adc0a13161783e524c6891eb68da02d3b3d Mon Sep 17 00:00:00 2001 From: Sam <30577766+Samasaur1@users.noreply.github.com> Date: Fri, 17 Oct 2025 10:26:09 -0500 Subject: [PATCH 357/380] apple-sdk_26-test: init This should compile with the Xcode 26 toolchain, and should run on all versions of macOS. On 26+, it should print "/private/tmp", while on earlier versions it should print ":(". It should fail to build in nixpkgs --- pkgs/by-name/ap/apple-sdk_26-test/package.nix | 19 +++++++++++++++++ .../apple-sdk_26-test/src/apple-sdk_26-test.m | 21 +++++++++++++++++++ .../ap/apple-sdk_26-test/src/meson.build | 2 ++ 3 files changed, 42 insertions(+) create mode 100644 pkgs/by-name/ap/apple-sdk_26-test/package.nix create mode 100644 pkgs/by-name/ap/apple-sdk_26-test/src/apple-sdk_26-test.m create mode 100644 pkgs/by-name/ap/apple-sdk_26-test/src/meson.build diff --git a/pkgs/by-name/ap/apple-sdk_26-test/package.nix b/pkgs/by-name/ap/apple-sdk_26-test/package.nix new file mode 100644 index 000000000000..dfb5aa59c7b8 --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk_26-test/package.nix @@ -0,0 +1,19 @@ +{ + lib, + stdenv, + meson, + ninja, +}: + +stdenv.mkDerivation { + name = "apple-sdk_26-test"; + + src = ./src; + + nativeBuildInputs = [ + meson + ninja + ]; + + meta.mainProgram = "apple-sdk_26-test"; +} diff --git a/pkgs/by-name/ap/apple-sdk_26-test/src/apple-sdk_26-test.m b/pkgs/by-name/ap/apple-sdk_26-test/src/apple-sdk_26-test.m new file mode 100644 index 000000000000..21fc3af5253a --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk_26-test/src/apple-sdk_26-test.m @@ -0,0 +1,21 @@ +#include +#include + +int main(int argc, char** argv, char** env) { + if (@available(macOS 26, *)) { + int ret; + pid_t pid; + posix_spawn_file_actions_t actions; + if ((ret = posix_spawn_file_actions_init(&actions))) { + printf("cannot create file_actions\n"); + } + if ((ret = posix_spawn_file_actions_addchdir(&actions, "/tmp"))) { + printf("cannot add_chdir\n"); + } + if ((ret = posix_spawnp(&pid, "pwd", &actions, NULL, argv, env))) { + printf("cannot spawn\n"); + } + } else { + printf(":(\n"); + } +} diff --git a/pkgs/by-name/ap/apple-sdk_26-test/src/meson.build b/pkgs/by-name/ap/apple-sdk_26-test/src/meson.build new file mode 100644 index 000000000000..ef3a4c6179aa --- /dev/null +++ b/pkgs/by-name/ap/apple-sdk_26-test/src/meson.build @@ -0,0 +1,2 @@ +project('apple-sdk_26-test', 'objc') +executable('apple-sdk_26-test', 'apple-sdk_26-test.m', install : true) From 23c079624b7cfe8f5e2de96be272d6dba8b94f41 Mon Sep 17 00:00:00 2001 From: Sam <30577766+Samasaur1@users.noreply.github.com> Date: Fri, 17 Oct 2025 10:49:16 -0500 Subject: [PATCH 358/380] apple-sdk_26: init --- .../metadata/apple-oss-lockfile.json | 178 ++++++++++++++++++ .../ap/apple-sdk/metadata/versions.json | 8 + pkgs/top-level/all-packages.nix | 1 + 3 files changed, 187 insertions(+) diff --git a/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json index 2dc99f12620d..63890c9d9369 100644 --- a/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json +++ b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json @@ -888,5 +888,183 @@ "hash": "sha256-o4tCuCAIgAYg/Li3wTs12mVWr5C/4vbwu1zi+kJ9d6w=", "version": "11417.121.6" } + }, + "26.0": { + "CarbonHeaders": { + "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=", + "version": "18.1" + }, + "CommonCrypto": { + "hash": "sha256-+qAwL6+s7di9cX/qXtapLkjCFoDuZaSYltRJEG4qekM=", + "version": "600035" + }, + "IOAudioFamily": { + "hash": "sha256-A3iiAjjP29VdjMj40tLS5Q/ni4qeh9bBpnmNzeG2pIY=", + "version": "700.2" + }, + "IOBDStorageFamily": { + "hash": "sha256-OcQUJ3nEfrpvWX/npnedJ4PECIGWFSLiM0PKoiH911w=", + "version": "26" + }, + "IOCDStorageFamily": { + "hash": "sha256-p/2qM5zjXFDRb/DISpEHxQEdvmuLlRGt/Ygc71Yu2rI=", + "version": "62" + }, + "IODVDStorageFamily": { + "hash": "sha256-1Sa8aZBGNtqJBNHva+YXxET6Wcdm2PgVrTzYT/8qrN4=", + "version": "46" + }, + "IOFWDVComponents": { + "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=", + "version": "208" + }, + "IOFireWireAVC": { + "hash": "sha256-qR9lSTa7PN5Z9Nis4tfuXlcZGMIU48dete/NPD0UBbE=", + "version": "436" + }, + "IOFireWireFamily": { + "hash": "sha256-hmErAXjLWIelqJaCrB8J4IiIxyB7S6EHFY+AY9YhmKQ=", + "version": "492" + }, + "IOFireWireSBP2": { + "hash": "sha256-Xk+PDnUaO9q46nQwHwTKf/QXtGclfs0wTWiUbcV7e4s=", + "version": "454" + }, + "IOFireWireSerialBusProtocolTransport": { + "hash": "sha256-cM/VFhVWNVwdJYk+mme0UYttQd7eJwd7Hlo7KNRyHY0=", + "version": "262" + }, + "IOGraphics": { + "hash": "sha256-iysZE42mOKZbFxSZBNspaBTCRKEKK38DFGBxZWQxZxI=", + "version": "599" + }, + "IOHIDFamily": { + "hash": "sha256-YLnabX90g4Q8LxjwVuJF6KODCDxychWV+VJaNG9d8fI=", + "version": "2222.0.24" + }, + "IOKitUser": { + "hash": "sha256-ngwi8YMUqE0q8j7Lr5cqJwi2V+IDu3ie3bduotHIUJU=", + "version": "100222.0.4" + }, + "IONetworkingFamily": { + "hash": "sha256-ZF5ML41Y1l1liQn32qTkcl4mMvx9Xdizb9VgvTzVTL4=", + "version": "186" + }, + "IOSerialFamily": { + "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=", + "version": "93" + }, + "IOStorageFamily": { + "hash": "sha256-1FKSF622qeXPGngA3UmQ2M/IU1pdlMoYBPbXytUFDaQ=", + "version": "331" + }, + "IOUSBFamily": { + "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=", + "version": "630.4.5" + }, + "Libc": { + "hash": "sha256-k+HQ+qgye0ORFm0hU8WzE4ysbbEoFZ7wcbVl5giDH/E=", + "version": "1725.0.11" + }, + "Libinfo": { + "hash": "sha256-4InBEPi0n2EMo/8mIBib1Im4iTKRcRJ4IlAcLCigVGk=", + "version": "600" + }, + "Libm": { + "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=", + "version": "2026" + }, + "Libnotify": { + "hash": "sha256-p8cJZlBYOFmI1NDHXGYjgcv8z9Ldc1amZuYlxxJfeVY=", + "version": "344.0.1" + }, + "Librpcsvc": { + "hash": "sha256-UWYdCQ9QsBqwM01bWr+igINAHSdSluB/FrOclC5AjTI=", + "version": "31" + }, + "Libsystem": { + "hash": "sha256-/NlSwPaoTVx+bl9hYsfz3C5MuLdqGv4vdAh0KDbDKmY=", + "version": "1356" + }, + "OpenDirectory": { + "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=", + "version": "146" + }, + "Security": { + "hash": "sha256-oxOvZsDoNYZNiWf+MASHrR4Q2o5oaqvK2We51hH7CO8=", + "version": "61901.0.87.0.1" + }, + "architecture": { + "hash": "sha256-PRNUrhzSOrwmxSPkKmV0LV7yEIik65sdkfKdBqcwFhU=", + "version": "282" + }, + "configd": { + "hash": "sha256-58or+OQP788UgQKO7Y8k8pY/enaSqH971ks7xCPu8fA=", + "version": "1385.0.7" + }, + "copyfile": { + "hash": "sha256-I9uDi5BDQKa7mO3XpHxv0d6PiROW2ueZ3vGfrsG0OJo=", + "version": "230.0.1.0.1" + }, + "dtrace": { + "hash": "sha256-5HpH6Cg8vWWzOX5ADD//izKDvqGnzV05Giju8lmGeyA=", + "version": "413" + }, + "dyld": { + "hash": "sha256-jzoFLwbms0rUwzyjYif/r6Rmr4kyn+as/bhc4paEPeY=", + "version": "1323.3" + }, + "eap8021x": { + "hash": "sha256-17bseWT4OWMA8hF+YSDDjxhVyJpbpP2xwv8dGti1YoM=", + "version": "368.0.3" + }, + "hfs": { + "hash": "sha256-OkgqZ03gwn2hTuHxZrPDmQOrY4Dwu7MrX+BfG+PTgvE=", + "version": "704.0.3.0.2" + }, + "launchd": { + "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=", + "version": "842.1.4" + }, + "libclosure": { + "hash": "sha256-pvwfcbeEJmTEPdt6/lgVswiabLRG+sMN6VT5FwG7C4Q=", + "version": "96" + }, + "libdispatch": { + "hash": "sha256-L0+Ho9dAlMXVpqFEGIcIMsJc0gULckRulUImNEZe5MU=", + "version": "1542.0.4" + }, + "libmalloc": { + "hash": "sha256-482hgm1ESr3LWC/JhuQNGNu9smsa2Eap49/eH+YNAio=", + "version": "792.1.1" + }, + "libplatform": { + "hash": "sha256-wGZ2Im81mRXx6epgj/tbOJpg89CEbAr0Z8oFEpkyNMU=", + "version": "359.1.2" + }, + "libpthread": { + "hash": "sha256-VuMpQjxuMsdHsFq0q6QIWSWi88gVF2jNzIfti20Gkbw=", + "version": "539" + }, + "mDNSResponder": { + "hash": "sha256-iRqCpPAQDRjgRbRz3s6q2oyzq6xo+w4FTBai79104Zo=", + "version": "2881.0.25" + }, + "objc4": { + "hash": "sha256-Nlgr36yLvGkUJIEFQ5w8FAB0r2syEsRTw0KuUShNT8E=", + "version": "950" + }, + "ppp": { + "hash": "sha256-FzHZ05o7JxwgTqz0e3D68b/DiLu2x2ErzGMh0U78fLo=", + "version": "1020.1.1" + }, + "removefile": { + "hash": "sha256-Z5UD0mk/s80CQB0PZWDzSl2JWXmnVmwUvlNb28+hR3k=", + "version": "84" + }, + "xnu": { + "hash": "sha256-Cuf7kPtsn4CPXqyZmxVsJlA5i+Ikryp8ezJyGrvT63c=", + "version": "12377.1.9" + } } } diff --git a/pkgs/by-name/ap/apple-sdk/metadata/versions.json b/pkgs/by-name/ap/apple-sdk/metadata/versions.json index 6c0b1ecabf46..303f456f9614 100644 --- a/pkgs/by-name/ap/apple-sdk/metadata/versions.json +++ b/pkgs/by-name/ap/apple-sdk/metadata/versions.json @@ -38,5 +38,13 @@ ], "version": "15.5", "hash": "sha256-HBiSJuw1XBUK5R/8Sj65c3rftSEvQl/O9ZZVp/g1Amo=" + }, + "26": { + "urls": [ + "https://swcdn.apple.com/content/downloads/27/62/093-35114-A_AAH24ZZQB5/yn87ru9qe9225m8hwq2ic3hjy5yc5vw7h9/CLTools_macOSNMOS_SDK.pkg", + "https://web.archive.org/web/20250915230423/https://swcdn.apple.com/content/downloads/27/62/093-35114-A_AAH24ZZQB5/yn87ru9qe9225m8hwq2ic3hjy5yc5vw7h9/CLTools_macOSNMOS_SDK.pkg" + ], + "version": "26.0", + "hash": "sha256-54UtisDXHCxs7vO4fZSWOYwxLbdouLxWwGisez+tlAc=" } } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5634a13c2734..578a12485503 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8897,6 +8897,7 @@ with pkgs; apple-sdk_13 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "13"; }; apple-sdk_14 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "14"; }; apple-sdk_15 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "15"; }; + apple-sdk_26 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "26"; }; darwinMinVersionHook = deploymentTarget: From e2734c5d78e0a1b7efc0d4615cf312db29fe7623 Mon Sep 17 00:00:00 2001 From: Sam <30577766+Samasaur1@users.noreply.github.com> Date: Fri, 17 Oct 2025 10:49:16 -0500 Subject: [PATCH 359/380] apple-sdk_26-test: fix by using apple-sdk_26 This should now build in nixpkgs, with the same behavior as when using the Xcode toolchain. --- pkgs/by-name/ap/apple-sdk_26-test/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ap/apple-sdk_26-test/package.nix b/pkgs/by-name/ap/apple-sdk_26-test/package.nix index dfb5aa59c7b8..8ab0f959eced 100644 --- a/pkgs/by-name/ap/apple-sdk_26-test/package.nix +++ b/pkgs/by-name/ap/apple-sdk_26-test/package.nix @@ -3,6 +3,7 @@ stdenv, meson, ninja, + apple-sdk_26, }: stdenv.mkDerivation { @@ -15,5 +16,9 @@ stdenv.mkDerivation { ninja ]; + buildInputs = [ + apple-sdk_26 + ]; + meta.mainProgram = "apple-sdk_26-test"; } From fbc33babd6daeab7b227ce2c6215600d2e08e0a3 Mon Sep 17 00:00:00 2001 From: Sam <30577766+Samasaur1@users.noreply.github.com> Date: Fri, 17 Oct 2025 12:22:55 -0500 Subject: [PATCH 360/380] apple-sdk_26-test: set min version to macOS 26 This should continue to behave the same on macOS 26+, but on earlier versions it should simply crash with missing symbol errors --- pkgs/by-name/ap/apple-sdk_26-test/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ap/apple-sdk_26-test/package.nix b/pkgs/by-name/ap/apple-sdk_26-test/package.nix index 8ab0f959eced..e177316c8dcd 100644 --- a/pkgs/by-name/ap/apple-sdk_26-test/package.nix +++ b/pkgs/by-name/ap/apple-sdk_26-test/package.nix @@ -4,6 +4,7 @@ meson, ninja, apple-sdk_26, + darwinMinVersionHook }: stdenv.mkDerivation { @@ -18,6 +19,7 @@ stdenv.mkDerivation { buildInputs = [ apple-sdk_26 + (darwinMinVersionHook "26.0") ]; meta.mainProgram = "apple-sdk_26-test"; From f143866f6c2f49288907504366420ed777d9c15a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 19:19:45 +0000 Subject: [PATCH 361/380] tootik: 0.19.6 -> 0.19.7 --- pkgs/by-name/to/tootik/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/to/tootik/package.nix b/pkgs/by-name/to/tootik/package.nix index 28a0a066ea02..fe23d7efd0eb 100644 --- a/pkgs/by-name/to/tootik/package.nix +++ b/pkgs/by-name/to/tootik/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "tootik"; - version = "0.19.6"; + version = "0.19.7"; src = fetchFromGitHub { owner = "dimkr"; repo = "tootik"; tag = "v${version}"; - hash = "sha256-xbYmIH3dsZg2mL4coUwIAyQA5EhnTUOXs6Vu6ThfwUg="; + hash = "sha256-8ZvLdEeuPOcjZnumy6bwu5jeloSKa+vvSnH7VH0BI6g="; }; - vendorHash = "sha256-hVhAtKW6O2wpmQS4l/O8ltt+aHxW6nDVpegOIip545c="; + vendorHash = "sha256-UENMw+kuZHD4x+gON3g3zNsH0Z3weRKpJZh58IiazLw="; nativeBuildInputs = [ openssl ]; From e7e541877fcce8e2cfedeec174d99525e657c81f Mon Sep 17 00:00:00 2001 From: Sam <30577766+Samasaur1@users.noreply.github.com> Date: Fri, 17 Oct 2025 13:13:19 -0500 Subject: [PATCH 362/380] apple-sdk_26-test: drop --- pkgs/by-name/ap/apple-sdk_26-test/package.nix | 26 ------------------- .../apple-sdk_26-test/src/apple-sdk_26-test.m | 21 --------------- .../ap/apple-sdk_26-test/src/meson.build | 2 -- 3 files changed, 49 deletions(-) delete mode 100644 pkgs/by-name/ap/apple-sdk_26-test/package.nix delete mode 100644 pkgs/by-name/ap/apple-sdk_26-test/src/apple-sdk_26-test.m delete mode 100644 pkgs/by-name/ap/apple-sdk_26-test/src/meson.build diff --git a/pkgs/by-name/ap/apple-sdk_26-test/package.nix b/pkgs/by-name/ap/apple-sdk_26-test/package.nix deleted file mode 100644 index e177316c8dcd..000000000000 --- a/pkgs/by-name/ap/apple-sdk_26-test/package.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - lib, - stdenv, - meson, - ninja, - apple-sdk_26, - darwinMinVersionHook -}: - -stdenv.mkDerivation { - name = "apple-sdk_26-test"; - - src = ./src; - - nativeBuildInputs = [ - meson - ninja - ]; - - buildInputs = [ - apple-sdk_26 - (darwinMinVersionHook "26.0") - ]; - - meta.mainProgram = "apple-sdk_26-test"; -} diff --git a/pkgs/by-name/ap/apple-sdk_26-test/src/apple-sdk_26-test.m b/pkgs/by-name/ap/apple-sdk_26-test/src/apple-sdk_26-test.m deleted file mode 100644 index 21fc3af5253a..000000000000 --- a/pkgs/by-name/ap/apple-sdk_26-test/src/apple-sdk_26-test.m +++ /dev/null @@ -1,21 +0,0 @@ -#include -#include - -int main(int argc, char** argv, char** env) { - if (@available(macOS 26, *)) { - int ret; - pid_t pid; - posix_spawn_file_actions_t actions; - if ((ret = posix_spawn_file_actions_init(&actions))) { - printf("cannot create file_actions\n"); - } - if ((ret = posix_spawn_file_actions_addchdir(&actions, "/tmp"))) { - printf("cannot add_chdir\n"); - } - if ((ret = posix_spawnp(&pid, "pwd", &actions, NULL, argv, env))) { - printf("cannot spawn\n"); - } - } else { - printf(":(\n"); - } -} diff --git a/pkgs/by-name/ap/apple-sdk_26-test/src/meson.build b/pkgs/by-name/ap/apple-sdk_26-test/src/meson.build deleted file mode 100644 index ef3a4c6179aa..000000000000 --- a/pkgs/by-name/ap/apple-sdk_26-test/src/meson.build +++ /dev/null @@ -1,2 +0,0 @@ -project('apple-sdk_26-test', 'objc') -executable('apple-sdk_26-test', 'apple-sdk_26-test.m', install : true) From d9ab8762935861e148d63ce078c35265a52fbe18 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 23 Oct 2025 21:22:33 +0200 Subject: [PATCH 363/380] netlify-cli: add issue link --- pkgs/by-name/ne/netlify-cli/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ne/netlify-cli/package.nix b/pkgs/by-name/ne/netlify-cli/package.nix index ceda6d70bf65..cdb3a637e605 100644 --- a/pkgs/by-name/ne/netlify-cli/package.nix +++ b/pkgs/by-name/ne/netlify-cli/package.nix @@ -22,6 +22,7 @@ buildNpmPackage rec { # Prevent postinstall script from running before package is built # See https://github.com/netlify/cli/blob/v23.9.2/scripts/postinstall.js#L70 + # This currently breaks completions: https://github.com/NixOS/nixpkgs/issues/455005 postPatch = '' touch .git ''; From 8010b9911dfe930ebb2178d3f5d6039383bb0cbc Mon Sep 17 00:00:00 2001 From: SkohTV Date: Thu, 23 Oct 2025 15:53:12 -0400 Subject: [PATCH 364/380] scribus: fix qt6.10 build --- pkgs/by-name/sc/scribus/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/sc/scribus/package.nix b/pkgs/by-name/sc/scribus/package.nix index 66b884951460..59593ed3b1fd 100644 --- a/pkgs/by-name/sc/scribus/package.nix +++ b/pkgs/by-name/sc/scribus/package.nix @@ -116,6 +116,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/scribusproject/scribus/commit/ff6c6abfa8683028e548a269dee6a859b6f63335.patch"; hash = "sha256-N4jve5feehsX5H0RXdxR4ableKL+c/rTyqCwkEf37Dk="; }) + (fetchpatch { + name = "fix-qt6.10-build.patch"; + url = "https://github.com/scribusproject/scribus/commit/13fc4f874354511e05bf91a48703b57b4c489715.patch"; + hash = "sha256-+pbQ77SaTh04QX55wmS6WeuZf3IGe5nq3pmrhk68tb8="; + }) ]; meta = { From 8a5c0deead7e641ae8696da64c1ee01c1078043a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 19:58:19 +0000 Subject: [PATCH 365/380] heynote: 2.6.1 -> 2.6.2 --- pkgs/by-name/he/heynote/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/he/heynote/package.nix b/pkgs/by-name/he/heynote/package.nix index 7c3333def150..4f2ce9b7a6f8 100644 --- a/pkgs/by-name/he/heynote/package.nix +++ b/pkgs/by-name/he/heynote/package.nix @@ -7,11 +7,11 @@ }: let pname = "heynote"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { url = "https://github.com/heyman/heynote/releases/download/v${version}/Heynote_${version}_x86_64.AppImage"; - sha256 = "sha256-NA7oKutjxj1Chv7EJ0V7L0uF1oMSZqh97Ly6UYbzhuQ="; + sha256 = "sha256-nA1FRjh9lKdTZXUfuECl5BlW5phYaoh7HOOCKDQuOGQ="; }; appimageContents = appimageTools.extractType2 { From cd6b9e73c542fe8bc503b3d8749dbece56cddfb6 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Sat, 4 Oct 2025 20:21:27 +0000 Subject: [PATCH 366/380] python3Packages.wgpu-py: 0.23.0 -> 0.25.0 --- pkgs/development/python-modules/wgpu-py/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/wgpu-py/default.nix b/pkgs/development/python-modules/wgpu-py/default.nix index 0760ef3f2270..a00c2e7f8ab8 100644 --- a/pkgs/development/python-modules/wgpu-py/default.nix +++ b/pkgs/development/python-modules/wgpu-py/default.nix @@ -29,6 +29,7 @@ psutil, pypng, pytest, + rendercanvas, ruff, trio, @@ -38,14 +39,14 @@ }: buildPythonPackage rec { pname = "wgpu-py"; - version = "0.23.0"; + version = "0.25.0"; pyproject = true; src = fetchFromGitHub { owner = "pygfx"; repo = "wgpu-py"; tag = "v${version}"; - hash = "sha256-z9MRnhPSI+9lGS0UQ5VnSwdCGdYdNnqlDQmb8JAqmyc="; + hash = "sha256-TErwgzujuHafvSiNpfmga9GQtvGFFkDjBqe8eX/dlP8="; }; postPatch = @@ -63,11 +64,6 @@ buildPythonPackage rec { + '' substituteInPlace examples/compute_textures.py \ --replace-fail 'import wgpu' 'import wgpu # run_example = false' - '' - # Tweak tests that fail due to a dependency of `wgpu-native`, `naga`, adding an `ir` module - + '' - substituteInPlace tests/test_wgpu_native_errors.py \ - --replace-fail 'naga::' 'naga::ir::' ''; # wgpu-py expects to have an appropriately named wgpu-native library in wgpu/resources @@ -111,6 +107,8 @@ buildPythonPackage rec { psutil pypng pytest + # break circular dependency cycle + (rendercanvas.overrideAttrs { doInstallCheck = false; }) ruff trio ]; From a35e7ea278632d431a7d92dad96598f7dfbf3767 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Thu, 23 Oct 2025 18:04:27 -0300 Subject: [PATCH 367/380] oonf-olsrd2: fix build with cmake4 --- pkgs/by-name/oo/oonf-olsrd2/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/oo/oonf-olsrd2/package.nix b/pkgs/by-name/oo/oonf-olsrd2/package.nix index 8f64185dd51b..8b5d6815d66e 100644 --- a/pkgs/by-name/oo/oonf-olsrd2/package.nix +++ b/pkgs/by-name/oo/oonf-olsrd2/package.nix @@ -31,6 +31,11 @@ stdenv.mkDerivation rec { cmake ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "Adhoc wireless mesh routing daemon"; license = licenses.bsd3; From f43d3a5fd10760ab66466af5e590503f6a1f5587 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 21:10:28 +0000 Subject: [PATCH 368/380] dprint-plugins.dprint-plugin-biome: 0.10.5 -> 0.10.6 --- pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix index 829393d9bec0..d189ce665f8f 100644 --- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix @@ -1,7 +1,7 @@ { mkDprintPlugin }: mkDprintPlugin { description = "Biome (JS/TS) wrapper plugin"; - hash = "sha256-GHl8Uo2U6K1yirfjwuD43ixkVtGdbZ2qxk0cySRLXys="; + hash = "sha256-Ht63tW4FqykpuNlWtyw3cHD2HXs0b6U6Zo9Rd9AXqD8="; initConfig = { configExcludes = [ "**/node_modules" ]; configKey = "biome"; @@ -16,6 +16,6 @@ mkDprintPlugin { }; pname = "dprint-plugin-biome"; updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json"; - url = "https://plugins.dprint.dev/biome-0.10.5.wasm"; - version = "0.10.5"; + url = "https://plugins.dprint.dev/biome-0.10.6.wasm"; + version = "0.10.6"; } From 53c2ede33d81afc18f538b125b130c40ea266f1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 23 Oct 2025 23:12:14 +0200 Subject: [PATCH 369/380] harlequin: fix eval when textual-textarea doesn't have pythonRelaxDeps --- pkgs/by-name/ha/harlequin/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix index b12abb6b7a03..186fa4ae2c04 100644 --- a/pkgs/by-name/ha/harlequin/package.nix +++ b/pkgs/by-name/ha/harlequin/package.nix @@ -28,7 +28,7 @@ let }); textual-textarea = super.textual-textarea.overridePythonAttrs (old: { - pythonRelaxDeps = old.pythonRelaxDeps ++ [ "textual" ]; + pythonRelaxDeps = (old.pythonRelaxDeps or [ ]) ++ [ "textual" ]; }); }; }; From b9fe891b60c61f49c3ab630ac9288cb0e715bbc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 23 Oct 2025 21:03:01 +0000 Subject: [PATCH 370/380] python3Packages.textual-textarea: 0.16.0 -> 0.17.1 --- .../python-modules/textual-textarea/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/textual-textarea/default.nix b/pkgs/development/python-modules/textual-textarea/default.nix index 89638f9586b6..8ab356d467ef 100644 --- a/pkgs/development/python-modules/textual-textarea/default.nix +++ b/pkgs/development/python-modules/textual-textarea/default.nix @@ -20,21 +20,18 @@ buildPythonPackage rec { pname = "textual-textarea"; - version = "0.16.0"; + version = "0.17.1"; pyproject = true; src = fetchFromGitHub { owner = "tconbeer"; repo = "textual-textarea"; tag = "v${version}"; - hash = "sha256-AIt3UqfZbJBgAACxJHElhvAsJWk9I6zjdeRjBtI/FiA="; + hash = "sha256-E6Yw/NRjfrdCeERgM0jdjfmG9zL2GhY2qAWUB1XwFic="; }; build-system = [ hatchling ]; - pythonRelaxDeps = [ - "tree-sitter-sql" - ]; dependencies = [ pyperclip textual From ef23d46198af2fb60257448598dd78c2c65f9cf6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 22:39:17 +0000 Subject: [PATCH 371/380] python3Packages.brotli-asgi: 1.4.0 -> 1.5.0 --- pkgs/development/python-modules/brotli-asgi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/brotli-asgi/default.nix b/pkgs/development/python-modules/brotli-asgi/default.nix index 302057470abb..5f96e62edc5a 100644 --- a/pkgs/development/python-modules/brotli-asgi/default.nix +++ b/pkgs/development/python-modules/brotli-asgi/default.nix @@ -14,7 +14,7 @@ }: let pname = "brotli-asgi"; - version = "1.4.0"; + version = "1.5.0"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { owner = "fullonic"; repo = "brotli-asgi"; rev = "v${version}"; - hash = "sha256-hQ6CSXnAoUSaKUSmE+2GHZemkFqd8Dc5+OvcUD7/r5Y="; + hash = "sha256-jOow5xrRvuBdg/dVEzAUgs1SxNLZqEItyW9OcvniTSY="; }; propagatedBuildInputs = [ From e007b227f3f8d0e1183d714c858894c620b0d300 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 23:25:10 +0000 Subject: [PATCH 372/380] beam26Packages.ex_doc: 0.38.4 -> 0.39.0 --- pkgs/development/beam-modules/ex_doc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/ex_doc/default.nix b/pkgs/development/beam-modules/ex_doc/default.nix index 5263899d4221..d0f121b41aa1 100644 --- a/pkgs/development/beam-modules/ex_doc/default.nix +++ b/pkgs/development/beam-modules/ex_doc/default.nix @@ -14,12 +14,12 @@ let pname = "ex_doc"; - version = "0.38.4"; + version = "0.39.0"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "${pname}"; rev = "v${version}"; - hash = "sha256-/gZczKm/IF5QQemrdcda9oKVIGDFSqdiu8YrBwT6Mtk="; + hash = "sha256-7f4TQgQIeWb+SRMYLsqnOWnPHY7Pqi8qtruVe8OaZRY="; }; in mixRelease { From c363a1748db092b9d6fa9a6c2550c365760663b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 23:52:18 +0000 Subject: [PATCH 373/380] _1password-gui: 8.11.12 -> 8.11.14 --- pkgs/by-name/_1/_1password-gui/sources.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json index 35bbf591fd53..60fc6b2e723b 100644 --- a/pkgs/by-name/_1/_1password-gui/sources.json +++ b/pkgs/by-name/_1/_1password-gui/sources.json @@ -1,28 +1,28 @@ { "stable": { "linux": { - "version": "8.11.12", + "version": "8.11.14", "sources": { "x86_64": { - "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.12.x64.tar.gz", - "hash": "sha256-znzmaEYOLVw6nUBk20oMdSngkO8iiSTHvM1y/t3Z55Y=" + "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.14.x64.tar.gz", + "hash": "sha256-LdGw2AVDiQXwGAz9abEeoCosQUdr5q978OMo+kXATIc=" }, "aarch64": { - "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.12.arm64.tar.gz", - "hash": "sha256-ENuvB8GExhHWjJ97JV0qc2cIn9HqXb202dzIxu1fz2A=" + "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.14.arm64.tar.gz", + "hash": "sha256-U+wJEH5NwWuPV+Oy6RJ+dki4lJB2A9aOVjvRSkm6zfY=" } } }, "darwin": { - "version": "8.11.12", + "version": "8.11.14", "sources": { "x86_64": { - "url": "https://downloads.1password.com/mac/1Password-8.11.12-x86_64.zip", - "hash": "sha256-mr7DsYIEh21pHQX0cq9JlTZ4lHhkyYHCmwMaxEiK+5g=" + "url": "https://downloads.1password.com/mac/1Password-8.11.14-x86_64.zip", + "hash": "sha256-GXbwYxFNw6R8UdKxPL6k2lQF4uabFRgaEKNaFzecnZ0=" }, "aarch64": { - "url": "https://downloads.1password.com/mac/1Password-8.11.12-aarch64.zip", - "hash": "sha256-34ylS5Xq9By6nuUkEmLoi0wR5hAQx1vBhrYFq4mjSDs=" + "url": "https://downloads.1password.com/mac/1Password-8.11.14-aarch64.zip", + "hash": "sha256-rViZC9b6kOaqkNNJibABmWu0Z5PEtBQE0jGtaUdd4LY=" } } } From c4eb0c1a50349a4f55bc669d9e85bc40da091a38 Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Fri, 24 Oct 2025 01:07:08 +0100 Subject: [PATCH 374/380] 64tass: rename to _64tass --- pkgs/by-name/{64/64tass => _6/_64tass}/package.nix | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pkgs/by-name/{64/64tass => _6/_64tass}/package.nix (100%) diff --git a/pkgs/by-name/64/64tass/package.nix b/pkgs/by-name/_6/_64tass/package.nix similarity index 100% rename from pkgs/by-name/64/64tass/package.nix rename to pkgs/by-name/_6/_64tass/package.nix From de292cafd13bd2c09ffa1c5f33e623c696e4593d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Oct 2025 00:31:05 +0000 Subject: [PATCH 375/380] livebook: 0.17.2 -> 0.17.3 --- pkgs/development/beam-modules/livebook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/livebook/default.nix b/pkgs/development/beam-modules/livebook/default.nix index 03c2d5111f87..47d5e548c3a9 100644 --- a/pkgs/development/beam-modules/livebook/default.nix +++ b/pkgs/development/beam-modules/livebook/default.nix @@ -9,7 +9,7 @@ beamPackages.mixRelease rec { pname = "livebook"; - version = "0.17.2"; + version = "0.17.3"; inherit (beamPackages) elixir; @@ -21,7 +21,7 @@ beamPackages.mixRelease rec { owner = "livebook-dev"; repo = "livebook"; tag = "v${version}"; - hash = "sha256-9AlvEqyQJvcRbAuuxF5Q5S9hG96vaQYVBYwPYp4lGQM="; + hash = "sha256-WElJgW2TxjeUgv6GZwq+hcgl6n4xr8mmCBPqoOGc1+w="; }; mixFodDeps = beamPackages.fetchMixDeps { From a53f158c5ac4be74530145c238df9241f520d0e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Oct 2025 00:45:50 +0000 Subject: [PATCH 376/380] crystal-dock: 2.14 -> 2.15 --- pkgs/by-name/cr/crystal-dock/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cr/crystal-dock/package.nix b/pkgs/by-name/cr/crystal-dock/package.nix index c755886c5425..a43bc1fcf2bc 100644 --- a/pkgs/by-name/cr/crystal-dock/package.nix +++ b/pkgs/by-name/cr/crystal-dock/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "crystal-dock"; - version = "2.14"; + version = "2.15"; src = fetchFromGitHub { owner = "dangvd"; repo = "crystal-dock"; rev = "v${finalAttrs.version}"; - hash = "sha256-szW3zIgwy0a9NmEax6xemeCdjs3//r7BRfUDeLv+VxE="; + hash = "sha256-XFq4T39El5MjaWRSnaimonjdj+HGOAydNmEOehgGWX4="; }; nativeBuildInputs = [ From 8deab44fce596034ab7ccb6a95a38afd8d29b5f7 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Thu, 23 Oct 2025 21:55:08 -0300 Subject: [PATCH 377/380] ringracers: fix build with cmake4 --- pkgs/by-name/ri/ringracers/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ri/ringracers/package.nix b/pkgs/by-name/ri/ringracers/package.nix index 8cb144d870cc..27d7eebb7e7d 100644 --- a/pkgs/by-name/ri/ringracers/package.nix +++ b/pkgs/by-name/ri/ringracers/package.nix @@ -85,6 +85,11 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + postPatch = '' + substituteInPlace src/acs/vm/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "Kart racing video game based on Sonic Robo Blast 2 (SRB2), itself based on a modified version of Doom Legacy"; homepage = "https://kartkrew.org"; From f93e34eff95dd5d527734db42a8986ee942e0249 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Oct 2025 02:24:59 +0000 Subject: [PATCH 378/380] tfswitch: 1.7.0 -> 1.8.0 --- pkgs/by-name/tf/tfswitch/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tf/tfswitch/package.nix b/pkgs/by-name/tf/tfswitch/package.nix index f6162a40b3db..dcb3dbd95972 100644 --- a/pkgs/by-name/tf/tfswitch/package.nix +++ b/pkgs/by-name/tf/tfswitch/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "tfswitch"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "warrensbox"; repo = "terraform-switcher"; rev = "v${version}"; - sha256 = "sha256-Lxczo2zlBqDyHAcGPR1UM1s8tR4+F80YeNI0JJXLN30="; + sha256 = "sha256-9N6C2y+lGyWSJgDiPsMKo03ji6lhq+0OI1idi1VcrAA="; }; - vendorHash = "sha256-JnfRdircsabRP1O8dSs8/OGwTSvv4xmIXeFQsnbpb5o="; + vendorHash = "sha256-4qZ5egtNN0O+ESkvavprNd6Xtxh/eyD5INolqKXo674="; # Disable tests since it requires network access and relies on the # presence of release.hashicorp.com From ad23c591bb74cbc0e6438653acb57a89d908b907 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Oct 2025 02:53:50 +0000 Subject: [PATCH 379/380] rumdl: 0.0.162 -> 0.0.166 --- pkgs/by-name/ru/rumdl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/rumdl/package.nix b/pkgs/by-name/ru/rumdl/package.nix index a0eac951ca98..b920521248a0 100644 --- a/pkgs/by-name/ru/rumdl/package.nix +++ b/pkgs/by-name/ru/rumdl/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rumdl"; - version = "0.0.162"; + version = "0.0.166"; src = fetchFromGitHub { owner = "rvben"; repo = "rumdl"; tag = "v${finalAttrs.version}"; - hash = "sha256-aCduiCO49YWeqET3nezI1EYkz+IbTR+uIy7FXHbkYCo="; + hash = "sha256-I63/GJa0bqJY2BHDmjcNDKSiglCygvpN4XBp/kQ6mEg="; }; - cargoHash = "sha256-o9NqTdMEoYFZC69Raf0v6fHUKnbN2K+rV3LK6rtjG/k="; + cargoHash = "sha256-Uh28HFWQhbJtYpKjUI0TuM0NRLpWnu+zQvt3gkGqKyU="; cargoBuildFlags = [ "--bin=rumdl" From 2e9d838795edcec2b79dda0284acf27ee34b1ecc Mon Sep 17 00:00:00 2001 From: h7x4 Date: Fri, 24 Oct 2025 14:24:14 +0900 Subject: [PATCH 380/380] nixos/rtkit: fix hardening --- nixos/modules/security/rtkit.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/rtkit.nix b/nixos/modules/security/rtkit.nix index d7c6df17f03b..f2cd256468da 100644 --- a/nixos/modules/security/rtkit.nix +++ b/nixos/modules/security/rtkit.nix @@ -64,7 +64,7 @@ in ]; # Needs to verify the user of the processes. - PrivateUsers = "full"; + PrivateUsers = false; # Needs to access other processes to modify their scheduling modes. ProcSubset = "all"; ProtectProc = "default";