From d87ec61ac2f680e60a00118552e68d186ddf7081 Mon Sep 17 00:00:00 2001 From: Quozlet Date: Tue, 9 Sep 2025 03:54:14 +0000 Subject: [PATCH 001/131] 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 c5cb903e37dd55fdd406b2791ac64cff42d1adfa Mon Sep 17 00:00:00 2001 From: polyfloyd Date: Tue, 16 Sep 2025 18:07:35 +0200 Subject: [PATCH 002/131] 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 003/131] 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 12146213adac15f7afe9c69cb41e0a7e48c5aff0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Sep 2025 14:20:23 +0000 Subject: [PATCH 004/131] 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 005/131] 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 a27f1f492e8d02477130d864a2e2d466a3770d02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Sep 2025 20:59:15 +0000 Subject: [PATCH 006/131] 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 007/131] 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 f86b727ba6758e47a89a7600461a90a47aee3784 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Sep 2025 00:52:40 +0000 Subject: [PATCH 008/131] 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 009/131] 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 010/131] 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 ddb8d0c236180cbe0e1e03519361d0fb0478ae22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Sep 2025 02:42:53 +0000 Subject: [PATCH 011/131] 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 d580f9d1475db223aa628f901180f8991662e27e Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Fri, 3 Oct 2025 21:25:32 +0000 Subject: [PATCH 012/131] 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 923dd5a6b52c28bf89fa330efb2cd33b4dc08f16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Oct 2025 17:26:28 +0000 Subject: [PATCH 013/131] 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 014/131] 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 015/131] 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 016/131] 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 017/131] 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 018/131] 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 d5db8235741ed4aae160f405e152243c907166d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Oct 2025 05:01:08 +0000 Subject: [PATCH 019/131] 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 020/131] 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 9322fb64c601bee770e894b49c5ac2c4cac69ff9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Oct 2025 09:49:20 +0000 Subject: [PATCH 021/131] 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 f994581e1007dc1549260112a757463bde437fb7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Oct 2025 07:37:56 +0000 Subject: [PATCH 022/131] 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 6dc29424d0c136e0ec921864d8800e360f630d1f Mon Sep 17 00:00:00 2001 From: jasonxue Date: Wed, 15 Oct 2025 22:20:04 +0800 Subject: [PATCH 023/131] 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 632d7f7d02e52b2920adeb839833d56b346f8985 Mon Sep 17 00:00:00 2001 From: Minionflo Date: Thu, 16 Oct 2025 18:52:30 +0200 Subject: [PATCH 024/131] 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 025/131] 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 026/131] 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 027/131] 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 028/131] 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 029/131] 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 030/131] 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 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 031/131] 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 faa0cd70272f3a2f76d88647fee53892e05d8329 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 11:49:19 +0000 Subject: [PATCH 032/131] 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 d3cbbf7007e0c590b3c1059b37c4625b5447b6be Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 16 Oct 2025 22:36:10 +0200 Subject: [PATCH 033/131] 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 32398d846eeff9288917348b7b39dc4a06fdecb7 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 17 Oct 2025 19:18:55 +0200 Subject: [PATCH 034/131] 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 000b7bd881b3387c412d549d2f389f483a6b560e Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 17 Oct 2025 22:51:16 +0200 Subject: [PATCH 035/131] 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 00d247dcfc683f0b10db0de8ee009ff6998d8b5e Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Sat, 18 Oct 2025 01:24:53 -0400 Subject: [PATCH 036/131] 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 037/131] 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 038/131] 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 49249eceb500b7688f6fd07287780572e3eb6438 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Oct 2025 12:25:01 +0000 Subject: [PATCH 039/131] 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 040/131] 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 041/131] 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 042/131] 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 f9bbb5f0d8885ca9b67ce537082c2a1f7643c094 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Oct 2025 17:37:09 +0000 Subject: [PATCH 043/131] 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 044/131] 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 045/131] 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 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 046/131] 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 d89867c8e7bb611cbab37a91960f2bfc1dc1f88e Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 19 Oct 2025 02:45:54 +0200 Subject: [PATCH 047/131] 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 7997be85a28f51c8fc295238625ce9e5d3eddad6 Mon Sep 17 00:00:00 2001 From: qbisi Date: Sat, 18 Oct 2025 03:48:20 +0800 Subject: [PATCH 048/131] 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 049/131] 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 050/131] 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 a3dbd9ed85e397212d49819e6722769e622e4304 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sun, 19 Oct 2025 08:27:23 -0300 Subject: [PATCH 051/131] 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 052/131] 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 053/131] 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 054/131] 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 055/131] 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 056/131] 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 057/131] 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 a0a29aaac4ffaba555ddc7f13ff15dbc56372213 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sun, 19 Oct 2025 22:08:55 -0300 Subject: [PATCH 058/131] 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 059/131] 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 8a9fa0f5e3d37ec8330d175bdf384949ffff69b7 Mon Sep 17 00:00:00 2001 From: sugar Date: Mon, 8 Sep 2025 09:50:30 +0200 Subject: [PATCH 060/131] 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 061/131] 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 d6d9fdd74279f8910b6bf83989b460d4d8a05ece Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 20 Oct 2025 14:21:35 -0300 Subject: [PATCH 062/131] 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 063/131] 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 f0553e3f118ebb8cec9cf906c9d234218b9c3181 Mon Sep 17 00:00:00 2001 From: Andrew Zah Date: Tue, 21 Oct 2025 10:11:24 +0900 Subject: [PATCH 064/131] 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 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 065/131] 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 066/131] 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 067/131] 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 8598b9e738dbb56e6081f8df6e88ce6d8db8a74a Mon Sep 17 00:00:00 2001 From: griffi-gh Date: Thu, 16 Oct 2025 12:23:18 +0200 Subject: [PATCH 068/131] 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 069/131] 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 ae67150a8d7e0903894fa4b0c5a8050e13cd7b21 Mon Sep 17 00:00:00 2001 From: Karolis Stasaitis Date: Tue, 21 Oct 2025 12:49:26 +0200 Subject: [PATCH 070/131] 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 235f38852d9dff2971eebf5b5dd521e36a7b8de5 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Tue, 21 Oct 2025 09:38:30 -0300 Subject: [PATCH 071/131] 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 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 072/131] 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 ca1811bd0cb2bca8e235a15411734d69faf8febf Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 22 Oct 2025 07:17:54 -0300 Subject: [PATCH 073/131] 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 9f62ff9ffdd9265c53838e719058a8c299dfd59f Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 22 Oct 2025 08:03:08 -0300 Subject: [PATCH 074/131] 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 075/131] 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 bfaa803e7dc276e35e608c29196905411ba09c1c Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 20 Oct 2025 13:57:09 -0300 Subject: [PATCH 076/131] 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 4a0a1c6ad27f9e7fbf64c5698c9d5a1851249ec0 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 22 Oct 2025 17:34:08 -0300 Subject: [PATCH 077/131] 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 294984f6e7a245a870092bf3d2e13ddfdd25a77f Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 22 Oct 2025 17:22:24 -0300 Subject: [PATCH 078/131] 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 4704a316771e45164f4747471f4cb146d4101370 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Mon, 20 Oct 2025 18:08:43 +0200 Subject: [PATCH 079/131] 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 efea9cb2cff2dbc2008608775467b25131d52551 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 02:06:02 +0000 Subject: [PATCH 080/131] 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 2a00280a2477bf1e5ad74d71854e373e8023a191 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 09:20:03 +0000 Subject: [PATCH 081/131] 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 17fe21e593235a33916e13042cf80bd601302f1a Mon Sep 17 00:00:00 2001 From: Nikita Uvarov Date: Thu, 23 Oct 2025 11:24:45 +0200 Subject: [PATCH 082/131] 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 083/131] 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 084/131] 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 085/131] 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 086/131] 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 087/131] 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 088/131] 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 089/131] 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 090/131] 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 091/131] 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 6898384e71123caed119cc8536381ab910f5d6d6 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Thu, 23 Oct 2025 12:52:52 +0200 Subject: [PATCH 092/131] 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 13:28:25 +0200 Subject: [PATCH 093/131] 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 094/131] 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 3e505de718c840728e2c84890a5ed99eee8f26cd Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 23 Oct 2025 13:40:15 +0200 Subject: [PATCH 095/131] 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 096/131] 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 097/131] 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 1f6186dd9ad4b8836553db163e25ae6ffe39a10f Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Thu, 23 Oct 2025 14:33:47 +0200 Subject: [PATCH 098/131] 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 f940a6d6fb8db8e4e9cd97c271fce55325ee249c Mon Sep 17 00:00:00 2001 From: Onni Hakala Date: Fri, 19 Sep 2025 08:21:07 +0300 Subject: [PATCH 099/131] 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 100/131] 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 101/131] 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 102/131] 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 103/131] 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 372a6a1e4d365b55b853dbcdb46488c3fa9475f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 13:17:52 +0000 Subject: [PATCH 104/131] 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 7aa6e24987f1634212b1075a3b0c44f81707dbaf Mon Sep 17 00:00:00 2001 From: Sergey Volkov Date: Thu, 9 Oct 2025 12:36:19 +0200 Subject: [PATCH 105/131] 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 106/131] 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 78b67e628929f227d0f3e81b703f24a7ae08e9bf Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Wed, 22 Oct 2025 21:02:01 -0400 Subject: [PATCH 107/131] 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 108/131] 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 109/131] 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 18528cfe2ce74ddf4a1d7a6e91dd3784f62c2e9d Mon Sep 17 00:00:00 2001 From: cinereal Date: Thu, 23 Oct 2025 16:47:49 +0200 Subject: [PATCH 110/131] 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 111/131] 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 112/131] 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 6784ffd6051cf535d5e9905112f1ff238146b4bd Mon Sep 17 00:00:00 2001 From: David Sierra DiazGranados Date: Wed, 22 Oct 2025 16:02:30 +0000 Subject: [PATCH 113/131] 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 7e25e67f6b2444d59a772b9e094d975db8de3ee5 Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 23 Oct 2025 18:01:41 +0200 Subject: [PATCH 114/131] 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 115/131] 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 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 116/131] 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 117/131] 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 118/131] 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 119/131] 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 120/131] 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 121/131] 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 122/131] 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 123/131] 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 124/131] 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 125/131] 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 126/131] 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 127/131] 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 8a5c0deead7e641ae8696da64c1ee01c1078043a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 19:58:19 +0000 Subject: [PATCH 128/131] 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 129/131] 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 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 130/131] 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 131/131] 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