diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 2cee346ce697..388b4645a3f4 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -260,6 +260,8 @@ - The main binary of `tomlq` has been renamed from `tomlq` to `tq`. +- `opensoldat` binaries and user configuration directory names have been prefixed by 'open', becoming opensoldat and opensoldatserver. Configuration will be moved automatically before launch when possible. + - `emacs-macport` has been moved to a fork of Mitsuharu Yamamoto's patched source code starting with Emacs v30 as the original project seems to be currently dormant. All older versions of this package have been dropped. This introduces some backwards‐incompatible changes; see the NEWS for details. NEWS can be viewed from Emacs by typing `C-h n`, or by clicking `Help->Emacs News` from the menu bar. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 97aad0f32f0e..535ef1d43934 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11750,6 +11750,12 @@ githubId = 29395089; name = "Jay Rovacsek"; }; + jaysa68 = { + email = "gh@jaysa.net"; + github = "jaysa68"; + githubId = 114126812; + name = "Jaysa Maria Garcia"; + }; jb55 = { email = "jb55@jb55.com"; github = "jb55"; diff --git a/nixos/modules/services/security/step-ca.nix b/nixos/modules/services/security/step-ca.nix index d7ed2acf7664..746d3c0b3839 100644 --- a/nixos/modules/services/security/step-ca.nix +++ b/nixos/modules/services/security/step-ca.nix @@ -55,10 +55,13 @@ in ''; }; intermediatePasswordFile = lib.mkOption { - type = lib.types.pathWith { - inStore = false; - absolute = true; - }; + type = lib.types.nullOr ( + lib.types.pathWith { + inStore = false; + absolute = true; + } + ); + default = null; example = "/run/keys/smallstep-password"; description = '' Path to the file containing the password for the intermediate @@ -104,11 +107,18 @@ in ReadWritePaths = ""; # override upstream # LocalCredential handles file permission problems arising from the use of DynamicUser. - LoadCredential = "intermediate_password:${cfg.intermediatePasswordFile}"; + LoadCredential = lib.mkIf ( + cfg.intermediatePasswordFile != null + ) "intermediate_password:${cfg.intermediatePasswordFile}"; ExecStart = [ "" # override upstream - "${cfg.package}/bin/step-ca /etc/smallstep/ca.json --password-file \${CREDENTIALS_DIRECTORY}/intermediate_password" + ( + "${cfg.package}/bin/step-ca /etc/smallstep/ca.json" + + lib.optionalString ( + cfg.intermediatePasswordFile != null + ) " --password-file \${CREDENTIALS_DIRECTORY}/intermediate_password" + ) ]; # ProtectProc = "invisible"; # not supported by upstream yet diff --git a/pkgs/applications/audio/playbar2/default.nix b/pkgs/applications/audio/playbar2/default.nix index f698a39440a6..1eff8ab97ee6 100644 --- a/pkgs/applications/audio/playbar2/default.nix +++ b/pkgs/applications/audio/playbar2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { version = "2.5"; src = fetchFromGitHub { - owner = "audoban"; + owner = "jsmitar"; repo = "PlayBar2"; rev = "v${version}"; sha256 = "0iv2m4flgaz2r0k7f6l0ca8p6cw8j8j2gin1gci2pg3l5g5khbch"; @@ -31,9 +31,14 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "Mpris2 Client for Plasma5"; - homepage = "https://github.com/audoban/PlayBar2"; + homepage = "https://github.com/jsmitar/PlayBar2"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ pjones ]; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 901c207e894c..54d95e730d12 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1609,6 +1609,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + blink-cmp-env = buildVimPlugin { + pname = "blink-cmp-env"; + version = "2025-09-13"; + src = fetchFromGitHub { + owner = "bydlw98"; + repo = "blink-cmp-env"; + rev = "99af62c1f9aa46005e8f50ad4ccee581946546ca"; + sha256 = "1wad8v0av1lfcfm8i07351n3zq41xil1fhfm8yj6kg96bk7cwk0c"; + }; + meta.homepage = "https://github.com/bydlw98/blink-cmp-env/"; + meta.hydraPlatforms = [ ]; + }; + blink-cmp-git = buildVimPlugin { pname = "blink-cmp-git"; version = "2025-10-09"; @@ -1661,6 +1674,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + blink-cmp-tmux = buildVimPlugin { + pname = "blink-cmp-tmux"; + version = "2025-05-23"; + src = fetchFromGitHub { + owner = "mgalliou"; + repo = "blink-cmp-tmux"; + rev = "4586c705b6f80b536c34a61ed0d3cd4d7f08322d"; + sha256 = "1d7kvpzjmasfk8lszwhpay46w1b11sas9s8542gdwqiv0l32dp7p"; + }; + meta.homepage = "https://github.com/mgalliou/blink-cmp-tmux/"; + meta.hydraPlatforms = [ ]; + }; + blink-cmp-words = buildVimPlugin { pname = "blink-cmp-words"; version = "2025-08-06"; @@ -1674,6 +1700,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + blink-cmp-yanky = buildVimPlugin { + pname = "blink-cmp-yanky"; + version = "2025-06-24"; + src = fetchFromGitHub { + owner = "marcoSven"; + repo = "blink-cmp-yanky"; + rev = "473b987c2a7d80cca116f6faf087dba4dbfbb3c5"; + sha256 = "1m0bkvp0bccavw46b6ycmhmx5bn7nx3w4z27linhlqd5gmlr1j0d"; + }; + meta.homepage = "https://github.com/marcoSven/blink-cmp-yanky/"; + meta.hydraPlatforms = [ ]; + }; + blink-compat = buildVimPlugin { pname = "blink.compat"; version = "2025-05-28"; @@ -1713,6 +1752,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + blink-indent = buildVimPlugin { + pname = "blink.indent"; + version = "2025-11-07"; + src = fetchFromGitHub { + owner = "Saghen"; + repo = "blink.indent"; + rev = "a8feeeae8510d16f26afbb5c81f2ad1ccea38d62"; + sha256 = "1qm8h8yfkwf79hnfwn18qmk3546qzr3b9qzr6038lnbf54gzvkff"; + }; + meta.homepage = "https://github.com/Saghen/blink.indent/"; + meta.hydraPlatforms = [ ]; + }; + blink-nerdfont-nvim = buildVimPlugin { pname = "blink-nerdfont.nvim"; version = "2025-02-06"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix index dc81b884361d..8d628bdd7767 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix @@ -6,13 +6,13 @@ }: vimUtils.buildVimPlugin { pname = "vim-ic10"; - version = "0-unstable-2025-10-09"; + version = "0-unstable-2025-11-02"; src = fetchFromGitLab { owner = "LittleMorph"; repo = "vim-ic10"; - rev = "7e9cb3bf91f692e26e899a6d513fcee7dd60bf72"; - hash = "sha256-7mQ8PEbqQS4E8Kg6nU+uTj9Nyke80FEcLpmV46B7GFA="; + rev = "74446a16078ef4f3d2088136b32af939fb6bc2a4"; + hash = "sha256-YCxrSB7eRQ54iZhpcsAR930Uccj+2ZyogpYGKbcSlys="; }; passthru.updateScript = nix-update-script { diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 2f9a1713aa2a..f714b498bbc6 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -314,6 +314,14 @@ assertNoAdditions { }; }); + blink-cmp-env = super.blink-cmp-env.overrideAttrs { + dependencies = [ self.blink-cmp ]; + }; + + blink-cmp-yanky = super.blink-cmp-yanky.overrideAttrs { + dependencies = [ self.blink-cmp ]; + }; + bluloco-nvim = super.bluloco-nvim.overrideAttrs { dependencies = [ self.lush-nvim ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 434460ee1101..d3ec2a41bd9b 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -122,16 +122,20 @@ https://github.com/Kaiser-Yang/blink-cmp-avante/,HEAD, https://github.com/disrupted/blink-cmp-conventional-commits/,HEAD, https://github.com/giuxtaposition/blink-cmp-copilot/,HEAD, https://github.com/Kaiser-Yang/blink-cmp-dictionary/,HEAD, +https://github.com/bydlw98/blink-cmp-env/,HEAD, https://github.com/Kaiser-Yang/blink-cmp-git/,HEAD, https://github.com/erooke/blink-cmp-latex/,HEAD, https://github.com/alexandre-abrioux/blink-cmp-npm.nvim/,HEAD, https://github.com/ribru17/blink-cmp-spell/,HEAD, +https://github.com/mgalliou/blink-cmp-tmux/,HEAD, https://github.com/archie-judd/blink-cmp-words/,HEAD, +https://github.com/marcoSven/blink-cmp-yanky/,HEAD, https://github.com/fang2hou/blink-copilot/,HEAD, https://github.com/moyiz/blink-emoji.nvim/,HEAD, https://github.com/MahanRahmati/blink-nerdfont.nvim/,HEAD, https://github.com/mikavilpas/blink-ripgrep.nvim/,HEAD, https://github.com/Saghen/blink.compat/,HEAD, +https://github.com/Saghen/blink.indent/,HEAD, https://github.com/dundalek/bloat.nvim/,HEAD, https://github.com/HampusHauffman/block.nvim/,HEAD, https://github.com/uloco/bluloco.nvim/,, diff --git a/pkgs/applications/emulators/libretro/cores/vba-m.nix b/pkgs/applications/emulators/libretro/cores/vba-m.nix index 613861b185e5..1a25a66478dd 100644 --- a/pkgs/applications/emulators/libretro/cores/vba-m.nix +++ b/pkgs/applications/emulators/libretro/cores/vba-m.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "vbam"; - version = "0-unstable-2025-10-17"; + version = "0-unstable-2025-11-05"; src = fetchFromGitHub { owner = "libretro"; repo = "vbam-libretro"; - rev = "badf47c0e050983e44ac1217033283ca78313298"; - hash = "sha256-PwqwG+YMgdWNMoWx0mdUIBebQBMgaFd8BiI27xSUhps="; + rev = "d0787aee43d260675da203c2f85ba9fa226c0c66"; + hash = "sha256-WhsiKsDk7jEIklrOw1YFCcWSlAmLK4vCCji3Mnsgwmw="; }; makefile = "Makefile"; diff --git a/pkgs/applications/misc/q4wine/default.nix b/pkgs/applications/misc/q4wine/default.nix index b3cbb9572923..708e965c0978 100644 --- a/pkgs/applications/misc/q4wine/default.nix +++ b/pkgs/applications/misc/q4wine/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, - mkDerivation, + stdenv, cmake, sqlite, qtbase, @@ -15,15 +15,15 @@ which, # runtime deps. }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "q4wine"; - version = "1.3.13"; + version = "1.4.2"; src = fetchFromGitHub { owner = "brezerk"; repo = "q4wine"; rev = "v${version}"; - sha256 = "04gw5y3dxdpivm2xqacqq85fdzx7xkl0c3h3hdazljb0c3cxxs6h"; + sha256 = "sha256-5rj+EDsOZib78gWT003a4IN23cZQftnhVggIdLN6f7I="; }; buildInputs = [ diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 1d74c153494f..a80ee39d368d 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -9,6 +9,7 @@ buildPackages, c-ares, cmake, + darwinMinVersionHook, fixDarwinDylibNames, flex, gettext, @@ -147,6 +148,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gmp + # Required by Qt 6 + (darwinMinVersionHook "12.0") ]; strictDeps = true; @@ -192,7 +195,7 @@ stdenv.mkDerivation rec { flags+=(-change @rpath/"$(basename "$file")" "$file") done - for file in $out/lib/wireshark/extcap/*; do + for file in $out/libexec/wireshark/extcap/*; do if [ -L "$file" ]; then continue; fi echo "$file: fixing dylib references" # note that -id does nothing on binaries @@ -210,7 +213,7 @@ stdenv.mkDerivation rec { rm -rf $out/Applications/Wireshark.app/Contents/MacOS/extcap $out/Applications/Wireshark.app/Contents/PlugIns mkdir -p $out/Applications/Wireshark.app/Contents/PlugIns cp -r $out/lib/wireshark/plugins $out/Applications/Wireshark.app/Contents/PlugIns/wireshark - cp -r $out/lib/wireshark/extcap $out/Applications/Wireshark.app/Contents/MacOS/extcap + cp -r $out/libexec/wireshark/extcap $out/Applications/Wireshark.app/Contents/MacOS/extcap ''; meta = { diff --git a/pkgs/applications/system/systemdgenie/default.nix b/pkgs/applications/system/systemdgenie/default.nix deleted file mode 100644 index 0131be7ebc71..000000000000 --- a/pkgs/applications/system/systemdgenie/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - stdenv, - lib, - cmake, - extra-cmake-modules, - kxmlgui, - fetchFromGitLab, - kdelibs4support, - wrapQtAppsHook, -}: -stdenv.mkDerivation rec { - pname = "systemdgenie"; - version = "0.99.0"; - src = fetchFromGitLab { - domain = "invent.kde.org"; - repo = "SystemdGenie"; - owner = "system"; - rev = "v${version}"; - hash = "sha256-y+A2OuK1ZooPY5W0SsXEb1aaOAJ2b7QSwiumolmAaR4="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - wrapQtAppsHook - ]; - - buildInputs = [ - kxmlgui - kdelibs4support - ]; - - meta = with lib; { - description = "Systemd management utility"; - mainProgram = "systemdgenie"; - homepage = "https://kde.org"; - license = licenses.gpl2; - maintainers = [ maintainers.pasqui23 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 886019af54f7..aeb1ec0492d6 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -113,7 +113,7 @@ let compressorForImage = compressor: imageName: compressors.${compressor} - or (throw "in docker image ${imageName}: compressor must be one of: [${toString builtins.attrNames compressors}]"); + or (throw "in docker image ${imageName}: compressor must be one of: [${toString (builtins.attrNames compressors)}]"); in rec { diff --git a/pkgs/by-name/ar/artix-games-launcher/package.nix b/pkgs/by-name/ar/artix-games-launcher/package.nix index 35fc2f7218a4..9ee50a47a602 100644 --- a/pkgs/by-name/ar/artix-games-launcher/package.nix +++ b/pkgs/by-name/ar/artix-games-launcher/package.nix @@ -22,6 +22,7 @@ appimageTools.wrapType2 { mkdir -p $out/share/applications install -m 444 -D ${appimageContents}/ArtixGamesLauncher.desktop $out/share/applications/ArtixGamesLauncher.desktop install -m 444 -D ${appimageContents}/ArtixLogo.png $out/share/icons/ArtixLogo.png + substituteInPlace $out/share/applications/ArtixGamesLauncher.desktop --replace-fail 'Exec=ArtixGameLauncher %u' 'Exec=artix-games-launcher %u' ''; meta = { diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix index 2ab3f13341b0..2a4f0b1a5f8b 100644 --- a/pkgs/by-name/ba/backrest/package.nix +++ b/pkgs/by-name/ba/backrest/package.nix @@ -93,6 +93,7 @@ buildGoModule { ++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestBackup" # relies on ionice "TestCancelBackup" + "TestFirstRun" # e2e test requires networking ]; in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; diff --git a/pkgs/by-name/ba/base16384/package.nix b/pkgs/by-name/ba/base16384/package.nix index ca6badfda00d..e066d25885d7 100644 --- a/pkgs/by-name/ba/base16384/package.nix +++ b/pkgs/by-name/ba/base16384/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "fumiama"; repo = "base16384"; rev = "v${version}"; - hash = "sha256-Xkub0sWT+1oJlznDnnV1mDgQNiMQj8gsWemrCOAYYgE="; + hash = "sha256-qaDnv+KpXMYdx6eqH7pU0pEjSpU5xg9I7afxpoO3iGs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/bb/bbedit/package.nix b/pkgs/by-name/bb/bbedit/package.nix index 7537b198f9f9..2c39f1e6ca57 100644 --- a/pkgs/by-name/bb/bbedit/package.nix +++ b/pkgs/by-name/bb/bbedit/package.nix @@ -27,6 +27,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + # app bundle may be messed up by standard fixup + dontFixup = true; + meta = { description = "Powerful and full-featured professional HTML and text editor for macOS"; homepage = "https://www.barebones.com/products/bbedit/"; diff --git a/pkgs/by-name/bi/biblesync/package.nix b/pkgs/by-name/bi/biblesync/package.nix index 486244f71329..58201c9ea269 100644 --- a/pkgs/by-name/bi/biblesync/package.nix +++ b/pkgs/by-name/bi/biblesync/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, pkg-config, cmake, libuuid, @@ -19,6 +20,15 @@ stdenv.mkDerivation rec { sha256 = "0prmd12jq2cjdhsph5v89y38j7hhd51dr3r1hivgkhczr3m5hf4s"; }; + patches = [ + # Fix cmake-4 support + (fetchpatch { + name = "cmake-4.patch"; + url = "https://github.com/karlkleinpaste/biblesync/commit/4b00f9fd3d0c858947eee18206ef44f9f6bd2283.patch?full_index=1"; + hash = "sha256-CVYhYBDneLN3Ogvye01EQCc9zxjSwaKBzk1fBaKINug="; + }) + ]; + nativeBuildInputs = [ pkg-config cmake diff --git a/pkgs/by-name/bl/blockattack/package.nix b/pkgs/by-name/bl/blockattack/package.nix index 5f866a0e7470..aafab547514c 100644 --- a/pkgs/by-name/bl/blockattack/package.nix +++ b/pkgs/by-name/bl/blockattack/package.nix @@ -9,6 +9,7 @@ fetchFromGitHub, gettext, gitUpdater, + libx11, ninja, physfs, pkg-config, @@ -18,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "blockattack"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "blockattack"; repo = "blockattack-game"; rev = "v${finalAttrs.version}"; - hash = "sha256-6mPj6A7mYm4CXkSSemNPn1CPkd7+01yr8KvCBM3a5po="; + hash = "sha256-sp/D0MSLWV1iV89UULlz8IrP5nmiMv6PsoGf1WM5kGw="; }; nativeBuildInputs = [ @@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2_ttf SDL2_ttf boost + libx11 physfs ]; diff --git a/pkgs/by-name/br/brill/package.nix b/pkgs/by-name/br/brill/package.nix index a077e5a1c169..ff7cc19b750f 100644 --- a/pkgs/by-name/br/brill/package.nix +++ b/pkgs/by-name/br/brill/package.nix @@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { version = "4.000.073"; src = fetchzip { - url = "https://brill.com/fileasset/The_Brill_Typeface_Package_v_4_0.zip"; + url = "https://web.archive.org/web/20250719162541/https://brill.com/fileasset/The_Brill_Typeface_Package_v_4_0.zip"; hash = "sha256-ugmEIkeBzD/4C9wkVfbctEtnzI8Kw+YD6KGcbk4BAf4="; stripRoot = false; }; diff --git a/pkgs/by-name/ca/capypdf/package.nix b/pkgs/by-name/ca/capypdf/package.nix index 51f3a492ae3a..3ddff2102dc8 100644 --- a/pkgs/by-name/ca/capypdf/package.nix +++ b/pkgs/by-name/ca/capypdf/package.nix @@ -11,6 +11,7 @@ libpng, libtiff, zlib, + darwinMinVersionHook, }: stdenv.mkDerivation (finalAttrs: { @@ -42,7 +43,9 @@ stdenv.mkDerivation (finalAttrs: { libjpeg libtiff zlib - ]; + ] + # error: 'to_chars' is unavailable: introduced in macOS 13.3 + ++ lib.optional stdenv.hostPlatform.isDarwin (darwinMinVersionHook "13.3"); meta = { description = "Fully color managed PDF generation library"; diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index 3fa44d6fe442..cc4c43735845 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tauri"; - version = "2.9.2"; + version = "2.9.3"; src = fetchFromGitHub { owner = "tauri-apps"; repo = "tauri"; tag = "tauri-cli-v${finalAttrs.version}"; - hash = "sha256-kkCeNQL5NR7DGKa3rbPx3NRQv1vAOHw741icHmzj5v8="; + hash = "sha256-cpD4eh0qxwPmGMDAzI1AHVLEe4WU80xGzeZIT56iMpc="; }; - cargoHash = "sha256-oTL/kwvuFio7RTnpVqeEXNsWCsNUKY8GlNlh+59LVxg="; + cargoHash = "sha256-H+HwPoUlCU7lDMZSQetaKQvCTowPnAvBres2QPJu5+Q="; nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [ pkg-config diff --git a/pkgs/by-name/co/copyparty-full-buggy/package.nix b/pkgs/by-name/co/copyparty-full-buggy/package.nix new file mode 100644 index 000000000000..d717d141a832 --- /dev/null +++ b/pkgs/by-name/co/copyparty-full-buggy/package.nix @@ -0,0 +1,17 @@ +{ copyparty }: +copyparty.override { + withHashedPasswords = true; + withCertgen = true; + withThumbnails = true; + withFastThumbnails = true; + withMediaProcessing = true; + withBasicAudioMetadata = true; + withZeroMQ = true; + withFTP = true; + withFTPS = true; + withTFTP = true; + withMagic = true; + withSMB = true; + nameSuffix = "-full-buggy"; + longDescription = "Full variant, all dependencies and features including those marked buggy"; +} diff --git a/pkgs/by-name/co/copyparty-min/package.nix b/pkgs/by-name/co/copyparty-min/package.nix new file mode 100644 index 000000000000..b2bd2b42ce53 --- /dev/null +++ b/pkgs/by-name/co/copyparty-min/package.nix @@ -0,0 +1,17 @@ +{ copyparty }: +copyparty.override { + withHashedPasswords = false; + withCertgen = false; + withThumbnails = false; + withFastThumbnails = false; + withMediaProcessing = false; + withBasicAudioMetadata = false; + withZeroMQ = false; + withFTP = false; + withFTPS = false; + withTFTP = false; + withSMB = false; + withMagic = false; + nameSuffix = "-min"; + longDescription = "Minimal variant, minimal dependencies and fewest features"; +} diff --git a/pkgs/by-name/co/copyparty-most/package.nix b/pkgs/by-name/co/copyparty-most/package.nix new file mode 100644 index 000000000000..6e8fa8e8b205 --- /dev/null +++ b/pkgs/by-name/co/copyparty-most/package.nix @@ -0,0 +1,17 @@ +{ copyparty }: +copyparty.override { + withHashedPasswords = true; + withCertgen = true; + withThumbnails = true; + withFastThumbnails = true; + withMediaProcessing = true; + withBasicAudioMetadata = true; + withZeroMQ = true; + withFTP = true; + withFTPS = true; + withTFTP = true; + withSMB = false; + withMagic = true; + nameSuffix = "-most"; + longDescription = "Almost-full variant, all dependencies and features except those marked buggy"; +} diff --git a/pkgs/by-name/co/copyparty/package.nix b/pkgs/by-name/co/copyparty/package.nix new file mode 100644 index 000000000000..558b476480be --- /dev/null +++ b/pkgs/by-name/co/copyparty/package.nix @@ -0,0 +1,174 @@ +# partially sourced from https://github.com/9001/copyparty/blob/hovudstraum/contrib/package/nix/copyparty/default.nix +{ + lib, + + fetchurl, + + python3Packages, + + # non-python deps + cfssl, + ffmpeg, + util-linux, + + # options + # use argon2id-hashed passwords in config files (sha2 is always available) + withHashedPasswords ? true, + + # generate TLS certificates on startup (pointless when reverse-proxied) + withCertgen ? true, + + # create thumbnails with Pillow; faster than FFmpeg / MediaProcessing + withThumbnails ? true, + + # create thumbnails with PyVIPS; even faster, uses more memory + # -- can be combined with Pillow to support more filetypes + withFastThumbnails ? false, + + # enable FFmpeg; thumbnails for most filetypes (also video and audio), extract audio metadata, transcode audio to opus + # -- possibly dangerous if you allow anonymous uploads, since FFmpeg has a huge attack surface + # -- can be combined with Thumbnails and/or FastThumbnails, since FFmpeg is slower than both + withMediaProcessing ? true, + + # if MediaProcessing is not enabled, you probably want this instead (less accurate, but much safer and faster) + withBasicAudioMetadata ? false, + + # send ZeroMQ messages from event-hooks + withZeroMQ ? true, + + # enable FTP server + withFTP ? true, + + # enable FTPS support in the FTP server + withFTPS ? false, + + # enable TFTP server + withTFTP ? false, + + # samba/cifs server; dangerous and buggy, enable if you really need it + withSMB ? false, + + # enables filetype detection for nameless uploads + withMagic ? false, + + # extra packages to add to the PATH + extraPackages ? [ ], + + # function that accepts a python packageset and returns a list of packages to + # be added to the python venv. useful for scripts and such that require + # additional dependencies + extraPythonPackages ? (_p: [ ]), + + nameSuffix ? "", + + # this goes directly into meta.longDescription + longDescription ? "Default build", +}: + +let + runtimeDeps = ([ util-linux ] ++ extraPackages ++ lib.optional withMediaProcessing ffmpeg); +in + +python3Packages.buildPythonApplication rec { + pname = "copyparty${nameSuffix}"; + version = "1.19.20"; + + src = fetchurl { + url = "https://github.com/9001/copyparty/releases/download/v${version}/copyparty-${version}.tar.gz"; + hash = "sha256-BQzMNFVOWSEKynpn2HoYbmmz9NvgE9XuLxGiLCWagqY="; + }; + + pyproject = true; + + build-system = [ + python3Packages.setuptools + ]; + + dependencies = + with python3Packages; + [ + jinja2 + fusepy + ] + ++ lib.optional withSMB impacket + ++ lib.optional withFTP pyftpdlib + ++ lib.optional withFTPS pyopenssl + ++ lib.optional withTFTP partftpy + ++ lib.optional withCertgen cfssl + ++ (lib.optionals withThumbnails [ + pillow + pillow-jpls + pillow-heif + rawpy + ]) + ++ lib.optional withFastThumbnails pyvips + ++ lib.optional withMediaProcessing ffmpeg + ++ lib.optional withBasicAudioMetadata mutagen + ++ lib.optional withHashedPasswords argon2-cffi + ++ lib.optional withZeroMQ pyzmq + ++ lib.optional withMagic magic + ++ (extraPythonPackages python3Packages); + + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath runtimeDeps}" ]; + + meta = { + description = "turn almost any device into a file server over http(s), webdav, ftp(s), and tftp"; + inherit longDescription; + homepage = "https://github.com/9001/copyparty"; + license = + let + # list from https://github.com/9001/copyparty/blob/hovudstraum/scripts/deps-docker/Dockerfile + includedLibraryLicenses = with lib.licenses; { + # https://github.com/openpgpjs/asmcrypto.js + asmcrypto = mit; + # https://github.com/markedjs/marked + marked = [ + # https://github.com/markedjs/marked/blob/master/LICENSE.md + mit + bsd3 + ]; + # https://github.com/Ionaru/easy-markdown-editor + easy-markdown-editor = lib.licenses.mit; + # https://github.com/codemirror/codemirror5 + codemirror = lib.licenses.mit; + # https://github.com/cure53/DOMPurify + dompurify = [ + asl20 # or + mpl20 + ]; + # https://github.com/FortAwesome/Font-Awesome + font-awesome = [ + cc-by-40 + ofl + mit + ]; + # https://github.com/PrismJS/prism/blob/v2/LICENSE + prism = mit; + # https://files.pythonhosted.org/packages/04/0b/4506cb2e831cea4b0214d3625430e921faaa05a7fb520458c75a2dbd2152/fusepy-3.0.1.tar.gz + # https://pypi.org/project/fusepy + # https://github.com/fusepy/fusepy + fusepy = isc; + }; + copypartyLicense = lib.licenses.mit; + res = lib.pipe includedLibraryLicenses [ + builtins.attrValues + (a: a ++ [ copypartyLicense ]) + lib.flatten + lib.unique + ]; + in + res; + sourceProvenance = with lib.sourceTypes; [ + fromSource + # the javascript deps come pre-built + # see https://github.com/9001/copyparty/blob/hovudstraum/scripts/deps-docker/Dockerfile + binaryBytecode + binaryNativeCode + ]; + maintainers = with lib.maintainers; [ + shelvacu + ]; + mainProgram = "copyparty"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/cy/cyan/package.nix b/pkgs/by-name/cy/cyan/package.nix index 327994945850..7e3714a12476 100644 --- a/pkgs/by-name/cy/cyan/package.nix +++ b/pkgs/by-name/cy/cyan/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, qt5, cmake, pkg-config, @@ -20,6 +21,16 @@ stdenv.mkDerivation rec { hash = "sha256-R5sj8AN7UT9OIeUPNrdTIUQvtEitXp1A32l/Z2qRS94="; }; + patches = [ + # cmake-4 build fix: + # https://github.com/rodlie/cyan/pull/123 + (fetchpatch2 { + name = "cmake-4.patch"; + url = "https://github.com/rodlie/cyan/commit/885e81310de8df7f32a5e1d2c722f89bcd969cd1.patch?full_index=1"; + hash = "sha256-5VhXKamDNGeEvi86l+R3Lvzb4G5JFBq2dqqd6TdyxZ4="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/dr/drawing/package.nix b/pkgs/by-name/dr/drawing/package.nix index 86e6b711add7..c42420618191 100644 --- a/pkgs/by-name/dr/drawing/package.nix +++ b/pkgs/by-name/dr/drawing/package.nix @@ -60,6 +60,13 @@ python3.pkgs.buildPythonApplication rec { patchShebangs build-aux/meson/postinstall.py ''; + # Prevent double wrapping because of wrapGAppsHook3 + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + strictDeps = false; meta = { diff --git a/pkgs/by-name/fa/fakesip/package.nix b/pkgs/by-name/fa/fakesip/package.nix new file mode 100644 index 000000000000..a0ce111a7d5f --- /dev/null +++ b/pkgs/by-name/fa/fakesip/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libnetfilter_queue, + libnfnetlink, + libmnl, + versionCheckHook, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fakesip"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "MikeWang000000"; + repo = "FakeSIP"; + tag = finalAttrs.version; + hash = "sha256-iY9EAvy4E6aM59B1sn9d0xoUMdOsX75LslVzB/Cf5XM="; + }; + + buildInputs = [ + libnetfilter_queue + libnfnetlink + libmnl + ]; + + makeFlags = [ + "CROSS_PREFIX=${stdenv.cc.targetPrefix}" + "VERSION=${finalAttrs.version}" + ]; + + installFlags = [ "PREFIX=$(out)" ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Disguise your UDP traffic as SIP protocol to evade DPI detection"; + homepage = "https://github.com/MikeWang000000/FakeSIP"; + changelog = "https://github.com/MikeWang000000/FakeSIP/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ moraxyc ]; + mainProgram = "fakesip"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/fl/flet-client-flutter/package.nix b/pkgs/by-name/fl/flet-client-flutter/package.nix index cf2bbab86e8a..470a9185cad6 100644 --- a/pkgs/by-name/fl/flet-client-flutter/package.nix +++ b/pkgs/by-name/fl/flet-client-flutter/package.nix @@ -60,6 +60,10 @@ flutter329.buildFlutterApplication rec { ++ mpv-unwrapped.buildInputs ++ libplacebo.buildInputs; + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=nontrivial-memcall" + ]; + passthru = { updateScript = _experimental-update-script-combinators.sequence [ (gitUpdater { rev-prefix = "v"; }) diff --git a/pkgs/by-name/gc/gcompris/package.nix b/pkgs/by-name/gc/gcompris/package.nix index df8f4c6e90f1..438f28ca1425 100644 --- a/pkgs/by-name/gc/gcompris/package.nix +++ b/pkgs/by-name/gc/gcompris/package.nix @@ -18,11 +18,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Y23pFov1/WKPrwYYRfGI8sOF0tp/ksSwRJE5zmxtoSo="; }; - # fix concatenation of absolute paths like - # /nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.1.1/bin/..//nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.1.1/share/gcompris-qt/rcc/core.rcc postPatch = '' + # fix concatenation of absolute paths like + # /nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.1.1/bin/..//nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.1.1/share/gcompris-qt/rcc/core.rcc substituteInPlace src/core/config.h.in --replace-fail \ "../@_data_dest_dir@" "../share/gcompris-qt" + + # Fix private Qt6 targets search for Qt 6.10 + substituteInPlace CMakeLists.txt --replace-fail \ + "set(QT_COMPONENTS Qml Quick Gui Multimedia Core Svg Network LinguistTools Sensors QuickControls2 QuickTemplates2 Charts Widgets QmlWorkerScript)" \ + "set(QT_COMPONENTS Qml Quick Gui Multimedia Core Svg Network LinguistTools Sensors QuickControls2 QuickTemplates2 Charts Widgets QmlWorkerScript CorePrivate QuickControls2BasicPrivate WaylandClientPrivate)" ''; cmakeFlags = [ diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index 5f151e0010f9..23469817d376 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -13,16 +13,16 @@ buildNpmPackage (finalAttrs: { pname = "gemini-cli"; - version = "0.11.3"; + version = "0.13.0"; src = fetchFromGitHub { owner = "google-gemini"; repo = "gemini-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-43ohCUqdM0quxwoN3s/3vOq4IRc+sck+BkAfqMEDq8g="; + hash = "sha256-Y6RIFF65uzgeOKU03wibEeLtUub1iG52tljM+rHDZbg="; }; - npmDepsHash = "sha256-wqzsHBFXo5NhsFHOErxVVG9Y08daEQs6YdRZHFeOq98="; + npmDepsHash = "sha256-6YhbPj+gbSi/OvyH+dFxkTD4qVj+/7TiMQuP7f1aZYE="; nativeBuildInputs = [ jq diff --git a/pkgs/by-name/gf/gfal2/package.nix b/pkgs/by-name/gf/gfal2/package.nix index 62e9714929b6..7c8e2fbd55bb 100644 --- a/pkgs/by-name/gf/gfal2/package.nix +++ b/pkgs/by-name/gf/gfal2/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "gfal2"; - version = "2.23.2"; + version = "2.23.5"; src = fetchFromGitHub { owner = "cern-fts"; repo = "gfal2"; rev = "v${finalAttrs.version}"; - hash = "sha256-gyEmz0sNHyxjvJA/3uSzLW42PQ3UVKx6nptNYl/3ExM="; + hash = "sha256-Dt6xA7U4aPKFZmO2iAiYM99w5ZIZNQJ+JXzuVItIlBM="; }; passthru.enablePluginStatus = { diff --git a/pkgs/by-name/je/jen/package.nix b/pkgs/by-name/je/jen/package.nix index f59d6dbee404..dbcfb71f6c39 100644 --- a/pkgs/by-name/je/jen/package.nix +++ b/pkgs/by-name/je/jen/package.nix @@ -2,33 +2,36 @@ lib, rustPlatform, fetchCrate, - fetchpatch, + versionCheckHook, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "jen"; - version = "1.7.0"; + version = "1.7.1"; src = fetchCrate { - inherit pname version; - hash = "sha256-nouAHEo5JJtZ0pV8ig/iJ3eB8uPz3yMVIYP6RrNVlSA="; + inherit (finalAttrs) pname version; + hash = "sha256-dRUIyy4aQRwofZ/zWOHThclfxxrpXGWHruqg2Pp2BtQ="; }; - cargoPatches = [ - (fetchpatch { - name = "fix-rust-1.80-build.patch"; - url = "https://github.com/whitfin/jen/commit/a6b5239593cecfd803a111ff317afa88c94c3640.patch"; - hash = "sha256-ikfmEj6Xm0nT9dxpx6xdm/mQbw0b3gh2PT6Zo69Zg0E="; - }) + cargoHash = "sha256-2c4XHA8fl2BA/Qtz+Hp29SjiWqPEJEj4WQiIFG/O4fE="; + + nativeInstallCheckInputs = [ + versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; - cargoHash = "sha256-qYEnKFC1Y24TEY0dXa9N7QNvxhHULq+vd4Wej/RK8HQ="; + passthru = { + updateScript = nix-update-script { }; + }; - meta = with lib; { + meta = { description = "Simple CLI generation tool for creating large datasets"; mainProgram = "jen"; homepage = "https://github.com/whitfin/jen"; - license = licenses.mit; - maintainers = [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ liberodark ]; }; -} +}) diff --git a/pkgs/by-name/ju/jumanpp/0001-Exclude-all-tests-from-the-build.patch b/pkgs/by-name/ju/jumanpp/0001-Exclude-all-tests-from-the-build.patch deleted file mode 100644 index d41bada82def..000000000000 --- a/pkgs/by-name/ju/jumanpp/0001-Exclude-all-tests-from-the-build.patch +++ /dev/null @@ -1,177 +0,0 @@ -From c52a5046e19718a43d48c9b3cfdc121d964e8c3b Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Fri, 28 Jan 2022 17:43:35 +0100 -Subject: [PATCH] Exclude all tests from the build - -For some reason it isn't sufficient to set `-DJPP_ENABLE_TESTS=OFF`. -Doing that because the tests on 2.0.0-rc3 don't seem to be working and -the vendored catch2 doesn't build with glibc 2.34. ---- - src/CMakeLists.txt | 3 +-- - src/core/CMakeLists.txt | 11 +---------- - src/core/analysis/CMakeLists.txt | 2 -- - src/core/codegen/CMakeLists.txt | 3 --- - src/core/spec/CMakeLists.txt | 2 -- - src/core/training/CMakeLists.txt | 2 -- - src/jumandic/CMakeLists.txt | 8 +------- - src/rnn/CMakeLists.txt | 5 +---- - src/util/CMakeLists.txt | 2 -- - 9 files changed, 4 insertions(+), 34 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 169dff5..64b6a07 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -67,7 +67,6 @@ function(jpp_feature_codegen) - endfunction(jpp_feature_codegen) - - add_subdirectory(util) --add_subdirectory(testing) - add_subdirectory(core) - add_subdirectory(jumandic) --add_subdirectory(rnn) -\ No newline at end of file -+add_subdirectory(rnn) -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index c63d134..01c825e 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -55,20 +55,11 @@ set(core_hdrs - ${core_hdrs} - ) - --set(core_test_srcs -- ${core_test_srcs} -- ${core_tsrcs} -- test/test_analyzer_env.h -- ../testing/test_analyzer.h -- ) -- - add_library(jpp_core ${core_srcs} ${core_hdrs} ${libs3p_pegtl_headers}) --jpp_test_executable(jpp_core_tests ${core_test_srcs}) - - target_include_directories(jpp_core PUBLIC ${jpp_core_cfg_dir}) - - target_link_libraries(jpp_core PUBLIC jpp_util jpp_rnn PRIVATE pathie) --target_link_libraries(jpp_core_tests jpp_core jpp_core_train) - - if (${JPP_USE_PROTOBUF}) - target_include_directories(jpp_core PUBLIC ${Protobuf_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -@@ -78,4 +69,4 @@ endif() - add_subdirectory(benchmarks) - if (${JPP_ENABLE_DEV_TOOLS}) - add_subdirectory(devtools) --endif () -\ No newline at end of file -+endif () -diff --git a/src/core/analysis/CMakeLists.txt b/src/core/analysis/CMakeLists.txt -index 526263e..1b32f8d 100644 ---- a/src/core/analysis/CMakeLists.txt -+++ b/src/core/analysis/CMakeLists.txt -@@ -79,5 +79,3 @@ jpp_core_files(core_hdrs - ) - - --jpp_test_executable(jpp_core_analysis_tests ${core_analysis_tsrc}) --target_link_libraries(jpp_core_analysis_tests jpp_core) -diff --git a/src/core/codegen/CMakeLists.txt b/src/core/codegen/CMakeLists.txt -index a905cee..fa759c7 100644 ---- a/src/core/codegen/CMakeLists.txt -+++ b/src/core/codegen/CMakeLists.txt -@@ -30,7 +30,4 @@ set(jpp_codegen_tsrcs - - add_library(jpp_core_codegen ${jpp_codegen_srcs} ${jpp_codegen_hdrs}) - --jpp_test_executable(jpp_codegen_tests ${jpp_codegen_tsrcs}) --target_include_directories(jpp_codegen_tests PRIVATE ${cgtest02_INCLUDE}) - target_link_libraries(jpp_core_codegen jpp_core) --target_link_libraries(jpp_codegen_tests jpp_core_codegen) -\ No newline at end of file -diff --git a/src/core/spec/CMakeLists.txt b/src/core/spec/CMakeLists.txt -index f495d67..da827b9 100644 ---- a/src/core/spec/CMakeLists.txt -+++ b/src/core/spec/CMakeLists.txt -@@ -33,5 +33,3 @@ jpp_core_files(core_hdrs - - ) - --jpp_test_executable(jpp_core_spec_tests ${core_spec_tsrc} ${libs3p_pegtl_headers}) --target_link_libraries(jpp_core_spec_tests jpp_core) -\ No newline at end of file -diff --git a/src/core/training/CMakeLists.txt b/src/core/training/CMakeLists.txt -index 960437e..4ede9e1 100644 ---- a/src/core/training/CMakeLists.txt -+++ b/src/core/training/CMakeLists.txt -@@ -39,7 +39,5 @@ set(core_train_hdrs - - - add_library(jpp_core_train ${core_train_src} ${core_train_hdrs}) --jpp_test_executable(jpp_core_train_tests ${core_train_tsrc}) - - target_link_libraries(jpp_core_train jpp_core) --target_link_libraries(jpp_core_train_tests jpp_core_train) -\ No newline at end of file -diff --git a/src/jumandic/CMakeLists.txt b/src/jumandic/CMakeLists.txt -index bef3149..85a8b5d 100644 ---- a/src/jumandic/CMakeLists.txt -+++ b/src/jumandic/CMakeLists.txt -@@ -53,10 +53,6 @@ if (${JPP_USE_PROTOBUF}) - endif () - - --jpp_test_executable(jpp_jumandic_tests ${jumandic_tests}) --jpp_test_executable(jpp_bug_tests ${bug_test_sources}) --target_include_directories(jpp_jumandic_tests PRIVATE ${jpp_jumandic_cg_INCLUDE}) -- - add_executable(jpp_jumandic_bootstrap main/bootstrap.cc) - add_executable(jumanpp_v2 main/jumanpp.cc) - add_executable(jumanpp_v2_train main/jumanpp_train.cc main/jumanpp_train.h) -@@ -64,11 +60,9 @@ add_executable(jpp_jumandic_pathdiff main/path_diff.cc) - target_include_directories(jpp_jumandic_pathdiff PRIVATE ${jpp_jumandic_cg_INCLUDE}) - - target_link_libraries(jpp_jumandic jpp_jumandic_spec) --target_link_libraries(jpp_jumandic_tests jpp_jumandic jpp_core_train) --target_link_libraries(jpp_bug_tests jpp_jumandic jpp_core_train) - target_link_libraries(jpp_jumandic_bootstrap jpp_jumandic) - target_link_libraries(jumanpp_v2 jpp_jumandic) - target_link_libraries(jumanpp_v2_train jpp_jumandic jpp_core_train) - target_link_libraries(jpp_jumandic_pathdiff jpp_jumandic) - --install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jumanpp_v2 RENAME jumanpp DESTINATION bin) -\ No newline at end of file -+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jumanpp_v2 RENAME jumanpp DESTINATION bin) -diff --git a/src/rnn/CMakeLists.txt b/src/rnn/CMakeLists.txt -index 448ba51..ca09a00 100644 ---- a/src/rnn/CMakeLists.txt -+++ b/src/rnn/CMakeLists.txt -@@ -1,12 +1,9 @@ - set(jpp_rnn_sources mikolov_rnn.cc) - set(jpp_rnn_includes mikolov_rnn.h simple_rnn_impl.h mikolov_rnn_impl.h rnn_arg_parse.h) --set(jpp_rnn_tests mikolov_rnn_test.cc) - - add_library(jpp_rnn ${jpp_rnn_sources} ${jpp_rnn_includes} ) - add_library(jumanpp_rnn_legacy legacy/rnnlmlib.h legacy/rnnlmlib_static.h legacy/rnnlmlib_static.cpp) - --jpp_test_executable(jpp_rnn_tests ${jpp_rnn_tests}) - target_link_libraries(jpp_rnn jpp_util) --target_link_libraries(jpp_rnn_tests jpp_rnn jumanpp_rnn_legacy) - --target_link_libraries(jumanpp_rnn_legacy jpp_util) -\ No newline at end of file -+target_link_libraries(jumanpp_rnn_legacy jpp_util) -diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt -index 53b6c57..c4599d5 100644 ---- a/src/util/CMakeLists.txt -+++ b/src/util/CMakeLists.txt -@@ -25,8 +25,6 @@ endif() - - - add_library(jpp_util ${jpp_util_sources} ${jpp_util_headers} ${BACKWARD_headers}) --jpp_test_executable(jpp_util_test ${jpp_util_test_srcs} ${jpp_util_headers}) --target_link_libraries(jpp_util_test jpp_util) - target_link_libraries(jpp_util ${CMAKE_THREAD_LIBS_INIT}) - target_include_directories(jpp_util PUBLIC ${JPP_LIBS_DIR} ${JPP_SRC_DIR}) - target_compile_features(jpp_util PUBLIC --- -2.33.1 - diff --git a/pkgs/by-name/ju/jumanpp/package.nix b/pkgs/by-name/ju/jumanpp/package.nix index 6f0ca2599757..a3b8678b5ead 100644 --- a/pkgs/by-name/ju/jumanpp/package.nix +++ b/pkgs/by-name/ju/jumanpp/package.nix @@ -2,46 +2,31 @@ lib, stdenv, fetchurl, - fetchpatch, cmake, protobuf, libiconv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jumanpp"; - version = "2.0.0-rc3"; + version = "2.0.0-rc4"; src = fetchurl { - url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ASdr6qbkSe71M7QmuuwidCa4xQhDVoXBJ2XqvSY53pQ="; + url = "https://github.com/ku-nlp/jumanpp/releases/download/v${finalAttrs.version}/jumanpp-${finalAttrs.version}.tar.xz"; + hash = "sha256-qyy0mTBrH3y8OBIVXuTHIDV+AbQIvCIA7rzhbI2b8y8="; }; - patches = [ - ./0001-Exclude-all-tests-from-the-build.patch - # https://github.com/ku-nlp/jumanpp/pull/132 - (fetchpatch { - name = "fix-unused-warning.patch"; - url = "https://github.com/ku-nlp/jumanpp/commit/cc0d555287c8b214e9d6f0279c449a4e035deee4.patch"; - sha256 = "sha256-yRKwuUJ2UPXJcjxBGhSOmcQI/EOijiJDMmmmSRdNpX8="; - }) - (fetchpatch { - name = "update-libs.patch"; - url = "https://github.com/ku-nlp/jumanpp/commit/5e9068f56ae310ed7c1df185b14d49654ffe1ab6.patch"; - sha256 = "sha256-X49/ZoLT0OGePLZYlgacNxA1dHM4WYdQ8I4LW3sW16E="; - }) - (fetchpatch { - name = "fix-mmap-on-apple-m1.patch"; - url = "https://github.com/ku-nlp/jumanpp/commit/0c22249f12928d0c962f03f229026661bf0c7921.patch"; - sha256 = "sha256-g6CuruqyoMJxU/hlNoALx1QnFM8BlTsTd0pwlVrco3I="; - }) - ]; - cmakeFlags = [ "-DJPP_ENABLE_TESTS=OFF" ]; + doCheck = true; nativeBuildInputs = [ cmake ]; buildInputs = [ protobuf ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; - meta = with lib; { + postPatch = '' + substituteInPlace libs/pathie-cpp/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)" + ''; + + meta = { description = "Japanese morphological analyser using a recurrent neural network language model (RNNLM)"; mainProgram = "jumanpp"; longDescription = '' @@ -50,8 +35,8 @@ stdenv.mkDerivation rec { language model (RNNLM). ''; homepage = "https://nlp.ist.i.kyoto-u.ac.jp/index.php?JUMAN++"; - license = licenses.asl20; - maintainers = with maintainers; [ mt-caret ]; - platforms = platforms.all; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ mt-caret ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/kg/kgraphviewer/cmake-minimum-required.patch b/pkgs/by-name/kg/kgraphviewer/cmake-minimum-required.patch new file mode 100644 index 000000000000..19ca4a46ec88 --- /dev/null +++ b/pkgs/by-name/kg/kgraphviewer/cmake-minimum-required.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 03dfe43..33553f8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.10) + cmake_policy(SET CMP0048 NEW) + project(kgraphviewer VERSION "2.4.3") + set(KGRAPHVIEWERLIB_SOVERION 3) diff --git a/pkgs/by-name/kg/kgraphviewer/package.nix b/pkgs/by-name/kg/kgraphviewer/package.nix index 27320c563890..797ed6c7fb30 100644 --- a/pkgs/by-name/kg/kgraphviewer/package.nix +++ b/pkgs/by-name/kg/kgraphviewer/package.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { sha256 = "1h6pgg89gvxl8gw7wmkabyqqrzad5pxyv5lsmn1fl4ir8lcc5q2l"; }; + patches = [ ./cmake-minimum-required.patch ]; + buildInputs = [ libsForQt5.qtbase libsForQt5.qtsvg diff --git a/pkgs/games/leela-zero/default.nix b/pkgs/by-name/le/leela-zero/package.nix similarity index 69% rename from pkgs/games/leela-zero/default.nix rename to pkgs/by-name/le/leela-zero/package.nix index da7c815fa056..7b5440562920 100644 --- a/pkgs/games/leela-zero/default.nix +++ b/pkgs/by-name/le/leela-zero/package.nix @@ -2,23 +2,23 @@ lib, stdenv, fetchFromGitHub, - cmake, boost, - opencl-headers, + cmake, + libsForQt5, ocl-icd, - qtbase, + opencl-headers, zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "leela-zero"; - version = "0.17"; + version = "0.17-unstable-2023-02-07"; src = fetchFromGitHub { owner = "gcp"; repo = "leela-zero"; - rev = "v${version}"; - hash = "sha256-AQRp2rkL9KCZdsJN6uz2Y+3kV4lyRLYjWn0p7UOjBMw="; + rev = "3ee6d20d0b36ae26120331c610926359cc5837de"; + hash = "sha256-JF25y471miw/0b7XXBURzK+4WBwZI5ZUP+36/cZUORo="; fetchSubmodules = true; }; @@ -26,12 +26,16 @@ stdenv.mkDerivation rec { boost opencl-headers ocl-icd - qtbase + libsForQt5.qtbase zlib ]; nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.10" + ]; + dontWrapQtApps = true; meta = with lib; { diff --git a/pkgs/by-name/li/libcork/package.nix b/pkgs/by-name/li/libcork/package.nix index ffcf1683533b..d8261ba99721 100644 --- a/pkgs/by-name/li/libcork/package.nix +++ b/pkgs/by-name/li/libcork/package.nix @@ -31,6 +31,9 @@ stdenv.mkDerivation rec { --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} \ --replace '\$'{datarootdir}/'$'{base_docdir} '$'{CMAKE_INSTALL_FULL_DOCDIR} + + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/liblaxjson/package.nix b/pkgs/by-name/li/liblaxjson/package.nix index 905cc1cb9a16..86fb56ebb3ce 100644 --- a/pkgs/by-name/li/liblaxjson/package.nix +++ b/pkgs/by-name/li/liblaxjson/package.nix @@ -18,11 +18,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "Library for parsing JSON config files"; homepage = "https://github.com/andrewrk/liblaxjson"; license = licenses.mit; platforms = platforms.unix; + broken = stdenv.hostPlatform.isDarwin; maintainers = [ maintainers.andrewrk ]; }; } diff --git a/pkgs/by-name/li/libnghttp2_asio/package.nix b/pkgs/by-name/li/libnghttp2_asio/package.nix index 4fe8889e16b2..490566fde01f 100644 --- a/pkgs/by-name/li/libnghttp2_asio/package.nix +++ b/pkgs/by-name/li/libnghttp2_asio/package.nix @@ -35,6 +35,11 @@ stdenv.mkDerivation { openssl ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "High level HTTP/2 C++ library"; longDescription = '' diff --git a/pkgs/by-name/li/libwebcam/package.nix b/pkgs/by-name/li/libwebcam/package.nix index aebf4eb6411b..70d08400a1b9 100644 --- a/pkgs/by-name/li/libwebcam/package.nix +++ b/pkgs/by-name/li/libwebcam/package.nix @@ -30,14 +30,20 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace ./uvcdynctrl/CMakeLists.txt \ - --replace "/lib/udev" "$out/lib/udev" + --replace-fail "/lib/udev" "$out/lib/udev" \ + --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" substituteInPlace ./uvcdynctrl/udev/scripts/uvcdynctrl \ - --replace 'debug=0' 'debug=''${NIX_UVCDYNCTRL_UDEV_DEBUG:-0}' \ - --replace 'uvcdynctrlpath=uvcdynctrl' "uvcdynctrlpath=$out/bin/uvcdynctrl" + --replace-fail 'debug=0' 'debug=''${NIX_UVCDYNCTRL_UDEV_DEBUG:-0}' \ + --replace-fail 'uvcdynctrlpath=uvcdynctrl' "uvcdynctrlpath=$out/bin/uvcdynctrl" substituteInPlace ./uvcdynctrl/udev/rules/80-uvcdynctrl.rules \ - --replace "/lib/udev" "$out/lib/udev" + --replace-fail "/lib/udev" "$out/lib/udev" + + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" + substituteInPlace libwebcam/CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" ''; preConfigure = '' diff --git a/pkgs/by-name/li/lightning-loop/package.nix b/pkgs/by-name/li/lightning-loop/package.nix index df3ad835f178..8db5d3ba5dfd 100644 --- a/pkgs/by-name/li/lightning-loop/package.nix +++ b/pkgs/by-name/li/lightning-loop/package.nix @@ -1,36 +1,48 @@ { buildGoModule, fetchFromGitHub, + installShellFiles, lib, }: buildGoModule rec { pname = "lightning-loop"; - version = "0.31.2-beta"; + version = "0.31.5-beta"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "loop"; rev = "v${version}"; - hash = "sha256-xhvGsAvcJqjSyf32Zo9jJUoHCN/5mWliLqcyN3GEjD0="; + hash = "sha256-pmZturc7b3wd+qgSQPNzeY0LoMTF82dqUgOe8NfPeZw="; }; - vendorHash = "sha256-Rb0P2mPrvOII5Ck4rtB4/gpymVmwuM1rH8sxLt0zDhs="; + vendorHash = "sha256-X/+yi04FkN8hauqeFytagIdfigb6EGTvv8tVrlm7MGw="; subPackages = [ "cmd/loop" "cmd/loopd" ]; + env.CGO_ENABLED = 0; + + nativeBuildInputs = [ installShellFiles ]; + ldflags = [ "-s" "-w" ]; + postInstall = '' + installManPage docs/loop.1 + ''; + meta = with lib; { description = "Lightning Loop Client"; homepage = "https://github.com/lightninglabs/loop"; license = licenses.mit; - maintainers = with maintainers; [ proofofkeags ]; + maintainers = with maintainers; [ + proofofkeags + starius + ]; }; } diff --git a/pkgs/by-name/mc/mcpelauncher-client/package.nix b/pkgs/by-name/mc/mcpelauncher-client/package.nix index 598fe0b50c14..386a94f1721a 100644 --- a/pkgs/by-name/mc/mcpelauncher-client/package.nix +++ b/pkgs/by-name/mc/mcpelauncher-client/package.nix @@ -98,7 +98,7 @@ clangStdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "USE_OWN_CURL" false) (lib.cmakeBool "ENABLE_DEV_PATHS" false) (lib.cmakeFeature "GAMEWINDOW_SYSTEM" "GLFW") - (lib.cmakeBool "USE_SDL3_AUDIO" false) + (lib.cmakeBool "SDL3_VENDORED" false) (lib.cmakeBool "BUILD_WEBVIEW" withQtWebview) (lib.cmakeBool "XAL_WEBVIEW_USE_CLI" (!withQtWebview)) (lib.cmakeBool "XAL_WEBVIEW_USE_QT" withQtWebview) diff --git a/pkgs/by-name/me/megahit/package.nix b/pkgs/by-name/me/megahit/package.nix index 84b8953a0556..ea0266471781 100644 --- a/pkgs/by-name/me/megahit/package.nix +++ b/pkgs/by-name/me/megahit/package.nix @@ -34,6 +34,12 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optionals stdenv.hostPlatform.isStatic [ "-DSTATIC_BUILD=ON" ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "Ultra-fast single-node solution for large and complex metagenomics assembly via succinct de Bruijn graph"; license = licenses.gpl3; diff --git a/pkgs/by-name/mi/miriway/package.nix b/pkgs/by-name/mi/miriway/package.nix index 88e592debefb..efa6921acce2 100644 --- a/pkgs/by-name/mi/miriway/package.nix +++ b/pkgs/by-name/mi/miriway/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "25.11"; + version = "25.12"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; tag = "v${finalAttrs.version}"; - hash = "sha256-tXxRKGP/MMXOD1QtOYj5E9IurLoUUu1JBg8+l5z0KCQ="; + hash = "sha256-I+W3tYhjnT3SI6U1K7Xz/5rBHYM3ZAeqj3vRgOXz+lU="; }; postPatch = '' diff --git a/pkgs/by-name/mk/mkclean/package.nix b/pkgs/by-name/mk/mkclean/package.nix index 13e6da9a0945..cfda95fc3c90 100644 --- a/pkgs/by-name/mk/mkclean/package.nix +++ b/pkgs/by-name/mk/mkclean/package.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "format" ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.1.2)" "cmake_minimum_required(VERSION 3.10)" + ''; + postInstall = '' install -Dm0755 mkclean/mkclean $out/bin/mkclean ''; diff --git a/pkgs/by-name/na/nanomq/package.nix b/pkgs/by-name/na/nanomq/package.nix index a365ce02aae1..ef1f0e3db184 100644 --- a/pkgs/by-name/na/nanomq/package.nix +++ b/pkgs/by-name/na/nanomq/package.nix @@ -49,13 +49,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nanomq"; - version = "0.23.6"; + version = "0.24.5"; src = fetchFromGitHub { owner = "emqx"; repo = "nanomq"; tag = finalAttrs.version; - hash = "sha256-Fy/9ASpQ/PHGItYhad69DdHWqCr/Wa+Xdm53Q573Pfc="; + hash = "sha256-tyhAEYdYCO0Tur7HDXXbBSQ8tzTHCbW9B8aBu0sMEEI="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/op/opensoldat/package.nix b/pkgs/by-name/op/opensoldat/package.nix index 76f713be4c9e..c31f93e4354f 100644 --- a/pkgs/by-name/op/opensoldat/package.nix +++ b/pkgs/by-name/op/opensoldat/package.nix @@ -2,8 +2,8 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, fpc, - zip, makeWrapper, SDL2, freetype, @@ -13,30 +13,31 @@ xorg, autoPatchelfHook, cmake, + python3, }: let base = stdenv.mkDerivation rec { pname = "opensoldat-base"; - version = "unstable-2021-09-05"; + version = "unstable-2025-10-16"; src = fetchFromGitHub { name = "base"; owner = "opensoldat"; repo = "base"; - rev = "6c74d768d511663e026e015dde788006c74406b5"; - sha256 = "175gmkdccy8rnkd95h2zqldqfydyji1hfby8b1qbnl8wz4dh08mz"; + rev = "5b6e5bef23f5c0d58fb1d4d887b9b94ebcf799b4"; + sha256 = "sha256-k3P4xSO7DgXn6EzDqlo+RHHTuMDPNvG5y+2iXqguh/M="; }; - nativeBuildInputs = [ zip ]; + nativeBuildInputs = [ python3 ]; buildPhase = '' - sh create_smod.sh + python create_smod.py ''; installPhase = '' - install -Dm644 soldat.smod -t $out/share/soldat - install -Dm644 client/play-regular.ttf -t $out/share/soldat + install -Dm644 soldat.smod -t $out/share/opensoldat + install -Dm644 play-regular.ttf -t $out/share/opensoldat ''; meta = with lib; { @@ -51,14 +52,14 @@ in stdenv.mkDerivation rec { pname = "opensoldat"; - version = "unstable-2022-07-02"; + version = "unstable-2025-10-21"; src = fetchFromGitHub { name = "opensoldat"; owner = "opensoldat"; repo = "opensoldat"; - rev = "9574f5791b7993067f03d2df03d625908bc3762f"; - sha256 = "0kyxzikd4ngx3nshjw0411x61zqq1b7l01lxw41rlcy4nad3r0vi"; + rev = "220468f558f6932ba1dc180a9ef84913d07ab324"; + sha256 = "sha256-BnTLuc/wucFNKh0jnVggpHNvLj/1kqL7i7fF7ORiIZA="; }; nativeBuildInputs = [ @@ -84,20 +85,24 @@ stdenv.mkDerivation rec { # TODO(@sternenseemann): set proper rpath via cmake, so we don't need autoPatchelfHook runtimeDependencies = [ xorg.libX11 ]; - # make sure soldat{,server} find their game archive, + # make sure opensoldat{,server} find their game archive, # let them write their state and configuration files # to $XDG_CONFIG_HOME/soldat/soldat{,server} unless # the user specifies otherwise. - # TODO(@sternenseemann): rename config dir to opensoldat + # Add 'open' prefix to configuration directories postInstall = '' - for p in $out/bin/soldatserver $out/bin/soldat; do - configDir="\''${XDG_CONFIG_HOME:-\$HOME/.config}/soldat/$(basename "$p")" + for p in soldatserver soldat; do + configDir="\''${XDG_CONFIG_HOME:-\$HOME/.config}/opensoldat/open$p" + oldConfigDir="\''${XDG_CONFIG_HOME:-\$HOME/.config}/soldat/$p" - wrapProgram "$p" \ - --run "mkdir -p \"$configDir\"" \ + wrapProgram $out/bin/open$p \ + --run "mkdir -p \"''${XDG_CONFIG_HOME:-\$HOME/.config}/opensoldat\"" \ + --run "[ -d \"$oldConfigDir\" ] && [ -d \"$configDir\" ] && echo Please migrate \"$oldConfigDir\" to \"$configDir\" manually. && exit 1" \ + --run "[ -d \"$oldConfigDir\" ] && [ ! -d \"$configDir\" ] && mv \"$oldConfigDir\" \"$configDir\"" \ + --run "mkdir -p \"$configDir\"; rmdir \"$oldConfigDir\" 2>/dev/null || true" \ --add-flags "-fs_portable 0" \ --add-flags "-fs_userpath \"$configDir\"" \ - --add-flags "-fs_basepath \"${base}/share/soldat\"" + --add-flags "-fs_basepath \"${base}/share/opensoldat\"" done ''; diff --git a/pkgs/by-name/pl/platformio-core/package.nix b/pkgs/by-name/pl/platformio-core/package.nix index f0afbb6b5642..9edb8ce9c8a3 100644 --- a/pkgs/by-name/pl/platformio-core/package.nix +++ b/pkgs/by-name/pl/platformio-core/package.nix @@ -79,6 +79,7 @@ buildPythonApplication rec { marshmallow pip pyelftools + pyparsing pyserial pyyaml requests diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index 73db3a0cda24..ca20001ba823 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "qownnotes"; appname = "QOwnNotes"; - version = "25.10.4"; + version = "25.11.1"; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz"; - hash = "sha256-taYrPrirSIu1CGs8GeX2lhSS8R1l3mr8YPqpkH4Y/bk="; + hash = "sha256-6U+UYF45Nv6cX9ghSmOBQF13HxgcwTbBDnDMLr9jxXY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ra/rapidraw/package.nix b/pkgs/by-name/ra/rapidraw/package.nix index bafcc3aea287..2a1c187ee1a6 100644 --- a/pkgs/by-name/ra/rapidraw/package.nix +++ b/pkgs/by-name/ra/rapidraw/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, fetchFromGitHub, fetchNpmDeps, rustPlatform, @@ -34,20 +35,21 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rapidraw"; - version = "1.3.2"; + version = "1.4.1"; src = fetchFromGitHub { owner = "CyberTimon"; repo = "RapidRAW"; tag = "v${finalAttrs.version}"; - hash = "sha256-j9Mpg3o90/PdKlSpJEePcnXZoO2BfnGtJEielM/5/uQ="; + hash = "sha256-aDOE2VXStPx4POQoSxoQbLwdBmt3LuMPxSZ8ZshE7Fc="; + fetchSubmodules = true; }; - cargoHash = "sha256-emwlK16NgeTYyQevWD4baHUxMP5xWJsKpQp/q5krAhQ="; + cargoHash = "sha256-+7CK2KxUMQ56CBVVb2esM+9ntJ7SzpVb2OmQ3mM5vNU="; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; - hash = "sha256-MULxH6gmHC58XdQe4ePvHcXP7/7fYNHgGHHltkODQ6w="; + hash = "sha256-QaPGXb26pDQLBJfYZoWt3jDeCdwameGkBvrTzhRMxYs="; }; nativeBuildInputs = [ @@ -64,11 +66,9 @@ rustPlatform.buildRustPackage (finalAttrs: { nodejs_20 glib-networking openssl - webkitgtk_4_1 gtk3 glib gdk-pixbuf - libappindicator cairo pango xorg.libX11 @@ -90,6 +90,10 @@ rustPlatform.buildRustPackage (finalAttrs: { libheif onnxruntime wrapGAppsHook4 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + webkitgtk_4_1 + libappindicator ]; cargoRoot = "src-tauri"; @@ -101,7 +105,11 @@ rustPlatform.buildRustPackage (finalAttrs: { # Configure Tauri to use lowercase binary name substituteInPlace src-tauri/tauri.conf.json \ - --replace ' "identifier": "com.rapidraw.app",' ' "identifier": "com.rapidraw.app", "mainBinaryName": "rapidraw",' + --replace-fail ' "identifier": "io.github.CyberTimon.RapidRAW",' ' "identifier": "io.github.CyberTimon.RapidRAW", "mainBinaryName": "rapidraw",' + + # Disable downloading of ONNX runtime library this is correctly linked during postInstall + substituteInPlace src-tauri/build.rs \ + --replace-fail 'if !is_valid' 'if false' ''; dontWrapGApps = true; @@ -109,7 +117,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # needs to be declared twice annoyingly ORT_STRATEGY = "system"; - postInstall = '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' # Patch the .desktop file to set the Categories field sed -i '/^Categories=/c\Categories=Graphics;Photography' "$out/share/applications/RapidRAW.desktop" @@ -123,7 +131,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm -rf $out/lib/RapidRAW/resources/libonnxruntime.dylib ''; - postFixup = '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' wrapGApp $out/bin/rapidraw \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs} \ --set ORT_STRATEGY "system" \ diff --git a/pkgs/by-name/sc/scipopt-gcg/package.nix b/pkgs/by-name/sc/scipopt-gcg/package.nix index d15f8f302f55..2357476ded2c 100644 --- a/pkgs/by-name/sc/scipopt-gcg/package.nix +++ b/pkgs/by-name/sc/scipopt-gcg/package.nix @@ -13,16 +13,16 @@ stdenv.mkDerivation rec { pname = "scipopt-gcg"; - version = "372"; + version = "372-unstable-2025-10-11"; # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.3"; + scipVersion = "9.2.4"; src = fetchFromGitHub { owner = "scipopt"; repo = "gcg"; - tag = "v${version}"; - hash = "sha256-Sx0ZSca7XBT4GqxWt3bzelaXlI7kZCJo+by22mtTFhA="; + rev = "83a2d210a03f920dd941d547da94867deb504882"; + hash = "sha256-wbzknCmwDhJ38gItA3DppJxSJfNK7NeIkxZVRd2kmp0="; }; nativeBuildInputs = [ @@ -53,6 +53,12 @@ stdenv.mkDerivation rec { ) ''; doCheck = true; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.3)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = { maintainers = with lib.maintainers; [ fettgoenner ]; changelog = "https://scipopt.org/doc-${scipVersion}/html/RN${lib.versions.major scipVersion}.php"; diff --git a/pkgs/by-name/sc/scipopt-papilo/package.nix b/pkgs/by-name/sc/scipopt-papilo/package.nix index ef557c5904e8..e6e692a1f743 100644 --- a/pkgs/by-name/sc/scipopt-papilo/package.nix +++ b/pkgs/by-name/sc/scipopt-papilo/package.nix @@ -12,16 +12,16 @@ stdenv.mkDerivation rec { pname = "scipopt-papilo"; - version = "2.4.3"; + version = "2.4.4"; # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.3"; + scipVersion = "9.2.4"; src = fetchFromGitHub { owner = "scipopt"; repo = "papilo"; tag = "v${version}"; - hash = "sha256-SsRAwidqvisoDODBLRatVWFw7wGeLUavmPXSlPmD7d8="; + hash = "sha256-VHOwr3uIhurab1zI9FeecBXZIp1ee2pk8fhVak6H0+A="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/sc/scipopt-scip/0001-check-fix-invalid-ctest-invocation.patch b/pkgs/by-name/sc/scipopt-scip/0001-check-fix-invalid-ctest-invocation.patch deleted file mode 100644 index d6b1f5cd2e18..000000000000 --- a/pkgs/by-name/sc/scipopt-scip/0001-check-fix-invalid-ctest-invocation.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 7772c64ee2face1c1099c23ecbfd20ff663cffc3 Mon Sep 17 00:00:00 2001 -From: Florian Klink -Date: Tue, 7 Oct 2025 16:19:31 +0300 -Subject: [PATCH] check: fix invalid ctest invocation - -ctest doesn't like `-R "-default"`. CMake 4.0 fails with the following -error message: - -> CMake Error: Invalid value used with -R - -`-R` normally specifies the regex that needs to match. If none is -specified, all are selected: - -https://cmake.org/cmake/help/latest/manual/ctest.1.html#cmdoption-ctest-R - -This maybe never worked, but got silently ignored until -https://cmake.org/cmake/help/latest/policy/CMP0175.html - -Removing that regex should only cause *more* tests to get selected, not -less - and the build now succeeds with it. ---- - check/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/check/CMakeLists.txt b/check/CMakeLists.txt -index 0d667d5..c26b978 100644 ---- a/check/CMakeLists.txt -+++ b/check/CMakeLists.txt -@@ -4,7 +4,7 @@ include(CTest) - # add a custom SCIP check target 'scip_check' - # - add_custom_target(scip_check -- COMMAND ${CMAKE_CTEST_COMMAND} -R "-default" -E "applications" --output-on-failure -+ COMMAND ${CMAKE_CTEST_COMMAND} -E "applications" --output-on-failure - DEPENDS scip - ) - --- -2.51.0 - diff --git a/pkgs/by-name/sc/scipopt-scip/package.nix b/pkgs/by-name/sc/scipopt-scip/package.nix index 901fcbb9a073..6b07a7fe84b3 100644 --- a/pkgs/by-name/sc/scipopt-scip/package.nix +++ b/pkgs/by-name/sc/scipopt-scip/package.nix @@ -19,20 +19,15 @@ stdenv.mkDerivation rec { pname = "scipopt-scip"; - version = "9.2.3"; + version = "9.2.4"; src = fetchFromGitHub { owner = "scipopt"; repo = "scip"; tag = "v${lib.replaceStrings [ "." ] [ "" ] version}"; - hash = "sha256-Zc1AXNpHQXXFO8jkMaJj6xYkmkQxAM8G+SiPiH9xCAw="; + hash = "sha256-nwFRtP63/HPfk9JhcyLKApicgqE9IF+7s5MGGrVJrpM="; }; - patches = [ - # https://github.com/scipopt/scip/pull/169 - ./0001-check-fix-invalid-ctest-invocation.patch - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ diff --git a/pkgs/by-name/sc/scipopt-soplex/package.nix b/pkgs/by-name/sc/scipopt-soplex/package.nix index 73ae32e5931b..3e36f07c2f69 100644 --- a/pkgs/by-name/sc/scipopt-soplex/package.nix +++ b/pkgs/by-name/sc/scipopt-soplex/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { version = "7.1.5"; # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.3"; + scipVersion = "9.2.4"; src = fetchFromGitHub { owner = "scipopt"; diff --git a/pkgs/by-name/sc/scipopt-ug/package.nix b/pkgs/by-name/sc/scipopt-ug/package.nix index 1afb8f50b291..96b9ae0d34de 100644 --- a/pkgs/by-name/sc/scipopt-ug/package.nix +++ b/pkgs/by-name/sc/scipopt-ug/package.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { version = "1.0.0-beta6"; # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.3"; + scipVersion = "9.2.4"; # Take the SCIPOptSuite source since no other source exists publicly. src = fetchzip { url = "https://github.com/scipopt/scip/releases/download/v${ lib.replaceStrings [ "." ] [ "" ] scipVersion }/scipoptsuite-${scipVersion}.tgz"; - sha256 = "sha256-Hi6oDPtJZODTBIuRYE62sUMTJqfmF0flY3cGoWh2IZE="; + hash = "sha256-ZFgHaC4JL0eFt/do0ucGkarmfL1WdGEecrE1iPBpFh0="; }; sourceRoot = "${src.name}/ug"; diff --git a/pkgs/by-name/sc/scipopt-zimpl/package.nix b/pkgs/by-name/sc/scipopt-zimpl/package.nix index ef63e973e232..971dc1b5cf19 100644 --- a/pkgs/by-name/sc/scipopt-zimpl/package.nix +++ b/pkgs/by-name/sc/scipopt-zimpl/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { version = "362"; # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.3"; + scipVersion = "9.2.4"; src = fetchFromGitHub { owner = "scipopt"; repo = "zimpl"; tag = "v${version}"; - sha256 = "juqAwzqBArsFXmz7L7RQaE78EhQdP5P51wQFlCoo7/o="; + hash = "sha256-juqAwzqBArsFXmz7L7RQaE78EhQdP5P51wQFlCoo7/o="; }; postPatch = '' diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix index 85785a8bea46..e2f25f468787 100644 --- a/pkgs/by-name/se/servo/package.nix +++ b/pkgs/by-name/se/servo/package.nix @@ -176,6 +176,8 @@ rustPlatform.buildRustPackage { }; meta = { + # undefined libmozjs_sys symbols during linking + broken = stdenv.hostPlatform.isDarwin; description = "Embeddable, independent, memory-safe, modular, parallel web rendering engine"; homepage = "https://servo.org"; license = lib.licenses.mpl20; diff --git a/pkgs/by-name/sk/skyemu/package.nix b/pkgs/by-name/sk/skyemu/package.nix index 697daa6cb5c7..02c63ae1399d 100644 --- a/pkgs/by-name/sk/skyemu/package.nix +++ b/pkgs/by-name/sk/skyemu/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "skyemu"; - version = "3-unstable-2025-02-23"; + version = "4"; src = fetchFromGitHub { owner = "skylersaleh"; repo = "SkyEmu"; - rev = "f8573db83d15791b0cd94c29ceb46bf683963ff0"; - hash = "sha256-LI4zBKjB48zYYYVZePzefRFrw/zvg17jzh5ZOPHAWok="; + tag = "v${finalAttrs.version}"; + hash = "sha256-rfXHOff+PG5iA19iwEij4c5aFD9XrSF1GQhIBhWzKgg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sr/srb2kart/package.nix b/pkgs/by-name/sr/srb2kart/package.nix index adfb3aff654d..42e00c935189 100644 --- a/pkgs/by-name/sr/srb2kart/package.nix +++ b/pkgs/by-name/sr/srb2kart/package.nix @@ -27,24 +27,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-5sIHdeenWZjczyYM2q+F8Y1SyLqL+y77yxYDUM3dVA0="; }; - assets = stdenv.mkDerivation { - pname = "srb2kart-data"; - version = finalAttrs.version; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" + ''; - src = fetchzip { - url = "https://github.com/STJr/Kart-Public/releases/download/v${finalAttrs.version}/AssetsLinuxOnly.zip"; - hash = "sha256-yaVdsQUnyobjSbmemeBEyu35GeZCX1ylTRcjcbDuIu4="; - stripRoot = false; - }; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/srb2kart - cp -r * $out/share/srb2kart - - runHook postInstall - ''; + assets = fetchzip { + name = "srb2kart-data"; + url = "https://github.com/STJr/Kart-Public/releases/download/v${finalAttrs.version}/AssetsLinuxOnly.zip"; + hash = "sha256-yaVdsQUnyobjSbmemeBEyu35GeZCX1ylTRcjcbDuIu4="; + stripRoot = false; }; nativeBuildInputs = [ @@ -64,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DSRB2_ASSET_DIRECTORY=${finalAttrs.assets}/share/srb2kart" + "-DSRB2_ASSET_DIRECTORY=${finalAttrs.assets}" "-DGME_INCLUDE_DIR=${game-music-emu}/include" "-DSDL2_MIXER_INCLUDE_DIR=${lib.getDev SDL2_mixer}/include/SDL2" "-DSDL2_INCLUDE_DIR=${lib.getDev SDL2}/include/SDL2" @@ -91,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { install -Dm755 bin/srb2kart $out/bin/srb2kart wrapProgram $out/bin/srb2kart \ - --set SRB2WADDIR "${finalAttrs.assets}/share/srb2kart" + --set-default SRB2WADDIR ${finalAttrs.assets} runHook postInstall ''; diff --git a/pkgs/by-name/st/step-kms-plugin/package.nix b/pkgs/by-name/st/step-kms-plugin/package.nix index 8683bafe7c72..fecf9a3fb954 100644 --- a/pkgs/by-name/st/step-kms-plugin/package.nix +++ b/pkgs/by-name/st/step-kms-plugin/package.nix @@ -42,13 +42,13 @@ buildGoModule rec { "-X github.com/smallstep/step-kms-plugin/cmd.Version=${version}" ]; + CGO_CFLAGS = "-I${lib.getDev pcsclite}/include/PCSC/"; + meta = with lib; { description = "Step plugin to manage keys and certificates on cloud KMSs and HSMs"; homepage = "https://smallstep.com/cli/"; license = licenses.asl20; maintainers = with maintainers; [ qbit ]; mainProgram = "step-kms-plugin"; - # can't find pcsclite header files - broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/sy/systemdgenie/package.nix b/pkgs/by-name/sy/systemdgenie/package.nix new file mode 100644 index 000000000000..bb4b43072d40 --- /dev/null +++ b/pkgs/by-name/sy/systemdgenie/package.nix @@ -0,0 +1,49 @@ +{ + stdenv, + lib, + cmake, + fetchFromGitLab, + kdePackages, + pkg-config, + nix-update-script, +}: + +stdenv.mkDerivation { + pname = "systemdgenie"; + version = "0.99.0-unstable-2025-10-11"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + repo = "SystemdGenie"; + owner = "system"; + rev = "dcfd937a711fb124da6c717c51334dbbb430e48e"; + hash = "sha256-X/qUWStT3vRvJNQMdzUV818bsZkbxaaAd7RHJcK+WEE="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + kdePackages.extra-cmake-modules + kdePackages.wrapQtAppsHook + ]; + + buildInputs = [ + kdePackages.kirigami-addons + kdePackages.kio + kdePackages.ktexteditor + kdePackages.kxmlgui + ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + + meta = { + description = "Systemd management utility"; + mainProgram = "systemdgenie"; + homepage = "https://kde.org"; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.pasqui23 ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/tr/traverso/package.nix b/pkgs/by-name/tr/traverso/package.nix index c554ac5683c9..d17f129eed4f 100644 --- a/pkgs/by-name/tr/traverso/package.nix +++ b/pkgs/by-name/tr/traverso/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchurl, + fetchgit, cmake, pkg-config, alsa-lib, @@ -15,24 +15,26 @@ libsndfile, libvorbis, portaudio, + qt6, wavpack, - libsForQt5, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "traverso"; - version = "0.49.6"; + version = "0-unstable-2024-09-28"; - src = fetchurl { - url = "https://traverso-daw.org/traverso-${finalAttrs.version}.tar.gz"; - sha256 = "12f7x8kw4fw1j0xkwjrp54cy4cv1ql0zwz2ba5arclk4pf6bhl7q"; + src = fetchgit { + url = "https://git.savannah.nongnu.org/git/traverso.git"; + rev = "f34717623a8d19dd7c04d9604ef4468734140abc"; + hash = "sha256-eobQFJohndwQjXRXBAehkTWS9jR/1bQOjrOF1XJN5L4="; }; + strictDeps = true; + nativeBuildInputs = [ cmake pkg-config - libsForQt5.wrapQtAppsHook + qt6.wrapQtAppsHook ]; - buildInputs = [ alsa-lib fftw @@ -45,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { libsndfile.dev libvorbis portaudio - libsForQt5.qtbase + qt6.qtbase wavpack ]; @@ -56,17 +58,16 @@ stdenv.mkDerivation (finalAttrs: { "-DWANT_LV2=0" ]; - hardeningDisable = [ "format" ]; - meta = { description = "Cross-platform multitrack audio recording and audio editing suite"; mainProgram = "traverso"; - homepage = "https://traverso-daw.org/"; + homepage = "https://savannah.nongnu.org/projects/traverso"; license = with lib.licenses; [ gpl2Plus lgpl21Plus ]; platforms = lib.platforms.all; + broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; maintainers = with lib.maintainers; [ coconnor ]; }; -}) +} diff --git a/pkgs/by-name/za/zatackax/0001-Fix-SDL_main-redefinition-issue-on-macOS.patch b/pkgs/by-name/za/zatackax/0001-Fix-SDL_main-redefinition-issue-on-macOS.patch new file mode 100644 index 000000000000..992a31664df6 --- /dev/null +++ b/pkgs/by-name/za/zatackax/0001-Fix-SDL_main-redefinition-issue-on-macOS.patch @@ -0,0 +1,25 @@ +From 9cf8d3f1025689f3765da2f0a27561a6bfe5c3cb Mon Sep 17 00:00:00 2001 +From: Moraxyc +Date: Fri, 7 Nov 2025 00:23:44 +0800 +Subject: [PATCH] Fix SDL_main redefinition issue on macOS + +--- + src/zatackax.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/zatackax.c b/src/zatackax.c +index dad2fa9..47a8bd7 100644 +--- a/src/zatackax.c ++++ b/src/zatackax.c +@@ -16,6 +16,8 @@ + */ + + #include "zatackax.h" ++// override SDL_main.h redefining main to SDL_main on darwin ++#define main main + + static const unsigned int FPS_CAP = 100; + +-- +2.51.0 + diff --git a/pkgs/by-name/za/zatackax/package.nix b/pkgs/by-name/za/zatackax/package.nix index 8361f286d084..62385ebb299d 100644 --- a/pkgs/by-name/za/zatackax/package.nix +++ b/pkgs/by-name/za/zatackax/package.nix @@ -21,6 +21,17 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-1m99hi0kjpj5Yl1nAmwSMMdQWcP0rfLLPFJPkU4oVbM="; }; + # src/zatackax.c:2069:5: error: conflicting types for 'SDL_main' + # Fix SDL_main redefinition issue on darwin + patches = lib.optional stdenv.hostPlatform.isDarwin ./0001-Fix-SDL_main-redefinition-issue-on-macOS.patch; + + # malloc.h is not needed because stdlib.h is already included. + # On darwin, malloc.h does not even exist, resulting in an error. + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace src/zatackax.h \ + --replace-fail '#include ' "" + ''; + strictDeps = true; nativeBuildInputs = [ @@ -45,6 +56,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.alch-emi ]; mainProgram = "zatackax"; - platforms = lib.platforms.linux; + platforms = with lib.platforms; linux ++ darwin; }; }) diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix index 8909caffcef7..e04804e60f84 100644 --- a/pkgs/development/libraries/kdb/default.nix +++ b/pkgs/development/libraries/kdb/default.nix @@ -1,8 +1,7 @@ { mkDerivation, lib, - fetchurl, - fetchpatch, + fetchFromGitLab, extra-cmake-modules, qtbase, kcoreaddons, @@ -13,28 +12,18 @@ qttools, }: -mkDerivation rec { +mkDerivation { pname = "kdb"; - version = "3.2.0"; + version = "3.2.0-unstable-2025-10-17"; - src = fetchurl { - url = "mirror://kde/stable/kdb/src/kdb-${version}.tar.xz"; - sha256 = "0s909x34a56n3xwhqz27irl2gbzidax0685w2kf34f0liny872cg"; + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "libraries"; + repo = "kdb"; + rev = "819f9f61d629ffd80990ae17ae6c8078721a142b"; + hash = "sha256-XkpFFzTgLEjPxEzwinbGhHRTULQrhl5TdakJlQuI27A="; }; - patches = [ - # fix build with newer QT versions - (fetchpatch { - url = "https://github.com/KDE/kdb/commit/b36d74f13a1421437a725fb74502c993c359392a.patch"; - sha256 = "sha256-ENMZTUZ3yCKUhHPMUcDe1cMY2GLBz0G3ZvMRyj8Hfrw="; - }) - # fix build with newer posgresql versions - (fetchpatch { - url = "https://github.com/KDE/kdb/commit/40cdaea4d7824cc1b0d26e6ad2dcb61fa2077911.patch"; - sha256 = "sha256-cZpX6L/NZX3vztnh0s2+v4J7kBcKgUdecY53LRp8CwM="; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules qttools @@ -50,11 +39,11 @@ mkDerivation rec { propagatedBuildInputs = [ qtbase ]; - meta = with lib; { + meta = { description = "Database connectivity and creation framework for various database vendors"; mainProgram = "kdb3_sqlite3_dump"; - license = licenses.lgpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ zraexy ]; + license = lib.licenses.lgpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ zraexy ]; }; } diff --git a/pkgs/development/libraries/kf5gpgmepp/default.nix b/pkgs/development/libraries/kf5gpgmepp/default.nix deleted file mode 100644 index 826a2f25f3c6..000000000000 --- a/pkgs/development/libraries/kf5gpgmepp/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - mkDerivation, - lib, - fetchgit, - cmake, - extra-cmake-modules, - qtbase, - boost, - gpgme, -}: - -mkDerivation { - pname = "kf5gpgmepp"; - version = "16.08.3"; - - src = fetchgit { - url = "https://anongit.kde.org/gpgmepp.git"; - rev = "9826f6674e496ce575f606d17c318566381b3b15"; - sha256 = "02ck2l3s8s7xh44blqaqnc5k49ccicdnzvhiwa67a3zgicz5i0vh"; - }; - - buildInputs = [ - qtbase - boost - ]; - propagatedBuildInputs = [ gpgme ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - meta = with lib; { - license = [ licenses.lgpl2 ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/development/libraries/kproperty/cmake-minimum-required.patch b/pkgs/development/libraries/kproperty/cmake-minimum-required.patch new file mode 100644 index 000000000000..9d7143b66a15 --- /dev/null +++ b/pkgs/development/libraries/kproperty/cmake-minimum-required.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d589d5..0e1390f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,5 @@ + set(KPROPERTY_GENERATE_PRI TRUE) +-cmake_minimum_required(VERSION 3.0 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.10 FATAL_ERROR) + find_package(ECM 1.8.0 REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) + include(SetKPropertyCMakePolicies NO_POLICY_SCOPE) +diff --git a/cmake/modules/SetKPropertyCMakePolicies.cmake b/cmake/modules/SetKPropertyCMakePolicies.cmake +index bc28d8a..85370c2 100644 +--- a/cmake/modules/SetKPropertyCMakePolicies.cmake ++++ b/cmake/modules/SetKPropertyCMakePolicies.cmake +@@ -9,7 +9,7 @@ cmake_policy(SET CMP0053 NEW) # TODO remove, temporary fix for a bug in Qt 5.8's + # "Simplify variable reference and escape sequence evaluation" + + if(POLICY CMP0059) # Don’t treat DEFINITIONS as a built-in directory property. +- cmake_policy(SET CMP0059 OLD) ++ cmake_policy(SET CMP0059 NEW) + endif() + if(POLICY CMP0063) # Honor visibility properties for all target types (since cmake 3.3) + cmake_policy(SET CMP0063 NEW) diff --git a/pkgs/development/libraries/kproperty/default.nix b/pkgs/development/libraries/kproperty/default.nix index b1a9aaa2c6e4..8bba65ad63d1 100644 --- a/pkgs/development/libraries/kproperty/default.nix +++ b/pkgs/development/libraries/kproperty/default.nix @@ -20,6 +20,10 @@ mkDerivation rec { sha256 = "1yldfsdamk4dag8dyryjn5n9j2pzi42s79kkafymfnbifhnhrbv7"; }; + patches = [ + ./cmake-minimum-required.patch + ]; + nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 8e19722ff5f5..c0d299f6b7e2 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -239,7 +239,10 @@ let # the code above, inhibiting `./Configure` from adding the # conflicting flags. "CFLAGS=-march=${stdenv.hostPlatform.gcc.arch}" - ]; + ] + # tests are not being installed, it makes no sense + # to build them if check is disabled, e.g. on cross. + ++ lib.optional (!finalAttrs.finalPackage.doCheck) "disable-tests"; makeFlags = [ "MANDIR=$(man)/share/man" diff --git a/pkgs/development/python-modules/aiobtclientapi/default.nix b/pkgs/development/python-modules/aiobtclientapi/default.nix index 22926e017b13..6af43695037d 100644 --- a/pkgs/development/python-modules/aiobtclientapi/default.nix +++ b/pkgs/development/python-modules/aiobtclientapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiobtclientapi"; - version = "1.1.3"; + version = "1.1.4"; pyproject = true; src = fetchFromGitea { @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "plotski"; repo = "aiobtclientapi"; tag = "v${version}"; - hash = "sha256-ZpUaMsJs1vdVGQOid7aJ+SJKaCbTtHfSw7cOwPTL0ss="; + hash = "sha256-ga3EyKhfdEKkjFktUlgLSX54QbTc/a48vmWjmRqa+4w="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/bosch-alarm-mode2/default.nix b/pkgs/development/python-modules/bosch-alarm-mode2/default.nix index bbbf81d71d18..f5e833f1f844 100644 --- a/pkgs/development/python-modules/bosch-alarm-mode2/default.nix +++ b/pkgs/development/python-modules/bosch-alarm-mode2/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "bosch-alarm-mode2"; - version = "0.4.6"; + version = "0.4.7"; pyproject = true; src = fetchFromGitHub { owner = "mag1024"; repo = "bosch-alarm-mode2"; tag = "v${version}"; - hash = "sha256-oTGkEguN4EFJI5+UhqxKBN1x2Ppf9wQ0AeYbiLi1fhk="; + hash = "sha256-3eb9Exhu3ME++m+JRCVNpiUVIE3QSb9NRmvi+wZf/QY="; }; build-system = [ diff --git a/pkgs/development/python-modules/disposable-email-domains/default.nix b/pkgs/development/python-modules/disposable-email-domains/default.nix index 37b92dfff92c..ae8d406c4e2d 100644 --- a/pkgs/development/python-modules/disposable-email-domains/default.nix +++ b/pkgs/development/python-modules/disposable-email-domains/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "disposable-email-domains"; - version = "0.0.145"; + version = "0.0.147"; pyproject = true; # No tags on GitHub src = fetchPypi { pname = "disposable_email_domains"; inherit version; - hash = "sha256-l8Il11KKgYUNKNCg9sDJ0Wsucaq+Hat5l7DnkTBjmzY="; + hash = "sha256-sbMQ9izDOzrQOoYKpSLWO/+W2/3bGMhlyFP34oOff5g="; }; build-system = [ diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 490a355a78ec..47a5a2d005b5 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.6.22"; + version = "9.6.23"; pyproject = true; src = fetchFromGitHub { owner = "squidfunk"; repo = "mkdocs-material"; tag = version; - hash = "sha256-64+9cIxMA0Kloe0XEycWxjz+ghkcWYc6DZ+LuJN/5Tc="; + hash = "sha256-k9xoysCbmWqdu1hNUTbWbTvPCuo8gcyvXEDecHiOpEw="; }; build-system = [ @@ -89,6 +89,9 @@ buildPythonPackage rec { downloadPage = "https://github.com/squidfunk/mkdocs-material"; homepage = "https://squidfunk.github.io/mkdocs-material/"; license = licenses.mit; - maintainers = with maintainers; [ dandellion ]; + maintainers = with maintainers; [ + dandellion + jaysa68 + ]; }; } diff --git a/pkgs/development/python-modules/partftpy/default.nix b/pkgs/development/python-modules/partftpy/default.nix new file mode 100644 index 000000000000..8a0df4e5f57a --- /dev/null +++ b/pkgs/development/python-modules/partftpy/default.nix @@ -0,0 +1,38 @@ +# mostly copied from https://github.com/9001/copyparty/blob/hovudstraum/contrib/package/nix/partftpy/default.nix +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: +buildPythonPackage rec { + pname = "partftpy"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "9001"; + repo = "partftpy"; + tag = "v${version}"; + hash = "sha256-9+zY9OpGQ3LbORwtjEYZF1lRaQCLmSyQ9KQdxaOzMuM="; + }; + + postPatch = '' + # poor setuptools gets confused by this dir + rm -r t + ''; + + pyproject = true; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "partftpy.TftpServer" ]; + + meta = { + description = "Pure Python TFTP library (copyparty fork of tftpy)"; + homepage = "https://github.com/9001/partftpy"; + changelog = "https://github.com/9001/partftpy/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.shelvacu ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/python-modules/pyopen-wakeword/default.nix b/pkgs/development/python-modules/pyopen-wakeword/default.nix index 79114e2b493a..2f5255d364c5 100644 --- a/pkgs/development/python-modules/pyopen-wakeword/default.nix +++ b/pkgs/development/python-modules/pyopen-wakeword/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, autoPatchelfHook, buildPythonPackage, fetchFromGitHub, @@ -45,6 +46,8 @@ buildPythonPackage rec { ]; meta = { + # elftools.common.exceptions.ELFError: Magic number does not match + broken = stdenv.hostPlatform.isDarwin; description = "Alternative Python library for openWakeWord"; homepage = "https://github.com/rhasspy/pyopen-wakeword"; changelog = "https://github.com/rhasspy/pyopen-wakeword/blob/${src.tag}/CHANGELOG.md"; diff --git a/pkgs/development/python-modules/python-u2flib-server/default.nix b/pkgs/development/python-modules/python-u2flib-server/default.nix deleted file mode 100644 index fa93cb83fce8..000000000000 --- a/pkgs/development/python-modules/python-u2flib-server/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - - # propagates - cryptography, - six, - - # optional - webob, - - # tests - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "python-u2flib-server"; - version = "5.0.1"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "Yubico"; - repo = "python-u2flib-server"; - rev = version; - hash = "sha256-ginP9u+aHcdaWpwcFYJWu0Ghf7+nDZq9i3TVAacIPhg="; - }; - - patches = [ ./cryptography-37-compat.patch ]; - - propagatedBuildInputs = [ - cryptography - six - ]; - - optional-dependencies = { - u2f_server = [ webob ]; - }; - - pythonImportsCheck = [ - "u2flib_server" - "u2flib_server.u2f" - ]; - - nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.u2f_server; - - meta = with lib; { - description = "Python based U2F server library"; - homepage = "https://github.com/Yubico/python-u2flib-server"; - changelog = "https://github.com/Yubico/python-u2flib-server/blob/${src.rev}/NEWS"; - license = licenses.bsd2; - maintainers = with maintainers; [ hexa ]; - }; -} diff --git a/pkgs/development/python-modules/segments/default.nix b/pkgs/development/python-modules/segments/default.nix index 94063cfdcaf9..58c6d711cbba 100644 --- a/pkgs/development/python-modules/segments/default.nix +++ b/pkgs/development/python-modules/segments/default.nix @@ -6,7 +6,6 @@ setuptools, regex, csvw, - clldutils, pytestCheckHook, pytest-cov-stub, pytest-mock, @@ -30,7 +29,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ regex csvw - clldutils ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/unicodedata2/default.nix b/pkgs/development/python-modules/unicodedata2/default.nix index b2ef805de809..7b60c65ef0b3 100644 --- a/pkgs/development/python-modules/unicodedata2/default.nix +++ b/pkgs/development/python-modules/unicodedata2/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "unicodedata2"; - version = "16.0.0"; + version = "17.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit version pname; - sha256 = "05488d6592b59cd78b61ec37d38725416b2df62efafa6a0d63a631b27aa474fc"; + sha256 = "sha256-/6Lw1oNGQv6ZbTVuco2ohyAVM7tUCXSuesl15m7MDjo="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/tools/analysis/massif-visualizer/cmake-minimum-required.patch b/pkgs/development/tools/analysis/massif-visualizer/cmake-minimum-required.patch new file mode 100644 index 000000000000..0f7d6e87b040 --- /dev/null +++ b/pkgs/development/tools/analysis/massif-visualizer/cmake-minimum-required.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d7067dc..337c4ea 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(massif-visualizer) + + set(QT_MIN_VERSION "5.2.0") diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix index d459bd320ac1..e20b252ae02d 100644 --- a/pkgs/development/tools/analysis/massif-visualizer/default.nix +++ b/pkgs/development/tools/analysis/massif-visualizer/default.nix @@ -25,6 +25,8 @@ mkDerivation rec { sha256 = "0v8z6r9gngzckvqyxjm9kp7hilwfqibyk2f9vag9l98ar0iwr97q"; }; + patches = [ ./cmake-minimum-required.patch ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix index 88482eb91e3c..fdf4002975b7 100644 --- a/pkgs/development/tools/tora/default.nix +++ b/pkgs/development/tools/tora/default.nix @@ -74,11 +74,18 @@ mkDerivation { ''--prefix PATH : ${lib.getBin graphviz}/bin'' ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "Tora SQL tool"; mainProgram = "tora"; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; license = licenses.asl20; + # fails to build on hydra since 2024 + broken = true; }; } diff --git a/pkgs/os-specific/cygwin/w32api/default.nix b/pkgs/os-specific/cygwin/w32api/default.nix index 4950da53116d..1fcb6d607066 100644 --- a/pkgs/os-specific/cygwin/w32api/default.nix +++ b/pkgs/os-specific/cygwin/w32api/default.nix @@ -39,7 +39,7 @@ license ; platforms = lib.platforms.unix ++ lib.platforms.windows; - teams = [ lib.maintainers.corngood ]; + maintainers = [ lib.maintainers.corngood ]; }; } // ( diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c81e3baeca6f..8eebb70ad05b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4005,8 +4005,6 @@ with pkgs; w3m = w3m-batch; }; - systemdgenie = libsForQt5.callPackage ../applications/system/systemdgenie { }; - tartube = callPackage ../applications/video/tartube { }; tartube-yt-dlp = callPackage ../applications/video/tartube { @@ -11215,7 +11213,7 @@ with pkgs; graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; }; graphicsmagick-imagemagick-compat = graphicsmagick.imagemagick-compat; - q4wine = libsForQt5.callPackage ../applications/misc/q4wine { }; + q4wine = kdePackages.callPackage ../applications/misc/q4wine { }; googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { }; @@ -13126,8 +13124,6 @@ with pkgs; pythonSupport = true; }; - leela-zero = libsForQt5.callPackage ../games/leela-zero { }; - liquidwar = callPackage ../games/liquidwar { guile = guile_2_0; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 95f6e7fd9c3f..7fb753fa664d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -365,6 +365,7 @@ mapAliases { python-lz4 = throw "'python-lz4' has been renamed to/replaced by 'lz4'"; # Converted to throw 2025-10-29 python-simple-hipchat = throw "'python-simple-hipchat' has been removed because it was broken and unmaintained"; # added 2025-08-26 python-subunit = throw "'python-subunit' has been renamed to/replaced by 'subunit'"; # Converted to throw 2025-10-29 + python-u2flib-server = throw "'python-u2flib-server' has been removed, since it was broken and archived upstream"; # added 2025-11-08 python-unshare = throw "python-unshare was removed as unmaintained since 2016"; # added 2025-05-25 python_docs_theme = throw "'python_docs_theme' has been renamed to/replaced by 'python-docs-theme'"; # Converted to throw 2025-10-29 python_fedora = throw "'python_fedora' has been renamed to/replaced by 'python-fedora'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e26022dac0d0..b2826a75d266 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11600,6 +11600,8 @@ self: super: with self; { partd = callPackage ../development/python-modules/partd { }; + partftpy = callPackage ../development/python-modules/partftpy { }; + partial-json-parser = callPackage ../development/python-modules/partial-json-parser { }; particle = callPackage ../development/python-modules/particle { }; @@ -15317,8 +15319,6 @@ self: super: with self; { python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { }; - python-u2flib-server = callPackage ../development/python-modules/python-u2flib-server { }; - python-uinput = callPackage ../development/python-modules/python-uinput { }; python-ulid = callPackage ../development/python-modules/python-ulid { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index c70f900e794b..73baf1bc0cc0 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -92,8 +92,6 @@ makeScopeWithSplicing' { kdsoap = callPackage ../development/libraries/kdsoap { }; - kf5gpgmepp = callPackage ../development/libraries/kf5gpgmepp { }; - kirigami-addons = libsForQt5.callPackage ../development/libraries/kirigami-addons { }; kimageannotator = callPackage ../development/libraries/kimageannotator { }; @@ -225,6 +223,12 @@ makeScopeWithSplicing' { xp-pen-deco-01-v2-driver = callPackage ../os-specific/linux/xp-pen-drivers/deco-01-v2 { }; } + // lib.optionalAttrs config.allowAliases { + kf5gpgmepp = throw '' + 'libsForQt5.kf5gpgmepp' has been removed because it has been unmaintained upstream since 2017. + Consider switching to the gpgmepp included in gpgme (gpgme <2), or to the GnuPG fork of gpgmepp (gpgme 2+), instead. + ''; # Added 2025-10-25 + } )) ); }