diff --git a/ci/parse.nix b/ci/parse.nix index 26ac0f785fd4..14fd1e719547 100644 --- a/ci/parse.nix +++ b/ci/parse.nix @@ -20,24 +20,15 @@ runCommand "nix-parse-${nix.name}" '' export NIX_STORE_DIR=$TMPDIR/store export NIX_STATE_DIR=$TMPDIR/state + nix-store --init cd "${nixpkgs}" - # Passes all files to nix-instantiate at once. - # Much faster, but will only show first error. - parse-all() { - find . -type f -iname '*.nix' | xargs -P $(nproc) nix-instantiate --parse >/dev/null 2>/dev/null - } - - # Passes each file separately to nix-instantiate with -n1. - # Much slower, but will show all errors. - parse-each() { - find . -type f -iname '*.nix' | xargs -n1 -P $(nproc) nix-instantiate --parse >/dev/null - } - - if ! parse-all; then - parse-each - fi + # This will only show the first parse error, not all of them. That's fine, because + # the other CI jobs will report in more detail. This job is about checking parsing + # across different implementations / versions, not about providing the best DX. + # Returning all parse errors requires significantly more resources. + find . -type f -iname '*.nix' | xargs -P $(nproc) nix-instantiate --parse >/dev/null touch $out '' diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 0e32e489a7ed..9d848da579dd 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -44,6 +44,8 @@ - GHC 8.6, 8.10, 9.0, 9.2, and their package sets have been removed. +- `webkitgtk_4_0` has been removed because it depends on an unmaintained version of security-critical libsoup library (`libsoup_2`) and the support will be [dropped upstream soon](https://webkitgtk.org/2025/10/07/webkitgtk-soup2-deprecation.html). + - Support for bootstrapping native GHC compilers on 32‐bit ARM and little‐endian 64‐bit PowerPC has been dropped. The latter was probably broken anyway. If there is interest in restoring support for these architectures, it should be possible to cross‐compile a bootstrap GHC binary. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1964f6b3e64f..313e48524cd6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4928,12 +4928,6 @@ githubId = 640797; name = "Roger Qiu"; }; - cmfwyp = { - email = "cmfwyp@riseup.net"; - github = "cmfwyp"; - githubId = 20808761; - name = "cmfwyp"; - }; cmm = { email = "repo@cmm.kakpryg.net"; github = "cmm"; @@ -5040,12 +5034,6 @@ githubId = 27779510; keys = [ { fingerprint = "FDF5 EF67 8CC1 FE22 1845 6A22 CF7B BB5B C756 1BD3"; } ]; }; - codsl = { - email = "codsl@riseup.net"; - github = "codsl"; - githubId = 6402559; - name = "codsl"; - }; codyopel = { email = "codyopel@gmail.com"; github = "codyopel"; @@ -14778,12 +14766,6 @@ matrix = "@link2xt:matrix.org"; name = "link2xt"; }; - linquize = { - email = "linquize@yahoo.com.hk"; - github = "linquize"; - githubId = 791115; - name = "Linquize"; - }; linsui = { email = "linsui555@gmail.com"; github = "linsui"; @@ -17309,12 +17291,6 @@ githubId = 64710; name = "Matthew O'Gorman"; }; - Mogria = { - email = "m0gr14@gmail.com"; - github = "mogria"; - githubId = 754512; - name = "Mogria"; - }; mohe2015 = { name = "Moritz Hedtke"; email = "Moritz.Hedtke@t-online.de"; @@ -19217,12 +19193,6 @@ githubId = 5339261; keys = [ { fingerprint = "4258 3FE7 12E9 6071 E84D 53C7 6E1D A270 0B72 746D"; } ]; }; - oida = { - email = "oida@posteo.de"; - github = "oida"; - githubId = 7249506; - name = "oida"; - }; oidro = { github = "oidro"; githubId = 31112680; @@ -20867,12 +20837,6 @@ githubId = 88623613; name = "ProggerX"; }; - proglodyte = { - email = "proglodyte23@gmail.com"; - github = "proglodyte"; - githubId = 18549627; - name = "Proglodyte"; - }; proglottis = { email = "proglottis@gmail.com"; github = "proglottis"; @@ -27404,12 +27368,6 @@ githubId = 1476338; name = "Viktor Illmer"; }; - vklquevs = { - email = "vklquevs@gmail.com"; - github = "vklquevs"; - githubId = 1771234; - name = "vklquevs"; - }; vlaci = { email = "laszlo.vasko@outlook.com"; github = "vlaci"; @@ -27605,12 +27563,6 @@ githubId = 988849; name = "Vasiliy Yorkin"; }; - vyp = { - email = "elisp.vim@gmail.com"; - github = "vyp"; - githubId = 3889405; - name = "vyp"; - }; w-lfchen = { email = "w-lfchen@posteo.net"; github = "w-lfchen"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 817e95c48407..9fca1e9827f4 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -41,12 +41,12 @@ llscheck,,,,,,mrcjkb lmathx,,,,,5.3,alexshpilkin lmpfrlib,,,,,5.3,alexshpilkin loadkit,,,,,,alerque -lpeg,,,,,,vyp +lpeg,,,,,, lpeg_patterns,,,,,, lpeglabel,,,,1.6.0,, lrexlib-gnu,,,,,, lrexlib-oniguruma,,,,,,junestepp -lrexlib-pcre,,,,,,vyp +lrexlib-pcre,,,,,, lrexlib-posix,,,,,, lsp-progress.nvim,,,,,,gepbird lua-cjson,,,,,, @@ -86,7 +86,7 @@ lualdap,,,,,,aanderse lualine.nvim,,,http://luarocks.org/dev,,, lualogging,,,,,, luaossl,,,,,5.1, -luaposix,,,,34.1.1-1,,vyp lblasc +luaposix,,,,34.1.1-1,,lblasc luaprompt,,,,,,Freed-Wu luarepl,,,,,, luarocks,,,,,,mrcjkb teto @@ -96,7 +96,7 @@ luarocks-build-treesitter-parser-cpp,,,,,,mrcjkb luasec,,,,,,flosse luasnip,,,,,, luasocket,,,,,, -luasql-sqlite3,,,,,,vyp +luasql-sqlite3,,,,,, luassert,,,,,, luasystem,,,,,, luatext,,,,,, @@ -148,7 +148,7 @@ sofa,,,,,,f4z3r sqlite,,,,,, std._debug,,,,,, std.normalize,,,,,, -stdlib,,,,41.2.2,,vyp +stdlib,,,,41.2.2,, teal-language-server,,,,,, telescope-manix,,,,,, telescope.nvim,,,,,5.1, diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix index 43eda28c095e..5412a7a53f9b 100644 --- a/nixos/modules/services/games/factorio.nix +++ b/nixos/modules/services/games/factorio.nix @@ -296,6 +296,15 @@ in Autosaving on connected Windows clients will be disabled regardless of autosave_only_on_server option. ''; }; + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + example = [ + "--rcon-bind=localhost:27015" + "--rcon-password=..." + ]; + description = "Extra command line arguments."; + }; }; }; @@ -340,6 +349,7 @@ in (playerListOption "server-adminlist" cfg.admins) (playerListOption "server-whitelist" cfg.allowedPlayers) (lib.optionalString (cfg.allowedPlayers != [ ]) "--use-server-whitelist") + cfg.extraArgs ]; # Sandboxing diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index bace8a010ee1..cc082bf5a22d 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -60,7 +60,7 @@ systemdLibs, tree-sitter, texinfo, - webkitgtk_4_0, + webkitgtk_4_1, wrapGAppsHook3, zlib, @@ -141,6 +141,8 @@ let ++ lib.optionals (stdenv.cc ? cc.lib.libgcc) [ "${lib.getLib stdenv.cc.cc.lib.libgcc}/lib" ]; + + withWebkitgtk = withXwidgets && stdenv.hostPlatform.isLinux; in stdenv.mkDerivation (finalAttrs: { pname = @@ -351,8 +353,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withXinput2 [ libXi ] - ++ lib.optionals (withXwidgets && stdenv.hostPlatform.isLinux) [ - webkitgtk_4_0 + ++ lib.optionals withWebkitgtk [ + webkitgtk_4_1 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool @@ -504,7 +506,8 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - broken = withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); + broken = + (withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) || withWebkitgtk; knownVulnerabilities = lib.optionals (lib.versionOlder version "30") [ "CVE-2024-53920 CVE-2025-1244, please use newer versions such as emacs30" ]; diff --git a/pkgs/applications/misc/razergenie/default.nix b/pkgs/applications/misc/razergenie/default.nix index 04cd8c67714f..c309bbceb844 100644 --- a/pkgs/applications/misc/razergenie/default.nix +++ b/pkgs/applications/misc/razergenie/default.nix @@ -78,7 +78,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ f4814n - Mogria ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 46ed77495f2e..5240664a0f1a 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -54,7 +54,7 @@ symlinkJoin, systemd, tzdata, - webkitgtk_4_0, + # webkitgtk_4_0, which, xorg, zlib, @@ -173,7 +173,7 @@ stdenv.mkDerivation rec { speex stdenv.cc.cc (lib.getLib systemd) - webkitgtk_4_0 + # webkitgtk_4_0 xorg.libXScrnSaver xorg.libXaw xorg.libXmu @@ -313,6 +313,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + # webkitgtk_4_0 was removed + broken = true; license = licenses.unfree; description = "Citrix Workspace"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 97b84cd59dbc..012a4a8b1661 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -19,13 +19,13 @@ let }: buildGoModule rec { pname = stname; - version = "2.0.8"; + version = "2.0.10"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; tag = "v${version}"; - hash = "sha256-QkCLFztzaH9MvgP6HWUr5Z8yIrKlY6/t2VaZwai/H8Q="; + hash = "sha256-N0+i5sj/cTPDv6q428b3Y0hsPRxIl96+RIuS1AyeTbc="; }; vendorHash = "sha256-iYTAnEy0MqJaTz/cdpteealyviwVrpwDzVigo8nnXqs="; diff --git a/pkgs/by-name/al/alexandria/package.nix b/pkgs/by-name/al/alexandria/package.nix index aadbb7714255..7ada5f42977e 100644 --- a/pkgs/by-name/al/alexandria/package.nix +++ b/pkgs/by-name/al/alexandria/package.nix @@ -3,7 +3,7 @@ lib, fetchFromGitHub, pkg-config, - webkitgtk_4_0, + # webkitgtk_4_0, openssl, nodejs, npmHooks, @@ -52,13 +52,15 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - webkitgtk_4_0 + # webkitgtk_4_0 gtk3 librsvg libappindicator-gtk3 ]; meta = { + # webkitgtk_4_0 was removed + broken = true; homepage = "https://github.com/btpf/Alexandria"; changelog = "https://github.com/btpf/Alexandria/releases/tag/v${version}"; description = "Minimalistic cross-platform eBook reader"; diff --git a/pkgs/by-name/am/am2rlauncher/package.nix b/pkgs/by-name/am/am2rlauncher/package.nix index 5e3b02984760..40a7e4d860a5 100644 --- a/pkgs/by-name/am/am2rlauncher/package.nix +++ b/pkgs/by-name/am/am2rlauncher/package.nix @@ -5,7 +5,7 @@ glibc, gtk3, libappindicator, - webkitgtk_4_0, + # webkitgtk_4_0, e2fsprogs, libnotify, libgit2, @@ -67,7 +67,7 @@ buildDotnetModule { glibc gtk3 libappindicator - webkitgtk_4_0 + # webkitgtk_4_0 e2fsprogs libnotify libgit2 @@ -116,6 +116,8 @@ buildDotnetModule { ''; meta = with lib; { + # webkitgtk_4_0 was removed + broken = true; homepage = "https://github.com/AM2R-Community-Developers/AM2RLauncher"; description = "Front-end for dealing with AM2R updates and mods"; longDescription = '' diff --git a/pkgs/by-name/an/anytype-heart/package.nix b/pkgs/by-name/an/anytype-heart/package.nix index 63224ae3fe9f..298e7313c18e 100644 --- a/pkgs/by-name/an/anytype-heart/package.nix +++ b/pkgs/by-name/an/anytype-heart/package.nix @@ -28,6 +28,8 @@ buildGoModule (finalAttrs: { # https://github.com/anyproto/anytype-ts/blob/v/middleware.version version = "0.44.5"; + # Update only together with 'anytype' package. + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "anyproto"; repo = "anytype-heart"; diff --git a/pkgs/by-name/as/asciinema-agg/package.nix b/pkgs/by-name/as/asciinema-agg/package.nix index 850b9fa8084c..764bb078cd42 100644 --- a/pkgs/by-name/as/asciinema-agg/package.nix +++ b/pkgs/by-name/as/asciinema-agg/package.nix @@ -6,18 +6,18 @@ rustPlatform.buildRustPackage rec { pname = "agg"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "asciinema"; repo = "agg"; rev = "v${version}"; - hash = "sha256-bCE59NeITaCwgajgyXgP6jxtV7aPihPaZ/Uzh39Po1k="; + hash = "sha256-FjAf/rhyxsm4LHoko4QRA9t5e+qKIgO2kSd48Zmf224="; }; strictDeps = true; - cargoHash = "sha256-KQ4g4hWy8FZH4nLiB0874r8FCINXJboZ4C1dAAPA8Gc="; + cargoHash = "sha256-CeXcpSD/6qPzA8nrSyC3oDFBpjFYNfDPySQxSOZPlgc="; meta = with lib; { description = "Command-line tool for generating animated GIF files from asciicast v2 files produced by asciinema terminal recorder"; diff --git a/pkgs/by-name/ba/balsa/package.nix b/pkgs/by-name/ba/balsa/package.nix index b1fbefb4e7cf..5a3201507f1e 100644 --- a/pkgs/by-name/ba/balsa/package.nix +++ b/pkgs/by-name/ba/balsa/package.nix @@ -19,7 +19,7 @@ ninja, pkg-config, sqlite, - webkitgtk_4_0, + # webkitgtk_4_0, wrapGAppsHook3, }: @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { libsecret openssl sqlite - webkitgtk_4_0 + # webkitgtk_4_0 ]; mesonFlags = [ @@ -78,6 +78,8 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; meta = { + # webkitgtk_4_0 was removed + broken = true; description = "E-mail client for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/balsa"; changelog = "https://gitlab.gnome.org/GNOME/balsa/-/blob/master/ChangeLog"; diff --git a/pkgs/by-name/bi/bitcomet/package.nix b/pkgs/by-name/bi/bitcomet/package.nix index 40395e291687..0ad83f9207b6 100644 --- a/pkgs/by-name/bi/bitcomet/package.nix +++ b/pkgs/by-name/bi/bitcomet/package.nix @@ -6,7 +6,7 @@ fetchurl, desktop-file-utils, dpkg, - webkitgtk_4_0, + # webkitgtk_4_0, runScript ? "BitComet", }: @@ -15,6 +15,8 @@ let version = "2.15.0"; meta = { + # webkitgtk_4_0 was removed + broken = true; homepage = "https://www.bitcomet.com"; description = "BitTorrent download client"; mainProgram = "BitComet"; @@ -82,7 +84,7 @@ buildFHSEnv { pkgs: [ bitcomet - webkitgtk_4_0 + # webkitgtk_4_0 ] ++ appimageTools.defaultFhsEnvArgs.targetPkgs pkgs; diff --git a/pkgs/by-name/bo/bookworm/package.nix b/pkgs/by-name/bo/bookworm/package.nix index 1195f4b90ae9..d68f8da9219f 100644 --- a/pkgs/by-name/bo/bookworm/package.nix +++ b/pkgs/by-name/bo/bookworm/package.nix @@ -24,7 +24,7 @@ unar, unzip, vala, - webkitgtk_4_0, + # webkitgtk_4_0, wrapGAppsHook3, }: @@ -60,7 +60,7 @@ stdenv.mkDerivation { poppler python3 sqlite - webkitgtk_4_0 + # webkitgtk_4_0 ]; postPatch = '' @@ -92,6 +92,8 @@ stdenv.mkDerivation { ''; meta = with lib; { + # webkitgtk_4_0 was removed + broken = true; description = "Simple, focused eBook reader"; mainProgram = "com.github.babluboy.bookworm"; longDescription = '' diff --git a/pkgs/by-name/bo/bootdev-cli/package.nix b/pkgs/by-name/bo/bootdev-cli/package.nix index b52025961641..b479570937af 100644 --- a/pkgs/by-name/bo/bootdev-cli/package.nix +++ b/pkgs/by-name/bo/bootdev-cli/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "bootdev-cli"; - version = "1.20.4"; + version = "1.20.5"; src = fetchFromGitHub { owner = "bootdotdev"; repo = "bootdev"; tag = "v${version}"; - hash = "sha256-ayjHhnnP6YWKMItsAw+nnScf1/eEHN2f7cOIkskE3mM="; + hash = "sha256-iVL2nRQb4A7UfhiQSBBbaxM1Yqc2pESvRfQ3xSjGq10="; }; vendorHash = "sha256-jhRoPXgfntDauInD+F7koCaJlX4XDj+jQSe/uEEYIMM="; diff --git a/pkgs/by-name/ca/cabin/package.nix b/pkgs/by-name/ca/cabin/package.nix index 87b866fe2d41..dc4c872944e5 100644 --- a/pkgs/by-name/ca/cabin/package.nix +++ b/pkgs/by-name/ca/cabin/package.nix @@ -40,7 +40,7 @@ stdenvNoCC.mkDerivation rec { ''; homepage = "http://www.impallari.com/cabin"; license = licenses.ofl; - maintainers = with maintainers; [ cmfwyp ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/ca/caligula/package.nix b/pkgs/by-name/ca/caligula/package.nix index 79412e36f1f9..e0ec5006c3d2 100644 --- a/pkgs/by-name/ca/caligula/package.nix +++ b/pkgs/by-name/ca/caligula/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "caligula"; - version = "0.4.8"; + version = "0.4.9"; src = fetchFromGitHub { owner = "ifd3f"; repo = "caligula"; rev = "v${version}"; - hash = "sha256-VwbVDfiGiVFefsxoQ1FBDHyYLp0sOKnnVZctklyO+Tw="; + hash = "sha256-eOhMT47QcuMpBxNT10KgXOCxmb36qhdvP0xQu0wVhbk="; }; - cargoHash = "sha256-kTVmwfUNDibYGsHGQvtZiBiHyyotkHMhTY/dvaATy8k="; + cargoHash = "sha256-p9ozKJsjUkNFxMaSPpO4iOg2/cfbSpSdzUFg3YnwEq0="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/cc/cccc/package.nix b/pkgs/by-name/cc/cccc/package.nix index 0629cda4e5c8..e6b65fc32799 100644 --- a/pkgs/by-name/cc/cccc/package.nix +++ b/pkgs/by-name/cc/cccc/package.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { homepage = "https://cccc.sourceforge.net/"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.linquize ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/co/codeblocks/package.nix b/pkgs/by-name/co/codeblocks/package.nix index 93c28e9d333b..ef647155ab38 100644 --- a/pkgs/by-name/co/codeblocks/package.nix +++ b/pkgs/by-name/co/codeblocks/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ''; meta = { - maintainers = [ lib.maintainers.linquize ]; + maintainers = [ ]; platforms = lib.platforms.all; description = "Open source, cross platform, free C, C++ and Fortran IDE"; longDescription = '' diff --git a/pkgs/by-name/de/deer/package.nix b/pkgs/by-name/de/deer/package.nix index 9cee98d1ff4c..d7db1050cba1 100644 --- a/pkgs/by-name/de/deer/package.nix +++ b/pkgs/by-name/de/deer/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Ranger-like file navigation for zsh"; homepage = "https://github.com/Vifon/deer"; license = licenses.gpl3Plus; - maintainers = [ maintainers.vyp ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/de/desktop-postflop/package.nix b/pkgs/by-name/de/desktop-postflop/package.nix index 4e400c9a3e1e..a3eec5bbb07d 100644 --- a/pkgs/by-name/de/desktop-postflop/package.nix +++ b/pkgs/by-name/de/desktop-postflop/package.nix @@ -8,7 +8,6 @@ pkg-config, gtk3, libsoup_2_4, - webkitgtk_4_0, }: rustPlatform.buildRustPackage rec { @@ -54,7 +53,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ gtk3 libsoup_2_4 - webkitgtk_4_0 + # webkitgtk_4_0 ]; postInstall = '' @@ -74,6 +73,8 @@ rustPlatform.buildRustPackage rec { ]; meta = { + # webkitgtk_4_0 was removed + broken = true; changelog = "https://github.com/b-inary/desktop-postflop/releases/tag/${src.rev}"; description = "Free, open-source GTO solver for Texas hold'em poker"; homepage = "https://github.com/b-inary/desktop-postflop"; diff --git a/pkgs/by-name/do/dosis/package.nix b/pkgs/by-name/do/dosis/package.nix index 8ccf74ba93c1..7c5da5416392 100644 --- a/pkgs/by-name/do/dosis/package.nix +++ b/pkgs/by-name/do/dosis/package.nix @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation rec { ''; homepage = "http://www.impallari.com/dosis"; license = licenses.ofl; - maintainers = with maintainers; [ cmfwyp ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/e1/e1s/package.nix b/pkgs/by-name/e1/e1s/package.nix index ede9a3c7840f..904276d85f7f 100644 --- a/pkgs/by-name/e1/e1s/package.nix +++ b/pkgs/by-name/e1/e1s/package.nix @@ -5,7 +5,7 @@ }: let pname = "e1s"; - version = "1.0.50"; + version = "1.0.51"; in buildGoModule { inherit pname version; @@ -14,7 +14,7 @@ buildGoModule { owner = "keidarcy"; repo = "e1s"; tag = "v${version}"; - hash = "sha256-ntuFMxuCrA0meE8tOnA9oPLLvYfXyhQgebBuKELeDgQ="; + hash = "sha256-9O6VRsO80d+ZvUbqt+AUqph9FXOWlwOdgJcqqiGBNC0="; }; vendorHash = "sha256-1lise/u40Q8W9STsuyrWIbhf2HY+SFCytUL1PTSWvfY="; diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix index 543c56115ac3..86772e48dd58 100644 --- a/pkgs/by-name/en/en-croissant/package.nix +++ b/pkgs/by-name/en/en-croissant/package.nix @@ -13,7 +13,7 @@ openssl, libsoup_2_4, - webkitgtk_4_0, + # webkitgtk_4_0, gst_all_1, }: @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl libsoup_2_4 - webkitgtk_4_0 + # webkitgtk_4_0 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-bad @@ -66,6 +66,8 @@ rustPlatform.buildRustPackage rec { ''; meta = { + # webkitgtk_4_0 was removed + broken = true; description = "Ultimate Chess Toolkit"; homepage = "https://github.com/franciscoBSalgueiro/en-croissant/"; license = lib.licenses.gpl3Only; diff --git a/pkgs/by-name/en/encode-sans/package.nix b/pkgs/by-name/en/encode-sans/package.nix index f81d9c386e68..5010ba6e8760 100644 --- a/pkgs/by-name/en/encode-sans/package.nix +++ b/pkgs/by-name/en/encode-sans/package.nix @@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec { ''; homepage = "https://github.com/impallari/Encode-Sans"; license = licenses.ofl; - maintainers = with maintainers; [ cmfwyp ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/g-/g-wrap/package.nix b/pkgs/by-name/g-/g-wrap/package.nix index 4648d800fecb..9c173dde0960 100644 --- a/pkgs/by-name/g-/g-wrap/package.nix +++ b/pkgs/by-name/g-/g-wrap/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.nongnu.org/g-wrap/"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ vyp ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/ga/gamehub/package.nix b/pkgs/by-name/ga/gamehub/package.nix index cb2ab9bdfcfa..af8f214cbc0c 100644 --- a/pkgs/by-name/ga/gamehub/package.nix +++ b/pkgs/by-name/ga/gamehub/package.nix @@ -14,7 +14,7 @@ libsoup_2_4, json-glib, sqlite, - webkitgtk_4_0, + # webkitgtk_4_0, libmanette, libXtst, wrapGAppsHook3, @@ -50,10 +50,12 @@ stdenv.mkDerivation rec { libsoup_2_4 libXtst sqlite - webkitgtk_4_0 + # webkitgtk_4_0 ]; meta = with lib; { + # webkitgtk_4_0 was removed + broken = true; homepage = "https://tkashkin.github.io/projects/gamehub"; description = "Unified library for all your games"; longDescription = '' diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/by-name/ga/garden-of-coloured-lights/package.nix similarity index 68% rename from pkgs/games/garden-of-coloured-lights/default.nix rename to pkgs/by-name/ga/garden-of-coloured-lights/package.nix index 77e252633532..a851110e7e12 100644 --- a/pkgs/games/garden-of-coloured-lights/default.nix +++ b/pkgs/by-name/ga/garden-of-coloured-lights/package.nix @@ -4,10 +4,14 @@ fetchurl, autoconf, automake, - allegro, + allegro4, }: -stdenv.mkDerivation rec { +let + allegro = allegro4; +in + +stdenv.mkDerivation (finalAttrs: { pname = "garden-of-coloured-lights"; version = "1.0.9"; @@ -24,8 +28,8 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "mirror://sourceforge/garden/${version}/garden-${version}.tar.gz"; - sha256 = "1qsj4d7r22m5f9f5f6cyvam1y5q5pbqvy5058r7w0k4s48n77y6s"; + url = "mirror://sourceforge/garden/${finalAttrs.version}/garden-${finalAttrs.version}.tar.gz"; + hash = "sha256-2vhzLCKaTMBPRgUUv/G6BRcfqtqeGVdccqUKkU8jUuM="; }; # Workaround build failure on -fno-common toolchains: @@ -33,12 +37,11 @@ stdenv.mkDerivation rec { # `eclass'; eclass.o:src/eclass.c:21: first defined here env.NIX_CFLAGS_COMPILE = "-fcommon"; - meta = with lib; { + meta = { description = "Old-school vertical shoot-em-up / bullet hell"; mainProgram = "garden"; homepage = "https://sourceforge.net/projects/garden/"; - maintainers = [ ]; - license = licenses.gpl3; + maintainers = with lib.maintainers; [ iedame ]; + license = lib.licenses.gpl3; }; - -} +}) diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix index 958166cd8df8..8a3c18f95d77 100644 --- a/pkgs/by-name/ga/gatus/package.nix +++ b/pkgs/by-name/ga/gatus/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gatus"; - version = "5.26.0"; + version = "5.27.0"; src = fetchFromGitHub { owner = "TwiN"; repo = "gatus"; rev = "v${version}"; - hash = "sha256-Aib8s1iHkUnp80MdDAgTleXLzOc2B3Z6rnhqffOIzg0="; + hash = "sha256-fyubtcmAuH6ayHvfj0bYNrYu1Xs0q7mDO+G9SklWc7o="; }; - vendorHash = "sha256-vm+M2U0EhRjBe7AgpPsukIynHTuvACA/NBL2cdUtKNw="; + vendorHash = "sha256-vvYnNFRpDTaNBX30btvSrwmhimPobio/zAs7zQnZ7b8="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gb/gbdfed/package.nix b/pkgs/by-name/gb/gbdfed/package.nix index 71e89cf5b38f..d0f182ac7331 100644 --- a/pkgs/by-name/gb/gbdfed/package.nix +++ b/pkgs/by-name/gb/gbdfed/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.linquize ]; + maintainers = [ ]; platforms = lib.platforms.all; mainProgram = "gbdfed"; }; diff --git a/pkgs/by-name/gd/gdevelop/darwin.nix b/pkgs/by-name/gd/gdevelop/darwin.nix index fa1663659417..52f8ec40f443 100644 --- a/pkgs/by-name/gd/gdevelop/darwin.nix +++ b/pkgs/by-name/gd/gdevelop/darwin.nix @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip"; - hash = "sha256-XSDzvh8zjrmKOP7YXjXG5+3qCzGQEJp1+RmwmRd4oOs="; + hash = "sha256-DO6IJbTESDnRtwHw0o+VkjjZiRBSynfPQ179qbNFBO0="; }; sourceRoot = "."; diff --git a/pkgs/by-name/gd/gdevelop/linux.nix b/pkgs/by-name/gd/gdevelop/linux.nix index bf5bb8805f20..6a541057c287 100644 --- a/pkgs/by-name/gd/gdevelop/linux.nix +++ b/pkgs/by-name/gd/gdevelop/linux.nix @@ -13,7 +13,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage"; - hash = "sha256-TkJyq6WyHTXoCvGSiV6w/IYoLCxAvbrS1oFdsgbfl5s="; + hash = "sha256-Tmnl9TagqphoDSMKu0Ny3guJZgEkd8IvdxlmQ+s7378="; } else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/by-name/gd/gdevelop/package.nix b/pkgs/by-name/gd/gdevelop/package.nix index ebf2955d54e1..b6eb2fff6102 100644 --- a/pkgs/by-name/gd/gdevelop/package.nix +++ b/pkgs/by-name/gd/gdevelop/package.nix @@ -4,7 +4,7 @@ callPackage, }: let - version = "5.5.242"; + version = "5.5.243"; pname = "gdevelop"; meta = { description = "Graphical Game Development Studio"; diff --git a/pkgs/by-name/gf/gflags/package.nix b/pkgs/by-name/gf/gflags/package.nix index 331aa6087332..059bec830b76 100644 --- a/pkgs/by-name/gf/gflags/package.nix +++ b/pkgs/by-name/gf/gflags/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://gflags.github.io/gflags/"; license = licenses.bsd3; - maintainers = [ maintainers.linquize ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/gl/glfw3/0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch b/pkgs/by-name/gl/glfw3/0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch deleted file mode 100644 index 70cec99815e9..000000000000 --- a/pkgs/by-name/gl/glfw3/0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 9997ae55a47de469ea26f8437c30b51483abda5f Mon Sep 17 00:00:00 2001 -From: Dan Klishch -Date: Sat, 30 Sep 2023 23:38:05 -0400 -Subject: Defer setting cursor position until the cursor is locked - ---- - src/wl_platform.h | 3 +++ - src/wl_window.c | 14 ++++++++++++-- - 2 files changed, 15 insertions(+), 2 deletions(-) - -diff --git a/src/wl_platform.h b/src/wl_platform.h -index ca34f66e..cd1f227f 100644 ---- a/src/wl_platform.h -+++ b/src/wl_platform.h -@@ -403,6 +403,9 @@ typedef struct _GLFWwindowWayland - int scaleSize; - int compositorPreferredScale; - -+ double askedCursorPosX, askedCursorPosY; -+ GLFWbool didAskForSetCursorPos; -+ - struct zwp_relative_pointer_v1* relativePointer; - struct zwp_locked_pointer_v1* lockedPointer; - struct zwp_confined_pointer_v1* confinedPointer; -diff --git a/src/wl_window.c b/src/wl_window.c -index 1de26558..0df16747 100644 ---- a/src/wl_window.c -+++ b/src/wl_window.c -@@ -2586,8 +2586,9 @@ void _glfwGetCursorPosWayland(_GLFWwindow* window, double* xpos, double* ypos) - - void _glfwSetCursorPosWayland(_GLFWwindow* window, double x, double y) - { -- _glfwInputError(GLFW_FEATURE_UNAVAILABLE, -- "Wayland: The platform does not support setting the cursor position"); -+ window->wl.didAskForSetCursorPos = true; -+ window->wl.askedCursorPosX = x; -+ window->wl.askedCursorPosY = y; - } - - void _glfwSetCursorModeWayland(_GLFWwindow* window, int mode) -@@ -2819,6 +2820,15 @@ static const struct zwp_relative_pointer_v1_listener relativePointerListener = - static void lockedPointerHandleLocked(void* userData, - struct zwp_locked_pointer_v1* lockedPointer) - { -+ _GLFWwindow* window = userData; -+ -+ if (window->wl.didAskForSetCursorPos) -+ { -+ window->wl.didAskForSetCursorPos = false; -+ zwp_locked_pointer_v1_set_cursor_position_hint(window->wl.lockedPointer, -+ wl_fixed_from_double(window->wl.askedCursorPosX), -+ wl_fixed_from_double(window->wl.askedCursorPosY)); -+ } - } - - static void lockedPointerHandleUnlocked(void* userData, --- -2.42.0 - diff --git a/pkgs/by-name/gl/glfw3/package.nix b/pkgs/by-name/gl/glfw3/package.nix index d5511c2ad8d3..193095773f7d 100644 --- a/pkgs/by-name/gl/glfw3/package.nix +++ b/pkgs/by-name/gl/glfw3/package.nix @@ -23,6 +23,12 @@ }: let version = "3.4"; + minecraftPatches = fetchFromGitHub { + owner = "BoyOrigin"; + repo = "glfw-wayland"; + rev = "f62b4ae8f93149fd754cadecd51d8b1a07d20522"; + hash = "sha256-kvWP34rOD4HSTvnKb33nvVquTGZoqP8/l+8XQ0h3b7Y="; + }; in stdenv.mkDerivation { pname = "glfw${lib.optionalString withMinecraftPatch "-minecraft"}"; @@ -36,12 +42,10 @@ stdenv.mkDerivation { }; # Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583) - patches = [ - ./x11.patch - ] - ++ lib.optionals withMinecraftPatch [ - ./0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch - ]; + patches = [ ./x11.patch ]; + prePatch = lib.optionalString withMinecraftPatch '' + patches+=(${minecraftPatches}/patches/*.patch) + ''; propagatedBuildInputs = lib.optionals (!stdenv.hostPlatform.isWindows) [ libGL ]; diff --git a/pkgs/by-name/gn/gnome-inform7/package.nix b/pkgs/by-name/gn/gnome-inform7/package.nix index 0c2aacc1a5bb..5346e9443f71 100644 --- a/pkgs/by-name/gn/gnome-inform7/package.nix +++ b/pkgs/by-name/gn/gnome-inform7/package.nix @@ -20,7 +20,7 @@ gobject-introspection, vala, gtk-doc, - webkitgtk_4_0, + # webkitgtk_4_0, gtksourceview3, gspell, libxml2, @@ -124,7 +124,7 @@ stdenv.mkDerivation { gtk3 gtksourceview3 gspell - webkitgtk_4_0 + # webkitgtk_4_0 libxml2 goocanvas2 libplist @@ -137,6 +137,8 @@ stdenv.mkDerivation { ''; meta = with lib; { + # webkitgtk_4_0 was removed + broken = true; description = "Inform 7 for the Gnome platform"; longDescription = '' This version of Inform 7 for the Gnome platform was created by Philip Chimento, based on a design by Graham Nelson and Andrew Hunter. diff --git a/pkgs/by-name/go/gol/package.nix b/pkgs/by-name/go/gol/package.nix index b71f97318f8d..bd838f576e0d 100644 --- a/pkgs/by-name/go/gol/package.nix +++ b/pkgs/by-name/go/gol/package.nix @@ -8,16 +8,16 @@ maven.buildMavenPackage rec { pname = "gol"; - version = "1.0.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "clarisma"; repo = "gol-tool"; tag = version; - hash = "sha256-roFtoSpNByNVGkl7ESt5O6b4voVzX8Nbow1dI6Sqgss"; + hash = "sha256-AnPm5Mooww9kAMWLnM36z8DVRGfIIEiqUE65tgNuKm8="; }; - mvnHash = "sha256-lKmoftSkyyb/pIthrsJaZ3p9l5V5K3FdK6sOBoZyhe8"; + mvnHash = "sha256-YD28YX0RKuxOEWuK12ToOnFFrUPqA9xZ+EmsCt1fDPI="; mvnParameters = "compile assembly:single -Dmaven.test.skip=true"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/go/gops/package.nix b/pkgs/by-name/go/gops/package.nix index 0975a213b853..2a38e8e13525 100644 --- a/pkgs/by-name/go/gops/package.nix +++ b/pkgs/by-name/go/gops/package.nix @@ -1,8 +1,10 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, writableTmpDirAsHomeHook, + installShellFiles, }: buildGoModule (finalAttrs: { @@ -20,6 +22,16 @@ buildGoModule (finalAttrs: { nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion \ + --cmd gops \ + --bash <($out/bin/gops completion bash) \ + --fish <($out/bin/gops completion fish) \ + --zsh <($out/bin/gops completion zsh) + ''; + meta = with lib; { description = "Tool to list and diagnose Go processes currently running on your system"; mainProgram = "gops"; diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix index 7fb8cc669cdb..1cc40b5af48b 100644 --- a/pkgs/by-name/gr/grafana-loki/package.nix +++ b/pkgs/by-name/gr/grafana-loki/package.nix @@ -12,14 +12,14 @@ }: buildGoModule rec { - version = "3.5.6"; + version = "3.5.7"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-Nm3DQ8LvKTFmK2Wi3rvDM+kJBq++Rm4zrajlp01SdIg="; + hash = "sha256-9Aq4ZZuvhTSVTSk1l+DpEo+e5HffrRXJr1DfjJBmBng="; }; vendorHash = null; diff --git a/pkgs/by-name/gu/guile-cairo/package.nix b/pkgs/by-name/gu/guile-cairo/package.nix index de1c3da398d4..427c6f990611 100644 --- a/pkgs/by-name/gu/guile-cairo/package.nix +++ b/pkgs/by-name/gu/guile-cairo/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { management, exceptions, macros, and a dynamic programming environment. ''; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ vyp ]; + maintainers = [ ]; platforms = guile.meta.platforms; }; } diff --git a/pkgs/by-name/gu/guile-fibers/package.nix b/pkgs/by-name/gu/guile-fibers/package.nix index a2a6468941dd..2ce6fb26509b 100644 --- a/pkgs/by-name/gu/guile-fibers/package.nix +++ b/pkgs/by-name/gu/guile-fibers/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/wingo/fibers"; description = "Concurrent ML-like concurrency for Guile"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ vyp ]; + maintainers = [ ]; platforms = guile.meta.platforms; }; } diff --git a/pkgs/by-name/gu/guile-lib/package.nix b/pkgs/by-name/gu/guile-lib/package.nix index 2e327df9a259..90ecc8d5cab0 100644 --- a/pkgs/by-name/gu/guile-lib/package.nix +++ b/pkgs/by-name/gu/guile-lib/package.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; maintainers = with maintainers; [ - vyp foo-dogsquared ]; platforms = guile.meta.platforms; diff --git a/pkgs/by-name/gu/guile-ncurses/package.nix b/pkgs/by-name/gu/guile-ncurses/package.nix index 16272d275805..1c0504966ec9 100644 --- a/pkgs/by-name/gu/guile-ncurses/package.nix +++ b/pkgs/by-name/gu/guile-ncurses/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { panel, and menu. ''; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ vyp ]; + maintainers = [ ]; platforms = guile.meta.platforms; }; } diff --git a/pkgs/by-name/gu/guile-opengl/package.nix b/pkgs/by-name/gu/guile-opengl/package.nix index f0ffc6586346..96be47683df7 100644 --- a/pkgs/by-name/gu/guile-opengl/package.nix +++ b/pkgs/by-name/gu/guile-opengl/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/guile-opengl/"; description = "Guile bindings for the OpenGL graphics API"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ vyp ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/gu/guile-sdl2/package.nix b/pkgs/by-name/gu/guile-sdl2/package.nix index cc39d0fe299e..5e30eea7d9c0 100644 --- a/pkgs/by-name/gu/guile-sdl2/package.nix +++ b/pkgs/by-name/gu/guile-sdl2/package.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl3Plus; maintainers = with maintainers; [ seppeljordan - vyp ]; platforms = platforms.all; }; diff --git a/pkgs/by-name/gu/guile-xcb/package.nix b/pkgs/by-name/gu/guile-xcb/package.nix index 44a59593d38c..3d375144d90c 100644 --- a/pkgs/by-name/gu/guile-xcb/package.nix +++ b/pkgs/by-name/gu/guile-xcb/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { homepage = "https://github.com/mwitmer/guile-xcb"; description = "XCB bindings for Guile"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ vyp ]; + maintainers = [ ]; platforms = guile.meta.platforms; }; } diff --git a/pkgs/by-name/ho/holochain-launcher/package.nix b/pkgs/by-name/ho/holochain-launcher/package.nix index 8e3b718f0692..a4c713a278f8 100644 --- a/pkgs/by-name/ho/holochain-launcher/package.nix +++ b/pkgs/by-name/ho/holochain-launcher/package.nix @@ -5,7 +5,7 @@ autoPatchelfHook, dpkg, openssl, - webkitgtk_4_0, + # webkitgtk_4_0, libappindicator, wrapGAppsHook3, shared-mime-info, @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl - webkitgtk_4_0 + # webkitgtk_4_0 libappindicator glib-networking @@ -52,6 +52,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + # webkitgtk_4_0 was removed + broken = true; description = "Cross-platform executable that launches a local Holochain conductor, and installs and opens apps"; homepage = "https://github.com/holochain/launcher"; maintainers = [ maintainers.steveej ]; diff --git a/pkgs/by-name/hy/hyprviz/package.nix b/pkgs/by-name/hy/hyprviz/package.nix index 0029ac0a80be..34f1e8375be3 100644 --- a/pkgs/by-name/hy/hyprviz/package.nix +++ b/pkgs/by-name/hy/hyprviz/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hyprviz"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "timasoft"; repo = "hyprviz"; tag = "v${finalAttrs.version}"; - hash = "sha256-voOfiiNJi6igBqkvG1zy5dakDSGHteStd2bqh6VLgU4="; + hash = "sha256-ar1O/Em9AcPPfbuT4xnyOwBX1IClJlFYfdPQbU/5vTk="; }; - cargoHash = "sha256-CZcBiTyIeWS7DFWXruXM7Lvzr4qEDALvfNCnprbyKOg="; + cargoHash = "sha256-BICF6nZcn/7t5X4Dj18fPD2RpEz7U1Zytt9sfHe7Xnw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/in/insulator2/package.nix b/pkgs/by-name/in/insulator2/package.nix index b74147d0e620..99b218789fad 100644 --- a/pkgs/by-name/in/insulator2/package.nix +++ b/pkgs/by-name/in/insulator2/package.nix @@ -20,7 +20,6 @@ freetype, libsoup_2_4, openssl, - webkitgtk_4_0, }: stdenv.mkDerivation rec { @@ -82,12 +81,14 @@ stdenv.mkDerivation rec { freetype libsoup_2_4 openssl - webkitgtk_4_0 + # webkitgtk_4_0 ]; env.OPENSSL_NO_VENDOR = 1; meta = with lib; { + # webkitgtk_4_0 was removed + broken = true; description = "Client UI to inspect Kafka topics, consume, produce and much more"; homepage = "https://github.com/andrewinci/insulator2"; license = licenses.gpl3Only; diff --git a/pkgs/by-name/ja/jai/package.nix b/pkgs/by-name/ja/jai/package.nix index 5e9acfed111c..1627c24b753c 100644 --- a/pkgs/by-name/ja/jai/package.nix +++ b/pkgs/by-name/ja/jai/package.nix @@ -9,7 +9,7 @@ let pname = "jai"; minor = "2"; - patch = "017"; + patch = "018"; version = "0.${minor}.${patch}"; zipName = "jai-beta-${minor}-${patch}.zip"; jai = stdenv.mkDerivation { @@ -20,7 +20,7 @@ let nix-store --add-fixed sha256 ${zipName} ''; name = zipName; - sha256 = "sha256-qVBF71qpFXfBkke9vCs7Wq/+P7ZQIgg4l1iLw8NmQhA="; + sha256 = "sha256-vs9YSQzeqp34OSSl8JghDVyyqegsQj3bhUDGNwecHRI="; }; nativeBuildInputs = [ unzip ]; buildCommand = "unzip $src -d $out"; diff --git a/pkgs/by-name/ko/komorebi/package.nix b/pkgs/by-name/ko/komorebi/package.nix index 8500661395e1..5983473634c7 100644 --- a/pkgs/by-name/ko/komorebi/package.nix +++ b/pkgs/by-name/ko/komorebi/package.nix @@ -8,7 +8,7 @@ glib, gtk3, libgee, - webkitgtk_4_0, + # webkitgtk_4_0, clutter-gtk, clutter-gst, ninja, @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { glib gtk3 libgee - webkitgtk_4_0 + # webkitgtk_4_0 clutter-gtk clutter-gst ]; @@ -47,6 +47,8 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = with lib; { + # webkitgtk_4_0 was removed + broken = true; description = "Beautiful and customizable wallpaper manager for Linux"; homepage = "https://github.com/Komorebi-Fork/komorebi"; license = licenses.gpl3Only; diff --git a/pkgs/by-name/kt/ktls-utils/package.nix b/pkgs/by-name/kt/ktls-utils/package.nix index acdc19dca812..3fb20ea47a93 100644 --- a/pkgs/by-name/kt/ktls-utils/package.nix +++ b/pkgs/by-name/kt/ktls-utils/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/oracle/ktls-utils/blob/${src.rev}/NEWS"; license = licenses.gpl2Only; maintainers = [ ]; - mainProgram = "ktls-utils"; + mainProgram = "tlshd"; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/li/libbgcode/package.nix b/pkgs/by-name/li/libbgcode/package.nix index 5ad44220d625..d6348bc29edd 100644 --- a/pkgs/by-name/li/libbgcode/package.nix +++ b/pkgs/by-name/li/libbgcode/package.nix @@ -9,7 +9,7 @@ boost, catch2_3, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "libbgcode"; version = "0-unstable-2025-02-19"; @@ -29,9 +29,18 @@ stdenv.mkDerivation { heatshrink zlib boost + ]; + + checkInputs = [ catch2_3 ]; + doCheck = true; + + cmakeFlags = [ + (lib.cmakeBool "LibBGCode_BUILD_TESTS" finalAttrs.finalPackage.doCheck) + ]; + meta = with lib; { homepage = "https://github.com/prusa3d/libbgcode"; description = "Prusa Block & Binary G-code reader / writer / converter"; @@ -40,4 +49,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ lach ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libcangjie/package.nix b/pkgs/by-name/li/libcangjie/package.nix index b9e40ee59d65..c2f09fa46fe3 100644 --- a/pkgs/by-name/li/libcangjie/package.nix +++ b/pkgs/by-name/li/libcangjie/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "C library implementing the Cangjie input method"; homepage = "https://gitlab.freedesktop.org/cangjie/libcangjie"; license = lib.licenses.lgpl3Plus; - maintainers = [ lib.maintainers.linquize ]; + maintainers = [ ]; platforms = lib.platforms.all; mainProgram = "libcangjie-cli"; }; diff --git a/pkgs/by-name/li/libnats-c/package.nix b/pkgs/by-name/li/libnats-c/package.nix index 9dce5480e0f3..830d74fa7e2d 100644 --- a/pkgs/by-name/li/libnats-c/package.nix +++ b/pkgs/by-name/li/libnats-c/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libnats"; - version = "3.10.1"; + version = "3.11.0"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats.c"; rev = "v${version}"; - sha256 = "sha256-hPudV1d+6QkHJzs7Mk47v8LVBfR3UTES/UyhdtMkNJA="; + sha256 = "sha256-W1WxaQ33K+N3AHCK3sQWTQo4sN57qW2ZuAGrj6JpgCU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/li/libre-baskerville/package.nix b/pkgs/by-name/li/libre-baskerville/package.nix index 848c2c009f05..0cefcbc1c56b 100644 --- a/pkgs/by-name/li/libre-baskerville/package.nix +++ b/pkgs/by-name/li/libre-baskerville/package.nix @@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec { ''; homepage = "http://www.impallari.com/projects/overview/libre-baskerville"; license = licenses.ofl; - maintainers = with maintainers; [ cmfwyp ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/li/libre-bodoni/package.nix b/pkgs/by-name/li/libre-bodoni/package.nix index 46d8510ff56d..4b58f7383ff1 100644 --- a/pkgs/by-name/li/libre-bodoni/package.nix +++ b/pkgs/by-name/li/libre-bodoni/package.nix @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation rec { ''; homepage = "https://github.com/impallari/Libre-Bodoni"; license = licenses.ofl; - maintainers = with maintainers; [ cmfwyp ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/li/libre-caslon/package.nix b/pkgs/by-name/li/libre-caslon/package.nix index 6f766f2df98a..9637cdd0be37 100644 --- a/pkgs/by-name/li/libre-caslon/package.nix +++ b/pkgs/by-name/li/libre-caslon/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { description = "Caslon fonts based on hand-lettered American Caslons of 1960s"; homepage = "http://www.impallari.com/librecaslon"; license = licenses.ofl; - maintainers = with maintainers; [ cmfwyp ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/li/libre-franklin/package.nix b/pkgs/by-name/li/libre-franklin/package.nix index 2af58d8c92f1..662231984d97 100644 --- a/pkgs/by-name/li/libre-franklin/package.nix +++ b/pkgs/by-name/li/libre-franklin/package.nix @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation rec { description = "Reinterpretation and expansion based on the 1912 Morris Fuller Benton’s classic"; homepage = "https://github.com/impallari/Libre-Franklin"; license = licenses.ofl; - maintainers = with maintainers; [ cmfwyp ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 9df32043c859..b832dddde80b 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -75,13 +75,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "6729"; + version = "6782"; src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-CkPLgzSsiCkSIAp4XetUJszt0+WjPRt+9V9SvRogbVU="; + hash = "sha256-9cFuYkEcgUHsC4jg8qzKvHA8xI8Bp0w4AQKEt/TACUI="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT diff --git a/pkgs/by-name/mb/mbake/package.nix b/pkgs/by-name/mb/mbake/package.nix index 740cdcb24de0..5ad1b65acbee 100644 --- a/pkgs/by-name/mb/mbake/package.nix +++ b/pkgs/by-name/mb/mbake/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "mbake"; - version = "1.4.1.pre"; + version = "1.4.2.post1"; pyproject = true; src = fetchFromGitHub { owner = "EbodShojaei"; repo = "bake"; tag = "v${version}"; - hash = "sha256-HbBibwrd73GA0Z3xiYJAu1te7BADqsSkk0d99bMrwPw="; + hash = "sha256-3wEVlxPO5Hyemm6uM6+W/nhaY64xygfLCjlJgTHzuTg="; }; build-system = [ diff --git a/pkgs/by-name/mo/mouse-actions-gui/package.nix b/pkgs/by-name/mo/mouse-actions-gui/package.nix index 485b4faecafa..ed2e60f79afb 100644 --- a/pkgs/by-name/mo/mouse-actions-gui/package.nix +++ b/pkgs/by-name/mo/mouse-actions-gui/package.nix @@ -16,7 +16,6 @@ udevCheckHook, gtk3, libsoup_2_4, - webkitgtk_4_0, }: rustPlatform.buildRustPackage rec { @@ -49,7 +48,7 @@ rustPlatform.buildRustPackage rec { # Tauri deps gtk3 libsoup_2_4 - webkitgtk_4_0 + # webkitgtk_4_0 ]; npmDeps = fetchNpmDeps { @@ -69,6 +68,8 @@ rustPlatform.buildRustPackage rec { ''; meta = { + # webkitgtk_4_0 was removed + broken = true; changelog = "https://github.com/jersou/mouse-actions/blob/${src.rev}/CHANGELOG.md"; description = "Mouse event based command executor, a mix between Easystroke and Comiz edge commands"; homepage = "https://github.com/jersou/mouse-actions"; diff --git a/pkgs/by-name/mt/mtpaint/package.nix b/pkgs/by-name/mt/mtpaint/package.nix index 39de8758a54a..0ff7f39b9b97 100644 --- a/pkgs/by-name/mt/mtpaint/package.nix +++ b/pkgs/by-name/mt/mtpaint/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { homepage = "https://mtpaint.sourceforge.net/"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.vklquevs ]; + maintainers = [ ]; mainProgram = "mtpaint"; }; } diff --git a/pkgs/by-name/ne/netbeans/package.nix b/pkgs/by-name/ne/netbeans/package.nix index 364ee5feebd8..3d53a6f2a506 100644 --- a/pkgs/by-name/ne/netbeans/package.nix +++ b/pkgs/by-name/ne/netbeans/package.nix @@ -13,7 +13,7 @@ }: let - version = "24"; + version = "27"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - hash = "sha256-mzmviZuyS68SZhOAzwWOdZLveOTS5UOgY1oW+oAv9Gs="; + hash = "sha256-/B8qE/Dwv1L6gZ8oTPsfq+zLb3cEyQ2YDdw6UFNim8c="; }; buildCommand = '' diff --git a/pkgs/by-name/nv/nvc/package.nix b/pkgs/by-name/nv/nvc/package.nix index 4a13cbbd4434..ed8e4044598e 100644 --- a/pkgs/by-name/nv/nvc/package.nix +++ b/pkgs/by-name/nv/nvc/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch2, autoreconfHook, check, flex, @@ -17,13 +16,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; tag = "r${version}"; - hash = "sha256-PpSoqDCjvROkfXSuOlGxqa9ChdBItu/PQztdsXvVC60="; + hash = "sha256-mf6CMUdpIk8O+soKXpbI94h8RUf1MrbOVDwBIJyKitA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ow/owl-compositor/package.nix b/pkgs/by-name/ow/owl-compositor/package.nix index 2ece27bf3218..06937ead954f 100644 --- a/pkgs/by-name/ow/owl-compositor/package.nix +++ b/pkgs/by-name/ow/owl-compositor/package.nix @@ -68,6 +68,9 @@ stdenv.mkDerivation { !stdenv.hostPlatform.isDarwin ) "-fobjc-runtime=gnustep-2.0"; + # ld: Seat/OwlPointer.o: undefined reference to symbol 'round@@GLIBC_2.2.5' + env.NIX_LDFLAGS = "-lm"; + installPhase = '' runHook preInstall diff --git a/pkgs/by-name/pi/pifpaf/package.nix b/pkgs/by-name/pi/pifpaf/package.nix index c72d6dfe763a..747559e09dd9 100644 --- a/pkgs/by-name/pi/pifpaf/package.nix +++ b/pkgs/by-name/pi/pifpaf/package.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication rec { pname = "pifpaf"; - version = "3.3.0"; + version = "3.4.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-xXkMj1sP1xXf6Ad/71BFbq8SHz/uHcaSqv6RQN0Ca1o="; + hash = "sha256-f9nPb483tuvNk82wDtuB6553z18qY/x0tgz1NbVGUWE="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/pl/plantuml/package.nix b/pkgs/by-name/pl/plantuml/package.nix index cfab4bda23af..f7ac77e03407 100644 --- a/pkgs/by-name/pl/plantuml/package.nix +++ b/pkgs/by-name/pl/plantuml/package.nix @@ -59,7 +59,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { mainProgram = "plantuml"; maintainers = with lib.maintainers; [ bjornfor - Mogria anthonyroussel ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/pr/projectlibre/package.nix b/pkgs/by-name/pr/projectlibre/package.nix index b1fb70ed9e27..960bf5faab2c 100644 --- a/pkgs/by-name/pr/projectlibre/package.nix +++ b/pkgs/by-name/pr/projectlibre/package.nix @@ -71,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.cpal10; mainProgram = "projectlibre"; maintainers = with lib.maintainers; [ - Mogria tomasajt ]; platforms = jre.meta.platforms; diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 40d377d04e20..11749bbc3444 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton10-19"; + version = "GE-Proton10-20"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-vV009ZlYFEAI1jkfMql46QnJXekRup5TqajVSc57f3U="; + hash = "sha256-sJkaDEnfAuEqcLDBtAfU6Rny3P3lOCnG1DusWfvv2Fg="; }; dontUnpack = true; diff --git a/pkgs/by-name/ry/rymcast/package.nix b/pkgs/by-name/ry/rymcast/package.nix index 26d8d851fd24..8ba351fafe1a 100644 --- a/pkgs/by-name/ry/rymcast/package.nix +++ b/pkgs/by-name/ry/rymcast/package.nix @@ -7,7 +7,7 @@ alsa-lib, curl, gtk3, - webkitgtk_4_0, + # webkitgtk_4_0, zenity, }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { curl gtk3 (lib.getLib stdenv.cc.cc) - webkitgtk_4_0 + # webkitgtk_4_0 zenity ]; @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + # webkitgtk_4_0 was removed + broken = true; description = "Player for Mega Drive/Genesis VGM files"; homepage = "https://www.inphonik.com/products/rymcast-genesis-vgm-player/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/sb/sbctl/package.nix b/pkgs/by-name/sb/sbctl/package.nix index 878aba99e4cd..bb18c7c79fb4 100644 --- a/pkgs/by-name/sb/sbctl/package.nix +++ b/pkgs/by-name/sb/sbctl/package.nix @@ -7,20 +7,22 @@ asciidoc, databasePath ? "/etc/secureboot", nix-update-script, + pkg-config, + pcsclite, }: buildGoModule rec { pname = "sbctl"; - version = "0.17"; + version = "0.18"; src = fetchFromGitHub { owner = "Foxboron"; repo = "sbctl"; tag = version; - hash = "sha256-7dCaWemkus2GHxILBEx5YvzdAmv89JfcPbqZZ6QwriI"; + hash = "sha256-Q8uQ74XvteMRcnUPu1PjLAPWt3jeI7aF4m3QMjiZJis="; }; - vendorHash = "sha256-gpHEJIbLnB0OiYB00rHK6OwrnHTHCj/tTVlUzuFjFKY="; + vendorHash = "sha256-PwLdWoC8tjdKoUAg2xvopggpgZ9WKaUslO3ZBtBah2k="; ldflags = [ "-s" @@ -32,8 +34,11 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles asciidoc + pkg-config ]; + buildInputs = [ pcsclite ]; + postBuild = '' make docs/sbctl.conf.5 docs/sbctl.8 ''; diff --git a/pkgs/by-name/se/setroot/package.nix b/pkgs/by-name/se/setroot/package.nix index 2e6cc2d6f8cd..a4fd8f94f10f 100644 --- a/pkgs/by-name/se/setroot/package.nix +++ b/pkgs/by-name/se/setroot/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { description = "Simple X background setter inspired by imlibsetroot and feh"; homepage = "https://github.com/ttzhou/setroot"; license = licenses.gpl3Plus; - maintainers = [ maintainers.vyp ]; + maintainers = [ ]; platforms = platforms.unix; mainProgram = "setroot"; }; diff --git a/pkgs/by-name/sn/snippetexpandergui/package.nix b/pkgs/by-name/sn/snippetexpandergui/package.nix index 4f968e5a98ec..6a1f172e7617 100644 --- a/pkgs/by-name/sn/snippetexpandergui/package.nix +++ b/pkgs/by-name/sn/snippetexpandergui/package.nix @@ -7,7 +7,7 @@ installShellFiles, xorg, gtk3, - webkitgtk_4_0, + # webkitgtk_4_0, snippetexpanderd, snippetexpanderx, }: @@ -33,7 +33,7 @@ buildGoModule rec { buildInputs = [ xorg.libX11 gtk3 - webkitgtk_4_0 + # webkitgtk_4_0 snippetexpanderd snippetexpanderx ]; @@ -68,6 +68,8 @@ buildGoModule rec { ''; meta = { + # webkitgtk_4_0 was removed + broken = true; description = "Your little expandable text snippet helper GUI"; homepage = "https://snippetexpander.org"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/by-name/so/sonobus/package.nix b/pkgs/by-name/so/sonobus/package.nix index bdcc44d62730..c3de44a3f59f 100644 --- a/pkgs/by-name/so/sonobus/package.nix +++ b/pkgs/by-name/so/sonobus/package.nix @@ -17,7 +17,6 @@ libopus, curl, gtk3, - webkitgtk_4_0, }: stdenv.mkDerivation (finalAttrs: { @@ -45,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { libopus curl gtk3 - webkitgtk_4_0 + # webkitgtk_4_0 ]; runtimeDependencies = [ @@ -76,12 +75,13 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { + # webkitgtk_4_0 was removed + broken = true; description = "High-quality network audio streaming"; homepage = "https://sonobus.net/"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ PowerUser64 ]; platforms = platforms.unix; - broken = stdenv.hostPlatform.isDarwin; mainProgram = "sonobus"; }; }) diff --git a/pkgs/by-name/sq/squirreldisk/package.nix b/pkgs/by-name/sq/squirreldisk/package.nix index bcc10d9b8dee..3624e7e84cb1 100644 --- a/pkgs/by-name/sq/squirreldisk/package.nix +++ b/pkgs/by-name/sq/squirreldisk/package.nix @@ -19,7 +19,6 @@ libsoup_2_4, openssl, parallel-disk-usage, - webkitgtk_4_0, }: rustPlatform.buildRustPackage rec { @@ -82,7 +81,7 @@ rustPlatform.buildRustPackage rec { gtk3 libsoup_2_4 openssl - webkitgtk_4_0 + # webkitgtk_4_0 ]; # Disable checkPhase, since the project doesn't contain tests @@ -102,6 +101,8 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { + # webkitgtk_4_0 was removed + broken = true; description = "Cross-platform disk usage analysis tool"; homepage = "https://www.squirreldisk.com/"; license = licenses.agpl3Only; diff --git a/pkgs/by-name/st/stderred/package.nix b/pkgs/by-name/st/stderred/package.nix index 997a1cc1a623..f8447a2409f9 100644 --- a/pkgs/by-name/st/stderred/package.nix +++ b/pkgs/by-name/st/stderred/package.nix @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-k/EA327AsRHgUYu7QqSF5yzOyO6h5XcE9Uv4l1VcIPI="; }; + postPatch = '' + # Inline https://github.com/ku1ik/stderred/pull/95 + substituteInPlace CMakeLists.txt --replace-fail \ + 'cmake_minimum_required(VERSION 3.0)' \ + 'cmake_minimum_required(VERSION 3.10)' + ''; + nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/su/surf/package.nix b/pkgs/by-name/su/surf/package.nix index 1e902f4ad50f..fe1c29899ae5 100644 --- a/pkgs/by-name/su/surf/package.nix +++ b/pkgs/by-name/su/surf/package.nix @@ -10,7 +10,8 @@ gsettings-desktop-schemas, gtk2, libsoup_2_4, - webkitgtk_4_0, + # webkitgtk_4_0, + webkitgtk_4_1, xorg, dmenu, findutils, @@ -42,7 +43,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gtk2 libsoup_2_4 - webkitgtk_4_0 + # webkitgtk_4_0 ] ++ (with gst_all_1; [ # Audio & video support for webkitgtk WebView @@ -75,6 +76,9 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + # webkitgtk_4_0 was removed. master is supposed to support 4.1 + # but it crashes with BadWindow X Error + broken = true; description = "Simple web browser based on WebKitGTK"; mainProgram = "surf"; longDescription = '' @@ -85,7 +89,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://surf.suckless.org"; license = licenses.mit; - platforms = webkitgtk_4_0.meta.platforms; + platforms = webkitgtk_4_1.meta.platforms; maintainers = with maintainers; [ joachifm ]; }; } diff --git a/pkgs/by-name/sx/sxhkd/package.nix b/pkgs/by-name/sx/sxhkd/package.nix index 531eca8d0018..3a454b69034e 100644 --- a/pkgs/by-name/sx/sxhkd/package.nix +++ b/pkgs/by-name/sx/sxhkd/package.nix @@ -53,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd2; mainProgram = "sxhkd"; maintainers = with lib.maintainers; [ - vyp ncfavier ]; inherit (libxcb.meta) platforms; diff --git a/pkgs/by-name/ta/tapview/package.nix b/pkgs/by-name/ta/tapview/package.nix index 5d186f9a5d37..bd95d188bbea 100644 --- a/pkgs/by-name/ta/tapview/package.nix +++ b/pkgs/by-name/ta/tapview/package.nix @@ -5,30 +5,27 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tapview"; - version = "1.1"; + version = "1.15"; nativeBuildInputs = [ asciidoctor ]; src = fetchFromGitLab { owner = "esr"; repo = "tapview"; - rev = version; - hash = "sha256-inrxICNglZU/tup+YnHaDiVss32K2OXht/7f8lOZI4g="; + tag = finalAttrs.version; + hash = "sha256-6v+CxNjj3gPE3wmhit6e5OuhkjVACFv/4QAbFDCySGc="; }; - # Remove unnecessary `echo` checks: `/bin/echo` fails, and `echo -n` works as expected. - patches = [ ./dont_check_echo.patch ]; - makeFlags = [ "prefix=$(out)" ]; - meta = with lib; { + meta = { description = "Minimalist pure consumer for TAP (Test Anything Protocol)"; mainProgram = "tapview"; homepage = "https://gitlab.com/esr/tapview"; - license = licenses.bsd2; - platforms = platforms.all; - maintainers = with maintainers; [ pamplemousse ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ pamplemousse ]; }; -} +}) diff --git a/pkgs/by-name/te/tektoncd-cli/package.nix b/pkgs/by-name/te/tektoncd-cli/package.nix index 082b85a549ff..cacb2ac2ba05 100644 --- a/pkgs/by-name/te/tektoncd-cli/package.nix +++ b/pkgs/by-name/te/tektoncd-cli/package.nix @@ -3,16 +3,23 @@ buildGoModule, fetchFromGitHub, installShellFiles, + + writableTmpDirAsHomeHook, + + stdenv, + buildPackages, + + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "tektoncd-cli"; version = "0.42.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-WB3XsXT8bXo2GpHC6hGKilRwloy31y18JD09cQklsV0="; }; @@ -21,47 +28,62 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}" + "-X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${finalAttrs.version}" ]; + # tests bind to ::1 + __darwinAllowLocalNetworking = true; + nativeBuildInputs = [ installShellFiles ]; - subPackages = [ "cmd/tkn" ]; + subPackages = [ + "cmd/tkn" + ]; + + excludedPackages = [ + "test/e2e" + ]; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + ]; preCheck = '' - # some tests try to write to the home dir - export HOME="$TMPDIR" - # run all tests unset subPackages # the tests expect the clientVersion ldflag not to be set unset ldflags - - # remove tests with networking - rm pkg/cmd/version/version_test.go ''; postInstall = '' installManPage docs/man/man1/* + '' + + ( + let + exe = + if stdenv.buildPlatform.canExecute stdenv.hostPlatform then + "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}" + else + lib.getExe buildPackages.tektoncd-cli; + in + '' + installShellCompletion --cmd ${finalAttrs.meta.mainProgram} \ + --bash <(${exe} completion bash) \ + --fish <(${exe} completion fish) \ + --zsh <(${exe} completion zsh) + '' + ); - installShellCompletion --cmd tkn \ - --bash <($out/bin/tkn completion bash) \ - --fish <($out/bin/tkn completion fish) \ - --zsh <($out/bin/tkn completion zsh) - ''; - + nativeInstallCheckInputs = [ + versionCheckHook + ]; doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/tkn --help - $out/bin/tkn version | grep "Client version: ${version}" - runHook postInstallCheck - ''; + versionCheckProgramArg = "version"; meta = { homepage = "https://tekton.dev"; - changelog = "https://github.com/tektoncd/cli/releases/tag/v${version}"; + changelog = "https://github.com/tektoncd/cli/releases/tag/${finalAttrs.src.tag}"; description = "Provides a CLI for interacting with Tekton - tkn"; longDescription = '' The Tekton Pipelines cli project provides a CLI for interacting with @@ -77,4 +99,4 @@ buildGoModule rec { ]; mainProgram = "tkn"; }; -} +}) diff --git a/pkgs/by-name/ti/tiny/package.nix b/pkgs/by-name/ti/tiny/package.nix index cba3ba635607..7afa3629b866 100644 --- a/pkgs/by-name/ti/tiny/package.nix +++ b/pkgs/by-name/ti/tiny/package.nix @@ -37,7 +37,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ Br1ght0ne - vyp ]; mainProgram = "tiny"; }; diff --git a/pkgs/by-name/to/tonelib-zoom/package.nix b/pkgs/by-name/to/tonelib-zoom/package.nix index 32ba6b2bb39e..2d2e9d62fcf8 100644 --- a/pkgs/by-name/to/tonelib-zoom/package.nix +++ b/pkgs/by-name/to/tonelib-zoom/package.nix @@ -13,7 +13,6 @@ libXrandr, libXrender, libjack2, - webkitgtk_4_0, }: stdenv.mkDerivation rec { @@ -35,7 +34,7 @@ stdenv.mkDerivation rec { alsa-lib freetype libglvnd - webkitgtk_4_0 + # webkitgtk_4_0 ] ++ runtimeDependencies; @@ -56,6 +55,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + # webkitgtk_4_0 was removed + broken = true; description = "ToneLib Zoom – change and save all the settings in your Zoom(r) guitar pedal"; homepage = "https://tonelib.net/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/tr/treefmt/package.nix b/pkgs/by-name/tr/treefmt/package.nix index af54b60210c4..e38f05966a46 100644 --- a/pkgs/by-name/tr/treefmt/package.nix +++ b/pkgs/by-name/tr/treefmt/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "treefmt"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "numtide"; repo = "treefmt"; rev = "v${version}"; - hash = "sha256-Z1AGLaGrRrUd75aQJc/UKwzMGb9gI/p5WxQ5XUgp98o="; + hash = "sha256-Okwwu5ls3BwLtm8qaq+QX3P+6uwuodV82F3j38tuszk="; }; - vendorHash = "sha256-9yAvqz99YlBfFU/hGs1PB/sH0iOyWaVadqGhfXMkj5E="; + vendorHash = "sha256-fiBpyhbkzyhv7i4iHDTsgFcC/jx6onOzGP/YMcUAe9I="; subPackages = [ "." ]; diff --git a/pkgs/by-name/ve/vectorcode/package.nix b/pkgs/by-name/ve/vectorcode/package.nix index 33c580bf5c76..12b02e55615a 100644 --- a/pkgs/by-name/ve/vectorcode/package.nix +++ b/pkgs/by-name/ve/vectorcode/package.nix @@ -93,14 +93,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "vectorcode"; - version = "0.7.15"; + version = "0.7.18"; pyproject = true; src = fetchFromGitHub { owner = "Davidyz"; repo = "VectorCode"; tag = version; - hash = "sha256-YRvJVdNZLmNongYEy06QPsmJkPvmg7cucjLJY05yD54="; + hash = "sha256-xtFSERuXivdqY5XT/JJ4lZ1HgGTAE+DGV7pxH1163ZQ="; }; build-system = with python.pkgs; [ @@ -184,6 +184,7 @@ python.pkgs.buildPythonApplication rec { disabledTests = [ # Require internet access + "test_build_query_results_chunk_mode_success" "test_chunked_add" "test_chunked_add_empty_file" "test_chunked_add_truncated" diff --git a/pkgs/by-name/we/webkit2-sharp/package.nix b/pkgs/by-name/we/webkit2-sharp/package.nix deleted file mode 100644 index e50da66aa854..000000000000 --- a/pkgs/by-name/we/webkit2-sharp/package.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - stdenv, - autoreconfHook, - fetchFromGitHub, - gtk-sharp-3_0, - lib, - libxslt, - mono, - pkg-config, - webkitgtk_4_0, -}: - -stdenv.mkDerivation rec { - pname = "webkit2-sharp"; - version = "a59fd76dd730432c76b12ee6347ea66567107ab9"; - - src = fetchFromGitHub { - owner = "hbons"; - repo = "webkit2-sharp"; - rev = version; - sha256 = "sha256:0a7vx81zvzn2wq4q2mqrxvlps1mqk28lm1gpfndqryxm4iiw28vc"; - }; - - nativeBuildInputs = [ - autoreconfHook - libxslt - mono - pkg-config - ]; - - buildInputs = [ - gtk-sharp-3_0 - webkitgtk_4_0 - ]; - - postPatch = '' - # Workaround build failure with WebKitGTK 2.40.0 - # https://github.com/hbons/webkit2-sharp/issues/6 - substituteInPlace sources/webkit2-sharp-api.raw --replace \ - '' \ - '' - ''; - - ac_cv_path_MONODOCER = "no"; - installFlags = [ "GAPIXMLDIR=/tmp/gapixml" ]; - - passthru = { - webkitgtk = webkitgtk_4_0; - }; - - meta = { - description = "C# bindings for WebKit 2 with GTK+ 3"; - homepage = "https://github.com/hbons/webkit2-sharp"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ kevincox ]; - }; -} diff --git a/pkgs/by-name/xp/xplorer/package.nix b/pkgs/by-name/xp/xplorer/package.nix index 33bc53e5ecae..1b88e9e984d7 100644 --- a/pkgs/by-name/xp/xplorer/package.nix +++ b/pkgs/by-name/xp/xplorer/package.nix @@ -14,7 +14,6 @@ openssl, pkg-config, rustPlatform, - webkitgtk_4_0, }: let @@ -75,7 +74,7 @@ rustPlatform.buildRustPackage { freetype libsoup_2_4 gtk3 - webkitgtk_4_0 + # webkitgtk_4_0 ]; checkFlags = [ @@ -88,6 +87,8 @@ rustPlatform.buildRustPackage { ''; meta = with lib; { + # webkitgtk_4_0 was removed + broken = true; description = "Customizable, modern file manager"; homepage = "https://xplorer.space"; license = licenses.asl20; diff --git a/pkgs/by-name/xs/xst/package.nix b/pkgs/by-name/xs/xst/package.nix index 8a089ac6ee85..826df612b4be 100644 --- a/pkgs/by-name/xs/xst/package.nix +++ b/pkgs/by-name/xs/xst/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Simple terminal fork that can load config from Xresources"; mainProgram = "xst"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.vyp ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ya/yaml-filter/package.nix b/pkgs/by-name/ya/yaml-filter/package.nix index 1f7f19b9ddef..56884cd7ec40 100644 --- a/pkgs/by-name/ya/yaml-filter/package.nix +++ b/pkgs/by-name/ya/yaml-filter/package.nix @@ -6,11 +6,15 @@ libyaml, pkg-config, }: - stdenv.mkDerivation rec { pname = "yaml-filter"; version = "0.2.0"; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2." "cmake_minimum_required(VERSION 3.10" + ''; + src = fetchFromGitHub { owner = "OpenSCAP"; repo = "yaml-filter"; diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index d4d2bc26d076..861c47348091 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -193,7 +193,6 @@ in addToNativeBuildInputs pkgs.taglib_1 old ); uuid-lib = addToBuildInputs pkgs.libuuid; - webview = addToBuildInputsWithPkgConfig pkgs.webkitgtk_4_0; ws-client = addToBuildInputs pkgs.zlib; xlib = addToPropagatedBuildInputs pkgs.xorg.libX11; yaml = addToBuildInputs pkgs.libyaml; @@ -302,6 +301,8 @@ in sundials = broken; svn-client = broken; tokyocabinet = broken; + # webkitgtk_4_0 was removed + webview = broken; # mark broken darwin diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 258b2c2343f9..63160da06f2b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -265218,7 +265218,7 @@ self: { license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; } - ) { inherit (pkgs) webkitgtk_4_0; }; + ) { webkitgtk_4_0 = null; }; gi-javascriptcore6 = callPackage ( { @@ -266170,7 +266170,7 @@ self: { badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; } - ) { inherit (pkgs) webkitgtk_4_0; }; + ) { webkitgtk_4_0 = null; }; gi-webkit2webextension = callPackage ( { @@ -266230,7 +266230,7 @@ self: { hydraPlatforms = lib.platforms.none; broken = true; } - ) { inherit (pkgs) webkitgtk_4_0; }; + ) { webkitgtk_4_0 = null; }; gi-webkitwebprocessextension = callPackage ( { @@ -672192,7 +672192,7 @@ self: { ) { inherit (pkgs) gtk3; - inherit (pkgs) webkitgtk_4_0; + webkitgtk_4_0 = null; }; tibetan-utils = callPackage ( @@ -719613,7 +719613,7 @@ self: { badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; } - ) { inherit (pkgs) webkitgtk_4_0; }; + ) { webkitgtk_4_0 = null; }; webkitgtk3 = callPackage ( { diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index bed1d40d4fb3..40cc38c2e852 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -18,7 +18,7 @@ gnutls, libgcrypt, libgpg-error, - gtk3, + gtk4, wayland, wayland-protocols, wayland-scanner, @@ -32,7 +32,7 @@ at-spi2-core, cairo, libxml2, - libsoup, + libsoup_3, libsecret, libxslt, harfbuzz, @@ -79,16 +79,15 @@ fetchpatch, }: +let + abiVersion = if lib.versionAtLeast gtk4.version "4.0" then "6.0" else "4.1"; +in + # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang. clangStdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; version = "2.50.1"; - name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${ - if lib.versionAtLeast gtk3.version "4.0" then - "6.0" - else - "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}" - }"; + name = "webkitgtk-${finalAttrs.version}+abi=${abiVersion}"; outputs = [ "out" @@ -206,13 +205,13 @@ clangStdenv.mkDerivation (finalAttrs: { ++ lib.optionals withLibsecret [ libsecret ] - ++ lib.optionals (lib.versionAtLeast gtk3.version "4.0") [ + ++ lib.optionals (lib.versionAtLeast gtk4.version "4.0") [ wayland-protocols ]; propagatedBuildInputs = [ - gtk3 - libsoup + gtk4 + libsoup_3 ]; cmakeFlags = @@ -222,7 +221,7 @@ clangStdenv.mkDerivation (finalAttrs: { [ "-DENABLE_INTROSPECTION=ON" "-DPORT=GTK" - "-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}" + "-DUSE_SOUP2=${cmakeBool false}" "-DUSE_LIBSECRET=${cmakeBool withLibsecret}" "-DENABLE_EXPERIMENTAL_FEATURES=${cmakeBool enableExperimental}" ] @@ -241,7 +240,7 @@ clangStdenv.mkDerivation (finalAttrs: { "-DUSE_APPLE_ICU=OFF" "-DUSE_OPENGL_OR_ES=OFF" ] - ++ lib.optionals (lib.versionOlder gtk3.version "4.0") [ + ++ lib.optionals (lib.versionOlder gtk4.version "4.0") [ "-DUSE_GTK4=OFF" ] ++ lib.optionals (!systemdSupport) [ @@ -267,9 +266,9 @@ clangStdenv.mkDerivation (finalAttrs: { homepage = "https://webkitgtk.org/"; license = licenses.bsd2; pkgConfigModules = [ - "javascriptcoregtk-4.0" - "webkit2gtk-4.0" - "webkit2gtk-web-extension-4.0" + "javascriptcoregtk-${abiVersion}" + "webkit2gtk-${abiVersion}" + "webkit2gtk-web-extension-${abiVersion}" ]; platforms = platforms.linux ++ platforms.darwin; teams = [ teams.gnome ]; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 4547825dc459..c748b6d3d483 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1414,7 +1414,7 @@ final: prev: { meta = { homepage = "https://www.inf.puc-rio.br/~roberto/lpeg.html"; description = "Parsing Expression Grammars For Lua"; - maintainers = with lib.maintainers; [ vyp ]; + maintainers = [ ]; license.fullName = "MIT/X11"; }; } @@ -1571,7 +1571,7 @@ final: prev: { meta = { homepage = "https://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (PCRE flavour)."; - maintainers = with lib.maintainers; [ vyp ]; + maintainers = [ ]; license.fullName = "MIT/X11"; }; } @@ -2870,7 +2870,6 @@ final: prev: { homepage = "https://github.com/luaposix/luaposix/"; description = "Lua bindings for POSIX"; maintainers = with lib.maintainers; [ - vyp lblasc ]; license.fullName = "MIT/X11"; @@ -3197,7 +3196,7 @@ final: prev: { meta = { homepage = "https://lunarmodules.github.io/luasql/"; description = "Database connectivity for Lua (SQLite3 driver)"; - maintainers = with lib.maintainers; [ vyp ]; + maintainers = [ ]; license.fullName = "MIT/X11"; }; } @@ -4903,7 +4902,7 @@ final: prev: { meta = { homepage = "http://lua-stdlib.github.io/lua-stdlib"; description = "General Lua Libraries"; - maintainers = with lib.maintainers; [ vyp ]; + maintainers = [ ]; license.fullName = "MIT/X11"; }; } diff --git a/pkgs/development/python-modules/aioasuswrt/default.nix b/pkgs/development/python-modules/aioasuswrt/default.nix index 2544f86902ee..3ef2f563bd71 100644 --- a/pkgs/development/python-modules/aioasuswrt/default.nix +++ b/pkgs/development/python-modules/aioasuswrt/default.nix @@ -4,25 +4,22 @@ buildPythonPackage, fetchFromGitHub, pytest-cov-stub, - pytest-asyncio_0, + pytest-asyncio, pytest-mock, pytestCheckHook, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "aioasuswrt"; - version = "1.4.0"; + version = "1.5.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "kennedyshead"; repo = "aioasuswrt"; - tag = "V${version}"; - hash = "sha256-RQxIgAU9KsTbcTKc/Zl+aP77lbDSeiYzR48MtIVwacc="; + tag = "v${version}"; + hash = "sha256-4bVDho1JtNoWW3ueDgfu+GfRtrxWP6XxIK5R3BXgqfQ="; }; build-system = [ setuptools ]; @@ -30,7 +27,7 @@ buildPythonPackage rec { dependencies = [ asyncssh ]; nativeCheckInputs = [ - pytest-asyncio_0 + pytest-asyncio pytest-cov-stub pytest-mock pytestCheckHook @@ -41,8 +38,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for Asuswrt"; homepage = "https://github.com/kennedyshead/aioasuswrt"; - changelog = "https://github.com/kennedyshead/aioasuswrt/releases/tag/V${version}"; - license = with licenses; [ mit ]; + changelog = "https://github.com/kennedyshead/aioasuswrt/releases/tag/${src.tag}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix index 461d28310a6a..58d857f5c346 100644 --- a/pkgs/development/python-modules/aiocomelit/default.nix +++ b/pkgs/development/python-modules/aiocomelit/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiocomelit"; - version = "1.1.1"; + version = "1.1.2"; pyproject = true; disabled = pythonOlder "3.12"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiocomelit"; tag = "v${version}"; - hash = "sha256-/loKnKmLF8EDuZVWdSgxQUslrTKU4DxNmJlFZ0Xv9v8="; + hash = "sha256-MPX9WXK2Z+QLGfQSJUlPrUhpjI2oNh7T6u6IfaVglO0="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/ducc0/default.nix b/pkgs/development/python-modules/ducc0/default.nix index 34c9442bf4ae..f782562c94a6 100644 --- a/pkgs/development/python-modules/ducc0/default.nix +++ b/pkgs/development/python-modules/ducc0/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "ducc0"; - version = "0.39.0"; + version = "0.39.1"; pyproject = true; src = fetchFromGitLab { @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mtr"; repo = "ducc"; tag = "ducc0_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-VF4m0/kna1HEccK5ljFuNwXSYoak9TeFMyhBmUgupf0="; + hash = "sha256-8nM7Jnxx1NoQQwL0VyPGLzdq1UW5apjxKa1ksq2Qh6U="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 2939b7c2ab9c..5832f88e0e6f 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -98,14 +98,14 @@ in buildPythonPackage rec { pname = "ibis-framework"; - version = "10.8.0"; + version = "11.0.0"; pyproject = true; src = fetchFromGitHub { owner = "ibis-project"; repo = "ibis"; tag = version; - hash = "sha256-Uuqm9Exu/oK3BGBL4ViUOGArMWhVutUn1gFRj1I4vt4="; + hash = "sha256-hf5guWeX9WQbKaNrs7ALwwDxV1Rgeb5Z0PedTQ4P7S0="; }; build-system = [ @@ -175,6 +175,9 @@ buildPythonPackage rec { # duckdb ParserError: syntax error at or near "AT" "test_90" + + # assert 0 == 3 (tests edge case behavior of databases) + "test_self_join_with_generated_keys" ]; # patch out tests that check formatting with black diff --git a/pkgs/development/python-modules/narwhals/default.nix b/pkgs/development/python-modules/narwhals/default.nix index 2006fa640a03..9c7c61b74527 100644 --- a/pkgs/development/python-modules/narwhals/default.nix +++ b/pkgs/development/python-modules/narwhals/default.nix @@ -73,6 +73,8 @@ buildPythonPackage rec { "test_convert_time_zone_to_connection_tz_pyspark" "test_replace_time_zone_to_connection_tz_pyspark" "test_lazy" + # Incompatible with ibis 11 + "test_unique_3069" ]; pytestFlags = [ diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 49d1f59f78e0..cd4514db013c 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "opower"; - version = "0.15.6"; + version = "0.15.7"; pyproject = true; src = fetchFromGitHub { owner = "tronikos"; repo = "opower"; tag = "v${version}"; - hash = "sha256-jSokUs3aJJmcsTPkt2OEkCATLekuOVDGBufi8Fb2rtg="; + hash = "sha256-NB3Hoieykkcf+EHjW77aOUdbJj5fSUTmJ5EPGlp4LXw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pandera/default.nix b/pkgs/development/python-modules/pandera/default.nix index c42958c57fa9..d1ac3c140a51 100644 --- a/pkgs/development/python-modules/pandera/default.nix +++ b/pkgs/development/python-modules/pandera/default.nix @@ -133,6 +133,10 @@ buildPythonPackage rec { # KeyError: 'dask' "tests/dask/test_dask.py::test_series_schema" "tests/dask/test_dask_accessor.py::test_dataframe_series_add_schema" + + # TypeError: memtable() got an unexpected keyword argument 'name' + # https://github.com/unionai-oss/pandera/issues/2154 + "tests/ibis/test_ibis_container.py" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix index 80a992b14e46..dbac3797e77a 100644 --- a/pkgs/development/python-modules/pycangjie/default.nix +++ b/pkgs/development/python-modules/pycangjie/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { description = "Python wrapper to libcangjie"; homepage = "https://cangjians.github.io/projects/pycangjie/"; license = licenses.lgpl3Plus; - maintainers = [ maintainers.linquize ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix index 1153f19f25cf..7f8c3b35f8f5 100644 --- a/pkgs/development/python-modules/pycm/default.nix +++ b/pkgs/development/python-modules/pycm/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pycm"; - version = "4.4"; + version = "4.5"; pyproject = true; src = fetchFromGitHub { owner = "sepandhaghighi"; repo = "pycm"; tag = "v${version}"; - hash = "sha256-CKvNnpZBT6CV71887jd+V4plBBdWQhMqAhO38APUg20="; + hash = "sha256-qskLY0Ru0Ex7RfbsgXSTsi/UekvDyAKdJEBH6XakQp8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index e773b843a894..519b7fe40d5e 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "pymc"; - version = "5.26.0"; + version = "5.26.1"; pyproject = true; src = fetchFromGitHub { owner = "pymc-devs"; repo = "pymc"; tag = "v${version}"; - hash = "sha256-RN/7xO8aq8mWW2/48Ve1KTq3q1GWMZpMxv8w6yco/GE="; + hash = "sha256-j1v8MzAFfOmkN7pDcF91dS5Xprls8qfTQHWdaFUO4GU="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyprobeplus/default.nix b/pkgs/development/python-modules/pyprobeplus/default.nix index 2f1be9b8f442..8e101a11d796 100644 --- a/pkgs/development/python-modules/pyprobeplus/default.nix +++ b/pkgs/development/python-modules/pyprobeplus/default.nix @@ -1,5 +1,6 @@ { bleak, + bleak-retry-connector, buildPythonPackage, fetchFromGitHub, lib, @@ -8,20 +9,21 @@ buildPythonPackage rec { pname = "pyprobeplus"; - version = "1.0.1"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "pantherale0"; repo = "pyprobeplus"; tag = version; - hash = "sha256-ixrkwnvqjHwqnKG3Xo4qJP/FcP7fuAOPKpar13e8U1w="; + hash = "sha256-pD8o+Wb9X1yTMPh1eY1PwOc5KR2W5KoxDDQ/otHz6zI="; }; build-system = [ setuptools ]; dependencies = [ bleak + bleak-retry-connector ]; pythonImportsCheck = [ "pyprobeplus" ]; diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix index 6a0828f0a6b3..80e02eb3d5b8 100644 --- a/pkgs/development/python-modules/pysqueezebox/default.nix +++ b/pkgs/development/python-modules/pysqueezebox/default.nix @@ -1,34 +1,28 @@ { lib, aiohttp, - async-timeout, buildPythonPackage, fetchFromGitHub, pytest-asyncio, pytestCheckHook, - pythonAtLeast, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "pysqueezebox"; - version = "0.12.1"; + version = "0.13.0"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "rajlaud"; repo = "pysqueezebox"; tag = "v${version}"; - hash = "sha256-Bi809OzIoQ2TJH77kZlsSSPEmDNgz6hAybmOXbFn3LM="; + hash = "sha256-1kkvqmmO197IjIcUlnmnKoeOq+0njbrgwogDU+ivIqw="; }; build-system = [ setuptools ]; dependencies = [ - async-timeout aiohttp ]; @@ -39,9 +33,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "pysqueezebox" ]; - disabledTests = lib.optionals (pythonAtLeast "3.12") [ - # AttributeError: 'has_calls' is not a valid assertion. Use a spec for the mock if 'has_calls' is meant to be an attribute. - "test_verified_pause" + disabledTests = [ + # Test contacts 192.168.1.1 + "test_bad_response" ]; disabledTestPaths = [ @@ -49,11 +43,11 @@ buildPythonPackage rec { "tests/test_integration.py" ]; - meta = with lib; { + meta = { description = "Asynchronous library to control Logitech Media Server"; homepage = "https://github.com/rajlaud/pysqueezebox"; changelog = "https://github.com/rajlaud/pysqueezebox/releases/tag/${src.tag}"; - license = licenses.asl20; - maintainers = with maintainers; [ nyanloutre ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nyanloutre ]; }; } diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index f8d0544838ae..63ec490c9cf8 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -64,7 +64,7 @@ let pname = "ray"; - version = "2.50.0"; + version = "2.50.1"; in buildPythonPackage rec { inherit pname version; @@ -84,22 +84,22 @@ buildPythonPackage rec { # Results are in ./ray-hashes.nix hashes = { x86_64-linux = { - cp310 = "sha256-yDG/+6D28N+iW2XFuAACLHI0y+wbmKjt4X+XzIJfcA0="; - cp311 = "sha256-A7Zfzo7eJuKlI2XyCWfAmzo16dfSuFZkXcxoBDWkfkM="; - cp312 = "sha256-IUoAZIlBnHhnFcsqgbPFLIjgjqMpX0i6l6tpuIjY+Bg="; - cp313 = "sha256-g40spgZcElW2xw8dIEHKC2qzq6uQgzA7ZdezE4wCLeI="; + cp310 = "sha256-3qnMYOkt0IlokVZ1bm2ZyZ/j5JE0GA9xVDay41K134Y="; + cp311 = "sha256-hfR2u05mfarWUxjymjWxPW+qjgUwB5xmfVSMAMLZJeg="; + cp312 = "sha256-dciE4x1NwMOE1KS2jpYRF1tqy6hiI1K8q7cxkMufjD8="; + cp313 = "sha256-elJVS9VfKmGIr1b/5ce9l35A65e3tigtgnqNOnPweJo="; }; aarch64-linux = { - cp310 = "sha256-AGKn+lY/QkZlsc3sD+6ccHCNqAfsxZFsSZJaIUOIl9A="; - cp311 = "sha256-sTkjnzAUDpgve8X7HMJpSKCnbJgOujce/d4/sEXQp+Q="; - cp312 = "sha256-z94CocsRRIF1ir/kC0uMMa/hmRUIhzciUUZiVnVpEcs="; - cp313 = "sha256-E1xwySvTwwUEQckFV26HG4edykhmSSGMRSQaPsRXI5k="; + cp310 = "sha256-sGGBb4rtS8oLgRdNv/5xfGn7e8og79j3VWDTpvjMsoA="; + cp311 = "sha256-duHqpifhm3Bvoh5InLppLHFD19NYQzc7pxlB3vB6tYs="; + cp312 = "sha256-qEJP06Sh7zFKhfgMNh8i6b2UnHpj4jjPQXLcGVWxLHw="; + cp313 = "sha256-QMtWy4Kid51bJna3vNkR0PCnjSI0oVq7T5gkFbZRz8o="; }; aarch64-darwin = { - cp310 = "sha256-sWTWr0IMejioMj+P83iLjFfO9GebNIg1ShI3GqwBh04="; - cp311 = "sha256-YZsua4gNWvEm3x382qJzFO3UPSxtYxXgHR4xGDmr/+Q="; - cp312 = "sha256-5oOYG1H/U0wJpIs6W2X8YYht49qKroc4I5WR2rK2fOU="; - cp313 = "sha256-w9qWaV4/Y70O7K1tMOx89tAwmoc44xrCcJV4ErzBzYs="; + cp310 = "sha256-DuYbabBqy3dU9s0IcWCEzklfu9ljrrcs+00UUl0OCWk="; + cp311 = "sha256-uzP9gWhP6tSqtwa9iLCqJ7lGhJBr+1EeWcxXVohaP28="; + cp312 = "sha256-cj5WyBk/it3j7BiBerQ3rRzJ1Oct8SY+hWl74oLPxSY="; + cp313 = "sha256-JUolfcK6Q0mkeErx8gTE2BaZCOp3mi5dTehzEatfUl8="; }; }; in diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix index 4be5d827d9e9..79c6e2c7bfb5 100644 --- a/pkgs/development/python-modules/web3/default.nix +++ b/pkgs/development/python-modules/web3/default.nix @@ -30,7 +30,7 @@ flaky, hypothesis, py-evm, - pytest-asyncio_0_21, + pytest-asyncio, pytest-mock, pytest-xdist, pytestCheckHook, @@ -85,7 +85,7 @@ buildPythonPackage rec { flaky hypothesis py-evm - pytest-asyncio_0_21 + pytest-asyncio pytest-mock pytest-xdist pytestCheckHook diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix index 550e1f8e33c4..752d7425467b 100644 --- a/pkgs/development/tools/devpod/default.nix +++ b/pkgs/development/tools/devpod/default.nix @@ -40,10 +40,7 @@ let mainProgram = "devpod"; homepage = "https://devpod.sh"; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ - maxbrunet - tomasajt - ]; + maintainers = [ lib.maintainers.tomasajt ]; }; devpod = buildGoModule (finalAttrs: { diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix deleted file mode 100644 index 453f12074d5b..000000000000 --- a/pkgs/games/warsow/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - warsow-engine, - makeWrapper, -}: - -stdenv.mkDerivation rec { - pname = "warsow"; - version = "2.1.2"; - - src = fetchurl { - url = "http://warsow.net/${pname}-${version}.tar.gz"; - sha256 = "07y2airw5qg3s1bf1c63a6snjj22riz0mqhk62jmfm9nrarhavrc"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/share/warsow - cp -r basewsw $out/share/warsow - ln -s ${warsow-engine}/lib/warsow $out/share/warsow/libs - - mkdir -p $out/bin - for i in ${warsow-engine}/bin/*; do - makeWrapper "$i" "$out/bin/$(basename "$i")" --chdir "$out/share/warsow" - done - ''; - - meta = with lib; { - description = "Multiplayer FPS game designed for competitive gaming"; - longDescription = '' - Set in a futuristic cartoon-like world where rocketlauncher-wielding - pigs and lasergun-carrying cyberpunks roam the streets, Warsow is a - completely free fast-paced first-person shooter (FPS) for Windows, Linux - and macOS. - ''; - homepage = "http://www.warsow.net"; - license = licenses.unfreeRedistributable; - maintainers = [ - ]; - platforms = warsow-engine.meta.platforms; - }; -} diff --git a/pkgs/games/warsow/engine.nix b/pkgs/games/warsow/engine.nix deleted file mode 100644 index 9a759d58986c..000000000000 --- a/pkgs/games/warsow/engine.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - stdenv, - lib, - replaceVars, - fetchurl, - cmake, - libogg, - libvorbis, - libtheora, - curl, - freetype, - libjpeg, - libpng, - SDL2, - libGL, - libX11, - openal, - zlib, -}: - -stdenv.mkDerivation { - pname = "warsow-engine"; - version = "2.1.0"; - - src = fetchurl { - url = "http://slice.sh/warsow/warsow_21_sdk.tar.gz"; - sha256 = "0fj5k7qpf6far8i1xhqxlpfjch10zj26xpilhp95aq2yiz08pj4r"; - }; - - patches = [ - (replaceVars ./libpath.patch { - inherit - zlib - curl - libpng - libjpeg - libogg - libvorbis - libtheora - freetype - ; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - libogg - libvorbis - libtheora - curl - freetype - libjpeg - SDL2 - libGL - libX11 - openal - zlib - libpng - ]; - - # Workaround build failure on -fno-common toolchains: - # ld: CMakeFiles/wswtv_server.dir/__/unix/unix_time.c.o:(.bss+0x8): multiple definition of - # `c_pointcontents'; CMakeFiles/wswtv_server.dir/__/null/ascript_null.c.o:(.bss+0x8): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - cmakeFlags = [ "-DQFUSION_GAME=Warsow" ]; - - preConfigure = '' - cd source/source - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib - cp -r libs $out/lib/warsow - for i in warsow.* wsw_server.* wswtv_server.*; do - install -Dm755 "$i" "$out/bin/''${i%.*}" - done - - runHook postInstall - ''; - - meta = with lib; { - description = "Multiplayer FPS game designed for competitive gaming (engine only)"; - homepage = "http://www.warsow.net"; - license = licenses.gpl2Plus; - maintainers = [ - ]; - platforms = platforms.linux; - broken = stdenv.hostPlatform.isAarch64; - }; -} diff --git a/pkgs/games/warsow/libpath.patch b/pkgs/games/warsow/libpath.patch deleted file mode 100644 index ad2487102379..000000000000 --- a/pkgs/games/warsow/libpath.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ru3 warsow_21_sdk_old/source/source/gameshared/q_arch.h warsow_21_sdk_new/source/source/gameshared/q_arch.h ---- warsow_21_sdk_old/source/source/gameshared/q_arch.h 2016-03-26 22:22:10.000000000 +0300 -+++ warsow_21_sdk_new/source/source/gameshared/q_arch.h 2018-03-13 00:37:29.907019953 +0300 -@@ -206,15 +206,15 @@ - #endif - - // FIXME: move these to CMakeLists.txt --#define LIBZ_LIBNAME "libz.so.1|libz.so" --#define LIBCURL_LIBNAME "libcurl.so.4|libcurl.so.3|libcurl.so" --#define LIBPNG_LIBNAME "libpng16.so.16|libpng15.so.15|libpng14.so.14|libpng12.so.0|libpng.so" --#define LIBJPEG_LIBNAME "libjpeg.so.8|libjpeg.so" --#define LIBOGG_LIBNAME "libogg.so.0|libogg.so" --#define LIBVORBIS_LIBNAME "libvorbis.so.0|libvorbis.so" --#define LIBVORBISFILE_LIBNAME "libvorbisfile.so.3|libvorbisfile.so" --#define LIBTHEORA_LIBNAME "libtheora.so.0|libtheora.so" --#define LIBFREETYPE_LIBNAME "libfreetype.so.6|libfreetype.so" -+#define LIBZ_LIBNAME "@zlib@/lib/libz.so" -+#define LIBCURL_LIBNAME "@curl@/lib/libcurl.so" -+#define LIBPNG_LIBNAME "@libpng@/lib/libpng.so" -+#define LIBJPEG_LIBNAME "@libjpeg@/lib/libjpeg.so" -+#define LIBOGG_LIBNAME "@libogg@/lib/libogg.so" -+#define LIBVORBIS_LIBNAME "@libvorbis@/lib/libvorbis.so" -+#define LIBVORBISFILE_LIBNAME "@libvorbis@/lib/libvorbisfile.so" -+#define LIBTHEORA_LIBNAME "@libtheora@/lib/libtheora.so" -+#define LIBFREETYPE_LIBNAME "@freetype@/lib/libfreetype.so" - - #if defined ( __FreeBSD__ ) - #define BUILDSTRING "FreeBSD" diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index aa0f36aeb8c9..b3e71a10d3bb 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2025.10.2"; + version = "2025.10.3"; components = { "3_day_blinds" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 876bd80e051a..2c683a7cbda1 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -330,7 +330,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2025.10.2"; + hassVersion = "2025.10.3"; in python.pkgs.buildPythonApplication rec { @@ -351,13 +351,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; tag = version; - hash = "sha256-Y9StuiDaICKgqRrYc8d0i/Ey6R78J/5tvk/0qGVeZPQ="; + hash = "sha256-b4yNS1uNoZSnTpYr3bVvSru/2KUe2d/xfe1tiAWibCg="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-tIUImUHGh8nrf0IuSOjSuV718B0SIS/oL6yLnyu8gOE="; + hash = "sha256-BjPva2mxlArG9yDnk9PpjpdLiL2MA4Eeb8AP1nkoqKk="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index e7e6ff98d0d3..f125e084d147 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20251001.2"; + version = "20251001.4"; format = "wheel"; src = fetchPypi { @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-VDfj1dshILdTD/r6tuiImzYFMO3suytMQoFQzJfIeBQ="; + hash = "sha256-yrGIgx8VgCi4G+xWFjy37lI4i1ohPV1bttJfejnkkXA="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 771bd9b3981e..920d1626d39b 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2025.10.2"; + version = "2025.10.3"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; tag = version; - hash = "sha256-iLQm7ERY5S9rMuk0RCLmGNxHiwIAAckuUvAjeKPvu1Q="; + hash = "sha256-A4nzqyjuYGgFJQR7pTg1fNzSzwcdXumiECLpYBOM+TM="; }; build-system = [ diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index 7173b606e2f1..53a8de613d2d 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -30,7 +30,6 @@ buildGoModule rec { homepage = "https://github.com/prometheus/snmp_exporter"; license = licenses.asl20; maintainers = with maintainers; [ - oida Frostman ]; }; diff --git a/pkgs/tools/inputmethods/interception-tools/caps2esc.nix b/pkgs/tools/inputmethods/interception-tools/caps2esc.nix index a75cb754f201..00e7c8416ecc 100644 --- a/pkgs/tools/inputmethods/interception-tools/caps2esc.nix +++ b/pkgs/tools/inputmethods/interception-tools/caps2esc.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Transforming the most useless key ever into the most useful one"; mainProgram = "caps2esc"; license = licenses.mit; - maintainers = [ maintainers.vyp ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index 6c5ee3a9ce93..d8545c391284 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/interception/linux/tools"; changelog = "https://gitlab.com/interception/linux/tools/-/tags/v${version}"; license = lib.licenses.gpl3Only; - maintainers = [ lib.maintainers.vyp ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b3c32fff8bd5..909f5afde9a1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2741,6 +2741,8 @@ mapAliases { wakatime = wakatime-cli; # 2024-05-30 wavm = throw "wavm has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10 wal_e = throw "wal_e was removed as it is unmaintained upstream and depends on the removed boto package; upstream recommends using wal-g or pgbackrest"; # Added 2024-09-22 + warsow = throw "'warsow' has been removed as it is unmaintained and is broken"; # Added 2025-10-09 + warsow-engine = throw "'warsow-engine' has been removed as it is unmaintained and is broken"; # Added 2025-10-09 wapp = tclPackages.wapp; # Added 2024-10-02 wavebox = throw "'wavebox' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-24 wasm-bindgen-cli = wasm-bindgen-cli_0_2_104; @@ -2755,6 +2757,7 @@ mapAliases { wcurl = throw "'wcurl' has been removed due to being bundled with 'curl'"; # Added 2025-07-04 webfontkitgenerator = webfont-bundler; # Added 2025-07-27 webkitgtk = throw "'webkitgtk' attribute has been removed from nixpkgs, use attribute with ABI version set explicitly"; # Added 2025-06-11 + webkitgtk_4_0 = throw "'webkitgtk_4_0' has been removed, port to `libsoup_3` and switch to `webkitgtk_4_1`"; # Added 2025-10-08 webmetro = throw "'webmetro' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 wg-bond = throw "'wg-bond' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 whatsapp-for-linux = wasistlos; # Added 2025-01-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 631a4196de71..6c80c713d314 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8813,19 +8813,13 @@ with pkgs; graphviz = graphviz-nox; }; - webkitgtk_4_0 = callPackage ../development/libraries/webkitgtk { + webkitgtk_6_0 = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzzFull; - libsoup = libsoup_2_4; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; }; - webkitgtk_4_1 = webkitgtk_4_0.override { - libsoup = libsoup_3; - }; - - webkitgtk_6_0 = webkitgtk_4_0.override { - libsoup = libsoup_3; - gtk3 = gtk4; + webkitgtk_4_1 = webkitgtk_6_0.override { + gtk4 = gtk3; }; wlr-protocols = callPackage ../development/libraries/wlroots/protocols.nix { }; @@ -13402,8 +13396,6 @@ with pkgs; freeciv_gtk = freeciv; - garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; }; - gl-gsync-demo = callPackage ../games/gl-gsync-demo { libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; }; @@ -13640,10 +13632,6 @@ with pkgs; vessel = pkgsi686Linux.callPackage ../games/vessel { }; - warsow-engine = callPackage ../games/warsow/engine.nix { }; - - warsow = callPackage ../games/warsow { }; - wesnoth-devel = callPackage ../by-name/we/wesnoth/package.nix { enableDevel = true; }; inherit (callPackage ../games/xonotic { }) diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json index a7a118056d37..a38da975f623 100644 --- a/pkgs/top-level/pkg-config/pkg-config-data.json +++ b/pkgs/top-level/pkg-config/pkg-config-data.json @@ -388,11 +388,6 @@ "libjack2" ] }, - "javascriptcoregtk-4.0": { - "attrPath": [ - "webkitgtk_4_0" - ] - }, "lapack": { "attrPath": [ "liblapack" @@ -820,16 +815,6 @@ "isDarwin": false } }, - "webkit2gtk-4.0": { - "attrPath": [ - "webkitgtk_4_0" - ] - }, - "webkit2gtk-web-extension-4.0": { - "attrPath": [ - "webkitgtk_4_0" - ] - }, "x11": { "attrPath": [ "xorg",