diff --git a/ci/eval/default.nix b/ci/eval/default.nix index c7310a5052d0..9cc5ad6857b7 100644 --- a/ci/eval/default.nix +++ b/ci/eval/default.nix @@ -95,6 +95,10 @@ let system=$3 outputDir=$4 + # Default is 5, higher values effectively disable the warning. + # This randomly breaks Eval. + export GC_LARGE_ALLOC_WARN_INTERVAL=1000 + export NIX_SHOW_STATS=1 export NIX_SHOW_STATS_PATH="$outputDir/stats/$myChunk" echo "Chunk $myChunk on $system start" diff --git a/ci/github-script/labels.js b/ci/github-script/labels.js index faf7693c0f04..c57a9bb60a56 100644 --- a/ci/github-script/labels.js +++ b/ci/github-script/labels.js @@ -20,6 +20,46 @@ module.exports = async ({ github, context, core, dry }) => { }) ).data + // When the same change has already been merged to the target branch, a PR will still be + // open and display the same changes - but will not actually have any effect. This causes + // strange CI behavior, because the diff of the merge-commit is empty, no rebuilds will + // be detected, no maintainers pinged. + // We can just check the temporary merge commit, and if it's empty the PR can safely be + // closed - there are no further changes. + if (pull_request.merge_commit_sha) { + const commit = ( + await github.rest.repos.getCommit({ + ...context.repo, + ref: pull_request.merge_commit_sha, + }) + ).data + + if (commit.files.length === 0) { + const body = [ + `The diff for the temporary merge commit ${pull_request.merge_commit_sha} is empty.`, + 'The changes in this PR have almost certainly already been merged to the target branch.', + ].join('\n') + + core.info(`PR #${item.number}: closed`) + + if (!dry) { + await github.rest.issues.createComment({ + ...context.repo, + issue_number: pull_number, + body, + }) + + await github.rest.pulls.update({ + ...context.repo, + pull_number, + state: 'closed', + }) + } + + return {} + } + } + const reviews = await github.paginate(github.rest.pulls.listReviews, { ...context.repo, pull_number, diff --git a/ci/nixpkgs-vet.nix b/ci/nixpkgs-vet.nix index 7c11dffc4f9b..6bdf92eedb3f 100644 --- a/ci/nixpkgs-vet.nix +++ b/ci/nixpkgs-vet.nix @@ -32,6 +32,7 @@ runCommand "nixpkgs-vet" } '' export NIX_STATE_DIR=$(mktemp -d) + $NIXPKGS_VET_NIX_PACKAGE/bin/nix-store --init nixpkgs-vet --base ${filteredBase} ${filteredHead} 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/packages/index.md b/doc/packages/index.md index 623fbe357d54..dbfe60ca3227 100644 --- a/doc/packages/index.md +++ b/doc/packages/index.md @@ -22,6 +22,7 @@ lhapdf.section.md locales.section.md etc-files.section.md nginx.section.md +nrfutil.section.md opengl.section.md shell-helpers.section.md python-tree-sitter.section.md diff --git a/doc/packages/nrfutil.section.md b/doc/packages/nrfutil.section.md new file mode 100644 index 000000000000..5767b0e0b946 --- /dev/null +++ b/doc/packages/nrfutil.section.md @@ -0,0 +1,13 @@ +# nrfutil {#sec-nrfutil} + +nrfutil can be built with its installables as following: + +```nix +(nrfutil.withExtensions [ + "nrfutil-completion" + "nrfutil-device" + "nrfutil-trace" +]) +``` + +Keep in mind that all installables might not be available for every supported platform. diff --git a/doc/redirects.json b/doc/redirects.json index 9828b36fc2d8..6a3d3e5138c8 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -325,6 +325,9 @@ "sec-nixpkgs-release-25.05-notable-changes": [ "release-notes.html#sec-nixpkgs-release-25.05-notable-changes" ], + "sec-nrfutil": [ + "index.html#sec-nrfutil" + ], "sec-overlays-install": [ "index.html#sec-overlays-install" ], diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index aa3f8fccd36a..c8192ba68b66 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -44,6 +44,8 @@ - The `haskellPackages.mkDerivation` builder now converts packages' cabal files to Unix line endings before `patchPhase`. This behavior can be disabled using `dontConvertCabalFileToUnix`. +- `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/lib/licenses.nix b/lib/licenses.nix index 09d708b570d2..d6e232482534 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -791,6 +791,12 @@ lib.mapAttrs mkLicense ( free = false; }; + intel-eula = { + fullName = "Intel End User License Agreement for Developer Tools"; + url = "https://software.intel.com/sites/manageability/AMT_Implementation_and_Reference_Guide/WordDocuments/intelamtsdklicense.htm"; + free = false; + }; + interbase = { spdxId = "Interbase-1.0"; fullName = "Interbase Public License v1.0"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 960ea08269e8..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"; @@ -26044,6 +26008,12 @@ githubId = 1761259; name = "Eric Roberts"; }; + thrix = { + email = "mvadkert@redhat.com"; + github = "thrix"; + githubId = 633969; + name = "Miroslav Vadkerti"; + }; thtrf = { email = "thtrf@proton.me"; github = "thtrf"; @@ -27398,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"; @@ -27599,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/programs/kdeconnect.nix b/nixos/modules/programs/kdeconnect.nix index f51eeb9c6ced..c1029c46b4ce 100644 --- a/nixos/modules/programs/kdeconnect.nix +++ b/nixos/modules/programs/kdeconnect.nix @@ -16,6 +16,7 @@ implementation if you use Gnome ''; package = lib.mkPackageOption pkgs [ "kdePackages" "kdeconnect-kde" ] { + nullable = true; example = "gnomeExtensions.gsconnect"; }; }; @@ -24,7 +25,7 @@ cfg = config.programs.kdeconnect; in lib.mkIf cfg.enable { - environment.systemPackages = [ + environment.systemPackages = lib.optionals (cfg.package != null) [ cfg.package ]; networking.firewall = rec { 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/nixos/modules/services/monitoring/vnstat.nix b/nixos/modules/services/monitoring/vnstat.nix index baae16394edd..062d181b059a 100644 --- a/nixos/modules/services/monitoring/vnstat.nix +++ b/nixos/modules/services/monitoring/vnstat.nix @@ -10,11 +10,12 @@ in { options.services.vnstat = { enable = lib.mkEnableOption "update of network usage statistics via vnstatd"; + package = lib.mkPackageOption pkgs "vnstat" { }; }; config = lib.mkIf cfg.enable { - environment.systemPackages = [ pkgs.vnstat ]; + environment.systemPackages = [ cfg.package ]; users = { groups.vnstatd = { }; @@ -37,7 +38,7 @@ in "man:vnstat.conf(5)" ]; serviceConfig = { - ExecStart = "${pkgs.vnstat}/bin/vnstatd -n"; + ExecStart = "${cfg.package}/bin/vnstatd -n"; ExecReload = "${pkgs.procps}/bin/kill -HUP $MAINPID"; # Hardening (from upstream example service) diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index ab54eafb6877..b1ed28980cfe 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -276,6 +276,8 @@ in Extra config to append to avahi-daemon.conf. ''; }; + + debug = lib.mkEnableOption "debug logging"; }; config = lib.mkIf cfg.enable { @@ -356,7 +358,7 @@ in NotifyAccess = "main"; BusName = "org.freedesktop.Avahi"; Type = "dbus"; - ExecStart = "${cfg.package}/sbin/avahi-daemon --syslog -f ${avahiDaemonConf}"; + ExecStart = "${cfg.package}/sbin/avahi-daemon --syslog -f ${avahiDaemonConf} ${lib.optionalString cfg.debug "--debug"}"; ConfigurationDirectory = "avahi/services"; # Hardening diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix index 5d89a2757863..dd01dbd7c66c 100644 --- a/nixos/modules/services/web-apps/immich.nix +++ b/nixos/modules/services/web-apps/immich.nix @@ -415,7 +415,7 @@ in lib.mapAttrsToListRecursive (attrPath: _: '' tmp="$(mktemp)" ${lib.getExe pkgs.jq} --rawfile secret "$CREDENTIALS_DIRECTORY/${attrPathToIndex attrPath}" \ - '${attrPathToIndex attrPath} = $secret' /run/immich/config.json > "$tmp" + '${attrPathToIndex attrPath} = ($secret | rtrimstr("\n"))' /run/immich/config.json > "$tmp" mv "$tmp" /run/immich/config.json '') cfg.secretSettings ) diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix index 77cb1d5332cb..9568c4fffb55 100644 --- a/nixos/tests/avahi.nix +++ b/nixos/tests/avahi.nix @@ -24,6 +24,7 @@ publish.userServices = true; publish.workstation = true; extraServiceFiles.ssh = "${pkgs.avahi}/etc/avahi/services/ssh.service"; + debug = true; }; } // pkgs.lib.optionalAttrs networkd { diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 181471838a87..c7d329b85b15 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -20,8 +20,8 @@ let sha256Hash = "sha256-znRzVtUqNrLmpLYd9a96jFh85n+EgOsdteVLqxnMvfM="; }; betaVersion = { - version = "2025.1.4.7"; # "Android Studio Narwhal 4 Feature Drop | 2025.1.4 RC 2" - sha256Hash = "sha256-KrKUsA7wFeI7IBa9VOp+MERqWIiMnNzLFO8oF0rCiIw="; + version = "2025.2.1.6"; # "Android Studio Otter | 2025.2.1 RC 1" + sha256Hash = "sha256-l+bJ0AWIrJ3qNcKJWiE+onrl6ZpLb6YWFXE3HtIejUs="; }; latestVersion = { version = "2025.2.2.1"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 Canary 1" 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/cluster/k3s/1_34/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix new file mode 100644 index 000000000000..f511cbde3870 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix @@ -0,0 +1,10 @@ +{ + traefik-crd = { + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-34.2.1+up34.2.0.tgz"; + sha256 = "0bnvkp1bxfsccgdnvpq3ni3p2h8jyvj0iclbqj0rsls8vv1jnp9z"; + }; + traefik = { + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-34.2.1+up34.2.0.tgz"; + sha256 = "16ljy2ncn2kc4kr3m93w2kfw4vjk8is3cp3i2lx4b7afbmi75zyw"; + }; +} diff --git a/pkgs/applications/networking/cluster/k3s/1_34/go_runc_require.patch b/pkgs/applications/networking/cluster/k3s/1_34/go_runc_require.patch new file mode 100644 index 000000000000..15a0cbb28137 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_34/go_runc_require.patch @@ -0,0 +1,15 @@ +diff --git a/scripts/package-cli b/scripts/package-cli +index a15d754926..bc450dbe4e 100755 +--- a/scripts/package-cli ++++ b/scripts/package-cli +@@ -3,7 +3,10 @@ set -e -x + + cd $(dirname $0)/.. + ++runc_require=$(grep "github.com/opencontainers/runc" go.mod | awk -F '=> ' '{print $2}' | xargs -0 printf 'require %s') ++echo "$runc_require" >> go.mod + . ./scripts/version.sh ++sed -i '$d' go.mod + + GO=${GO-go} + diff --git a/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json new file mode 100644 index 000000000000..1d838a36651c --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json @@ -0,0 +1,26 @@ +{ + "airgap-images-amd64-tar-gz": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "076c53d96bbca9ed7aee5a4e398933787c55c59fd58e617581ce885e22759793" + }, + "airgap-images-amd64-tar-zst": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "27355d2838c727180f0a8ded8aec0ac14e2186bd50487a3c3f29500884121aa7" + }, + "airgap-images-arm-tar-gz": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "7292bafb04a8800b7efdc096a4e4f00d972dcf9a009f7ccca311a0bc9b23eda1" + }, + "airgap-images-arm-tar-zst": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "64e166d1b037ed87566c444261365bdd54745de6cf8acf1ae4698ddf34ca69a7" + }, + "airgap-images-arm64-tar-gz": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "b1f649125466251088aec6fcd56b86df29d7674eb3ae6ab596448ddfd60cc9e0" + }, + "airgap-images-arm64-tar-zst": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "78380791cb61262b78d61c2b52fd77e0eedde6c0351e53d11e2cfb9034ec5937" + } +} diff --git a/pkgs/applications/networking/cluster/k3s/1_34/version_sh_go_list.patch b/pkgs/applications/networking/cluster/k3s/1_34/version_sh_go_list.patch new file mode 100644 index 000000000000..7788762eaf2b --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_34/version_sh_go_list.patch @@ -0,0 +1,18 @@ +diff --git a/scripts/version.sh b/scripts/version.sh +index 37500a3b788d..96a6e6205472 100755 +--- a/scripts/version.sh ++++ b/scripts/version.sh +@@ -10,11 +10,11 @@ if [ -z "$NO_DAPPER" ]; then + fi + + get-module-version(){ +- go list -m -f '{{if .Replace}}{{.Replace.Version}}{{else}}{{.Version}}{{end}}' $1 ++ go list -mod=readonly -e -m -f '{{if .Replace}}{{.Replace.Version}}{{else}}{{.Version}}{{end}}' $1 + } + + get-module-path(){ +- go list -m -f '{{if .Replace}}{{.Replace.Path}}{{else}}{{.Path}}{{end}}' $1 ++ go list -mod=readonly -m -f '{{if .Replace}}{{.Replace.Path}}{{else}}{{.Path}}{{end}}' $1 + } + + PKG_CONTAINERD_K3S=$(get-module-path github.com/containerd/containerd/v2) diff --git a/pkgs/applications/networking/cluster/k3s/1_34/versions.nix b/pkgs/applications/networking/cluster/k3s/1_34/versions.nix new file mode 100644 index 000000000000..6dfebc63f175 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_34/versions.nix @@ -0,0 +1,15 @@ +{ + k3sVersion = "1.34.1+k3s1"; + k3sCommit = "24fc436e6ea59c56ebc37727baa4e6c9a201ee01"; + k3sRepoSha256 = "0fjkjsmig7xdn1filph2wbp69jva0jdkv8ax68wymvbqq4rn3s0k"; + k3sVendorHash = "sha256-87YMUWhwfFwm5bzcL42b7JFJbVWsoRtubH4jjYH/7mc="; + chartVersions = import ./chart-versions.nix; + imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); + k3sRootVersion = "0.15.0"; + k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0"; + k3sCNIVersion = "1.7.1-k3s1"; + k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz"; + containerdVersion = "2.1.4-k3s2"; + containerdSha256 = "18z6i6mzvllhglarsc6npn4k0m4akg7wm1rqc4a926dag47mgh8j"; + criCtlVersion = "1.34.0-k3s2"; +} diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index c4f52dd566e4..f4f3dff1d4f3 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -478,5 +478,7 @@ buildGoModule (finalAttrs: { } // (lib.mapAttrs (_: value: fetchurl value) imagesVersions); - meta = baseMeta; + meta = baseMeta // { + mainProgram = "k3s"; + }; }) diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index c1e6635c0c65..aac1f555d094 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -41,4 +41,27 @@ in ]; } ) extraArgs; + + k3s_1_34 = + (common ( + (import ./1_34/versions.nix) + // { + updateScript = [ + ./update-script.sh + "34" + ]; + } + ) extraArgs).overrideAttrs + { + patches = [ + # Sets -mod=readonly for go list commands in scripts/version.sh to prevent go from using + # the (intentional) incomplete vendor directory. Additionally, sets -e for go list to + # change handling of erroneous packages. + ./1_34/version_sh_go_list.patch + # Adds explicit require of opencontainers/runc to go.mod before version.sh is called and + # removes it afterwards so that later build commands don't complain about inconsistent + # vendoring. + ./1_34/go_runc_require.patch + ]; + }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/darwin.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/darwin.nix new file mode 100644 index 000000000000..3e2197c84b48 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/darwin.nix @@ -0,0 +1,36 @@ +{ + pname, + version, + src, + nativeBuildInputs, + passthru, + meta, + stdenv, + undmg, +}: + +stdenv.mkDerivation { + inherit + pname + version + src + ; + + sourceRoot = "."; + + nativeBuildInputs = nativeBuildInputs ++ [ undmg ]; + + # don't break code signing + dontFixup = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + mv Thunderbird*.app "$out/Applications/${passthru.applicationName}.app" + + runHook postInstall + ''; + + inherit passthru meta; +} diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 06377f89c6fe..16602868fda4 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -10,12 +10,9 @@ fetchurl, config, wrapGAppsHook3, - autoPatchelfHook, - alsa-lib, curl, gtk3, writeScript, - writeText, xidel, coreutils, gnused, @@ -23,18 +20,29 @@ gnupg, runtimeShell, systemLocale ? config.i18n.defaultLocale or "en_US", - patchelfUnstable, # have to use patchelfUnstable to support --no-clobber-old-sections generated, versionSuffix ? "", applicationName ? "Thunderbird", + # linux dependencies + writeText, + autoPatchelfHook, + patchelfUnstable, + alsa-lib, + # darwin dependencies + undmg, }: let inherit (generated) version sources; + pname = "thunderbird-bin"; + mozillaPlatforms = { i686-linux = "linux-i686"; x86_64-linux = "linux-x86_64"; + # bundles are universal and can be re-used for both darwin architectures + aarch64-darwin = "mac"; + x86_64-darwin = "mac"; }; arch = mozillaPlatforms.${stdenv.hostPlatform.system}; @@ -43,12 +51,6 @@ let sourceMatches = locale: source: (isPrefixOf source.locale locale) && source.arch == arch; - policies = { - DisableAppUpdate = true; - } - // config.thunderbird.policies or { }; - policiesJson = writeText "thunderbird-policies.json" (builtins.toJSON { inherit policies; }); - defaultSource = lib.findFirst (sourceMatches "en-US") { } sources; mozLocale = @@ -59,50 +61,23 @@ let source = lib.findFirst (sourceMatches mozLocale) defaultSource sources; - pname = "thunderbird-bin"; -in - -stdenv.mkDerivation { - inherit pname version; - src = fetchurl { inherit (source) url sha256; }; - nativeBuildInputs = [ - wrapGAppsHook3 - autoPatchelfHook - patchelfUnstable - ]; - buildInputs = [ - alsa-lib - ]; - # Thunderbird uses "relrhack" to manually process relocations from a fixed offset - patchelfFlags = [ "--no-clobber-old-sections" ]; + meta = { + changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/"; + description = "Mozilla Thunderbird, a full-featured email client (binary package)"; + homepage = "http://www.mozilla.org/thunderbird/"; + mainProgram = "thunderbird"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ lovesegfault ]; + platforms = builtins.attrNames mozillaPlatforms; + hydraPlatforms = [ ]; + }; - patchPhase = '' - # Don't download updates from Mozilla directly - echo 'pref("app.update.auto", "false");' >> defaults/pref/channel-prefs.js - ''; - - installPhase = '' - mkdir -p "$prefix/usr/lib/thunderbird-bin-${version}" - cp -r * "$prefix/usr/lib/thunderbird-bin-${version}" - - mkdir -p "$out/bin" - ln -s "$prefix/usr/lib/thunderbird-bin-${version}/thunderbird" "$out/bin/" - - # wrapThunderbird expects "$out/lib" instead of "$out/usr/lib" - ln -s "$out/usr/lib" "$out/lib" - - gappsWrapperArgs+=(--argv0 "$out/bin/.thunderbird-wrapped") - - # See: https://github.com/mozilla/policy-templates/blob/master/README.md - mkdir -p "$out/lib/thunderbird-bin-${version}/distribution"; - ln -s ${policiesJson} "$out/lib/thunderbird-bin-${version}/distribution/policies.json"; - ''; - - passthru.updateScript = import ./../../browsers/firefox-bin/update.nix { + updateScript = import ./../../browsers/firefox-bin/update.nix { inherit pname writeScript @@ -120,22 +95,48 @@ stdenv.mkDerivation { baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; }; + nativeBuildInputs = [ + wrapGAppsHook3 + ]; + passthru = { - inherit applicationName; + inherit + applicationName + updateScript + gtk3 + ; binaryName = "thunderbird"; gssSupport = true; - gtk3 = gtk3; }; - meta = { - changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/"; - description = "Mozilla Thunderbird, a full-featured email client (binary package)"; - homepage = "http://www.mozilla.org/thunderbird/"; - mainProgram = "thunderbird"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ lovesegfault ]; - platforms = builtins.attrNames mozillaPlatforms; - hydraPlatforms = [ ]; - }; -} +in +if stdenv.hostPlatform.isDarwin then + import ./darwin.nix { + inherit + pname + version + src + nativeBuildInputs + passthru + meta + stdenv + undmg + ; + } +else + import ./linux.nix { + inherit + pname + version + src + nativeBuildInputs + passthru + meta + stdenv + config + writeText + autoPatchelfHook + patchelfUnstable + alsa-lib + ; + } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/linux.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/linux.nix new file mode 100644 index 000000000000..d94874055d43 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/linux.nix @@ -0,0 +1,70 @@ +{ + pname, + version, + src, + nativeBuildInputs, + passthru, + meta, + stdenv, + config, + writeText, + autoPatchelfHook, + patchelfUnstable, + alsa-lib, +}: + +let + policies = { + DisableAppUpdate = true; + } + // config.thunderbird.policies or { }; + + policiesJson = writeText "thunderbird-policies.json" (builtins.toJSON { inherit policies; }); +in +stdenv.mkDerivation { + inherit + pname + version + src + ; + + nativeBuildInputs = nativeBuildInputs ++ [ + autoPatchelfHook + patchelfUnstable + ]; + + buildInputs = [ + alsa-lib + ]; + + # Thunderbird uses "relrhack" to manually process relocations from a fixed offset + patchelfFlags = [ "--no-clobber-old-sections" ]; + + postPatch = '' + # Don't download updates from Mozilla directly + echo 'pref("app.update.auto", "false");' >> defaults/pref/channel-prefs.js + ''; + + installPhase = '' + runHook preInstall + + mkdir -p "$prefix/usr/lib/thunderbird-bin-${version}" + cp -r * "$prefix/usr/lib/thunderbird-bin-${version}" + + mkdir -p "$out/bin" + ln -s "$prefix/usr/lib/thunderbird-bin-${version}/thunderbird" "$out/bin/" + + # wrapThunderbird expects "$out/lib" instead of "$out/usr/lib" + ln -s "$out/usr/lib" "$out/lib" + + gappsWrapperArgs+=(--argv0 "$out/bin/.thunderbird-wrapped") + + # See: https://github.com/mozilla/policy-templates/blob/master/README.md + mkdir -p "$out/lib/thunderbird-bin-${version}/distribution"; + ln -s ${policiesJson} "$out/lib/thunderbird-bin-${version}/distribution/policies.json"; + + runHook postInstall + ''; + + inherit passthru meta; +} 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/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 11d1711c0ed7..2130a31f6e59 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -315,7 +315,7 @@ stdenv.mkDerivation (finalAttrs: { ./readd-explicit-zlib-link.patch ] - ++ lib.optionals (lib.versionOlder version "25.8") [ + ++ lib.optionals (variant == "collabora") [ # Backport patch to fix build with Poppler 25.05 (fetchpatch2 { url = "https://github.com/LibreOffice/core/commit/0ee2636304ac049f21415c67e92040f7d6c14d35.patch"; @@ -323,13 +323,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-8yipl5ln1yCNfVM8SuWowsw1Iy/SXIwbdT1ZfNw4cJA="; }) ] - ++ lib.optionals (lib.versionOlder version "24.8") [ - (fetchpatch2 { - name = "icu74-compat.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/main/libreoffice-7.5.8.2-icu-74-compatibility.patch?ref_type=heads.patch"; - hash = "sha256-OGBPIVQj8JTYlkKywt4QpH7ULAzKmet5jTLztGpIS0Y="; - }) - ] ++ lib.optionals (variant == "collabora") [ ./fix-unpack-collabora.patch ]; @@ -594,6 +587,11 @@ stdenv.mkDerivation (finalAttrs: { # cannot find headers, no idea why "--without-system-boost" + + "--with-system-rhino" + "--with-rhino-jar=${rhino}/share/java/js.jar" + + "--without-system-java-websocket" ] ++ optionals kdeIntegration [ "--enable-kf6" @@ -603,21 +601,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-system-beanshell" "--with-ant-home=${ant.home}" "--with-beanshell-jar=${bsh}" - ] - ++ ( - if variant == "fresh" || variant == "collabora" then - [ - "--with-system-rhino" - "--with-rhino-jar=${rhino}/share/java/js.jar" - - "--without-system-java-websocket" - ] - else - [ - # our Rhino is too new for older versions - "--without-system-rhino" - ] - ); + ]; env = { # FIXME: this is a hack, because the right cflags are not being picked up diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch index 43bb332be8cf..13606bac50fc 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch @@ -38,66 +38,16 @@ m_pDoc->InsertTab(0, u"Formula"_ustr); sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on. ---- a/sw/qa/extras/layout/layout3.cxx -+++ b/sw/qa/extras/layout/layout3.cxx -@@ -3640,6 +3642,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf104209VertRTL) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR) - { -+ return; // fails due to missing font: Noto Sans Hebrew - // Verify that line breaking a first bidi portion correctly underflows in LTR text - createSwDoc("tdf56408-ltr.fodt"); - auto pXmlDoc = parseLayoutDump(); -@@ -3654,6 +3656,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408RTL) - { -+ return; // fails due to missing font: Noto Sans Hebrew - // Verify that line breaking a first bidi portion correctly underflows in RTL text - createSwDoc("tdf56408-rtl.fodt"); - auto pXmlDoc = parseLayoutDump(); -@@ -3671,6 +3671,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408RTL) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow) - { -+ return; // fails due to missing font: Noto Sans Hebrew - // The fix for tdf#56408 introduced a change to line breaking between text with - // direction changes. This test verifies behavior in the trivial case, when a - // break opportunity exists at the direction change boundary. -@@ -3684,6 +3687,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408AfterFieldCrash) - { -+ return; // fails due to missing font: Noto Sans Hebrew - // Verify there is no crash/assertion for underflow after a number field - createSwDoc("tdf56408-after-field.fodt"); - } -@@ -3722,6 +3722,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf146081) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR) - { -+ return; // fails due to missing font: Noto Sans Hebrew - // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions - createSwDoc("tdf157829-ltr.fodt"); - auto pXmlDoc = parseLayoutDump(); -@@ -3736,6 +3740,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR) - - CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829RTL) - { -+ return; // fails due to missing Noto Sans Hebrew - // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions - createSwDoc("tdf157829-rtl.fodt"); - auto pXmlDoc = parseLayoutDump(); --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx -@@ -700,6 +700,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSearchAll) +@@ -447,6 +447,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSearchAll) CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSearchAllNotifications) { + return; // flaky on GTK + - SwXTextDocument* pXTextDocument = createDoc("search.odt"); - SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); + createDoc("search.odt"); + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); setupLibreOfficeKitViewCallback(pWrtShell->GetSfxViewShell()); @@ -970,6 +972,8 @@ namespace { @@ -132,9 +82,9 @@ { + return; // flaky on GTK + - comphelper::LibreOfficeKit::setActive(); - SwXTextDocument* pXTextDocument = createDoc("shape.fodt"); + createDoc("shape.fodt"); + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); --- a/sw/qa/extras/odfexport/odfexport2.cxx +++ b/sw/qa/extras/odfexport/odfexport2.cxx @@ -1711,6 +1711,7 @@ CPPUNIT_TEST_FIXTURE(Test, testMidnightRedlineDatetime) @@ -165,3 +115,84 @@ aMediaDescriptor[u"FilterName"_ustr] <<= u"writer_pdf_Export"_ustr; saveAsPDF(u"tdf164106.fodt"); +--- a/sw/qa/extras/layout/layout4.cxx ++++ b/sw/qa/extras/layout/layout4.cxx +@@ -1518,6 +1518,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf104209VertRTL) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking a first bidi portion correctly underflows in LTR text + createSwDoc("tdf56408-ltr.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -1532,6 +1533,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking a first bidi portion correctly underflows in RTL text + createSwDoc("tdf56408-rtl.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -1546,6 +1548,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // The fix for tdf#56408 introduced a change to line breaking between text with + // direction changes. This test verifies behavior in the trivial case, when a + // break opportunity exists at the direction change boundary. +@@ -1562,6 +1565,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408AfterFieldCrash) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify there is no crash/assertion for underflow after a number field + createSwDoc("tdf56408-after-field.fodt"); + } +@@ -1619,6 +1623,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf164907_rowHeightAtLeast) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions + createSwDoc("tdf157829-ltr.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -1633,6 +1638,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829RTL) + { ++ return; // fails due to missing font: Noto Sans Hebrew + // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions + createSwDoc("tdf157829-rtl.fodt"); + auto pXmlDoc = parseLayoutDump(); +--- a/sw/qa/extras/layout/layout5.cxx ++++ b/sw/qa/extras/layout/layout5.cxx +@@ -1544,6 +1544,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf144450) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf166152) + { ++ return; // fails due to missing font: Noto Sans ++ + createSwDoc("tdf166152.fodt"); + + auto* pWrtShell = getSwDocShell()->GetWrtShell(); +--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx ++++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx +@@ -6077,6 +6077,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf162750SmallCapsLigature) + + CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf164106SplitReorderedClusters) + { ++ return; // fails due to missing font: Noto Sans + saveAsPDF(u"tdf164106.fodt"); + + auto pPdfDocument = parsePDFExport(); +--- i/sc/qa/extras/scsolverobj.cxx ++++ w/sc/qa/extras/scsolverobj.cxx +@@ -74,6 +74,7 @@ void ScSolverSettingsObj::testCellRangeAddress(const uno::Any& rExpected, const + // Creates a model using the XSolverSettings API checks if it is accessible via the API + void ScSolverSettingsObj::testXSolverSettings() + { ++ return; + uno::Reference xDoc(mxComponent, uno::UNO_QUERY_THROW); + uno::Reference xIndex(xDoc->getSheets(), uno::UNO_QUERY_THROW); + uno::Reference xSheet(xIndex->getByIndex(0), uno::UNO_QUERY_THROW); diff --git a/pkgs/applications/office/libreoffice/src-fresh/deps.nix b/pkgs/applications/office/libreoffice/src-fresh/deps.nix index 6e808a0b2496..a0a96f5a26e3 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/deps.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/deps.nix @@ -147,11 +147,11 @@ md5name = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83-libetonyek-0.1.12.tar.xz"; } { - name = "expat-2.7.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/expat-2.7.1.tar.xz"; - sha256 = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30"; + name = "expat-2.7.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.7.2.tar.xz"; + sha256 = "21b778b34ec837c2ac285aef340f9fb5fa063a811b21ea4d2412a9702c88995c"; md5 = ""; - md5name = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30-expat-2.7.1.tar.xz"; + md5name = "21b778b34ec837c2ac285aef340f9fb5fa063a811b21ea4d2412a9702c88995c-expat-2.7.2.tar.xz"; } { name = "Firebird-3.0.7.33374-0.tar.bz2"; @@ -413,11 +413,11 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.13.3.tar.xz"; - url = "https://dev-www.libreoffice.org/src/freetype-2.13.3.tar.xz"; - sha256 = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289"; + name = "freetype-2.14.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/freetype-2.14.1.tar.xz"; + sha256 = "32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc"; md5 = ""; - md5name = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289-freetype-2.13.3.tar.xz"; + md5name = "32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc-freetype-2.14.1.tar.xz"; } { name = "frozen-1.2.0.tar.gz"; @@ -448,11 +448,11 @@ md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; } { - name = "harfbuzz-11.4.3.tar.xz"; - url = "https://dev-www.libreoffice.org/src/harfbuzz-11.4.3.tar.xz"; - sha256 = "6660415ad48fa1a46e4fa75fcdb70ff819c452153f08677d34ffb29eda66415d"; + name = "harfbuzz-11.5.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/harfbuzz-11.5.1.tar.xz"; + sha256 = "972a60a8d274d49e70361da6920c3a73dfb0fb4387f6c6811906a47ba634d8a1"; md5 = ""; - md5name = "6660415ad48fa1a46e4fa75fcdb70ff819c452153f08677d34ffb29eda66415d-harfbuzz-11.4.3.tar.xz"; + md5name = "972a60a8d274d49e70361da6920c3a73dfb0fb4387f6c6811906a47ba634d8a1-harfbuzz-11.5.1.tar.xz"; } { name = "hsqldb_1_8_0.zip"; @@ -581,18 +581,18 @@ md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { - name = "libjpeg-turbo-3.1.1.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-3.1.1.tar.gz"; - sha256 = "304165ae11e64ab752e9cfc07c37bfdc87abd0bfe4bc699e59f34036d9c84f72"; + name = "libjpeg-turbo-3.1.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-3.1.2.tar.gz"; + sha256 = "560f6338b547544c4f9721b18d8b87685d433ec78b3c644c70d77adad22c55e6"; md5 = ""; - md5name = "304165ae11e64ab752e9cfc07c37bfdc87abd0bfe4bc699e59f34036d9c84f72-libjpeg-turbo-3.1.1.tar.gz"; + md5name = "560f6338b547544c4f9721b18d8b87685d433ec78b3c644c70d77adad22c55e6-libjpeg-turbo-3.1.2.tar.gz"; } { - name = "language-subtag-registry-2025-07-15.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-07-15.tar.bz2"; - sha256 = "2689f0a9a1fc21442d8097951fbca6d7013f9f9847f0b5e87144bd8e1355e052"; + name = "language-subtag-registry-2025-08-25.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-08-25.tar.bz2"; + sha256 = "9b008d21f97bbf37c5aefd07805ff5500524bccbe8c39d623e184b1ed425ff39"; md5 = ""; - md5name = "2689f0a9a1fc21442d8097951fbca6d7013f9f9847f0b5e87144bd8e1355e052-language-subtag-registry-2025-07-15.tar.bz2"; + md5name = "9b008d21f97bbf37c5aefd07805ff5500524bccbe8c39d623e184b1ed425ff39-language-subtag-registry-2025-08-25.tar.bz2"; } { name = "lcms2-2.17.tar.gz"; @@ -609,11 +609,11 @@ md5name = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6-libassuan-3.0.2.tar.bz2"; } { - name = "libatomic_ops-7.8.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.2.tar.gz"; - sha256 = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51"; + name = "libatomic_ops-7.8.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.4.tar.gz"; + sha256 = "2356e002e80ef695875e971d6a4fd8c61ca5c6fa4fd1bf31cce54a269c8bfcd5"; md5 = ""; - md5name = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51-libatomic_ops-7.8.2.tar.gz"; + md5name = "2356e002e80ef695875e971d6a4fd8c61ca5c6fa4fd1bf31cce54a269c8bfcd5-libatomic_ops-7.8.4.tar.gz"; } { name = "libeot-0.01.tar.bz2"; @@ -679,11 +679,11 @@ md5name = "d82e93b69b8aa205a616b62917a269322bf63a3eaafb3775014e61752b2013ea-xmlsec1-1.3.7.tar.gz"; } { - name = "libxml2-2.14.5.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.14.5.tar.xz"; - sha256 = "03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b"; + name = "libxml2-2.14.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.14.6.tar.xz"; + sha256 = "7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a"; md5 = ""; - md5name = "03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b-libxml2-2.14.5.tar.xz"; + md5name = "7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a-libxml2-2.14.6.tar.xz"; } { name = "libxslt-1.1.43.tar.xz"; @@ -700,18 +700,18 @@ md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; } { - name = "lxml-6.0.1.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lxml-6.0.1.tar.gz"; - sha256 = "2b3a882ebf27dd026df3801a87cf49ff791336e0f94b0fad195db77e01240690"; + name = "lxml-6.0.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lxml-6.0.2.tar.gz"; + sha256 = "cd79f3367bd74b317dda655dc8fcfa304d9eb6e4fb06b7168c5cf27f96e0cd62"; md5 = ""; - md5name = "2b3a882ebf27dd026df3801a87cf49ff791336e0f94b0fad195db77e01240690-lxml-6.0.1.tar.gz"; + md5name = "cd79f3367bd74b317dda655dc8fcfa304d9eb6e4fb06b7168c5cf27f96e0cd62-lxml-6.0.2.tar.gz"; } { - name = "mariadb-connector-c-3.3.15-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.15-src.tar.gz"; - sha256 = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe"; + name = "mariadb-connector-c-3.3.17-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.17-src.tar.gz"; + sha256 = "a5abb7331508988f7287b481c1839bd929261ce38352cd0fde6c002c300e0c01"; md5 = ""; - md5name = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe-mariadb-connector-c-3.3.15-src.tar.gz"; + md5name = "a5abb7331508988f7287b481c1839bd929261ce38352cd0fde6c002c300e0c01-mariadb-connector-c-3.3.17-src.tar.gz"; } { name = "mdds-3.1.0.tar.xz"; @@ -728,11 +728,11 @@ md5name = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0-mDNSResponder-878.200.35.tar.gz"; } { - name = "meson-1.8.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/meson-1.8.0.tar.gz"; - sha256 = "0a9b23311271519bd03dca12d7d8b0eab582c3a2c5da433d465b6e519dc88e2f"; + name = "meson-1.8.3.tar.gz"; + url = "https://dev-www.libreoffice.org/src/meson-1.8.3.tar.gz"; + sha256 = "f118aa910fc0a137cc2dd0122232dbf82153d9a12fb5b0f5bb64896f6a157abf"; md5 = ""; - md5name = "0a9b23311271519bd03dca12d7d8b0eab582c3a2c5da433d465b6e519dc88e2f-meson-1.8.0.tar.gz"; + md5name = "f118aa910fc0a137cc2dd0122232dbf82153d9a12fb5b0f5bb64896f6a157abf-meson-1.8.3.tar.gz"; } { name = "libmspub-0.1.4.tar.xz"; @@ -756,11 +756,11 @@ md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz"; } { - name = "nss-3.115.1-with-nspr-4.37.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.115.1-with-nspr-4.37.tar.gz"; - sha256 = "5ff67daaa778ff302ccacdd00e665ce71da59f05dcdaab62bcdab6e23c90d320"; + name = "nss-3.116-with-nspr-4.37.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.116-with-nspr-4.37.tar.gz"; + sha256 = "af6f21bae9f16534988842597871754450fd6cdbd786750e7cd069f8d231ce10"; md5 = ""; - md5name = "5ff67daaa778ff302ccacdd00e665ce71da59f05dcdaab62bcdab6e23c90d320-nss-3.115.1-with-nspr-4.37.tar.gz"; + md5name = "af6f21bae9f16534988842597871754450fd6cdbd786750e7cd069f8d231ce10-nss-3.116-with-nspr-4.37.tar.gz"; } { name = "libodfgen-0.1.8.tar.xz"; @@ -798,11 +798,11 @@ md5name = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516-openldap-2.6.10.tgz"; } { - name = "openssl-3.0.17.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-3.0.17.tar.gz"; - sha256 = "dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce"; + name = "openssl-3.0.18.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-3.0.18.tar.gz"; + sha256 = "d80c34f5cf902dccf1f1b5df5ebb86d0392e37049e5d73df1b3abae72e4ffe8b"; md5 = ""; - md5name = "dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce-openssl-3.0.17.tar.gz"; + md5name = "d80c34f5cf902dccf1f1b5df5ebb86d0392e37049e5d73df1b3abae72e4ffe8b-openssl-3.0.18.tar.gz"; } { name = "liborcus-0.20.1.tar.xz"; @@ -840,18 +840,18 @@ md5name = "4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307-libpng-1.6.50.tar.xz"; } { - name = "tiff-4.7.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/tiff-4.7.0.tar.xz"; - sha256 = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017"; + name = "tiff-4.7.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/tiff-4.7.1.tar.xz"; + sha256 = "b92017489bdc1db3a4c97191aa4b75366673cb746de0dce5d7a749d5954681ba"; md5 = ""; - md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz"; + md5name = "b92017489bdc1db3a4c97191aa4b75366673cb746de0dce5d7a749d5954681ba-tiff-4.7.1.tar.xz"; } { - name = "poppler-25.08.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-25.08.0.tar.xz"; - sha256 = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d"; + name = "poppler-25.09.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-25.09.1.tar.xz"; + sha256 = "0c1091d01d3dd1664a13816861e812d02b29201e96665454b81b52d261fad658"; md5 = ""; - md5name = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d-poppler-25.08.0.tar.xz"; + md5name = "0c1091d01d3dd1664a13816861e812d02b29201e96665454b81b52d261fad658-poppler-25.09.1.tar.xz"; } { name = "poppler-data-0.4.12.tar.gz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/help.nix b/pkgs/applications/office/libreoffice/src-fresh/help.nix index f699007bc73b..314832020879 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/help.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/help.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "1dghyg96daa9iff7njanfy8v0lqql3i9vy6cqysdq141rgdbglql"; - url = "https://download.documentfoundation.org/libreoffice/src/25.8.1/libreoffice-help-25.8.1.1.tar.xz"; + sha256 = "0pzb8xaiqzwqs0l3pdb857vk3z26n2zwqicmyj0paxaw0cndx7xv"; + url = "https://download.documentfoundation.org/libreoffice/src/25.8.2/libreoffice-help-25.8.2.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/main.nix b/pkgs/applications/office/libreoffice/src-fresh/main.nix index da90604b5aab..ec1097e528fb 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/main.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/main.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0gig194j66rxf678n236r7wnqv12w1bknm1kkjj8155y59n2qkjv"; - url = "https://download.documentfoundation.org/libreoffice/src/25.8.1/libreoffice-25.8.1.1.tar.xz"; + sha256 = "0pn1swdy3vpi5phh4br1q3mly6b349qbanmwalv8v0fzqgpa4b00"; + url = "https://download.documentfoundation.org/libreoffice/src/25.8.2/libreoffice-25.8.2.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/translations.nix b/pkgs/applications/office/libreoffice/src-fresh/translations.nix index 27f4cc4d4aeb..396afcb84eb3 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/translations.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/translations.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0x1vx27w8kw4qfjhhdmh5zx68svh27yiy43f057qd61rbnds0p85"; - url = "https://download.documentfoundation.org/libreoffice/src/25.8.1/libreoffice-translations-25.8.1.1.tar.xz"; + sha256 = "0c184wz9c55q7q87wnf0jy87cws01rwqsqc2cyilv2r5sy7ih0gv"; + url = "https://download.documentfoundation.org/libreoffice/src/25.8.2/libreoffice-translations-25.8.2.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/version.nix b/pkgs/applications/office/libreoffice/src-fresh/version.nix index 2f0e9dc54fed..84598b00df3b 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/version.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/version.nix @@ -1 +1 @@ -"25.8.1.1" +"25.8.2.2" diff --git a/pkgs/applications/office/libreoffice/src-still/deps.nix b/pkgs/applications/office/libreoffice/src-still/deps.nix index 9301730b3521..a81ab062be11 100644 --- a/pkgs/applications/office/libreoffice/src-still/deps.nix +++ b/pkgs/applications/office/libreoffice/src-still/deps.nix @@ -14,11 +14,11 @@ md5name = "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c-phc-winner-argon2-20190702.tar.gz"; } { - name = "boost_1_85_0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/boost_1_85_0.tar.xz"; - sha256 = "4e23218ff5036d57afd20f7cdab2e94cdbf6ba9c509d656ace643a81c40a985a"; + name = "boost_1_86_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_86_0.tar.xz"; + sha256 = "efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c"; md5 = ""; - md5name = "4e23218ff5036d57afd20f7cdab2e94cdbf6ba9c509d656ace643a81c40a985a-boost_1_85_0.tar.xz"; + md5name = "efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c-boost_1_86_0.tar.xz"; } { name = "box2d-2.4.1.tar.gz"; @@ -105,11 +105,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "curl-8.12.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-8.12.1.tar.xz"; - sha256 = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202"; + name = "curl-8.14.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.14.1.tar.xz"; + sha256 = "f4619a1e2474c4bbfedc88a7c2191209c8334b48fa1f4e53fd584cc12e9120dd"; md5 = ""; - md5name = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202-curl-8.12.1.tar.xz"; + md5name = "f4619a1e2474c4bbfedc88a7c2191209c8334b48fa1f4e53fd584cc12e9120dd-curl-8.14.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -161,11 +161,11 @@ md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2"; } { - name = "fontconfig-2.15.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/fontconfig-2.15.0.tar.xz"; - sha256 = "63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e"; + name = "fontconfig-2.16.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/fontconfig-2.16.2.tar.xz"; + sha256 = "165b8fd2a119864c87464b233986c4a1bc09efb09c65de1ca40cc1e85ffb77e2"; md5 = ""; - md5name = "63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e-fontconfig-2.15.0.tar.xz"; + md5name = "165b8fd2a119864c87464b233986c4a1bc09efb09c65de1ca40cc1e85ffb77e2-fontconfig-2.16.2.tar.xz"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -315,11 +315,11 @@ md5name = "b12a1ff762680681b7ce4d98dd29a7f54d90f5bcadd10c955afc640a27b3a268-NotoSansLisu-v2.102.zip"; } { - name = "culmus-0.133.tar.gz"; - url = "https://dev-www.libreoffice.org/src/culmus-0.133.tar.gz"; - sha256 = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05"; + name = "culmus-0.140.tar.gz"; + url = "https://dev-www.libreoffice.org/src/culmus-0.140.tar.gz"; + sha256 = "6daed104481007752a76905000e71c0093c591c8ef3017d1b18222c277fc52e3"; md5 = ""; - md5name = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05-culmus-0.133.tar.gz"; + md5name = "6daed104481007752a76905000e71c0093c591c8ef3017d1b18222c277fc52e3-culmus-0.140.tar.gz"; } { name = "libre-hebrew-1.0.tar.gz"; @@ -343,11 +343,11 @@ md5name = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a-Amiri-1.001.zip"; } { - name = "ReemKufi-1.7.zip"; - url = "https://dev-www.libreoffice.org/src/ReemKufi-1.7.zip"; - sha256 = "2359f036c7bddeb4d5529d7b3c9139c3288c920cc26053d417cdbb563eafe0a4"; + name = "ReemKufi-1.8.zip"; + url = "https://dev-www.libreoffice.org/src/ReemKufi-1.8.zip"; + sha256 = "6bf586b0473edaaca19dbd594c25e2bf6111952b8643a262976b7fa75ef345dc"; md5 = ""; - md5name = "2359f036c7bddeb4d5529d7b3c9139c3288c920cc26053d417cdbb563eafe0a4-ReemKufi-1.7.zip"; + md5name = "6bf586b0473edaaca19dbd594c25e2bf6111952b8643a262976b7fa75ef345dc-ReemKufi-1.8.zip"; } { name = "Scheherazade-2.100.zip"; @@ -356,6 +356,55 @@ md5 = ""; md5name = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5-Scheherazade-2.100.zip"; } + { + name = "Agdasima-2.002.zip"; + url = "https://dev-www.libreoffice.org/src/Agdasima-2.002.zip"; + sha256 = "b4c17499f8bc183320ffdcf1f8491c778dd68a237adc056dc08e1fcb2da488f3"; + md5 = ""; + md5name = "b4c17499f8bc183320ffdcf1f8491c778dd68a237adc056dc08e1fcb2da488f3-Agdasima-2.002.zip"; + } + { + name = "Bacasime_Antique-2.000.zip"; + url = "https://dev-www.libreoffice.org/src/Bacasime_Antique-2.000.zip"; + sha256 = "81127cebc97d4ee0b950c2bc2d6be0ed29abfe0d5988435eb9a39e382557250a"; + md5 = ""; + md5name = "81127cebc97d4ee0b950c2bc2d6be0ed29abfe0d5988435eb9a39e382557250a-Bacasime_Antique-2.000.zip"; + } + { + name = "Belanosima-2.000.zip"; + url = "https://dev-www.libreoffice.org/src/Belanosima-2.000.zip"; + sha256 = "9c30e9e7cdb0797b651113a77f6b789659b8d8598a466b2ba92754e9dec30449"; + md5 = ""; + md5name = "9c30e9e7cdb0797b651113a77f6b789659b8d8598a466b2ba92754e9dec30449-Belanosima-2.000.zip"; + } + { + name = "Caprasimo-1.001.zip"; + url = "https://dev-www.libreoffice.org/src/Caprasimo-1.001.zip"; + sha256 = "f066d27cfc99b6601083be102d08b4039da8d2834e2795aabd890f16c6fd1b9b"; + md5 = ""; + md5name = "f066d27cfc99b6601083be102d08b4039da8d2834e2795aabd890f16c6fd1b9b-Caprasimo-1.001.zip"; + } + { + name = "Lugrasimo-1.001.zip"; + url = "https://dev-www.libreoffice.org/src/Lugrasimo-1.001.zip"; + sha256 = "db24dff31e8ddf6a113556c947a219f9534b072852e9ce2079a08c94854a7503"; + md5 = ""; + md5name = "db24dff31e8ddf6a113556c947a219f9534b072852e9ce2079a08c94854a7503-Lugrasimo-1.001.zip"; + } + { + name = "Lumanosimo-1.010.zip"; + url = "https://dev-www.libreoffice.org/src/Lumanosimo-1.010.zip"; + sha256 = "d4545ad6afded9a55d9a7728cfc7453cf5637861db87aafe0a730676a0cb960f"; + md5 = ""; + md5name = "d4545ad6afded9a55d9a7728cfc7453cf5637861db87aafe0a730676a0cb960f-Lumanosimo-1.010.zip"; + } + { + name = "Lunasima-2.009.zip"; + url = "https://dev-www.libreoffice.org/src/Lunasima-2.009.zip"; + sha256 = "4302809cf4b95b481bec53de87484d919b391c90a518d065f6c775fd435a5393"; + md5 = ""; + md5name = "4302809cf4b95b481bec53de87484d919b391c90a518d065f6c775fd435a5393-Lunasima-2.009.zip"; + } { name = "libfreehand-0.1.2.tar.xz"; url = "https://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz"; @@ -371,11 +420,11 @@ md5name = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289-freetype-2.13.3.tar.xz"; } { - name = "frozen-1.1.1.tar.gz"; - url = "https://dev-www.libreoffice.org/src/frozen-1.1.1.tar.gz"; - sha256 = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45"; + name = "frozen-1.2.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/frozen-1.2.0.tar.gz"; + sha256 = "ed8339c017d7c5fe019ac2c642477f435278f0dc643c1d69d3f3b1e95915e823"; md5 = ""; - md5name = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45-frozen-1.1.1.tar.gz"; + md5name = "ed8339c017d7c5fe019ac2c642477f435278f0dc643c1d69d3f3b1e95915e823-frozen-1.2.0.tar.gz"; } { name = "glm-1.0.1.zip"; @@ -385,11 +434,11 @@ md5name = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5-glm-1.0.1.zip"; } { - name = "gpgme-1.24.2.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/gpgme-1.24.2.tar.bz2"; - sha256 = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581"; + name = "gpgme-1.24.3.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/gpgme-1.24.3.tar.bz2"; + sha256 = "bfc17f5bd1b178c8649fdd918956d277080f33df006a2dc40acdecdce68c50dd"; md5 = ""; - md5name = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581-gpgme-1.24.2.tar.bz2"; + md5name = "bfc17f5bd1b178c8649fdd918956d277080f33df006a2dc40acdecdce68c50dd-gpgme-1.24.3.tar.bz2"; } { name = "graphite2-minimal-1.3.14.tgz"; @@ -434,25 +483,25 @@ md5name = "0e279003f5199f80031c6dcd08f79d6f65a0505139160e7df0d09b226bff4023-IAccessible2-1.3+git20231013.3d8c7f0.tar.gz"; } { - name = "icu4c-74_2-src.tgz"; - url = "https://dev-www.libreoffice.org/src/icu4c-74_2-src.tgz"; - sha256 = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c"; + name = "icu4c-75_1-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-75_1-src.tgz"; + sha256 = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef"; md5 = ""; - md5name = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c-icu4c-74_2-src.tgz"; + md5name = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef-icu4c-75_1-src.tgz"; } { - name = "icu4c-74_2-data.zip"; - url = "https://dev-www.libreoffice.org/src/icu4c-74_2-data.zip"; - sha256 = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6"; + name = "icu4c-75_1-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-75_1-data.zip"; + sha256 = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1"; md5 = ""; - md5name = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6-icu4c-74_2-data.zip"; + md5name = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1-icu4c-75_1-data.zip"; } { - name = "Java-WebSocket-1.5.6.tar.gz"; - url = "https://dev-www.libreoffice.org/src/Java-WebSocket-1.5.6.tar.gz"; - sha256 = "167e86561cd7b5ed21b67d7543536134edcb14b373892739b28c417566a3832f"; + name = "Java-WebSocket-1.6.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/Java-WebSocket-1.6.0.tar.gz"; + sha256 = "f3ce29efde338707241d47ab4784b19a1e3658bfa0564b5bc5f80c27e5118728"; md5 = ""; - md5name = "167e86561cd7b5ed21b67d7543536134edcb14b373892739b28c417566a3832f-Java-WebSocket-1.5.6.tar.gz"; + md5name = "f3ce29efde338707241d47ab4784b19a1e3658bfa0564b5bc5f80c27e5118728-Java-WebSocket-1.6.0.tar.gz"; } { name = "flow-engine-0.9.4.zip"; @@ -539,18 +588,18 @@ md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; } { - name = "language-subtag-registry-2025-03-10.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-03-10.tar.bz2"; - sha256 = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39"; + name = "language-subtag-registry-2025-08-25.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-08-25.tar.bz2"; + sha256 = "9b008d21f97bbf37c5aefd07805ff5500524bccbe8c39d623e184b1ed425ff39"; md5 = ""; - md5name = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39-language-subtag-registry-2025-03-10.tar.bz2"; + md5name = "9b008d21f97bbf37c5aefd07805ff5500524bccbe8c39d623e184b1ed425ff39-language-subtag-registry-2025-08-25.tar.bz2"; } { - name = "lcms2-2.16.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lcms2-2.16.tar.gz"; - sha256 = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51"; + name = "lcms2-2.17.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lcms2-2.17.tar.gz"; + sha256 = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074"; md5 = ""; - md5name = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51-lcms2-2.16.tar.gz"; + md5name = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074-lcms2-2.17.tar.gz"; } { name = "libassuan-3.0.2.tar.bz2"; @@ -581,11 +630,11 @@ md5name = "df0a59d413a5b202573d8d4f5159e33a8538da4f8e8e60979facc64d6290cebd-libexttextcat-3.4.7.tar.xz"; } { - name = "libffi-3.4.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libffi-3.4.4.tar.gz"; - sha256 = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676"; + name = "libffi-3.5.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libffi-3.5.2.tar.gz"; + sha256 = "f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc"; md5 = ""; - md5name = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676-libffi-3.4.4.tar.gz"; + md5name = "f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc-libffi-3.5.2.tar.gz"; } { name = "libgpg-error-1.55.tar.bz2"; @@ -616,25 +665,25 @@ md5name = "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08-ltm-1.3.0.tar.xz"; } { - name = "libwebp-1.5.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libwebp-1.5.0.tar.gz"; - sha256 = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c"; + name = "libwebp-1.6.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libwebp-1.6.0.tar.gz"; + sha256 = "e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564"; md5 = ""; - md5name = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c-libwebp-1.5.0.tar.gz"; + md5name = "e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564-libwebp-1.6.0.tar.gz"; } { - name = "xmlsec1-1.3.5.tar.gz"; - url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.5.tar.gz"; - sha256 = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917"; + name = "xmlsec1-1.3.6.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.6.tar.gz"; + sha256 = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f"; md5 = ""; - md5name = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917-xmlsec1-1.3.5.tar.gz"; + md5name = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f-xmlsec1-1.3.6.tar.gz"; } { - name = "libxml2-2.13.8.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.13.8.tar.xz"; - sha256 = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a"; + name = "libxml2-2.14.5.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.14.5.tar.xz"; + sha256 = "03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b"; md5 = ""; - md5name = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a-libxml2-2.13.8.tar.xz"; + md5name = "03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b-libxml2-2.14.5.tar.xz"; } { name = "libxslt-1.1.43.tar.xz"; @@ -735,18 +784,18 @@ md5name = "37206cf981e8409d048b59ac5839621ea107ff49af72beb9d7769a2f41da8d90-onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz"; } { - name = "openldap-2.6.9.tgz"; - url = "https://dev-www.libreoffice.org/src/openldap-2.6.9.tgz"; - sha256 = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff"; + name = "openldap-2.6.10.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.6.10.tgz"; + sha256 = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516"; md5 = ""; - md5name = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff-openldap-2.6.9.tgz"; + md5name = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516-openldap-2.6.10.tgz"; } { - name = "openssl-3.0.16.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-3.0.16.tar.gz"; - sha256 = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86"; + name = "openssl-3.0.17.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-3.0.17.tar.gz"; + sha256 = "dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce"; md5 = ""; - md5name = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86-openssl-3.0.16.tar.gz"; + md5name = "dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce-openssl-3.0.17.tar.gz"; } { name = "liborcus-0.19.2.tar.xz"; @@ -763,11 +812,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-6425.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-6425.tar.bz2"; - sha256 = "fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c"; + name = "pdfium-6764.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-6764.tar.bz2"; + sha256 = "59d5df3b38312b069d96a8de9d4f8d7f44a29835c9dc82bd792ea02be86c4e49"; md5 = ""; - md5name = "fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c-pdfium-6425.tar.bz2"; + md5name = "59d5df3b38312b069d96a8de9d4f8d7f44a29835c9dc82bd792ea02be86c4e49-pdfium-6764.tar.bz2"; } { name = "pixman-0.42.2.tar.gz"; @@ -777,11 +826,11 @@ md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz"; } { - name = "libpng-1.6.47.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libpng-1.6.47.tar.xz"; - sha256 = "b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631"; + name = "libpng-1.6.50.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.50.tar.xz"; + sha256 = "4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307"; md5 = ""; - md5name = "b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631-libpng-1.6.47.tar.xz"; + md5name = "4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307-libpng-1.6.50.tar.xz"; } { name = "tiff-4.7.0.tar.xz"; @@ -791,11 +840,11 @@ md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz"; } { - name = "poppler-25.04.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-25.04.0.tar.xz"; - sha256 = "b010c596dce127fba88532fd2f1043e55ea30601767952d0f2c0a80e7dc0da3d"; + name = "poppler-25.08.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-25.08.0.tar.xz"; + sha256 = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d"; md5 = ""; - md5name = "b010c596dce127fba88532fd2f1043e55ea30601767952d0f2c0a80e7dc0da3d-poppler-25.04.0.tar.xz"; + md5name = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d-poppler-25.08.0.tar.xz"; } { name = "poppler-data-0.4.12.tar.gz"; @@ -805,18 +854,18 @@ md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz"; } { - name = "postgresql-13.19.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-13.19.tar.bz2"; - sha256 = "482cce0a9f8d24c2447cfc7b2817e55f86d51afe5f7f1a85214bf93644e774ea"; + name = "postgresql-14.19.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-14.19.tar.bz2"; + sha256 = "727e9e334bc1a31940df808259f69fe47a59f6d42174b22ae62d67fe7a01ad80"; md5 = ""; - md5name = "482cce0a9f8d24c2447cfc7b2817e55f86d51afe5f7f1a85214bf93644e774ea-postgresql-13.19.tar.bz2"; + md5name = "727e9e334bc1a31940df808259f69fe47a59f6d42174b22ae62d67fe7a01ad80-postgresql-14.19.tar.bz2"; } { - name = "Python-3.9.22.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.9.22.tar.xz"; - sha256 = "8c136d199d3637a1fce98a16adc809c1d83c922d02d41f3614b34f8b6e7d38ec"; + name = "Python-3.10.18.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.10.18.tar.xz"; + sha256 = "ae665bc678abd9ab6a6e1573d2481625a53719bc517e9a634ed2b9fefae3817f"; md5 = ""; - md5name = "8c136d199d3637a1fce98a16adc809c1d83c922d02d41f3614b34f8b6e7d38ec-Python-3.9.22.tar.xz"; + md5name = "ae665bc678abd9ab6a6e1573d2481625a53719bc517e9a634ed2b9fefae3817f-Python-3.10.18.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -826,11 +875,11 @@ md5name = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c-libqxp-0.0.2.tar.xz"; } { - name = "raptor2-2.0.15.tar.gz"; - url = "https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; - sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed"; - md5 = "a39f6c07ddb20d7dd2ff1f95fa21e2cd"; - md5name = "a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; + name = "raptor2-2.0.16.tar.gz"; + url = "https://dev-www.libreoffice.org/src/raptor2-2.0.16.tar.gz"; + sha256 = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680"; + md5 = ""; + md5name = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680-raptor2-2.0.16.tar.gz"; } { name = "rasqal-0.9.33.tar.gz"; @@ -854,18 +903,18 @@ md5name = "5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5-librevenge-0.0.5.tar.bz2"; } { - name = "rhino-1.7.14.zip"; - url = "https://dev-www.libreoffice.org/src/rhino-1.7.14.zip"; - sha256 = "bf4d2d0c5ff8889fd494486db09291cb7965f0bf2f93ef005d3b08070a5a4f5c"; + name = "rhino-1.7.15.zip"; + url = "https://dev-www.libreoffice.org/src/rhino-1.7.15.zip"; + sha256 = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa"; md5 = ""; - md5name = "bf4d2d0c5ff8889fd494486db09291cb7965f0bf2f93ef005d3b08070a5a4f5c-rhino-1.7.14.zip"; + md5name = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa-rhino-1.7.15.zip"; } { - name = "skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"; - url = "https://dev-www.libreoffice.org/src/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"; - sha256 = "2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01"; + name = "skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz"; + sha256 = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d"; md5 = ""; - md5name = "2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01-skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"; + md5name = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d-skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; @@ -931,11 +980,11 @@ md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; } { - name = "zxcvbn-c-2.5.tar.gz"; - url = "https://dev-www.libreoffice.org/src/zxcvbn-c-2.5.tar.gz"; - sha256 = "77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd"; + name = "zxcvbn-c-2.6.tar.gz"; + url = "https://dev-www.libreoffice.org/src/zxcvbn-c-2.6.tar.gz"; + sha256 = "11e39f6776f9c82c68b2acb94336e32697d4ab6cdb4ac16f9583ccbdd735113a"; md5 = ""; - md5name = "77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd-zxcvbn-c-2.5.tar.gz"; + md5name = "11e39f6776f9c82c68b2acb94336e32697d4ab6cdb4ac16f9583ccbdd735113a-zxcvbn-c-2.6.tar.gz"; } { name = "zxing-cpp-2.2.1.tar.gz"; diff --git a/pkgs/applications/office/libreoffice/src-still/help.nix b/pkgs/applications/office/libreoffice/src-still/help.nix index dc23461a2d8d..7ded287747c9 100644 --- a/pkgs/applications/office/libreoffice/src-still/help.nix +++ b/pkgs/applications/office/libreoffice/src-still/help.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0139rsgny1n554qycwmwsxyirr4afbw2q0r326s2mz6bxfg817qm"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.7/libreoffice-help-24.8.7.2.tar.xz"; + sha256 = "0spbylki80y5ny45hrjmhjfax7m1pps0k4blyjbi8knpxr2cnak4"; + url = "https://download.documentfoundation.org/libreoffice/src/25.2.6/libreoffice-help-25.2.6.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/main.nix b/pkgs/applications/office/libreoffice/src-still/main.nix index cec518b7d4df..1bc471ec7b52 100644 --- a/pkgs/applications/office/libreoffice/src-still/main.nix +++ b/pkgs/applications/office/libreoffice/src-still/main.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "1swl16qznhzbchjzx6rp0a388s1ndwpdqswjpz1mxga514dlgpzh"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.7/libreoffice-24.8.7.2.tar.xz"; + sha256 = "0ix7d20qa396cf8gvzicma9l257js97840hvkavrdk2pyznq5286"; + url = "https://download.documentfoundation.org/libreoffice/src/25.2.6/libreoffice-25.2.6.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/translations.nix b/pkgs/applications/office/libreoffice/src-still/translations.nix index 878b8f3ae73b..f0330ed0a9de 100644 --- a/pkgs/applications/office/libreoffice/src-still/translations.nix +++ b/pkgs/applications/office/libreoffice/src-still/translations.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: fetchurl { - sha256 = "0r4zvy4xlhz23bk4vmh03qa1d5qdrcjg4fppy0q92yclxkrnzlgh"; - url = "https://download.documentfoundation.org/libreoffice/src/24.8.7/libreoffice-translations-24.8.7.2.tar.xz"; + sha256 = "1kgqfk59qs4lqlgw32csh0wgyyqi3hzy1wv3dl7rm960n0im7xqh"; + url = "https://download.documentfoundation.org/libreoffice/src/25.2.6/libreoffice-translations-25.2.6.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/version.nix b/pkgs/applications/office/libreoffice/src-still/version.nix index 1ca4acb8d8c9..fb516bd04a58 100644 --- a/pkgs/applications/office/libreoffice/src-still/version.nix +++ b/pkgs/applications/office/libreoffice/src-still/version.nix @@ -1 +1 @@ -"24.8.7.2" +"25.2.6.2" diff --git a/pkgs/by-name/ad/adaptivecpp/package.nix b/pkgs/by-name/ad/adaptivecpp/package.nix index a59389109be1..3c17cb88edbf 100644 --- a/pkgs/by-name/ad/adaptivecpp/package.nix +++ b/pkgs/by-name/ad/adaptivecpp/package.nix @@ -10,7 +10,7 @@ makeWrapper, config, cudaPackages, - rocmPackages_6, + rocmPackages, ompSupport ? true, openclSupport ? false, rocmSupport ? config.rocmSupport, @@ -23,7 +23,6 @@ }: let inherit (llvmPackages) stdenv; - rocmPackages = rocmPackages_6; llvmPackages = llvmPackages_18; in stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index c2bf85af259f..3c7a995f5e87 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -4,7 +4,7 @@ stdenvNoCC, fetchFromGitHub, rustPlatform, - electron_37, + electron, nodejs_22, yarn-berry_4, cacert, @@ -28,7 +28,6 @@ let hostPlatform = stdenvNoCC.hostPlatform; nodePlatform = hostPlatform.node.platform; nodeArch = hostPlatform.node.arch; - electron = electron_37; nodejs = nodejs_22; yarn-berry = yarn-berry_4.override { inherit nodejs; }; productName = if buildType != "stable" then "AFFiNE-${buildType}" else "AFFiNE"; @@ -37,17 +36,17 @@ in stdenv.mkDerivation (finalAttrs: { pname = binName; - version = "0.24.1"; + version = "0.25.1"; src = fetchFromGitHub { owner = "toeverything"; repo = "AFFiNE"; tag = "v${finalAttrs.version}"; - hash = "sha256-Yq5TD5yInv+0d1S6M58I8CneCAGUwH0ThGrEJfLIrX0="; + hash = "sha256-TrPyxXgrhzODyiamLU49vbIwDzau+jI9D8VWGa734x8="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-tRDc7Rky59Rh08QTNiG3yopErHJzARxN8BZGrSUECLE="; + hash = "sha256-7btQd3i3rfJ3pJV7OXhSIz17Uy48D3OwrsXh/kls8Hc="; }; yarnOfflineCache = stdenvNoCC.mkDerivation { name = "yarn-offline-cache"; @@ -92,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { ''; dontInstall = true; outputHashMode = "recursive"; - outputHash = "sha256-U2FGvdtGiM97aXmbfNIfi87hvwDkd1dvlAABYiDgAGI="; + outputHash = "sha256-cQFX49K27Q8pKRiZ+UqK4LIwfi3VEgZ7qS7N/rUj8rM="; }; buildInputs = lib.optionals hostPlatform.isDarwin [ 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/ar/argpp/package.nix b/pkgs/by-name/ar/argpp/package.nix new file mode 100644 index 000000000000..131a31a75a89 --- /dev/null +++ b/pkgs/by-name/ar/argpp/package.nix @@ -0,0 +1,38 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + gtest, + tinycmmc, +}: + +stdenv.mkDerivation { + pname = "argpp"; + version = "0-unstable-2022-08-14"; + + src = fetchFromGitHub { + owner = "Grumbel"; + repo = "argpp"; + rev = "9e1d54f8ed20af0aa5857e6653ab605b2ab63d5c"; + sha256 = "sha256-unfAFxgvv1BOUEqrYYMFfouGe2xIcKJ3ithCel1P9sc="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + gtest + tinycmmc + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" + ''; + + meta = { + description = "Argument Parser for C++"; + maintainers = [ lib.maintainers.SchweGELBin ]; + platforms = lib.platforms.linux; + license = lib.licenses.free; + }; +} 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/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix index 789ef0d73019..cf4fafdb9f4e 100644 --- a/pkgs/by-name/at/atac/package.nix +++ b/pkgs/by-name/at/atac/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "atac"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "Julien-cpsn"; repo = "ATAC"; rev = "v${version}"; - hash = "sha256-zMCz0WRqIS2htf9TMfq6BlupU8dj5PrziEMxisjkOEc="; + hash = "sha256-PXSjyMe7Rcoeczm/cqFgn1Ra66T9cA34NdfaqLTljmc="; }; - cargoHash = "sha256-U+8JElXGNsiPUM9bLmqXYudRmg+K+VJLAgKLGqiVddc="; + cargoHash = "sha256-qjg5yxWRcNnmrl91kogUEOfFOs06tcgmK2hpqx6nftU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix index 7d5e98be0386..bc990312581b 100644 --- a/pkgs/by-name/au/automatic-timezoned/package.nix +++ b/pkgs/by-name/au/automatic-timezoned/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.92"; + version = "2.0.93"; src = fetchFromGitHub { owner = "maxbrunet"; repo = "automatic-timezoned"; rev = "v${version}"; - sha256 = "sha256-X1B2L8bh3iXPZ5NpaH+VP67i/ykmd0IVXu0dg6XmUGo="; + sha256 = "sha256-EJxHmzNJvWtchFnptTK03jyPWMzFKO6jxte30xipdM8="; }; - cargoHash = "sha256-4ZV5ef033cZdMJaQD0gLNaKe8XfQzhF7mADm7N0NxvA="; + cargoHash = "sha256-kfsc7QXvRczatRwvPeMPXuD6GC9qd6zBwUd3EYXALSc="; meta = { description = "Automatically update system timezone based on location"; diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index eb04c37998ef..9c1ab1ed328a 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -83,9 +83,9 @@ containerapp = mkAzExtension rec { pname = "containerapp"; - version = "1.2.0b3"; + version = "1.2.0b4"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/containerapp-${version}-py2.py3-none-any.whl"; - hash = "sha256-UK7fbWI7NoW8sBo3OEafXX3DolFNQXhFDMHUoE1h/qA="; + hash = "sha256-v2Mu46qVpDKjGARgGkKzQm5QcK4Msj4XgdgWZwI8fS0="; description = "Microsoft Azure Command-Line Tools Containerapp Extension"; propagatedBuildInputs = with python3Packages; [ docker 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/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix index 95a4bd90acba..09139984a44e 100644 --- a/pkgs/by-name/bi/bitrise/package.nix +++ b/pkgs/by-name/bi/bitrise/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "bitrise"; - version = "2.34.3"; + version = "2.34.5"; src = fetchFromGitHub { owner = "bitrise-io"; repo = "bitrise"; rev = "v${version}"; - hash = "sha256-Px4u3Jc3HbTN9NRGFYwTVL0/g+PsFw+JxEyOuTSTQbc="; + hash = "sha256-QsGF5lDnY55OGdFagGJfXcq9/2P6qzmoHx64ijOkRfo="; }; # many tests rely on writable $HOME/.bitrise and require network access 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/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index b6d25b670993..1b9dd41f397e 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -19,20 +19,20 @@ buildNpmPackage rec { pname = "bruno"; - version = "2.12.0"; + version = "2.13.2"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; tag = "v${version}"; - hash = "sha256-5yYcclJBb5kKaDr9irkLQBa6Tg8yO1LWh89ntBiMQho="; + hash = "sha256-oYp4sSL36HrDyK+YJfjvSQuYV0NdYcB6UeTGksbrcuI="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-mLl8igkdujzI4Fz4SoUrCdnI2KUo6DsNtPdAhwjYpac="; + npmDepsHash = "sha256-TkPjT2SW5KgbaZiSCjWEd1UTqSsFq+MI58bMShkm/yI="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = [ 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/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix index 77b2be8479f5..d8b989e13460 100644 --- a/pkgs/by-name/ca/cargo-nextest/package.nix +++ b/pkgs/by-name/ca/cargo-nextest/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.105"; + version = "0.9.106"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - hash = "sha256-IBw6adO9Mzv878n+glLJTNeFykx6bGxfrPGxl014/7o="; + hash = "sha256-jgxoEKl6kAF8dj6TB42nSXE8Ez/da/yagbVVHcC0L0Q="; }; - cargoHash = "sha256-qHiifv1je7oNwOGYeT/QGcfagiXcLTCTG2kHV1rJJ4o="; + cargoHash = "sha256-XM9N74w5lbQFC6uZO3Vy45puZxSe6bthZwOQVrLv3ac="; cargoBuildFlags = [ "-p" 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/cd/cdk/package.nix b/pkgs/by-name/cd/cdk/package.nix index 157c0d4e7ac0..e948031c33a2 100644 --- a/pkgs/by-name/cd/cdk/package.nix +++ b/pkgs/by-name/cd/cdk/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "cdk"; - version = "5.0-20251001"; + version = "5.0-20251014"; src = fetchurl { url = "https://invisible-mirror.net/archives/cdk/cdk-${finalAttrs.version}.tgz"; - hash = "sha256-GLGW5gGmVTPQ3/MmJvu4h1FNhojng9f2CYtLTrxk2FM="; + hash = "sha256-DtRpScaApfQuNCzEiizmC8/CzIue67F2h3takfgpQ1w="; }; buildInputs = [ diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix index ff62fe6c1ad4..25f2d3ce8076 100644 --- a/pkgs/by-name/ch/chirp/package.nix +++ b/pkgs/by-name/ch/chirp/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication { pname = "chirp"; - version = "0.4.0-unstable-2025-10-09"; + version = "0.4.0-unstable-2025-10-14"; pyproject = true; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "abd542d16e7351ae7fff3c56b40172315dcf690c"; - hash = "sha256-ncO+/M4ZU0yZOd2DeL9ZCmZS+FhrByeiOtlY/By7bmQ="; + rev = "1e7dd4b2b83980dba5020b3787fa4c3f4dc5b68a"; + hash = "sha256-zzkppK0B1udSODKwLOJtE0kEQVLWD9xMhNvnH0wzoK0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cl/clickable/package.nix b/pkgs/by-name/cl/clickable/package.nix index 75d614d1a623..6504ad9ade7b 100644 --- a/pkgs/by-name/cl/clickable/package.nix +++ b/pkgs/by-name/cl/clickable/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "clickable"; - version = "8.5.0"; + version = "8.6.0"; format = "pyproject"; src = fetchFromGitLab { owner = "clickable"; repo = "clickable"; rev = "v${version}"; - hash = "sha256-hQkRntdOlWLK+vVrdiWEkYIMK+ymEEC5ajh7+L2fH2g="; + hash = "sha256-rgIp4LCSUamImYhgFeG+XEpgnxHcKylWRB2CCx9u5S0="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/cl/clickhouse/lts.nix b/pkgs/by-name/cl/clickhouse/lts.nix index 3d7bae589f65..01b70a91dda8 100644 --- a/pkgs/by-name/cl/clickhouse/lts.nix +++ b/pkgs/by-name/cl/clickhouse/lts.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "25.8.8.26-lts"; - hash = "sha256-jzgfbM0WRdbSr0OXB9t0e1BjZQwZaEwIfzg7W4Z11c0="; + version = "25.8.10.7-lts"; + hash = "sha256-EOZ2AfeBeXAWQqa25eQX3loE+xegt03lsCU1aQt/Ebs="; lts = true; nixUpdateExtraArgs = [ "--version-regex" 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/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix index fc04d5d9194e..be7ee8b049cb 100644 --- a/pkgs/by-name/co/codebook/package.nix +++ b/pkgs/by-name/co/codebook/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "codebook"; - version = "0.3.13"; + version = "0.3.14"; src = fetchFromGitHub { owner = "blopker"; repo = "codebook"; tag = "v${finalAttrs.version}"; - hash = "sha256-46RSHbr9vVyVYXAV/+A6PSz2qokDwQjY51jnIQ11Dls="; + hash = "sha256-XS4neGqi0tLzs53jV37mDsfC8bAXwpqinoe3gT8GYZw="; }; buildAndTestSubdir = "crates/codebook-lsp"; - cargoHash = "sha256-/7ci8of8KfD7ne3XjXA+tVq1x3HmQWKWh1wO4zA0Elg="; + cargoHash = "sha256-39ROafYvaTL3wZCUyycGV0PCnR/mr+rJK3/lrvfqKIM="; # Integration tests require internet access for dictionaries doCheck = false; diff --git a/pkgs/applications/science/misc/convertall/default.nix b/pkgs/by-name/co/convertall/package.nix similarity index 100% rename from pkgs/applications/science/misc/convertall/default.nix rename to pkgs/by-name/co/convertall/package.nix diff --git a/pkgs/applications/science/misc/convertall/pubspec.lock.json b/pkgs/by-name/co/convertall/pubspec.lock.json similarity index 100% rename from pkgs/applications/science/misc/convertall/pubspec.lock.json rename to pkgs/by-name/co/convertall/pubspec.lock.json diff --git a/pkgs/by-name/db/dbgate/package.nix b/pkgs/by-name/db/dbgate/package.nix index 2c25cecd5073..5150df43c757 100644 --- a/pkgs/by-name/db/dbgate/package.nix +++ b/pkgs/by-name/db/dbgate/package.nix @@ -8,25 +8,25 @@ let pname = "dbgate"; - version = "6.6.4"; + version = "6.6.5"; src = fetchurl { aarch64-linux = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_arm64.AppImage"; - hash = "sha256-pwG+muAEVmyIK9eiCrydZ0glxPK5FGl7b3ps/8xeFgE="; + hash = "sha256-DIlFERRnNdh6VzApYNDoiUb78lESfE2RTgmEsffJ5EI="; }; x86_64-linux = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage"; - hash = "sha256-4xsxYbVbbfxJ70CaB3z/reRoPgBom/XX6/YfT30uDpY="; + hash = "sha256-xn6KhD08K57T9kWy7AHvIar22zGXV+6/geK3dGIxKhk="; }; x86_64-darwin = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg"; - hash = "sha256-plG9n/JtPmyUcJoP4kcAttKpzpT7ytt2M82CT0zZ4tA="; + hash = "sha256-ycThFJ+f6NOWI97KyqgMES2Y2ZZ1aBkggBe6Z50Vhjs="; }; aarch64-darwin = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_universal.dmg"; - hash = "sha256-cId3K8m+XRlYHD4NyjSEyFR6c4Yvk6UzGAkdHt0bQUs="; + hash = "sha256-bE16GScBk9a32k49P9WuT4fymscdY2AyP9k29UsN8HY="; }; } .${stdenv.hostPlatform.system} or (throw "dbgate: ${stdenv.hostPlatform.system} is unsupported."); 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/dp/dprint/plugins/dprint-plugin-biome.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix index 2707f2da497b..829393d9bec0 100644 --- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix @@ -1,7 +1,7 @@ { mkDprintPlugin }: mkDprintPlugin { description = "Biome (JS/TS) wrapper plugin"; - hash = "sha256-czgTZXlW+LdTKGtX7JJtG7qAbnWlQpunMY92WiC+X8A="; + hash = "sha256-GHl8Uo2U6K1yirfjwuD43ixkVtGdbZ2qxk0cySRLXys="; initConfig = { configExcludes = [ "**/node_modules" ]; configKey = "biome"; @@ -16,6 +16,6 @@ mkDprintPlugin { }; pname = "dprint-plugin-biome"; updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json"; - url = "https://plugins.dprint.dev/biome-0.10.4.wasm"; - version = "0.10.4"; + url = "https://plugins.dprint.dev/biome-0.10.5.wasm"; + version = "0.10.5"; } 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/em/emmylua-doc-cli/package.nix b/pkgs/by-name/em/emmylua-doc-cli/package.nix index 1d1ab9a96763..cbd96a27de53 100644 --- a/pkgs/by-name/em/emmylua-doc-cli/package.nix +++ b/pkgs/by-name/em/emmylua-doc-cli/package.nix @@ -6,18 +6,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "emmylua_doc_cli"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "EmmyLuaLs"; repo = "emmylua-analyzer-rust"; tag = finalAttrs.version; - hash = "sha256-UfsSsS+yXpWY1L2Wcgcj+JxS/LNr3BYhHq2JzUdxwqE="; + hash = "sha256-6mcVIOKsC+1cboZ8e23J0m2ed/2ohR0F3LfrM9UlaR4="; }; buildAndTestSubdir = "crates/emmylua_doc_cli"; - cargoHash = "sha256-rVTxAOQOngeJaP2SDfgeqOuoc2T8dEvlpe9gKfu5tas="; + cargoHash = "sha256-d6dhrib4mz7KmHo3EbkUXBPpjEGu35GeYNkpIrJrKJI="; nativeInstallCheckInputs = [ versionCheckHook 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/ep/epkowa/package.nix b/pkgs/by-name/ep/epkowa/package.nix index e0f1c2e5a65c..1f179ab71018 100644 --- a/pkgs/by-name/ep/epkowa/package.nix +++ b/pkgs/by-name/ep/epkowa/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + callPackages, fetchurl, fetchpatch, makeWrapper, @@ -12,11 +13,9 @@ libxslt, libusb-compat-0_1, sane-backends, - rpm, - cpio, getopt, - autoPatchelfHook, - gcc, + epkowa, + plugins ? epkowa.plugins, }: let common_meta = { @@ -25,492 +24,12 @@ let license = with lib.licenses; epson; platforms = with lib.platforms; linux; }; -in -############################ -# -# PLUGINS -# -############################ - -# adding a plugin for another printer shouldn't be too difficult, but you need the firmware to test... -let - plugins = { - v330 = stdenv.mkDerivation rec { - name = "iscan-v330-bundle"; - version = "2.30.4"; - - src = fetchurl { - # To find new versions, visit - # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for - # some printer like for instance "WF-7210" to get to the most recent - # version. - # NOTE: Don't forget to update the webarchive link too! - urls = [ - "https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz" - "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz" - ]; - sha256 = "056c04pfsf98nnknphg28l489isqb6y4l2c8g7wqhclwgj7m338i"; - }; - - nativeBuildInputs = [ - autoPatchelfHook - rpm - ]; - - installPhase = '' - ${rpm}/bin/rpm2cpio plugins/esci-interpreter-perfection-v330-*.x86_64.rpm | ${cpio}/bin/cpio -idmv - mkdir $out{,/share,/lib} - cp -r ./usr/share/{iscan-data,esci}/ $out/share/ - cp -r ./usr/lib64/esci $out/lib - ''; - - passthru = { - registrationCommand = '' - $registry --add interpreter usb 0x04b8 0x0142 "$plugin/lib/esci/libesci-interpreter-perfection-v330 $plugin/share/esci/esfwad.bin" - ''; - hw = "Perfection V330 Photo"; - }; - meta = common_meta // { - description = "Plugin to support " + passthru.hw + " scanner in sane"; - }; - }; - v370 = stdenv.mkDerivation rec { - name = "iscan-v370-bundle"; - version = "2.30.4"; - - src = fetchurl { - urls = [ - "https://download2.ebz.epson.net/iscan/plugin/perfection-v370/rpm/x64/iscan-perfection-v370-bundle-${version}.x64.rpm.tar.gz" - "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v370/rpm/x64/iscan-perfection-v370-bundle-${version}.x64.rpm.tar.gz" - ]; - sha256 = "1ff7adp9mha1i2ibllz540xkagpy8r757h4s3h60bgxbyzv2yggr"; - }; - - nativeBuildInputs = [ - autoPatchelfHook - rpm - ]; - - installPhase = '' - cd plugins - ${rpm}/bin/rpm2cpio iscan-plugin-perfection-v370-*.x86_64.rpm | ${cpio}/bin/cpio -idmv - - - mkdir -p $out/share $out/lib - cp -r usr/share/{iscan-data,iscan}/ $out/share - cp -r usr/lib64/iscan $out/lib - mv $out/share/iscan $out/share/esci - mv $out/lib/iscan $out/lib/esci - ''; - - passthru = { - registrationCommand = '' - $registry --add interpreter usb 0x04b8 0x014a "$plugin/lib/esci/libiscan-plugin-perfection-v370 $plugin/share/esci/esfwdd.bin" - ''; - hw = "Perfection V37/V370"; - }; - meta = common_meta // { - description = "Plugin to support " + passthru.hw + " scanner in sane"; - }; - }; - v550 = stdenv.mkDerivation rec { - pname = "iscan-perfection-v550-bundle"; - version = "2.30.4"; - - nativeBuildInputs = [ - autoPatchelfHook - rpm - ]; - src = fetchurl { - urls = [ - "https://download2.ebz.epson.net/iscan/plugin/perfection-v550/rpm/x64/iscan-perfection-v550-bundle-${version}.x64.rpm.tar.gz" - "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v550/rpm/x64/iscan-perfection-v550-bundle-${version}.x64.rpm.tar.gz" - ]; - sha256 = "f8b3abf21354fc5b9bc87753cef950b6c0f07bf322a94aaff2c163bafcf50cd9"; - }; - installPhase = '' - cd plugins - ${rpm}/bin/rpm2cpio iscan-plugin-perfection-v550-*.x86_64.rpm | ${cpio}/bin/cpio -idmv - mkdir $out - cp -r usr/share $out - cp -r usr/lib64 $out/lib - mv $out/share/iscan $out/share/esci - mv $out/lib/iscan $out/lib/esci - ''; - passthru = { - registrationCommand = '' - $registry --add interpreter usb 0x04b8 0x013b "$plugin/lib/esci/libiscan-plugin-perfection-v550 $plugin/share/esci/esfweb.bin" - ''; - hw = "Perfection V550 Photo"; - }; - meta = common_meta // { - description = "Plugin to support " + passthru.hw + " scanner in sane"; - }; - }; - v600 = stdenv.mkDerivation rec { - pname = "iscan-gt-x820-bundle"; - version = "2.30.4"; - - nativeBuildInputs = [ - autoPatchelfHook - rpm - ]; - src = fetchurl { - urls = [ - "https://download2.ebz.epson.net/iscan/plugin/gt-x820/rpm/x64/iscan-gt-x820-bundle-${version}.x64.rpm.tar.gz" - "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x820/rpm/x64/iscan-gt-x820-bundle-${version}.x64.rpm.tar.gz" - ]; - sha256 = "1vlba7dsgpk35nn3n7is8nwds3yzlk38q43mppjzwsz2d2n7sr33"; - }; - installPhase = '' - cd plugins - ${rpm}/bin/rpm2cpio iscan-plugin-gt-x820-*.x86_64.rpm | ${cpio}/bin/cpio -idmv - mkdir $out - cp -r usr/share $out - cp -r usr/lib64 $out/lib - mv $out/share/iscan $out/share/esci - mv $out/lib/iscan $out/lib/esci - ''; - passthru = { - registrationCommand = '' - $registry --add interpreter usb 0x04b8 0x013a "$plugin/lib/esci/libesintA1 $plugin/share/esci/esfwA1.bin" - ''; - hw = "Perfection V600 Photo"; - }; - meta = common_meta // { - description = "iscan esci x820 plugin for " + passthru.hw; - }; - }; - x770 = stdenv.mkDerivation rec { - pname = "iscan-gt-x770-bundle"; - version = "2.30.4"; - - nativeBuildInputs = [ - autoPatchelfHook - rpm - ]; - src = fetchurl { - urls = [ - "https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz" - "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz" - ]; - sha256 = "1chxdm6smv2d14pn2jl9xyd0vr42diy7vpskd3b9a61gf5h3gj03"; - }; - installPhase = '' - cd plugins - ${rpm}/bin/rpm2cpio iscan-plugin-gt-x770-*.x86_64.rpm | ${cpio}/bin/cpio -idmv - mkdir $out - cp -r usr/share $out - cp -r usr/lib64 $out/lib - mv $out/share/iscan $out/share/esci - mv $out/lib/iscan $out/lib/esci - ''; - passthru = { - registrationCommand = '' - $registry --add interpreter usb 0x04b8 0x0130 "$plugin/lib/esci/libesint7C $plugin/share/esci/esfw7C.bin" - ''; - hw = "Perfection V500 Photo"; - }; - meta = common_meta // { - description = "iscan esci x770 plugin for " + passthru.hw; - }; - }; - f720 = stdenv.mkDerivation rec { - pname = "iscan-gt-f720-bundle"; - version = "2.30.4"; - - nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ gcc.cc.lib ]; - src = fetchurl { - urls = [ - "https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz" - "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz" - ]; - sha256 = "1xnbmb2rn610kqpg1x6k1cc13zlmx2f3l2xnj6809rnhg96qqn20"; - }; - installPhase = '' - cd plugins - ${rpm}/bin/rpm2cpio esci-interpreter-gt-f720-*.x86_64.rpm | ${cpio}/bin/cpio -idmv - mkdir $out - cp -r usr/share $out - cp -r usr/lib64 $out/lib - ''; - - passthru = { - registrationCommand = '' - $registry --add interpreter usb 0x04b8 0x0131 "$plugin/lib/esci/libesci-interpreter-gt-f720 $plugin/share/esci/esfw8b.bin" - ''; - hw = "GT-F720, GT-S620, Perfection V30, Perfection V300 Photo"; - }; - - meta = common_meta // { - description = "iscan esci f720 plugin for " + passthru.hw; - }; - }; - s80 = stdenv.mkDerivation rec { - pname = "iscan-gt-s80-bundle"; - version = "2.30.4"; - - nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ - gcc.cc.lib - libtool - ]; - src = fetchurl { - urls = [ - "https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz" - "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz" - ]; - sha256 = "00qfdgs03k7bbs67zjrk8hbxvlyinsmk890amp9cmpfjfzdxgg58"; - }; - installPhase = '' - cd plugins - ${rpm}/bin/rpm2cpio esci-interpreter-gt-s80-*.x86_64.rpm | ${cpio}/bin/cpio -idmv - ${rpm}/bin/rpm2cpio iscan-plugin-esdip-*.x86_64.rpm | ${cpio}/bin/cpio -idmv - mkdir $out - cp -r usr/share $out - cp -r usr/lib64 $out/lib - mkdir $out/share/esci - ''; - - passthru = { - registrationCommand = '' - $registry --add interpreter usb 0x04b8 0x0136 "$plugin/lib/esci/libesci-interpreter-gt-s80.so" - $registry --add interpreter usb 0x04b8 0x0137 "$plugin/lib/esci/libesci-interpreter-gt-s50.so" - $registry --add interpreter usb 0x04b8 0x0143 "$plugin/lib/esci/libesci-interpreter-gt-s50.so" - $registry --add interpreter usb 0x04b8 0x0144 "$plugin/lib/esci/libesci-interpreter-gt-s80.so" - ''; - hw = "ES-D200, ED-D350, ES-D400, GT-S50, GT-S55, GT-S80, GT-S85"; - }; - - meta = common_meta // { - description = "iscan esci s80 plugin for " + passthru.hw; - }; - }; - s600 = stdenv.mkDerivation rec { - name = "iscan-gt-s600-bundle"; - version = "2.30.4"; - - src = fetchurl { - urls = [ - "https://download2.ebz.epson.net/iscan/plugin/gt-s600/rpm/x64/iscan-gt-s600-bundle-${version}.x64.rpm.tar.gz" - "https://web.archive.org/web/20240614120113/https://download2.ebz.epson.net/iscan/plugin/gt-s600/rpm/x64/iscan-gt-s600-bundle-${version}.x64.rpm.tar.gz" - ]; - sha256 = "fe1356b1d5c40bc5ac985a5693166efb9e5049a78b412f49c385eb503eadf2c6"; - }; - - nativeBuildInputs = [ - autoPatchelfHook - rpm - ]; - - installPhase = '' - cd plugins - ${rpm}/bin/rpm2cpio iscan-plugin-gt-s600-*.x86_64.rpm | ${cpio}/bin/cpio -idmv - mkdir $out - cp -r usr/share $out - cp -r usr/lib64 $out/lib - mv $out/share/iscan $out/share/esci - mv $out/lib/iscan $out/lib/esci - ''; - - passthru = { - registrationCommand = '' - $registry --add interpreter usb 0x04b8 0x012d "$plugin/lib/esci/libesint66 $plugin/share/esci/esfw66.bin" - ''; - hw = "GT-F650, GT-S600, Perfection V10, Perfection V100 Photo"; - }; - meta = common_meta // { - description = "iscan gt-s600 plugin for " + passthru.hw; - }; - }; - s650 = stdenv.mkDerivation rec { - name = "iscan-gt-s650-bundle"; - version = "2.30.4"; - - src = fetchurl { - urls = [ - "https://download2.ebz.epson.net/iscan/plugin/gt-s650/rpm/x64/iscan-gt-s650-bundle-${version}.x64.rpm.tar.gz" - "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-s650/rpm/x64/iscan-gt-s650-bundle-${version}.x64.rpm.tar.gz" - ]; - sha256 = "0fn4lz4g0a8l301v6yv7fwl37wgwhz5y90nf681f655xxc91hqh7"; - }; - - nativeBuildInputs = [ - autoPatchelfHook - rpm - ]; - - installPhase = '' - cd plugins - ${rpm}/bin/rpm2cpio iscan-plugin-gt-s650-*.x86_64.rpm | ${cpio}/bin/cpio -idmv - mkdir $out - cp -r usr/share $out - cp -r usr/lib64 $out/lib - mv $out/share/iscan $out/share/esci - mv $out/lib/iscan $out/lib/esci - ''; - - passthru = { - registrationCommand = '' - $registry --add interpreter usb 0x04b8 0x013c "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin" - $registry --add interpreter usb 0x04b8 0x013d "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin" - ''; - hw = "GT-S650, Perfection V19, Perfection V39"; - }; - meta = common_meta // { - description = "iscan GT-S650 for " + passthru.hw; - }; - }; - x750 = stdenv.mkDerivation rec { - name = "iscan-gt-x750-bundle"; - version = "2.30.4"; - - src = fetchurl { - urls = [ - "https://download2.ebz.epson.net/iscan/plugin/gt-x750/rpm/x64/iscan-gt-x750-bundle-${version}.x64.rpm.tar.gz" - "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x750/rpm/x64/iscan-gt-x750-bundle-${version}.x64.rpm.tar.gz" - ]; - sha256 = "sha256-9EeBHmh1nwSxnTnevPP8RZ4WBdyY+itR3VXo2I7f5N0="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - rpm - ]; - - installPhase = '' - cd plugins - ${rpm}/bin/rpm2cpio iscan-plugin-gt-x750-*.x86_64.rpm | ${cpio}/bin/cpio -idmv - mkdir $out - cp -r usr/share $out - cp -r usr/lib64 $out/lib - mv $out/share/iscan $out/share/esci - mv $out/lib/iscan $out/lib/esci - ''; - - passthru = { - registrationCommand = '' - $registry --add interpreter usb 0x04b8 0x0119 "$plugin/lib/esci/libesint54 $plugin/share/esci/esfw54.bin" - ''; - hw = "GT-X750, Perfection 4490"; - }; - meta = common_meta // { - description = "iscan GT-X750 for " + passthru.hw; - }; - }; - gt1500 = stdenv.mkDerivation rec { - name = "iscan-gt-1500-bundle"; - version = "2.30.4"; - - src = fetchurl { - urls = [ - "https://download2.ebz.epson.net/iscan/plugin/gt-1500/rpm/x64/iscan-gt-1500-bundle-${version}.x64.rpm.tar.gz" - "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-1500/rpm/x64/iscan-gt-1500-bundle-${version}.x64.rpm.tar.gz" - ]; - sha256 = "sha256-1rVsbBsb+QtCOT1FsyhgvCbZIN6IeQH7rZXNmsD7cl8="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - rpm - ]; - - installPhase = '' - cd plugins - ${rpm}/bin/rpm2cpio iscan-plugin-gt-1500-*.x86_64.rpm | ${cpio}/bin/cpio -idmv - mkdir $out - cp -r usr/share $out - cp -r usr/lib64 $out/lib - mv $out/share/iscan $out/share/esci - mv $out/lib/iscan $out/lib/esci - ''; - - passthru = { - registrationCommand = '' - $registry --add interpreter usb 0x04b8 0x0133 "$plugin/lib/esci/libesint86 $plugin/share/esci/esfw86.bin" - ''; - hw = "GT-1500"; - }; - meta = common_meta // { - description = "iscan GT-1500 for " + passthru.hw; - }; - }; - ds30 = stdenv.mkDerivation rec { - name = "iscan-ds-30-bundle"; - version = "2.30.4"; - - src = fetchurl { - urls = [ - "https://download2.ebz.epson.net/iscan/plugin/ds-30/rpm/x64/iscan-ds-30-bundle-${version}.x64.rpm.tar.gz" - "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/ds-30/rpm/x64/iscan-ds-30-bundle-${version}.x64.rpm.tar.gz" - ]; - sha256 = "0d5ef9b83999c56c14bd17ca63537f63ad4f0d70056870dc00888af1b36f4153"; - }; - - nativeBuildInputs = [ - autoPatchelfHook - rpm - ]; - - installPhase = '' - ${rpm}/bin/rpm2cpio plugins/iscan-plugin-ds-30-*.x86_64.rpm | ${cpio}/bin/cpio -idmv - mkdir $out - cp -r usr/share $out - cp -r usr/lib64 $out/lib - mv $out/lib/iscan $out/lib/esci - mkdir $out/share/esci - ''; - - passthru = { - registrationCommand = '' - $registry --add interpreter usb 0x04b8 0x0147 "$plugin/lib/esci/libiscan-plugin-ds-30.so" - ''; - hw = "DS-30"; - }; - meta = common_meta // { - description = "Plugin to support " + passthru.hw + " scanner in sane"; - }; - }; - network = stdenv.mkDerivation rec { - pname = "iscan-nt-bundle"; - # for the version, look for the driver of XP-750 in the search page - version = "2.30.4"; - - buildInputs = [ (lib.getLib stdenv.cc.cc) ]; - nativeBuildInputs = [ autoPatchelfHook ]; - - src = fetchurl { - urls = [ - "https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz" - "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz" - ]; - sha256 = "0jssigsgkxb9i7qa7db291a1gbvwl795i4ahvb7bnqp33czkj85k"; - }; - installPhase = '' - cd plugins - ${rpm}/bin/rpm2cpio iscan-network-nt-*.x86_64.rpm | ${cpio}/bin/cpio -idmv - - mkdir $out - cp -r usr/share $out - cp -r usr/lib64 $out/lib - mkdir $out/share/esci - ''; - passthru = { - registrationCommand = ""; - hw = "network"; - }; - - meta = common_meta // { - description = "iscan network plugin"; - }; - }; - }; + plugins' = lib.attrsets.filterAttrs (_: lib.isDerivation) plugins; in let fwdir = symlinkJoin { name = "esci-firmware-dir"; - paths = lib.mapAttrsToList (name: value: value + "/share/esci") plugins; + paths = lib.mapAttrsToList (name: value: value + "/share/esci") plugins'; }; in let @@ -588,7 +107,9 @@ stdenv.mkDerivation rec { echo "epkowa" > $out/etc/sane.d/dll.conf ln -s ${iscan-data}/share/iscan-data $out/share/iscan-data mkdir -p $out/lib/iscan - ln -s ${plugins.network}/lib/iscan/network $out/lib/iscan/network + '' + + lib.optionalString (plugins' ? network) '' + ln -s ${plugins'.network}/lib/iscan/network $out/lib/iscan/network ''; postFixup = '' # iscan-registry is a shell script requiring getopt @@ -599,15 +120,26 @@ stdenv.mkDerivation rec { lib.mapAttrsToList (name: value: '' plugin=${value}; ${value.passthru.registrationCommand} - '') plugins + '') plugins' ); + + passthru.plugins = callPackages ./plugins.nix { inherit common_meta; }; + meta = common_meta // { description = "sane-epkowa backend for some epson scanners"; longDescription = '' Includes gui-less iscan (aka. Image Scan! for Linux). Supported hardware: at least : '' - + lib.concatStringsSep ", " (lib.mapAttrsToList (name: value: value.passthru.hw) plugins); + + lib.concatStringsSep ", " (lib.mapAttrsToList (name: value: value.passthru.hw) plugins') + + '' + It is possible to only use a subset of the plugins by overriding the `plugins` input: + epkowa' = pkgs.epkowa.override { + plugins = { + inherit (pkgs.epkowa.plugins) x770; # Select correct plugins for your scanner here + }; + }; + ''; maintainers = with lib.maintainers; [ symphorien dominikh diff --git a/pkgs/by-name/ep/epkowa/plugins.nix b/pkgs/by-name/ep/epkowa/plugins.nix new file mode 100644 index 000000000000..0e854304a081 --- /dev/null +++ b/pkgs/by-name/ep/epkowa/plugins.nix @@ -0,0 +1,485 @@ +{ + lib, + stdenv, + fetchurl, + autoPatchelfHook, + rpm, + cpio, + gcc, + libtool, + common_meta, +}: + +# adding a plugin for another printer shouldn't be too difficult, but you need the firmware to test... +{ + v330 = stdenv.mkDerivation rec { + name = "iscan-v330-bundle"; + version = "2.30.4"; + + src = fetchurl { + # To find new versions, visit + # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for + # some printer like for instance "WF-7210" to get to the most recent + # version. + # NOTE: Don't forget to update the webarchive link too! + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "056c04pfsf98nnknphg28l489isqb6y4l2c8g7wqhclwgj7m338i"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + rpm + ]; + + installPhase = '' + ${rpm}/bin/rpm2cpio plugins/esci-interpreter-perfection-v330-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out{,/share,/lib} + cp -r ./usr/share/{iscan-data,esci}/ $out/share/ + cp -r ./usr/lib64/esci $out/lib + ''; + + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x0142 "$plugin/lib/esci/libesci-interpreter-perfection-v330 $plugin/share/esci/esfwad.bin" + ''; + hw = "Perfection V330 Photo"; + }; + meta = common_meta // { + description = "Plugin to support " + passthru.hw + " scanner in sane"; + }; + }; + v370 = stdenv.mkDerivation rec { + name = "iscan-v370-bundle"; + version = "2.30.4"; + + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/perfection-v370/rpm/x64/iscan-perfection-v370-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v370/rpm/x64/iscan-perfection-v370-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "1ff7adp9mha1i2ibllz540xkagpy8r757h4s3h60bgxbyzv2yggr"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + rpm + ]; + + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-plugin-perfection-v370-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + + + mkdir -p $out/share $out/lib + cp -r usr/share/{iscan-data,iscan}/ $out/share + cp -r usr/lib64/iscan $out/lib + mv $out/share/iscan $out/share/esci + mv $out/lib/iscan $out/lib/esci + ''; + + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x014a "$plugin/lib/esci/libiscan-plugin-perfection-v370 $plugin/share/esci/esfwdd.bin" + ''; + hw = "Perfection V37/V370"; + }; + meta = common_meta // { + description = "Plugin to support " + passthru.hw + " scanner in sane"; + }; + }; + v550 = stdenv.mkDerivation rec { + pname = "iscan-perfection-v550-bundle"; + version = "2.30.4"; + + nativeBuildInputs = [ + autoPatchelfHook + rpm + ]; + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/perfection-v550/rpm/x64/iscan-perfection-v550-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v550/rpm/x64/iscan-perfection-v550-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "f8b3abf21354fc5b9bc87753cef950b6c0f07bf322a94aaff2c163bafcf50cd9"; + }; + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-plugin-perfection-v550-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mv $out/share/iscan $out/share/esci + mv $out/lib/iscan $out/lib/esci + ''; + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x013b "$plugin/lib/esci/libiscan-plugin-perfection-v550 $plugin/share/esci/esfweb.bin" + ''; + hw = "Perfection V550 Photo"; + }; + meta = common_meta // { + description = "Plugin to support " + passthru.hw + " scanner in sane"; + }; + }; + v600 = stdenv.mkDerivation rec { + pname = "iscan-gt-x820-bundle"; + version = "2.30.4"; + + nativeBuildInputs = [ + autoPatchelfHook + rpm + ]; + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/gt-x820/rpm/x64/iscan-gt-x820-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x820/rpm/x64/iscan-gt-x820-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "1vlba7dsgpk35nn3n7is8nwds3yzlk38q43mppjzwsz2d2n7sr33"; + }; + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-plugin-gt-x820-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mv $out/share/iscan $out/share/esci + mv $out/lib/iscan $out/lib/esci + ''; + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x013a "$plugin/lib/esci/libesintA1 $plugin/share/esci/esfwA1.bin" + ''; + hw = "Perfection V600 Photo"; + }; + meta = common_meta // { + description = "iscan esci x820 plugin for " + passthru.hw; + }; + }; + x770 = stdenv.mkDerivation rec { + pname = "iscan-gt-x770-bundle"; + version = "2.30.4"; + + nativeBuildInputs = [ + autoPatchelfHook + rpm + ]; + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "1chxdm6smv2d14pn2jl9xyd0vr42diy7vpskd3b9a61gf5h3gj03"; + }; + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-plugin-gt-x770-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mv $out/share/iscan $out/share/esci + mv $out/lib/iscan $out/lib/esci + ''; + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x0130 "$plugin/lib/esci/libesint7C $plugin/share/esci/esfw7C.bin" + ''; + hw = "Perfection V500 Photo"; + }; + meta = common_meta // { + description = "iscan esci x770 plugin for " + passthru.hw; + }; + }; + f720 = stdenv.mkDerivation rec { + pname = "iscan-gt-f720-bundle"; + version = "2.30.4"; + + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ gcc.cc.lib ]; + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "1xnbmb2rn610kqpg1x6k1cc13zlmx2f3l2xnj6809rnhg96qqn20"; + }; + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio esci-interpreter-gt-f720-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + ''; + + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x0131 "$plugin/lib/esci/libesci-interpreter-gt-f720 $plugin/share/esci/esfw8b.bin" + ''; + hw = "GT-F720, GT-S620, Perfection V30, Perfection V300 Photo"; + }; + + meta = common_meta // { + description = "iscan esci f720 plugin for " + passthru.hw; + }; + }; + s80 = stdenv.mkDerivation rec { + pname = "iscan-gt-s80-bundle"; + version = "2.30.4"; + + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ + gcc.cc.lib + libtool + ]; + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "00qfdgs03k7bbs67zjrk8hbxvlyinsmk890amp9cmpfjfzdxgg58"; + }; + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio esci-interpreter-gt-s80-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + ${rpm}/bin/rpm2cpio iscan-plugin-esdip-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mkdir $out/share/esci + ''; + + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x0136 "$plugin/lib/esci/libesci-interpreter-gt-s80.so" + $registry --add interpreter usb 0x04b8 0x0137 "$plugin/lib/esci/libesci-interpreter-gt-s50.so" + $registry --add interpreter usb 0x04b8 0x0143 "$plugin/lib/esci/libesci-interpreter-gt-s50.so" + $registry --add interpreter usb 0x04b8 0x0144 "$plugin/lib/esci/libesci-interpreter-gt-s80.so" + ''; + hw = "ES-D200, ED-D350, ES-D400, GT-S50, GT-S55, GT-S80, GT-S85"; + }; + + meta = common_meta // { + description = "iscan esci s80 plugin for " + passthru.hw; + }; + }; + s600 = stdenv.mkDerivation rec { + name = "iscan-gt-s600-bundle"; + version = "2.30.4"; + + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/gt-s600/rpm/x64/iscan-gt-s600-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/20240614120113/https://download2.ebz.epson.net/iscan/plugin/gt-s600/rpm/x64/iscan-gt-s600-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "fe1356b1d5c40bc5ac985a5693166efb9e5049a78b412f49c385eb503eadf2c6"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + rpm + ]; + + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-plugin-gt-s600-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mv $out/share/iscan $out/share/esci + mv $out/lib/iscan $out/lib/esci + ''; + + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x012d "$plugin/lib/esci/libesint66 $plugin/share/esci/esfw66.bin" + ''; + hw = "GT-F650, GT-S600, Perfection V10, Perfection V100 Photo"; + }; + meta = common_meta // { + description = "iscan gt-s600 plugin for " + passthru.hw; + }; + }; + s650 = stdenv.mkDerivation rec { + name = "iscan-gt-s650-bundle"; + version = "2.30.4"; + + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/gt-s650/rpm/x64/iscan-gt-s650-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-s650/rpm/x64/iscan-gt-s650-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "0fn4lz4g0a8l301v6yv7fwl37wgwhz5y90nf681f655xxc91hqh7"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + rpm + ]; + + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-plugin-gt-s650-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mv $out/share/iscan $out/share/esci + mv $out/lib/iscan $out/lib/esci + ''; + + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x013c "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin" + $registry --add interpreter usb 0x04b8 0x013d "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin" + ''; + hw = "GT-S650, Perfection V19, Perfection V39"; + }; + meta = common_meta // { + description = "iscan GT-S650 for " + passthru.hw; + }; + }; + x750 = stdenv.mkDerivation rec { + name = "iscan-gt-x750-bundle"; + version = "2.30.4"; + + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/gt-x750/rpm/x64/iscan-gt-x750-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x750/rpm/x64/iscan-gt-x750-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "sha256-9EeBHmh1nwSxnTnevPP8RZ4WBdyY+itR3VXo2I7f5N0="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + rpm + ]; + + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-plugin-gt-x750-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mv $out/share/iscan $out/share/esci + mv $out/lib/iscan $out/lib/esci + ''; + + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x0119 "$plugin/lib/esci/libesint54 $plugin/share/esci/esfw54.bin" + ''; + hw = "GT-X750, Perfection 4490"; + }; + meta = common_meta // { + description = "iscan GT-X750 for " + passthru.hw; + }; + }; + gt1500 = stdenv.mkDerivation rec { + name = "iscan-gt-1500-bundle"; + version = "2.30.4"; + + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/gt-1500/rpm/x64/iscan-gt-1500-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-1500/rpm/x64/iscan-gt-1500-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "sha256-1rVsbBsb+QtCOT1FsyhgvCbZIN6IeQH7rZXNmsD7cl8="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + rpm + ]; + + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-plugin-gt-1500-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mv $out/share/iscan $out/share/esci + mv $out/lib/iscan $out/lib/esci + ''; + + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x0133 "$plugin/lib/esci/libesint86 $plugin/share/esci/esfw86.bin" + ''; + hw = "GT-1500"; + }; + meta = common_meta // { + description = "iscan GT-1500 for " + passthru.hw; + }; + }; + ds30 = stdenv.mkDerivation rec { + name = "iscan-ds-30-bundle"; + version = "2.30.4"; + + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/ds-30/rpm/x64/iscan-ds-30-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/ds-30/rpm/x64/iscan-ds-30-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "0d5ef9b83999c56c14bd17ca63537f63ad4f0d70056870dc00888af1b36f4153"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + rpm + ]; + + installPhase = '' + ${rpm}/bin/rpm2cpio plugins/iscan-plugin-ds-30-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mv $out/lib/iscan $out/lib/esci + mkdir $out/share/esci + ''; + + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x0147 "$plugin/lib/esci/libiscan-plugin-ds-30.so" + ''; + hw = "DS-30"; + }; + meta = common_meta // { + description = "Plugin to support " + passthru.hw + " scanner in sane"; + }; + }; + network = stdenv.mkDerivation rec { + pname = "iscan-nt-bundle"; + # for the version, look for the driver of XP-750 in the search page + version = "2.30.4"; + + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; + nativeBuildInputs = [ autoPatchelfHook ]; + + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "0jssigsgkxb9i7qa7db291a1gbvwl795i4ahvb7bnqp33czkj85k"; + }; + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-network-nt-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mkdir $out/share/esci + ''; + passthru = { + registrationCommand = ""; + hw = "network"; + }; + + meta = common_meta // { + description = "iscan network plugin"; + }; + }; +} diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix index 810c6e30404b..b2147ac05b47 100644 --- a/pkgs/by-name/eq/equicord/package.nix +++ b/pkgs/by-name/eq/equicord/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { # the Equicord repository. Dates as tags (and automatic releases) were the compromise # we came to with upstream. Please do not change the version schema (e.g., to semver) # unless upstream changes the tag schema from dates. - version = "2025-10-12"; + version = "2025-10-18"; src = fetchFromGitHub { owner = "Equicord"; repo = "Equicord"; tag = "${finalAttrs.version}"; - hash = "sha256-SH8zRLBmglsSFAg0kNmab2BV+Hx2ZCl/wd3KptUWezY="; + hash = "sha256-OTndJGxnr7Laf7So0vmSP+8OuyFDVV4xXi8tkuSR3U0="; }; pnpmDeps = pnpm_10.fetchDeps { diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index 293b9a702dc3..164d25db9891 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -59,13 +59,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.53.0"; + version = "2.54.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; tag = finalAttrs.version; - hash = "sha256-Cq6Nq7UpeW7MFi6VjsWmU2M3FjzDiAyhwnl4yTQFRnA="; + hash = "sha256-HU+OqaLuepx89lSBwOTJYS5nq8d19AhzAaUXwlpEhUc="; }; outputs = [ diff --git a/pkgs/by-name/fi/filezilla/package.nix b/pkgs/by-name/fi/filezilla/package.nix index 82906428ea9a..6f481421e95d 100644 --- a/pkgs/by-name/fi/filezilla/package.nix +++ b/pkgs/by-name/fi/filezilla/package.nix @@ -22,12 +22,12 @@ stdenv.mkDerivation { pname = "filezilla"; - version = "3.68.1"; + version = "3.69.3"; src = fetchsvn { url = "https://svn.filezilla-project.org/svn/FileZilla3/trunk"; - rev = "11205"; - hash = "sha256-izaNfagJYUcPRPihZ1yXwLUTHunzVXuiMITW69KPSFE="; + rev = "11309"; + hash = "sha256-+wvdQnsYUsLS4pHoa3JVzkgTVxbeck/c7IaDt0VqU+8="; }; configureFlags = [ @@ -70,6 +70,9 @@ stdenv.mkDerivation { ''; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ + pSub + iedame + ]; }; } diff --git a/pkgs/by-name/fi/firezone-headless-client/package.nix b/pkgs/by-name/fi/firezone-headless-client/package.nix index 04005009e9c8..b141c4e925c4 100644 --- a/pkgs/by-name/fi/firezone-headless-client/package.nix +++ b/pkgs/by-name/fi/firezone-headless-client/package.nix @@ -6,15 +6,15 @@ }: rustPlatform.buildRustPackage rec { pname = "firezone-headless-client"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "firezone"; repo = "firezone"; tag = "headless-client-${version}"; - hash = "sha256-Tu0Bq/Axj05dCRCd1eB7CiOXQ5n4i8hnE3ZiGCQ5ZdY="; + hash = "sha256-dVqZs5Xie9lc3F6wVMdxRHeoM7y/e9TvwjzfikenQ6w="; }; - cargoHash = "sha256-wlf+TtrRG7hHNav7WqLn2DSX9QkKFVzyiKP5CRdXlNY="; + cargoHash = "sha256-J2IqqFBuoTkbO0nMJbY680G2HTAtC1To/nMra2PCopY="; sourceRoot = "${src.name}/rust"; buildAndTestSubdir = "headless-client"; RUSTFLAGS = "--cfg system_certs"; diff --git a/pkgs/by-name/fn/fna3d/package.nix b/pkgs/by-name/fn/fna3d/package.nix index b2b5330515b6..dc63bb22113e 100644 --- a/pkgs/by-name/fn/fna3d/package.nix +++ b/pkgs/by-name/fn/fna3d/package.nix @@ -4,36 +4,33 @@ fetchFromGitHub, cmake, SDL2, + sdl3, + useSDL3 ? false, }: + stdenv.mkDerivation rec { pname = "fna3d"; - version = "25.02"; + version = "25.10"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FNA3D"; tag = version; fetchSubmodules = true; - hash = "sha256-0rRwIbOciPepo+ApvJiK5IyhMdq/4jsMlCSv0UeDETs="; + hash = "sha256-Hbj1GGKSFaP2C7V0II6x6euxRDc/BYSK00cVsFMKGEw="; }; - buildInputs = [ SDL2 ]; + cmakeFlags = [ + (lib.cmakeBool "BUILD_SDL3" useSDL3) + ]; + buildInputs = if useSDL3 then [ sdl3 ] else [ SDL2 ]; nativeBuildInputs = [ cmake ]; - installPhase = '' - runHook preInstall - install -Dm755 libFNA3D.so $out/lib/libFNA3D.so - ln -s libFNA3D.so $out/lib/libFNA3D.so.0 - ln -s libFNA3D.so $out/lib/libFNA3D.so.0.${version} - runHook postInstall - ''; - meta = { description = "Accuracy-focused XNA4 reimplementation for open platforms"; homepage = "https://fna-xna.github.io/"; - license = lib.licenses.mspl; + license = lib.licenses.zlib; platforms = lib.platforms.linux; - mainProgram = "fna3d"; maintainers = with lib.maintainers; [ mrtnvgr ]; }; } diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix index cd4432b931fa..1f182654142c 100644 --- a/pkgs/by-name/fr/fractal/package.nix +++ b/pkgs/by-name/fr/fractal/package.nix @@ -15,6 +15,7 @@ gtksourceview5, lcms2, libadwaita, + libglycin, gst_all_1, desktop-file-utils, appstream-glib, @@ -62,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { # We should eventually use a cargo vendor patch hook instead preConfigure = '' pushd ../$(stripHash $cargoDeps)/glycin-2.* - patch -p3 < ${glycin-loaders.passthru.glycinPathsPatch} + patch -p3 < ${libglycin.passthru.glycinPathsPatch} popd ''; diff --git a/pkgs/by-name/fr/freifunk-meshviewer/package.nix b/pkgs/by-name/fr/freifunk-meshviewer/package.nix new file mode 100644 index 000000000000..7f976504e88f --- /dev/null +++ b/pkgs/by-name/fr/freifunk-meshviewer/package.nix @@ -0,0 +1,35 @@ +{ + buildNpmPackage, + fetchFromGitHub, + lib, +}: + +buildNpmPackage (finalAttrs: { + pname = "freifunk-meshviewer"; + + version = "12.6.0"; + + src = fetchFromGitHub { + owner = "freifunk"; + repo = "meshviewer"; + tag = "v${finalAttrs.version}"; + sha256 = "sha256-h+0f6RwJip3V7XJ8q8eEov2k09wNwdHOJgR2XUZqkgw="; + }; + + npmDepsHash = "sha256-QgUEoUF2qEtplx2YaMO81g9cY7a+oXCX5dF6V54waD8="; + + installPhase = '' + mkdir -p $out/share/freifunk-meshviewer/ + cp -r build/* $out/share/freifunk-meshviewer/ + ''; + + meta = { + homepage = "https://github.com/freifunk/meshviewer"; + changelog = "https://github.com/freifunk/meshviewer/releases/tag/v${finalAttrs.version}"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + felixsinger + ]; + license = lib.licenses.agpl3Only; + }; +}) 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/ge/geomcpp/package.nix b/pkgs/by-name/ge/geomcpp/package.nix new file mode 100644 index 000000000000..8b6f70498e80 --- /dev/null +++ b/pkgs/by-name/ge/geomcpp/package.nix @@ -0,0 +1,47 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + glm, + gtest, + tinycmmc, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "geomcpp"; + version = "0.0.0-unstable-2025-06-11"; + + src = fetchFromGitHub { + owner = "Grumbel"; + repo = "geomcpp"; + rev = "282e3710fbe6dacee630391e4af8ffe03181f8a9"; + sha256 = "sha256-M4a6P6J/PBDklpOiR81Nah0STlXFI48+mQkNqMBicKQ="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + gtest + tinycmmc + ]; + propagatedBuildInputs = [ glm ]; + + cmakeFlags = [ + "-DWARNINGS=ON" + "-DWERROR=ON" + "-DBUILD_TESTS=ON" + ]; + + doCheck = true; + + postPatch = '' + echo $version > VERSION + ''; + + meta = { + description = "Collection of point, size and rect classes"; + maintainers = [ lib.maintainers.SchweGELBin ]; + platforms = lib.platforms.linux; + license = lib.licenses.free; + }; +}) 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/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix index 33b42d89cc49..d42d4d3f82eb 100644 --- a/pkgs/by-name/gi/gitify/package.nix +++ b/pkgs/by-name/gi/gitify/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gitify"; - version = "6.9.1"; + version = "6.10.0"; src = fetchFromGitHub { owner = "gitify-app"; repo = "gitify"; tag = "v${finalAttrs.version}"; - hash = "sha256-Bd2Yy2wpO0ksAv3O19QhKFSbX+QjFaYZ4iE1b7lc6VI="; + hash = "sha256-bTkKZc3KlclUO0XFUT1lRjPsL9AGg5u4w+8AfOXG7ao="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-/iNKeHjVQhkpm0lXZ6WBcm5Y0HOktsMQR1G4KEHYJCE="; + hash = "sha256-Ol8/SSVJ4RXLK1F9cztQODkq+zAxJtbKyPzMVBjluLY="; }; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index 0671c642a9f5..6eb10676c64d 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "glab"; - version = "1.73.0"; + version = "1.74.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-2beWB7QD2oeGZIjDWxKyqZLGzNJKWlRuqA1h7GRu1G4="; + hash = "sha256-4nQg7wb3+nc9Pxdf9ys8aMzSgF6boNzri+MmtDLS5jE="; leaveDotGit = true; postFetch = '' cd "$out" @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { ''; }; - vendorHash = "sha256-pQK3cRNxvGm+NH4zBlw8jm+fPgSg65FIe7zxZ99jl5Q="; + vendorHash = "sha256-htb/LAX3SOZEDHTYcu9WRcAkuY+fUMolODYfGE3qihY="; ldflags = [ "-s" 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/gl/glycin-loaders/package.nix b/pkgs/by-name/gl/glycin-loaders/package.nix index a3588b6628a9..b8df7fcaba32 100644 --- a/pkgs/by-name/gl/glycin-loaders/package.nix +++ b/pkgs/by-name/gl/glycin-loaders/package.nix @@ -2,8 +2,6 @@ stdenv, lib, fetchurl, - replaceVars, - bubblewrap, cairo, cargo, gettext, @@ -32,14 +30,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-OAqv4r+07KDEW0JmDr/0SWANAKQ7YJ1bHIP3lfXI+zw="; }; - patches = [ - # Fix paths in glycin library. - # Not actually needed for this package since we are only building loaders - # and this patch is relevant just to apps that use the loaders - # but apply it here to ensure the patch continues to apply. - finalAttrs.passthru.glycinPathsPatch - ]; - cargoVendorDir = "vendor"; nativeBuildInputs = [ @@ -84,10 +74,6 @@ stdenv.mkDerivation (finalAttrs: { attrPath = "glycin-loaders"; packageName = "glycin"; }; - - glycinPathsPatch = replaceVars ./fix-glycin-paths.patch { - bwrap = "${bubblewrap}/bin/bwrap"; - }; }; meta = with lib; { 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/go-critic/package.nix b/pkgs/by-name/go/go-critic/package.nix index 051978678183..766ada2c9437 100644 --- a/pkgs/by-name/go/go-critic/package.nix +++ b/pkgs/by-name/go/go-critic/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "go-critic"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "go-critic"; repo = "go-critic"; rev = "v${finalAttrs.version}"; - hash = "sha256-0AOhq7OhSHub4I6XXL018hg6i2ERkIbZCrO9osNjvHw="; + hash = "sha256-dTUjcGULG/47FogLQbFkge66v5/V6WbJDx5eJiSPQOs="; }; - vendorHash = "sha256-yTm5Hhqbk1aJ4ZAR+ie2NnDOAGpjijUKQxZW3Tp9bs8="; + vendorHash = "sha256-3iLJiwW/VgmWpK5sGYkIyz7V2XGnsNcCd7kwz7ctRX4="; subPackages = [ "cmd/gocritic" diff --git a/pkgs/by-name/go/gocheat/package.nix b/pkgs/by-name/go/gocheat/package.nix new file mode 100644 index 000000000000..2812b11318c7 --- /dev/null +++ b/pkgs/by-name/go/gocheat/package.nix @@ -0,0 +1,35 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule (finalAttrs: { + pname = "gocheat"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "Achno"; + repo = "gocheat"; + tag = "v${finalAttrs.version}"; + hash = "sha256-9Xw1GVfqk0Se8pLx3vzqR+f9GgX4LDo/H3iq1fzoTRs="; + }; + + vendorHash = "sha256-CByVf4+WWUlFGJcqt7aq5bHXiLMjdHTKvv6PQYEbLqc="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "TUI Cheatsheet for keybindings, hotkeys and more"; + homepage = "https://github.com/Achno/gocheat"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + adamperkowski + sebaguardian + ]; + mainProgram = "gocheat"; + }; +}) 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/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 8eec731135f6..a73f5a770eef 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0-rolling-2025-09-24"; + version = "2.3.0-rolling-2025-10-17"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "74012bb501f14e61e5ecc1e9860bd66ba6789e0d"; - hash = "sha256-zEibiI3BdhaTty5vZ3PPXTbHIRLsE2iUiwI6hRZfy8A="; + rev = "562d7bd089173da03e71bc4c0824468751c5b411"; + hash = "sha256-/P4S8ng1kQPPHNSNuqgLasu2c2Y9BD2Y9v0hlMiPCIM="; }; outputs = [ 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/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix index d019d9d5a5b0..b949294ee968 100644 --- a/pkgs/by-name/hy/hyprutils/package.nix +++ b/pkgs/by-name/hy/hyprutils/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprutils"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprutils"; tag = "v${finalAttrs.version}"; - hash = "sha256-FWB9Xe9iIMlUskfLzKlYH3scvnHpSC5rMyN1EDHUQmE="; + hash = "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A="; }; nativeBuildInputs = [ @@ -43,5 +43,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; platforms = lib.platforms.linux ++ lib.platforms.freebsd; teams = [ lib.teams.hyprland ]; + maintainers = with lib.maintainers; [ logger ]; }; }) 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/libfilezilla/package.nix b/pkgs/by-name/li/libfilezilla/package.nix index 0f2b1fc9619b..f9bb201a5a44 100644 --- a/pkgs/by-name/li/libfilezilla/package.nix +++ b/pkgs/by-name/li/libfilezilla/package.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation { pname = "libfilezilla"; - version = "0.49.0"; + version = "0.51.1"; src = fetchsvn { url = "https://svn.filezilla-project.org/svn/libfilezilla/trunk"; - rev = "11192"; - hash = "sha256-fm1cenGwYcPz0TtMzbPXrZA7nAzwo8toBNA9cW2Gnh0="; + rev = "11305"; + hash = "sha256-s+KeMlKJMz88lQ6d3dpcgZhCkcPW0cHNHALteMWLhpk="; }; nativeBuildInputs = [ @@ -42,7 +42,10 @@ stdenv.mkDerivation { homepage = "https://lib.filezilla-project.org/"; description = "Modern C++ library, offering some basic functionality to build high-performing, platform-independent programs"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ + pSub + iedame + ]; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/gl/glycin-loaders/fix-glycin-paths.patch b/pkgs/by-name/li/libglycin/fix-glycin-paths.patch similarity index 100% rename from pkgs/by-name/gl/glycin-loaders/fix-glycin-paths.patch rename to pkgs/by-name/li/libglycin/fix-glycin-paths.patch diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix index 220d59e878a1..74f78c18fa7a 100644 --- a/pkgs/by-name/li/libglycin/package.nix +++ b/pkgs/by-name/li/libglycin/package.nix @@ -15,6 +15,8 @@ gtk4, gobject-introspection, gnome, + replaceVars, + bubblewrap, common-updater-scripts, _experimental-update-script-combinators, buildPackages, @@ -72,6 +74,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonBool "capi_docs" withIntrospection) ]; + postPatch = '' + patch -p2 < ${finalAttrs.passthru.glycinPathsPatch} + ''; + passthru = { updateScript = let @@ -100,6 +106,10 @@ stdenv.mkDerivation (finalAttrs: { updateSource updateLockfile ]; + + glycinPathsPatch = replaceVars ./fix-glycin-paths.patch { + bwrap = "${bubblewrap}/bin/bwrap"; + }; }; meta = { @@ -111,6 +121,7 @@ stdenv.mkDerivation (finalAttrs: { lgpl21Plus ]; maintainers = with lib.maintainers; [ normalcea ]; + teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; pkgConfigModules = [ "glycin-1" 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/libosmoabis/package.nix b/pkgs/by-name/li/libosmoabis/package.nix index ad13ba6ad468..376ea6a18a69 100644 --- a/pkgs/by-name/li/libosmoabis/package.nix +++ b/pkgs/by-name/li/libosmoabis/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libosmoabis"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmo-abis"; rev = version; - hash = "sha256-TxK+r+GhqPjvFYA3AX3JXjRwhEyjoLcPTR1lpkgSlUo="; + hash = "sha256-OdmegQXdbpwNBepY+7MeUjaEguVo2q9b8lSkRmlXHEc="; }; configureFlags = [ "enable_dahdi=false" ]; diff --git a/pkgs/by-name/li/libosmocore/package.nix b/pkgs/by-name/li/libosmocore/package.nix index 4b21695d7546..334e153a7826 100644 --- a/pkgs/by-name/li/libosmocore/package.nix +++ b/pkgs/by-name/li/libosmocore/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libosmocore"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmocore"; rev = version; - hash = "sha256-JR1L2ffVqvhylrYWPnWKQ/iihx6in7B3iP6Mo0MHbpw="; + hash = "sha256-cEMPz5xmvaBnm+U7G1PttfhR6TXsT2PN2hk2FXHbXpg="; }; postPatch = '' 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/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix index b7a28602a8dc..60173444ec93 100644 --- a/pkgs/by-name/lo/lockbook/package.nix +++ b/pkgs/by-name/lo/lockbook/package.nix @@ -4,7 +4,12 @@ rustPlatform, fetchFromGitHub, installShellFiles, + nfs-utils ? null, # macOS doesn't need this + makeBinaryWrapper, }: +let + inherit (stdenv.hostPlatform) isLinux; +in rustPlatform.buildRustPackage rec { pname = "lockbook"; version = "25.10.13"; @@ -24,7 +29,16 @@ rustPlatform.buildRustPackage rec { "lockbook" ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ] + ++ lib.optionals isLinux [ makeBinaryWrapper ]; + + postFixup = lib.optionalString isLinux '' + wrapProgram $out/bin/lockbook \ + --prefix PATH : "${lib.makeBinPath [ nfs-utils ]}" + ''; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --bash --name lockbook.bash <($out/bin/lockbook completions bash) installShellCompletion --zsh --name _lockbook <($out/bin/lockbook completions zsh) diff --git a/pkgs/by-name/lo/logmich/package.nix b/pkgs/by-name/lo/logmich/package.nix new file mode 100644 index 000000000000..b334e503b549 --- /dev/null +++ b/pkgs/by-name/lo/logmich/package.nix @@ -0,0 +1,31 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + tinycmmc, + fmt, +}: + +stdenv.mkDerivation { + pname = "logmich"; + version = "0.1.0-unstable-2025-07-21"; + + src = fetchFromGitHub { + owner = "logmich"; + repo = "logmich"; + rev = "c73c7b7d6cd050d1bcc42d522ce80a2eb86da5c8"; + sha256 = "sha256-e8k/ZzPAfLgNF30wmXHDX5ovK/msTH6sgzxWKzZhtOY="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ tinycmmc ]; + propagatedBuildInputs = [ fmt ]; + + meta = { + description = "A trivial logging library"; + maintainers = [ lib.maintainers.SchweGELBin ]; + platforms = lib.platforms.linux; + license = lib.licenses.zlib; + }; +} diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix index cf5a039ba465..a43aae827f4a 100644 --- a/pkgs/by-name/lo/loupe/package.nix +++ b/pkgs/by-name/lo/loupe/package.nix @@ -15,6 +15,7 @@ libadwaita, libgweather, libseccomp, + libglycin, glycin-loaders, gnome, common-updater-scripts, @@ -67,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { # Dirty approach to add patches after cargoSetupPostUnpackHook # We should eventually use a cargo vendor patch hook instead pushd ../$(stripHash $cargoDeps)/glycin-2.* - patch -p3 < ${glycin-loaders.passthru.glycinPathsPatch} + patch -p3 < ${libglycin.passthru.glycinPathsPatch} popd ''; diff --git a/pkgs/by-name/m-/m-cli/package.nix b/pkgs/by-name/m-/m-cli/package.nix index 6d207a8606b6..340df4bf12e1 100644 --- a/pkgs/by-name/m-/m-cli/package.nix +++ b/pkgs/by-name/m-/m-cli/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "m-cli"; - version = "0.3.0"; + version = "2.0.5"; src = fetchFromGitHub { owner = "rgcr"; repo = "m-cli"; rev = "v${version}"; - sha256 = "sha256-KzlE1DdVMLnGmcOS1a2HK4pASofD1EHpdqbzVVIxeb4="; + sha256 = "sha256-41o7RoRlHwAmzSREDhQpq2Lchkz8QPxJRqN42ShUJb8="; }; dontBuild = true; @@ -24,16 +24,17 @@ stdenv.mkDerivation rec { gsub(/^\[ -L.*|^\s+\|\| pushd.*|^popd.*/, ""); gsub(/MPATH=.*/, "MPATH='$MPATH'"); gsub(/(update|uninstall)_mcli \&\&.*/, "echo NOOP \\&\\& exit 0"); + gsub(/get_version \&\&.*/, "echo m-cli version: ${version} \\&\\& exit 0"); print }' m - install -Dt "$MPATH/plugins" -m755 plugins/* + install -Dt "$out/bin/plugins" -m755 plugins/* install -Dm755 m $out/bin/m - install -Dt "$out/share/bash-completion/completions/" -m444 completion/bash/m - install -Dt "$out/share/fish/vendor_completions.d/" -m444 completion/fish/m.fish - install -Dt "$out/share/zsh/site-functions/" -m444 completion/zsh/_m + install -Dt "$out/share/bash-completion/completions/" -m444 completions/bash/m + install -Dt "$out/share/fish/vendor_completions.d/" -m444 completions/fish/m.fish + install -Dt "$out/share/zsh/site-functions/" -m444 completions/zsh/_m ''; meta = with lib; { 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/mi/mio/package.nix b/pkgs/by-name/mi/mio/package.nix new file mode 100644 index 000000000000..845408564c58 --- /dev/null +++ b/pkgs/by-name/mi/mio/package.nix @@ -0,0 +1,30 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mio"; + version = "unstable-2023-03-03"; + + src = fetchFromGitHub { + owner = "vimpunk"; + repo = "mio"; + rev = "8b6b7d878c89e81614d05edca7936de41ccdd2da"; + hash = "sha256-j/wbjyI2v/BsFz2RKi8ZxMKuT+7o5uI4I4yIkUran7I="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = { + description = "Cross-platform C++11 header-only library for memory mapped file IO"; + homepage = "https://github.com/vimpunk/mio"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.szanko ]; + platforms = lib.platforms.all; + }; +}) 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/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix index b804f38bec7f..07e8146bd060 100644 --- a/pkgs/by-name/na/naja/package.nix +++ b/pkgs/by-name/na/naja/package.nix @@ -17,13 +17,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "naja"; - version = "0.2.2"; + version = "0.2.12"; src = fetchFromGitHub { owner = "najaeda"; repo = "naja"; tag = "v${finalAttrs.version}"; - hash = "sha256-cm9MwN60R/K2bL4FWpvusFmb2ENYEYg8NcMVgmeTj0c="; + hash = "sha256-NqxgFAD/JHh1rgtuv/NTda5oEx79NgdafL3fDLJO2kU="; fetchSubmodules = true; }; @@ -39,11 +39,9 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace cmake/CMakeLists.txt \ --replace-fail 'DESTINATION cmake' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}/cmake' - # Fix install location for bne library & headers - # Remove when https://github.com/najaeda/naja/pull/278 merged & in release - substituteInPlace src/bne/CMakeLists.txt \ - --replace-fail 'LIBRARY DESTINATION lib' 'LIBRARY DESTINATION ''${CMAKE_INSTALL_LIBDIR}' \ - --replace-fail 'PUBLIC_HEADER DESTINATION include' 'PUBLIC_HEADER DESTINATION ''${CMAKE_INSTALL_INCLUDEDIR}' + substituteInPlace CMakeLists.txt --replace-fail \ + "cmake_minimum_required(VERSION 3.21)" \ + "cmake_minimum_required(VERSION 4.0)" '' # disable building tests for cross build + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' @@ -57,6 +55,12 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs --build test/test_utils/diff_files.py ''; + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals stdenv.cc.isClang [ + "-Wno-character-conversion" + ] + ); + strictDeps = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/na/nakama/package.nix b/pkgs/by-name/na/nakama/package.nix index 993d10579855..6ea82575b579 100644 --- a/pkgs/by-name/na/nakama/package.nix +++ b/pkgs/by-name/na/nakama/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "nakama"; - version = "3.32.0"; + version = "3.32.1"; src = fetchFromGitHub { owner = "heroiclabs"; repo = "nakama"; tag = "v${version}"; - hash = "sha256-Ly8NYqaJIC/ySPrCiEwwWR3+Zyk6dEW0r7SeyOS1CwE="; + hash = "sha256-guoKppChjT4f1IOM4Cxg6XZkJrYNVv9gwOTy57t7wDs="; }; vendorHash = null; 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/no/node-gyp/package-lock.json b/pkgs/by-name/no/node-gyp/package-lock.json index c5612067dc0d..8ec0df643c44 100644 --- a/pkgs/by-name/no/node-gyp/package-lock.json +++ b/pkgs/by-name/no/node-gyp/package-lock.json @@ -1,12 +1,12 @@ { "name": "node-gyp", - "version": "11.4.2", + "version": "11.5.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "node-gyp", - "version": "11.4.2", + "version": "11.5.0", "license": "MIT", "dependencies": { "env-paths": "^2.2.0", @@ -37,9 +37,9 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz", - "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz", + "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==", "dev": true, "license": "MIT", "dependencies": { @@ -79,13 +79,13 @@ } }, "node_modules/@eslint/config-array": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz", - "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==", + "version": "0.21.1", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz", + "integrity": "sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/object-schema": "^2.1.6", + "@eslint/object-schema": "^2.1.7", "debug": "^4.3.1", "minimatch": "^3.1.2" }, @@ -94,19 +94,22 @@ } }, "node_modules/@eslint/config-helpers": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.1.tgz", - "integrity": "sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.1.tgz", + "integrity": "sha512-csZAzkNhsgwb0I/UAV6/RGFTbiakPCf0ZrGmrIxQpYvGZ00PhTkSnyKNolphgIvmnJeGw6rcGVEXfTzUnFuEvw==", "dev": true, "license": "Apache-2.0", + "dependencies": { + "@eslint/core": "^0.16.0" + }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/@eslint/core": { - "version": "0.15.2", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz", - "integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==", + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.16.0.tgz", + "integrity": "sha512-nmC8/totwobIiFcGkDza3GIKfAw1+hLiYVrh3I1nIomQ8PEr5cxg34jnkmGawul/ep52wGRAcyeDCNtWKSOj4Q==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -141,9 +144,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.34.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.34.0.tgz", - "integrity": "sha512-EoyvqQnBNsV1CWaEJ559rxXL4c8V92gxirbawSmVUOWXlsRxxQXl6LmCpdUblgxgSkDIqKnhzba2SjRTI/A5Rw==", + "version": "9.38.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.38.0.tgz", + "integrity": "sha512-UZ1VpFvXf9J06YG9xQBdnzU+kthors6KjhMAl6f4gH4usHyh31rUf2DLGInT8RFYIReYXNSydgPY0V2LuWgl7A==", "dev": true, "license": "MIT", "engines": { @@ -154,9 +157,9 @@ } }, "node_modules/@eslint/object-schema": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz", - "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==", + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz", + "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==", "dev": true, "license": "Apache-2.0", "engines": { @@ -164,13 +167,13 @@ } }, "node_modules/@eslint/plugin-kit": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz", - "integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.0.tgz", + "integrity": "sha512-sB5uyeq+dwCWyPi31B2gQlVlo+j5brPlWx4yZBrEaRo/nhdDE8Xke1gsGgtiBdaBTxuTkceLVuVt/pclrasb0A==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/core": "^0.15.2", + "@eslint/core": "^0.16.0", "levn": "^0.4.1" }, "engines": { @@ -188,33 +191,19 @@ } }, "node_modules/@humanfs/node": { - "version": "0.16.6", - "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", - "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", + "version": "0.16.7", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz", + "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==", "dev": true, "license": "Apache-2.0", "dependencies": { "@humanfs/core": "^0.19.1", - "@humanwhocodes/retry": "^0.3.0" + "@humanwhocodes/retry": "^0.4.0" }, "engines": { "node": ">=18.18.0" } }, - "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", - "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=18.18" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, "node_modules/@humanwhocodes/gitignore-to-minimatch": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz", @@ -394,17 +383,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.41.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.41.0.tgz", - "integrity": "sha512-8fz6oa6wEKZrhXWro/S3n2eRJqlRcIa6SlDh59FXJ5Wp5XRZ8B9ixpJDcjadHq47hMx0u+HW6SNa6LjJQ6NLtw==", + "version": "8.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.46.1.tgz", + "integrity": "sha512-rUsLh8PXmBjdiPY+Emjz9NX2yHvhS11v0SR6xNJkm5GM1MO9ea/1GoDKlHHZGrOJclL/cZ2i/vRUYVtjRhrHVQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.41.0", - "@typescript-eslint/type-utils": "8.41.0", - "@typescript-eslint/utils": "8.41.0", - "@typescript-eslint/visitor-keys": "8.41.0", + "@typescript-eslint/scope-manager": "8.46.1", + "@typescript-eslint/type-utils": "8.46.1", + "@typescript-eslint/utils": "8.46.1", + "@typescript-eslint/visitor-keys": "8.46.1", "graphemer": "^1.4.0", "ignore": "^7.0.0", "natural-compare": "^1.4.0", @@ -418,7 +407,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.41.0", + "@typescript-eslint/parser": "^8.46.1", "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } @@ -434,16 +423,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.41.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.41.0.tgz", - "integrity": "sha512-gTtSdWX9xiMPA/7MV9STjJOOYtWwIJIYxkQxnSV1U3xcE+mnJSH3f6zI0RYP+ew66WSlZ5ed+h0VCxsvdC1jJg==", + "version": "8.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.46.1.tgz", + "integrity": "sha512-6JSSaBZmsKvEkbRUkf7Zj7dru/8ZCrJxAqArcLaVMee5907JdtEbKGsZ7zNiIm/UAkpGUkaSMZEXShnN2D1HZA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.41.0", - "@typescript-eslint/types": "8.41.0", - "@typescript-eslint/typescript-estree": "8.41.0", - "@typescript-eslint/visitor-keys": "8.41.0", + "@typescript-eslint/scope-manager": "8.46.1", + "@typescript-eslint/types": "8.46.1", + "@typescript-eslint/typescript-estree": "8.46.1", + "@typescript-eslint/visitor-keys": "8.46.1", "debug": "^4.3.4" }, "engines": { @@ -459,14 +448,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.41.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.41.0.tgz", - "integrity": "sha512-b8V9SdGBQzQdjJ/IO3eDifGpDBJfvrNTp2QD9P2BeqWTGrRibgfgIlBSw6z3b6R7dPzg752tOs4u/7yCLxksSQ==", + "version": "8.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.46.1.tgz", + "integrity": "sha512-FOIaFVMHzRskXr5J4Jp8lFVV0gz5ngv3RHmn+E4HYxSJ3DgDzU7fVI1/M7Ijh1zf6S7HIoaIOtln1H5y8V+9Zg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.41.0", - "@typescript-eslint/types": "^8.41.0", + "@typescript-eslint/tsconfig-utils": "^8.46.1", + "@typescript-eslint/types": "^8.46.1", "debug": "^4.3.4" }, "engines": { @@ -481,14 +470,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.41.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.41.0.tgz", - "integrity": "sha512-n6m05bXn/Cd6DZDGyrpXrELCPVaTnLdPToyhBoFkLIMznRUQUEQdSp96s/pcWSQdqOhrgR1mzJ+yItK7T+WPMQ==", + "version": "8.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.46.1.tgz", + "integrity": "sha512-weL9Gg3/5F0pVQKiF8eOXFZp8emqWzZsOJuWRUNtHT+UNV2xSJegmpCNQHy37aEQIbToTq7RHKhWvOsmbM680A==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.41.0", - "@typescript-eslint/visitor-keys": "8.41.0" + "@typescript-eslint/types": "8.46.1", + "@typescript-eslint/visitor-keys": "8.46.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -499,9 +488,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.41.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.41.0.tgz", - "integrity": "sha512-TDhxYFPUYRFxFhuU5hTIJk+auzM/wKvWgoNYOPcOf6i4ReYlOoYN8q1dV5kOTjNQNJgzWN3TUUQMtlLOcUgdUw==", + "version": "8.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.46.1.tgz", + "integrity": "sha512-X88+J/CwFvlJB+mK09VFqx5FE4H5cXD+H/Bdza2aEWkSb8hnWIQorNcscRl4IEo1Cz9VI/+/r/jnGWkbWPx54g==", "dev": true, "license": "MIT", "engines": { @@ -516,15 +505,15 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.41.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.41.0.tgz", - "integrity": "sha512-63qt1h91vg3KsjVVonFJWjgSK7pZHSQFKH6uwqxAH9bBrsyRhO6ONoKyXxyVBzG1lJnFAJcKAcxLS54N1ee1OQ==", + "version": "8.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.46.1.tgz", + "integrity": "sha512-+BlmiHIiqufBxkVnOtFwjah/vrkF4MtKKvpXrKSPLCkCtAp8H01/VV43sfqA98Od7nJpDcFnkwgyfQbOG0AMvw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.41.0", - "@typescript-eslint/typescript-estree": "8.41.0", - "@typescript-eslint/utils": "8.41.0", + "@typescript-eslint/types": "8.46.1", + "@typescript-eslint/typescript-estree": "8.46.1", + "@typescript-eslint/utils": "8.46.1", "debug": "^4.3.4", "ts-api-utils": "^2.1.0" }, @@ -541,9 +530,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.41.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.41.0.tgz", - "integrity": "sha512-9EwxsWdVqh42afLbHP90n2VdHaWU/oWgbH2P0CfcNfdKL7CuKpwMQGjwev56vWu9cSKU7FWSu6r9zck6CVfnag==", + "version": "8.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.46.1.tgz", + "integrity": "sha512-C+soprGBHwWBdkDpbaRC4paGBrkIXxVlNohadL5o0kfhsXqOC6GYH2S/Obmig+I0HTDl8wMaRySwrfrXVP8/pQ==", "dev": true, "license": "MIT", "engines": { @@ -555,16 +544,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.41.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.41.0.tgz", - "integrity": "sha512-D43UwUYJmGhuwHfY7MtNKRZMmfd8+p/eNSfFe6tH5mbVDto+VQCayeAt35rOx3Cs6wxD16DQtIKw/YXxt5E0UQ==", + "version": "8.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.46.1.tgz", + "integrity": "sha512-uIifjT4s8cQKFQ8ZBXXyoUODtRoAd7F7+G8MKmtzj17+1UbdzFl52AzRyZRyKqPHhgzvXunnSckVu36flGy8cg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.41.0", - "@typescript-eslint/tsconfig-utils": "8.41.0", - "@typescript-eslint/types": "8.41.0", - "@typescript-eslint/visitor-keys": "8.41.0", + "@typescript-eslint/project-service": "8.46.1", + "@typescript-eslint/tsconfig-utils": "8.46.1", + "@typescript-eslint/types": "8.46.1", + "@typescript-eslint/visitor-keys": "8.46.1", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -610,16 +599,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.41.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.41.0.tgz", - "integrity": "sha512-udbCVstxZ5jiPIXrdH+BZWnPatjlYwJuJkDA4Tbo3WyYLh8NvB+h/bKeSZHDOFKfphsZYJQqaFtLeXEqurQn1A==", + "version": "8.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.46.1.tgz", + "integrity": "sha512-vkYUy6LdZS7q1v/Gxb2Zs7zziuXN0wxqsetJdeZdRe/f5dwJFglmuvZBfTUivCtjH725C1jWCDfpadadD95EDQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.7.0", - "@typescript-eslint/scope-manager": "8.41.0", - "@typescript-eslint/types": "8.41.0", - "@typescript-eslint/typescript-estree": "8.41.0" + "@typescript-eslint/scope-manager": "8.46.1", + "@typescript-eslint/types": "8.46.1", + "@typescript-eslint/typescript-estree": "8.46.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -634,13 +623,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.41.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.41.0.tgz", - "integrity": "sha512-+GeGMebMCy0elMNg67LRNoVnUFPIm37iu5CmHESVx56/9Jsfdpsvbv605DQ81Pi/x11IdKUsS5nzgTYbCQU9fg==", + "version": "8.46.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.46.1.tgz", + "integrity": "sha512-ptkmIf2iDkNUjdeu2bQqhFPV1m6qTnFFjg7PPDjxKWaMaP0Z6I9l30Jr3g5QqbZGdw8YdYvLp+XnqnWWZOg/NA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.41.0", + "@typescript-eslint/types": "8.46.1", "eslint-visitor-keys": "^4.2.1" }, "engines": { @@ -710,9 +699,9 @@ } }, "node_modules/ansi-regex": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz", - "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", "license": "MIT", "engines": { "node": ">=12" @@ -1311,9 +1300,9 @@ } }, "node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -1673,25 +1662,24 @@ } }, "node_modules/eslint": { - "version": "9.34.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.34.0.tgz", - "integrity": "sha512-RNCHRX5EwdrESy3Jc9o8ie8Bog+PeYvvSR8sDGoZxNFTvZ4dlxUB3WzQ3bQMztFrSRODGrLLj8g6OFuGY/aiQg==", + "version": "9.38.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.38.0.tgz", + "integrity": "sha512-t5aPOpmtJcZcz5UJyY2GbvpDlsK5E8JqRqoKtfiKE3cNh437KIqfJr3A3AKf5k64NPx6d0G3dno6XDY05PqPtw==", "dev": true, "license": "MIT", "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.21.0", - "@eslint/config-helpers": "^0.3.1", - "@eslint/core": "^0.15.2", + "@eslint/config-array": "^0.21.1", + "@eslint/config-helpers": "^0.4.1", + "@eslint/core": "^0.16.0", "@eslint/eslintrc": "^3.3.1", - "@eslint/js": "9.34.0", - "@eslint/plugin-kit": "^0.3.5", + "@eslint/js": "9.38.0", + "@eslint/plugin-kit": "^0.4.0", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", - "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.6", @@ -1772,9 +1760,9 @@ } }, "node_modules/eslint-plugin-n": { - "version": "17.21.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.21.3.tgz", - "integrity": "sha512-MtxYjDZhMQgsWRm/4xYLL0i2EhusWT7itDxlJ80l1NND2AL2Vi5Mvneqv/ikG9+zpran0VsVRXTEHrpLmUZRNw==", + "version": "17.23.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.23.1.tgz", + "integrity": "sha512-68PealUpYoHOBh332JLLD9Sj7OQUDkFpmcfqt8R9sySfFSeuGJjMTJQvCRRB96zO3A/PELRLkPrzsHmzEFQQ5A==", "dev": true, "license": "MIT", "dependencies": { @@ -1968,9 +1956,9 @@ } }, "node_modules/exponential-backoff": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz", - "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.3.tgz", + "integrity": "sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA==", "license": "Apache-2.0" }, "node_modules/fast-deep-equal": { @@ -2217,6 +2205,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/generator-function": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/generator-function/-/generator-function-2.0.1.tgz", + "integrity": "sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -2285,9 +2283,9 @@ } }, "node_modules/get-tsconfig": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.1.tgz", - "integrity": "sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.12.0.tgz", + "integrity": "sha512-LScr2aNr2FbjAjZh2C6X6BxRx1/x+aTDExct/xyq2XKbYOiG5c0aK7pMsSuyc0brz3ibr/lbQiHD9jzt4lccJw==", "dev": true, "license": "MIT", "dependencies": { @@ -2797,14 +2795,15 @@ } }, "node_modules/is-generator-function": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz", - "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.2.tgz", + "integrity": "sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==", "dev": true, "license": "MIT", "dependencies": { - "call-bound": "^1.0.3", - "get-proto": "^1.0.0", + "call-bound": "^1.0.4", + "generator-function": "^2.0.0", + "get-proto": "^1.0.1", "has-tostringtag": "^1.0.2", "safe-regex-test": "^1.1.0" }, @@ -2881,6 +2880,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/is-plain-obj": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", @@ -3449,9 +3458,9 @@ "license": "ISC" }, "node_modules/minizlib": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz", - "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz", + "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==", "license": "MIT", "dependencies": { "minipass": "^7.1.2" @@ -3460,25 +3469,10 @@ "node": ">= 18" } }, - "node_modules/mkdirp": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", - "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==", - "license": "MIT", - "bin": { - "mkdirp": "dist/cjs/src/bin.js" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/mocha": { - "version": "11.7.1", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.1.tgz", - "integrity": "sha512-5EK+Cty6KheMS/YLPPMJC64g5V61gIR25KsRItHw6x4hEKT6Njp1n9LOlH4gpevuwMVS66SXaBBpg+RWZkza4A==", + "version": "11.7.4", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.4.tgz", + "integrity": "sha512-1jYAaY8x0kAZ0XszLWu14pzsf4KV740Gld4HXkhNTXwcHx4AUEDkPzgEHg9CM5dVcW+zv036tjpsEbLraPJj4w==", "dev": true, "license": "MIT", "dependencies": { @@ -3490,6 +3484,7 @@ "find-up": "^5.0.0", "glob": "^10.4.5", "he": "^1.2.0", + "is-path-inside": "^3.0.3", "js-yaml": "^4.1.0", "log-symbols": "^4.1.0", "minimatch": "^9.0.5", @@ -4261,9 +4256,9 @@ "optional": true }, "node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "version": "7.7.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", + "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -4662,9 +4657,9 @@ } }, "node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", + "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", "license": "MIT", "dependencies": { "ansi-regex": "^6.0.1" @@ -4738,9 +4733,9 @@ } }, "node_modules/tapable": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.3.tgz", - "integrity": "sha512-ZL6DDuAlRlLGghwcfmSn9sK3Hr6ArtyudlSAiCqQ6IfE+b+HHbydbYDIG15IfS5do+7XQQBdBiubF/cV2dnDzg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz", + "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==", "dev": true, "license": "MIT", "engines": { @@ -4752,16 +4747,15 @@ } }, "node_modules/tar": { - "version": "7.4.3", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz", - "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==", + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.1.tgz", + "integrity": "sha512-nlGpxf+hv0v7GkWBK2V9spgactGOp0qvfWRxUMjqHyzrt3SgwE48DIv/FhqPHJYLHpgW1opq3nERbz5Anq7n1g==", "license": "ISC", "dependencies": { "@isaacs/fs-minipass": "^4.0.0", "chownr": "^3.0.0", "minipass": "^7.1.2", - "minizlib": "^3.0.1", - "mkdirp": "^3.0.1", + "minizlib": "^3.1.0", "yallist": "^5.0.0" }, "engines": { @@ -4769,13 +4763,13 @@ } }, "node_modules/tinyglobby": { - "version": "0.2.14", - "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz", - "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==", + "version": "0.2.15", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz", + "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==", "license": "MIT", "dependencies": { - "fdir": "^6.4.4", - "picomatch": "^4.0.2" + "fdir": "^6.5.0", + "picomatch": "^4.0.3" }, "engines": { "node": ">=12.0.0" @@ -4925,9 +4919,9 @@ } }, "node_modules/typescript": { - "version": "5.9.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz", - "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==", + "version": "5.9.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", + "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, "license": "Apache-2.0", "peer": true, @@ -4940,16 +4934,16 @@ } }, "node_modules/typescript-eslint": { - "version": "8.41.0", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.41.0.tgz", - "integrity": "sha512-n66rzs5OBXW3SFSnZHr2T685q1i4ODm2nulFJhMZBotaTavsS8TrI3d7bDlRSs9yWo7HmyWrN9qDu14Qv7Y0Dw==", + "version": "8.46.1", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.46.1.tgz", + "integrity": "sha512-VHgijW803JafdSsDO8I761r3SHrgk4T00IdyQ+/UsthtgPRsBWQLqoSxOolxTpxRKi1kGXK0bSz4CoAc9ObqJA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.41.0", - "@typescript-eslint/parser": "8.41.0", - "@typescript-eslint/typescript-estree": "8.41.0", - "@typescript-eslint/utils": "8.41.0" + "@typescript-eslint/eslint-plugin": "8.46.1", + "@typescript-eslint/parser": "8.46.1", + "@typescript-eslint/typescript-estree": "8.46.1", + "@typescript-eslint/utils": "8.46.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -5131,9 +5125,9 @@ } }, "node_modules/workerpool": { - "version": "9.3.3", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-9.3.3.tgz", - "integrity": "sha512-slxCaKbYjEdFT/o2rH9xS1hf4uRDch1w7Uo+apxhZ+sf/1d9e0ZVkn42kPNGP2dgjIx6YFvSevj0zHvbWe2jdw==", + "version": "9.3.4", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-9.3.4.tgz", + "integrity": "sha512-TmPRQYYSAnnDiEB0P/Ytip7bFGvqnSU6I2BcuSw7Hx+JSg/DsUi5ebYfc8GYaSdpuvOcEs6dXxPurOYpe9QFwg==", "dev": true, "license": "Apache-2.0" }, @@ -5214,9 +5208,9 @@ } }, "node_modules/wrap-ansi/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", "license": "MIT", "engines": { "node": ">=12" diff --git a/pkgs/by-name/no/node-gyp/package.nix b/pkgs/by-name/no/node-gyp/package.nix index ec2aa63bdf36..216f1e2b2646 100644 --- a/pkgs/by-name/no/node-gyp/package.nix +++ b/pkgs/by-name/no/node-gyp/package.nix @@ -8,16 +8,16 @@ (buildNpmPackage.override { inherit nodejs; }) rec { pname = "node-gyp"; - version = "11.4.2"; + version = "11.5.0"; src = fetchFromGitHub { owner = "nodejs"; repo = "node-gyp"; tag = "v${version}"; - hash = "sha256-IoW71RdjQRfIEr6Nh+xqDsgf28WhQ7vHTS1BB++3mdU="; + hash = "sha256-IymzSi9bQhtBX8AjtYAjHs0dN+5scywJuATz5IclSJs="; }; - npmDepsHash = "sha256-ixAelIVTKlTmXiXLA2iI9vJ/gp79wpd+wRvspUqEci4="; + npmDepsHash = "sha256-C8/pQ26gHToC0yq/6V385Uo1cM8SknoQ2h7u7i3Gy/Q="; postPatch = '' ln -s ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/nr/nrfutil/package.nix b/pkgs/by-name/nr/nrfutil/package.nix index 926dcd030251..0001d94b374c 100644 --- a/pkgs/by-name/nr/nrfutil/package.nix +++ b/pkgs/by-name/nr/nrfutil/package.nix @@ -2,69 +2,148 @@ lib, stdenvNoCC, fetchurl, + + xz, zlib, libusb1, segger-jlink-headless, gcc, + autoPatchelfHook, versionCheckHook, + makeWrapper, + installShellFiles, + + symlinkJoin, + extensions ? [ ], + nrfutil, }: let - source = import ./source.nix; - supported = removeAttrs source [ "version" ]; + sources = import ./source.nix; + platformSources = + sources.${stdenvNoCC.system} or (throw "unsupported platform ${stdenvNoCC.system}"); - platform = supported.${stdenvNoCC.system} or (throw "unsupported platform ${stdenvNoCC.system}"); - -in -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "nrfutil"; - inherit (source) version; - - src = fetchurl { - url = "https://files.nordicsemi.com/artifactory/swtools/external/nrfutil/packages/nrfutil/nrfutil-${platform.name}-${finalAttrs.version}.tar.gz"; - inherit (platform) hash; - }; - - nativeBuildInputs = [ - autoPatchelfHook - ]; - - buildInputs = [ - zlib - libusb1 - gcc.cc.lib - segger-jlink-headless - ]; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out - mv data/* $out/ - - runHook postInstall - ''; - - doInstallCheck = true; - nativeInstallCheckInputs = [ - versionCheckHook - ]; - passthru.updateScript = ./update.sh; - - meta = with lib; { + sharedMeta = with lib; { description = "CLI tool for managing Nordic Semiconductor devices"; homepage = "https://www.nordicsemi.com/Products/Development-tools/nRF-Util"; changelog = "https://docs.nordicsemi.com/bundle/nrfutil/page/guides/revision_history.html"; license = licenses.unfree; - platforms = lib.attrNames supported; + platforms = lib.attrNames sources; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ h7x4 ezrizhu ]; + }; + + packages = + map + ( + name: + let + package = platformSources.packages.${name}; + in + stdenvNoCC.mkDerivation (finalAttrs: { + pname = name; + inherit (package) version; + + src = fetchurl { + url = "https://files.nordicsemi.com/artifactory/swtools/external/nrfutil/packages/${name}/${name}-${platformSources.triplet}-${package.version}.tar.gz"; + inherit (package) hash; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + xz + zlib + libusb1 + gcc.cc.lib + segger-jlink-headless + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out + mv data/* $out/ + + runHook postInstall + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + + meta = sharedMeta // { + mainProgram = name; + }; + }) + ) + ( + [ + "nrfutil" + "nrfutil-completion" + ] + ++ extensions + ); + +in +symlinkJoin { + pname = "nrfutil"; + inherit (platformSources.packages.nrfutil) version; + + paths = packages; + + nativeBuildInputs = [ + makeWrapper + installShellFiles + ]; + + postBuild = + let + wrapProgramArgs = lib.concatStringsSep " " ( + [ + ''--prefix PATH : "$out/bin"'' + ''--prefix PATH : "$out"/lib/nrfutil-npm'' + ''--prefix PATH : "$out"/lib/nrfutil-nrf5sdk-tools'' + ''--set NRF_JLINK_DLL_PATH '${segger-jlink-headless}'/lib/libjlinkarm.so'' + ''--set NRFUTIL_BLE_SNIFFER_SHIM_BIN_ENV "$out"/lib/nrfutil-ble-sniffer/wireshark-shim'' + ''--set NRFUTIL_BLE_SNIFFER_HCI_SHIM_BIN_ENV "$out"/lib/nrfutil-ble-sniffer/wireshark-hci-shim'' + ] + ++ ( + let + # These are the extensions with the probe-plugin-worker executable vendored. + relevantExtensions = lib.intersectLists [ "nrfutil-device" "nrfutil-trace" ] extensions; + in + lib.optionals (relevantExtensions != [ ]) [ + ''--set NRF_PROBE_PATH "$out"/lib/${lib.head relevantExtensions}'' + ] + ) + ); + in + '' + wrapProgram "$out"/bin/nrfutil ${wrapProgramArgs} + + installShellCompletion --cmd nrfutil \ + --bash $(realpath "$out"/share/nrfutil-completion/scripts/bash/setup.bash) \ + --zsh $(realpath "$out"/share/nrfutil-completion/scripts/zsh/_nrfutil) + ''; + + passthru = { + updateScript = ./update.sh; + withExtensions = extensions: nrfutil.override { inherit extensions; }; + }; + + meta = sharedMeta // { mainProgram = "nrfutil"; }; -}) +} diff --git a/pkgs/by-name/nr/nrfutil/source.nix b/pkgs/by-name/nr/nrfutil/source.nix index ba5df8b720a5..e5663ff78268 100644 --- a/pkgs/by-name/nr/nrfutil/source.nix +++ b/pkgs/by-name/nr/nrfutil/source.nix @@ -1,7 +1,84 @@ { - version = "7.13.0"; + aarch64-linux = { + triplet = "aarch64-unknown-linux-gnu"; + packages = { + nrfutil = { + version = "8.1.1"; + hash = "sha256-y7ywCr9Ze3Uz1JQh0hNg2BOPKW2yEftYDaD8WzHWSxY="; + }; + nrfutil-ble-sniffer = { + version = "0.16.2"; + hash = "sha256-vCpSs9oUcqKPDKVoEtrqqY9Jy0AtbMwK8s398xvQ7Us="; + }; + nrfutil-device = { + version = "2.15.1"; + hash = "sha256-u8JlM7bxkR5x0fhTQRIkElpxot6jpKyL2SljFfoKj54="; + }; + nrfutil-mcu-manager = { + version = "0.8.0"; + hash = "sha256-jLsLN/Ny5zL4MSaKS3cb2L4WBCKZHVLiR2RkPAL8JnY="; + }; + nrfutil-sdk-manager = { + version = "1.8.0"; + hash = "sha256-DsGuOQ6rzwit5oeG4ZLObCOaxMt8WB+YYnuXRYtqq4U="; + }; + nrfutil-trace = { + version = "4.0.1"; + hash = "sha256-IR4P1tK/0P3d96Wnwciq7b3TJurENF2pYKaHu2yZIPk="; + }; + }; + }; x86_64-linux = { - name = "x86_64-unknown-linux-gnu"; - hash = "sha256-R3OF/340xEab+0zamfwvejY16fjy/3TrzMvQaBlVxHw="; + triplet = "x86_64-unknown-linux-gnu"; + packages = { + nrfutil = { + version = "8.1.1"; + hash = "sha256-asX1UbAE6X03lLC3l9e/9G2WgVRezfmRD6dyXJKb18Y="; + }; + nrfutil-91 = { + version = "0.5.0"; + hash = "sha256-ACQ+csYVIoANKV+CyAAD+drXQSb7CVUdvDYe76LELqs="; + }; + nrfutil-ble-sniffer = { + version = "0.16.2"; + hash = "sha256-4TGbn0HdlER5k76Hc5rCSVvyx89VdLQ56fMiGgWUvrU="; + }; + nrfutil-completion = { + version = "1.5.0"; + hash = "sha256-KA5h9/hJA66nkAAW1Tui+m60E/Iv9wzVPdeQqIQWpxc="; + }; + nrfutil-device = { + version = "2.15.1"; + hash = "sha256-zH/QtM1vM6BIiZHPLM23TRt2LCRUdJvmYN9oveotsH0="; + }; + nrfutil-mcu-manager = { + version = "0.8.0"; + hash = "sha256-ItU3kys1HMd06srLTzPtRoAW1YxwOt39LqjIQPMvmaI="; + }; + nrfutil-npm = { + version = "0.3.1"; + hash = "sha256-kQ63fVWR8RdGTQLA27Sg7jegYhtlkvXvLJsucifH4I0="; + }; + nrfutil-nrf5sdk-tools = { + version = "1.1.0"; + hash = "sha256-hLQhTEa5F2lrFxppKmVrD5PnIA3JPcP/M/r9bYizHk8="; + }; + nrfutil-sdk-manager = { + version = "1.8.0"; + hash = "sha256-+Z1xfEdTAcvYj+hjsW0z/dHRoIzVGWXjD6lSqoQvOPg="; + }; + nrfutil-suit = { + version = "0.9.0"; + hash = "sha256-uwbUgjpJNC27bSINyhfzTrOXIUi7GjFnPebg38apRKc="; + }; + nrfutil-toolchain-manager = { + version = "0.15.0"; + hash = "sha256-/bQx4yu1ybCO2TBd7MctxCANiYO5c1qCDYSjXm7hLcE="; + }; + nrfutil-trace = { + version = "4.0.1"; + hash = "sha256-YmsMQOD1vylaRwMWOhOA9xXePJR779P8im4Lcs7EcWk="; + }; + }; }; } diff --git a/pkgs/by-name/nr/nrfutil/update.sh b/pkgs/by-name/nr/nrfutil/update.sh index 199983e4aabb..72bb4763a361 100755 --- a/pkgs/by-name/nr/nrfutil/update.sh +++ b/pkgs/by-name/nr/nrfutil/update.sh @@ -12,23 +12,60 @@ set -euo pipefail declare -A architectures declare -A versions declare -A hashes +declare -a packages architectures["x86_64-linux"]="x86_64-unknown-linux-gnu" +architectures["aarch64-linux"]="aarch64-unknown-linux-gnu" +# NOTE: segger-jlink is not yet packaged for darwin +# architectures["x86_64-darwin"]="x86_64-apple-darwin" +# architectures["aarch64-darwin"]="aarch64-apple-darwin" + +packages=( + "nrfutil" + "nrfutil-91" + "nrfutil-ble-sniffer" + "nrfutil-completion" + "nrfutil-device" + "nrfutil-mcu-manager" + "nrfutil-npm" + "nrfutil-nrf5sdk-tools" + "nrfutil-sdk-manager" + "nrfutil-suit" + "nrfutil-toolchain-manager" + "nrfutil-trace" +) + BASE_URL="https://files.nordicsemi.com/artifactory/swtools/external/nrfutil" -for a in ${!architectures[@]}; do - versions["$a"]=$(curl "$BASE_URL/index/${architectures[${a}]}/index.json" | jq -r '.packages.nrfutil.latest_version') - hashes["$a"]=$(narhash "$BASE_URL/packages/nrfutil/nrfutil-${architectures[${a}]}-${versions[${a}]}.tar.gz") +for a in "${!architectures[@]}"; do + ARCH="${architectures["${a}"]}" + INDEX=$(curl "$BASE_URL/index/${ARCH}/index.json") + for p in "${!packages[@]}"; do + PKG="${packages["${p}"]}" + + jq -e -r ".packages.\"${PKG}\"" <<< "$INDEX" 1>/dev/null && { + versions["$a-$p"]=$(jq -r ".packages.\"${PKG}\".latest_version" <<< "$INDEX") + hashes["$a-$p"]=$(narhash "$BASE_URL/packages/${PKG}/${PKG}-${ARCH}-${versions["$a-$p"]}.tar.gz") + } + done done { printf "{\n" - printf " version = \"${versions["x86_64-linux"]}\";\n" - for a in ${!architectures[@]}; do - printf " ${a} = {\n" - printf " name = \"${architectures[${a}]}\";\n" - printf " hash = \"${hashes[${a}]}\";\n" + for a in "${!architectures[@]}"; do + printf " %s = {\n" "$a" + printf " triplet = \"%s\";\n" "${architectures["${a}"]}" + printf " packages = {\n" + for p in "${!packages[@]}"; do + test ${versions["$a-$p"]+_} && { + printf " %s = {\n" "${packages["${p}"]}" + printf " version = \"%s\";\n" "${versions["$a-$p"]}" + printf " hash = \"%s\";\n" "${hashes["$a-$p"]}" + printf " };\n" + } + done + printf " };\n" printf " };\n" done printf "}\n" 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/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 0fc029c214c1..3bb160cf6bc2 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -3,8 +3,7 @@ buildGoModule, fetchFromGitHub, buildEnv, - linkFarm, - makeWrapper, + makeBinaryWrapper, stdenv, addDriverRunpath, nix-update-script, @@ -20,9 +19,11 @@ autoAddDriverRunpath, apple-sdk_15, + versionCheckHook, + writableTmpDirAsHomeHook, + # passthru nixosTests, - testers, ollama, ollama-rocm, ollama-cuda, @@ -117,13 +118,13 @@ in goBuild (finalAttrs: { pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.12.3"; + version = "0.12.5"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; tag = "v${finalAttrs.version}"; - hash = "sha256-ooDGwTklGJ/wzDlAY3uJiqpZUxT1cCsqVNJKU8BAPbQ="; + hash = "sha256-X5xxM53DfN8EW29hfJiAeADKLvKdmdNYE2NBa05T82k="; }; vendorHash = "sha256-SlaDsu001TUW+t9WRp7LqxUSQSGDF1Lqu9M1bgILoX4="; @@ -148,7 +149,7 @@ goBuild (finalAttrs: { ] ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ] ++ lib.optionals (enableRocm || enableCuda) [ - makeWrapper + makeBinaryWrapper autoAddDriverRunpath ]; @@ -214,8 +215,6 @@ goBuild (finalAttrs: { ''; ldflags = [ - "-s" - "-w" "-X=github.com/ollama/ollama/version.Version=${finalAttrs.version}" "-X=github.com/ollama/ollama/server.mode=release" ]; @@ -237,13 +236,17 @@ goBuild (finalAttrs: { in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + writableTmpDirAsHomeHook + ]; + versionCheckKeepEnvironment = "HOME"; + versionCheckProgramArg = "--version"; + passthru = { tests = { inherit ollama; - version = testers.testVersion { - inherit (finalAttrs) version; - package = ollama; - }; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit ollama-rocm ollama-cuda; 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/pg/pgbackrest/package.nix b/pkgs/by-name/pg/pgbackrest/package.nix index 122516cbefbd..4b5ebce7beb8 100644 --- a/pkgs/by-name/pg/pgbackrest/package.nix +++ b/pkgs/by-name/pg/pgbackrest/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pgbackrest"; - version = "2.56.0"; + version = "2.57.0"; src = fetchFromGitHub { owner = "pgbackrest"; repo = "pgbackrest"; tag = "release/${finalAttrs.version}"; - hash = "sha256-GDHpeTz85cgKTbcuaTlwJ1SUNMedSylqKWdrgH8Zp8Q="; + hash = "sha256-TwyMWE9/aCWBIn+AKGaR0UC5qScWPEaDyOG723/2NHA="; }; strictDeps = true; 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/pi/pimsync/package.nix b/pkgs/by-name/pi/pimsync/package.nix index 4a89efa7e861..80e40c73ba77 100644 --- a/pkgs/by-name/pi/pimsync/package.nix +++ b/pkgs/by-name/pi/pimsync/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pimsync"; - version = "0.4.4"; + version = "0.5.4"; src = fetchFromSourcehut { owner = "~whynothugo"; repo = "pimsync"; rev = "v${finalAttrs.version}"; - hash = "sha256-M29kqvvNfs4zF1epurXGEas1phPdrEAFDnYKqyCzzfE="; + hash = "sha256-LHdm6CeaGrlTNzN4h9XzYCG5aRG2lk3ZqqZLd37q7is="; }; - cargoHash = "sha256-HQObvolih9nOn0epu7tWkLa0ibkNarXy2pNNzllQtMg="; + cargoHash = "sha256-6n7kjmLWzG5rttYak65gmu5KM/W4bN4FS1MaEnCELV8="; PIMSYNC_VERSION = finalAttrs.version; @@ -50,6 +50,9 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Synchronise calendars and contacts"; homepage = "https://git.sr.ht/~whynothugo/pimsync"; + changelog = "https://pimsync.whynothugo.nl/changelog.html#v${ + lib.replaceString "." "-" finalAttrs.version + }"; license = lib.licenses.eupl12; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.qxrein ]; diff --git a/pkgs/by-name/pi/pingus/package.nix b/pkgs/by-name/pi/pingus/package.nix index f47e64d08b7f..f1795ee2a9aa 100644 --- a/pkgs/by-name/pi/pingus/package.nix +++ b/pkgs/by-name/pi/pingus/package.nix @@ -1,55 +1,86 @@ { lib, stdenv, - fetchgit, + fetchFromGitHub, cmake, + pkg-config, + makeWrapper, + libGL, + libGLU, SDL2, SDL2_image, - boost, + fmt, + gtest, libpng, - SDL2_mixer, - pkg-config, - libGLU, - libGL, - git, - jsoncpp, + libsigcxx, + argpp, + geomcpp, + logmich, + priocpp, + strutcpp, + tinycmmc, + tinygettext, + uitest, + wstsound, + xdgcpp, }: + stdenv.mkDerivation { pname = "pingus"; - version = "unstable-0.7.6.0.20191104"; + version = "0.7.6-unstable-2025-07-21"; + + src = fetchFromGitHub { + owner = "Pingus"; + repo = "pingus"; + rev = "b0ceeeeb95428c73b1b81208211535c61acfc5d0"; + sha256 = "sha256-jQYZM7VLqbl9/+QXyswEXdGmwOq/nxRzWARvcDqNM9M="; + }; nativeBuildInputs = [ cmake pkg-config - git + makeWrapper ]; + buildInputs = [ + libGL + libGLU SDL2 SDL2_image - boost + fmt + gtest libpng - SDL2_mixer - libGLU - libGL - jsoncpp + libsigcxx + argpp + geomcpp + logmich + priocpp + strutcpp + tinycmmc + tinygettext + uitest + wstsound + xdgcpp ]; - src = fetchgit { - url = "https://gitlab.com/pingus/pingus/"; - rev = "709546d9b9c4d6d5f45fc9112b45ac10c7f9417d"; - sha256 = "11mmzk0766riaw5qyd1r5i7s7vczbbzfccm92bvgrm99iy1sj022"; - fetchSubmodules = true; - }; - postPatch = '' - # Fix missing gcc-13 headers - sed -e '1i #include ' -i src/util/pathname.hpp - ''; + cmakeFlags = [ + "-DWARNINGS=ON" + "-DWERROR=ON" + "-DBUILD_EXTRA=OFF" + "-DBUILD_TESTS=OFF" + ]; + + doCheck = true; meta = { description = "Puzzle game with mechanics similar to Lemmings"; + homepage = "https://pingus.seul.org/"; mainProgram = "pingus"; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.raskin ]; + maintainers = with lib.maintainers; [ + raskin + SchweGELBin + ]; license = lib.licenses.gpl3; }; } 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/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix index 1061faf40eac..4e5996b9a2c3 100644 --- a/pkgs/by-name/po/positron-bin/package.nix +++ b/pkgs/by-name/po/positron-bin/package.nix @@ -22,7 +22,7 @@ }: let pname = "positron-bin"; - version = "2025.10.0-199"; + version = "2025.10.1-4"; in stdenv.mkDerivation { inherit version pname; @@ -31,17 +31,17 @@ stdenv.mkDerivation { if stdenv.hostPlatform.isDarwin then fetchurl { url = "https://cdn.posit.co/positron/releases/mac/universal/Positron-${version}-universal.dmg"; - hash = "sha256-iYEkuMQZkn/71bjHCvltTK6EC5l45kNdBhcK6TUB1hM="; + hash = "sha256-E3OZBmuIbobVa1e8hcUCE5rUqGN4+ySk+3qSOgYP6DA="; } else if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://cdn.posit.co/positron/releases/deb/arm64/Positron-${version}-arm64.deb"; - hash = "sha256-JkgFuVebyDRqGh2ZcTZitVWzRSYdatKCtXWL1GMb0ZM="; + hash = "sha256-gcr8FoNmC+ojSNpoqsRCUVwjquITqS2HXGdW/8juZDY="; } else fetchurl { url = "https://cdn.posit.co/positron/releases/deb/x86_64/Positron-${version}-x64.deb"; - hash = "sha256-ycheOOKirLhDiNIh2Bg/7KBTau7YPGGWHLkRmZJkrnk="; + hash = "sha256-xu4DINK9t+k6BkEwwh9H//pdkbXOh7C6FSWbAKOTYcU="; }; buildInputs = [ diff --git a/pkgs/by-name/pr/priocpp/package.nix b/pkgs/by-name/pr/priocpp/package.nix new file mode 100644 index 000000000000..d2518f9bee89 --- /dev/null +++ b/pkgs/by-name/pr/priocpp/package.nix @@ -0,0 +1,54 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + fmt, + gtest, + logmich, + tinycmmc, + jsoncpp, + sexp-cpp, +}: + +stdenv.mkDerivation { + pname = "priocpp"; + version = "0.0.0-unstable-2025-07-21"; + + src = fetchFromGitHub { + owner = "Grumbel"; + repo = "priocpp"; + rev = "b2664449adcaed93f609e3ea1fb68f8295390ce9"; + sha256 = "sha256-tn0UNK+rQQPpSgTexOKyROOvX6ynEHFUj+gk11dlh/8="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + propagatedBuildInputs = [ + fmt + gtest + logmich + tinycmmc + jsoncpp + sexp-cpp + ]; + + cmakeFlags = [ + "-DBUILD_EXTRA=ON" + "-DBUILD_TESTS=ON" + "-DPRIO_USE_JSONCPP=ON" + "-DPRIO_USE_SEXPCPP=ON" + ]; + + doCheck = true; + + meta = { + description = "Property I/O for C++"; + maintainers = [ lib.maintainers.SchweGELBin ]; + platforms = lib.platforms.linux; + license = lib.licenses.free; + }; +} 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/ra/rapidapi/package.nix b/pkgs/by-name/ra/rapidapi/package.nix index 108197375beb..48f041a3d4e2 100644 --- a/pkgs/by-name/ra/rapidapi/package.nix +++ b/pkgs/by-name/ra/rapidapi/package.nix @@ -16,11 +16,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "rapidapi"; - version = "4.2.8-4002008002"; + version = "4.4.3-4004003001"; src = fetchurl { url = "https://cdn-builds.paw.cloud/paw/RapidAPI-${finalAttrs.version}.zip"; - hash = "sha256-ApBOYMOjpQJvUe+JsEAnyK7xpIZNt6qkX/2KUIT6S8g="; + hash = "sha256-eckLVX/NnyYa2Ad1+D6RUxR6nGrRcG5HFkudhFWhII0="; }; dontPatch = true; diff --git a/pkgs/by-name/ra/ratpoints/package.nix b/pkgs/by-name/ra/ratpoints/package.nix index 8caba2276334..0481b3935aef 100644 --- a/pkgs/by-name/ra/ratpoints/package.nix +++ b/pkgs/by-name/ra/ratpoints/package.nix @@ -2,25 +2,33 @@ lib, stdenv, fetchurl, - fetchpatch, + texliveSmall, + writableTmpDirAsHomeHook, gmp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ratpoints"; - version = "2.1.3.p4"; + version = "2.2.2"; src = fetchurl { - url = "http://www.mathe2.uni-bayreuth.de/stoll/programs/ratpoints-${version}.tar.gz"; - sha256 = "0zhad84sfds7izyksbqjmwpfw4rvyqk63yzdjd3ysd32zss5bgf4"; + url = "https://www.mathe2.uni-bayreuth.de/stoll/programs/ratpoints-${finalAttrs.version}.tar.gz"; + hash = "sha256-2A4VIhkKHhIvey3i78Je+qyQf1XzdjXY2t3Q0Yqv/ZM="; }; enableParallelBuilding = true; - patches = [ - (fetchpatch { - url = "https://raw.githubusercontent.com/sagemath/sage/1615f58890e8f9881c4228c78a6b39b9aab1303a/build/pkgs/ratpoints/patches/sturm_and_rp_private.patch"; - sha256 = "0q3wajncyfr3gahd8gwk9x7g56zw54lpywrl63lqk7drkf60mrcl"; - }) + nativeBuildInputs = [ + (texliveSmall.withPackages ( + ps: with ps; [ + charter + comment + cyrillic + preprint + titlesec + xypic + ] + )) + writableTmpDirAsHomeHook ]; buildInputs = [ gmp ]; @@ -42,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; homepage = "http://www.mathe2.uni-bayreuth.de/stoll/programs/"; }; -} +}) diff --git a/pkgs/by-name/re/reaper-sws-extension/darwin.nix b/pkgs/by-name/re/reaper-sws-extension/darwin.nix index 1ad6b3688032..3011ad5e7ee6 100644 --- a/pkgs/by-name/re/reaper-sws-extension/darwin.nix +++ b/pkgs/by-name/re/reaper-sws-extension/darwin.nix @@ -23,8 +23,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { "https://github.com/reaper-oss/sws/releases/download/v${finalAttrs.version}/reaper_sws-${arch}.dylib"; hash = { - x86_64-darwin = "sha256-B185QWS9FaC/0XDhxUBbgr9zu2Ot8OIsfaPQ3sUHh4s="; - aarch64-darwin = "sha256-8gbyPlnIXdWtSD+Aj70xzacJhO34edTTG2IOryB67os="; + x86_64-darwin = "sha256-c0enRIXFN+dMDdxTQ3hFv0almTF0dfrSHILNigJp2Js="; + aarch64-darwin = "sha256-jmuob0qslYhxiE2ShfTwY4RJAKBLJSUb+VBEM0sQPbo="; } .${stdenvNoCC.hostPlatform.system}; }; @@ -33,20 +33,22 @@ stdenvNoCC.mkDerivation (finalAttrs: { plugin (fetchurl { url = "https://github.com/reaper-oss/sws/releases/download/v${finalAttrs.version}/sws_python64.py"; - hash = "sha256-Yujj60+jOEfdSZ74cRU1Wxoh7RL2fo/IhJIpa+BDYV0="; + hash = "sha256-GDlvfARg1g5oTH2itEug6Auxr9iFlPDdGueInGmHqSI="; }) (fetchurl { url = "https://github.com/reaper-oss/sws/releases/download/v${finalAttrs.version}/sws_python32.py"; - hash = "sha256-QktzdIDpTvNs9IrH7TOI6LTIBkfuQ3cqw06iqLxSSTI="; + hash = "sha256-np2r568csSdIS7VZHDASroZlXhpfxXwNn0gROTinWU4="; }) ]; - dontUnpack = true; + unpackCmd = '' + cp $curSrc $(stripHash $curSrc) + ''; installPhase = '' runHook preInstall - install -D *.py -t $out/Scripts - install -D *.dylib -t $out/UserPlugins + install -D -t $out/Scripts *.py + install -D -t $out/UserPlugins *.dylib runHook postInstall ''; }) diff --git a/pkgs/by-name/re/reaper-sws-extension/linux.nix b/pkgs/by-name/re/reaper-sws-extension/linux.nix index c45de74689b8..892c40506ee6 100644 --- a/pkgs/by-name/re/reaper-sws-extension/linux.nix +++ b/pkgs/by-name/re/reaper-sws-extension/linux.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "reaper-oss"; repo = "sws"; tag = "v${finalAttrs.version}"; - hash = "sha256-37pBbNACQuuEk1HJTiUHdb0mDiR2+ZsEQUOhz7mrPPg="; + hash = "sha256-J2igVacDClHgKGZ2WATcd5XW2FkarKtALxVLgqa90Cs="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/re/reaper-sws-extension/package.nix b/pkgs/by-name/re/reaper-sws-extension/package.nix index 4f8a4892cc17..f4f2a33aadee 100644 --- a/pkgs/by-name/re/reaper-sws-extension/package.nix +++ b/pkgs/by-name/re/reaper-sws-extension/package.nix @@ -9,7 +9,7 @@ in callPackage p { pname = "reaper-sws-extension"; - version = "2.14.0.3"; + version = "2.14.0.7"; meta = { description = "Reaper Plugin Extension"; longDescription = '' diff --git a/pkgs/by-name/re/recordbox/package.nix b/pkgs/by-name/re/recordbox/package.nix index cc5f6b7c69b3..0678773dacd5 100644 --- a/pkgs/by-name/re/recordbox/package.nix +++ b/pkgs/by-name/re/recordbox/package.nix @@ -8,6 +8,7 @@ desktop-file-utils, fetchFromGitea, glib, + libglycin, glycin-loaders, gst_all_1, gtk4, @@ -90,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { # Dirty approach to add patches after cargoSetupPostUnpackHook # We should eventually use a cargo vendor patch hook instead pushd ../$(stripHash $cargoDeps)/glycin-2.* - patch -p3 < ${glycin-loaders.passthru.glycinPathsPatch} + patch -p3 < ${libglycin.passthru.glycinPathsPatch} popd ''; preFixup = '' diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix index e85db23b014b..8aa302b99f8a 100644 --- a/pkgs/by-name/re/remind/package.nix +++ b/pkgs/by-name/re/remind/package.nix @@ -16,14 +16,14 @@ tcl.mkTclDerivation rec { pname = "remind"; - version = "06.01.04"; + version = "06.01.05"; src = fetchFromGitea { domain = "git.skoll.ca"; owner = "Skollsoft-Public"; repo = "Remind"; rev = version; - hash = "sha256-DNqwG/HsBEfu1kkRJVkFEWjc+EKY7rdQPcaw3k1HuDk="; + hash = "sha256-5S6s3PylXNGxxzYII2bwT59TFg8sIEUjENkRUDFTuFM="; }; propagatedBuildInputs = lib.optionals withGui [ diff --git a/pkgs/by-name/ru/rumdl/package.nix b/pkgs/by-name/ru/rumdl/package.nix index e64a26b89c45..a0eac951ca98 100644 --- a/pkgs/by-name/ru/rumdl/package.nix +++ b/pkgs/by-name/ru/rumdl/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rumdl"; - version = "0.0.156"; + version = "0.0.162"; src = fetchFromGitHub { owner = "rvben"; repo = "rumdl"; tag = "v${finalAttrs.version}"; - hash = "sha256-yHOfrX3iOq1oGwHtHchMyQblqLXreoUKLBTpxxh2FEE="; + hash = "sha256-aCduiCO49YWeqET3nezI1EYkz+IbTR+uIy7FXHbkYCo="; }; - cargoHash = "sha256-U8kb3fQjA3Prrpn1KmhsQl4S0hvhcY+5qlqT5ovbUZE="; + cargoHash = "sha256-o9NqTdMEoYFZC69Raf0v6fHUKnbN2K+rV3LK6rtjG/k="; cargoBuildFlags = [ "--bin=rumdl" 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/seagoat/package.nix b/pkgs/by-name/se/seagoat/package.nix index 44440b7881ec..2d0550823c09 100644 --- a/pkgs/by-name/se/seagoat/package.nix +++ b/pkgs/by-name/se/seagoat/package.nix @@ -30,6 +30,7 @@ python3Packages.buildPythonApplication rec { "chromadb" "psutil" "setuptools" + "ollama" ]; dependencies = with python3Packages; [ @@ -46,6 +47,7 @@ python3Packages.buildPythonApplication rec { ollama psutil pygments + python-dotenv requests stop-words waitress 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/se/sexp-cpp/package.nix b/pkgs/by-name/se/sexp-cpp/package.nix new file mode 100644 index 000000000000..52b915243d36 --- /dev/null +++ b/pkgs/by-name/se/sexp-cpp/package.nix @@ -0,0 +1,45 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + gtest, + tinycmmc, +}: + +stdenv.mkDerivation { + pname = "sexp-cpp"; + version = "0.1.0-unstable-2025-07-21"; + + src = fetchFromGitHub { + owner = "lispparser"; + repo = "sexp-cpp"; + rev = "677b6f3ecd54e92339d33062084b081ebb9f14a6"; + sha256 = "sha256-/wH9Cgo+4eyYRyUcYRNkYR38rLRv/mJq87dpE9wCPlw="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + gtest + tinycmmc + ]; + + cmakeFlags = [ + "-DBUILD_TESTS=ON" + "-DUSE_CXX17=ON" + ]; + + doCheck = true; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" + ''; + + meta = { + description = "S-Expression parser for C++"; + maintainers = [ lib.maintainers.SchweGELBin ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3; + }; +} diff --git a/pkgs/by-name/si/sillytavern/package.nix b/pkgs/by-name/si/sillytavern/package.nix index 90a0168c361f..570e3d45fd8e 100644 --- a/pkgs/by-name/si/sillytavern/package.nix +++ b/pkgs/by-name/si/sillytavern/package.nix @@ -5,15 +5,15 @@ }: buildNpmPackage (finalAttrs: { pname = "sillytavern"; - version = "1.13.4"; + version = "1.13.5"; src = fetchFromGitHub { owner = "SillyTavern"; repo = "SillyTavern"; tag = finalAttrs.version; - hash = "sha256-C1VWyowuk4w1F5u88Xcp9m3UgNmcDKEn/NSojuLGAd8="; + hash = "sha256-kYTma8+GIXCwFrKB0EnU4nLMPi+HOayBioz1z+xNa+0="; }; - npmDepsHash = "sha256-lVG00oUzrMxIVoKqTRtkMYUmS45YEOkcepXJl4vth2w="; + npmDepsHash = "sha256-BBB+mKuG9cm9Rpa7kPneqK0gSA09hEvszWoWML78eSQ="; dontNpmBuild = true; diff --git a/pkgs/by-name/sn/snapshot/package.nix b/pkgs/by-name/sn/snapshot/package.nix index edb440b1cab7..9bc4466f3252 100644 --- a/pkgs/by-name/sn/snapshot/package.nix +++ b/pkgs/by-name/sn/snapshot/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchurl, + libglycin, glycin-loaders, cargo, desktop-file-utils, @@ -34,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Fix paths in glycin library - glycin-loaders.passthru.glycinPathsPatch + libglycin.passthru.glycinPathsPatch ]; cargoVendorDir = "vendor"; 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/so/source-meta-json-schema/package.nix b/pkgs/by-name/so/source-meta-json-schema/package.nix index 7c0f42fd610e..b47e596c1a42 100644 --- a/pkgs/by-name/so/source-meta-json-schema/package.nix +++ b/pkgs/by-name/so/source-meta-json-schema/package.nix @@ -5,7 +5,7 @@ cmake, }: let - version = "11.9.0"; + version = "11.11.1"; in stdenv.mkDerivation (finalAttrs: { pname = "source-meta-json-schema"; @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "sourcemeta"; repo = "jsonschema"; rev = "v${version}"; - hash = "sha256-POZRyex9eaa3F9ZlmIrVBDMBfvDM98drJdAvk2nkYSs="; + hash = "sha256-JB37vOFoThc3wsaeMJ/BqGO27HQaA8bqtaA2avNSn7A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sq/squid/package.nix b/pkgs/by-name/sq/squid/package.nix index 7d33a4abff0d..efd5c86fd16e 100644 --- a/pkgs/by-name/sq/squid/package.nix +++ b/pkgs/by-name/sq/squid/package.nix @@ -19,13 +19,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "squid"; - version = "7.1"; + version = "7.2"; src = fetchurl { url = "https://github.com/squid-cache/squid/releases/download/SQUID_${ builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version }/squid-${finalAttrs.version}.tar.xz"; - hash = "sha256-djtaeFYc7cTkdjT6QrjmuNRsh8lJoVG056wjltL5feo="; + hash = "sha256-Xgd74dg6nmls6NDZ5yOxJzFSIHoJFAS+aKS5qeGMcAM="; }; nativeBuildInputs = [ pkg-config ]; 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/st/strutcpp/package.nix b/pkgs/by-name/st/strutcpp/package.nix new file mode 100644 index 000000000000..f15f2bfaa1be --- /dev/null +++ b/pkgs/by-name/st/strutcpp/package.nix @@ -0,0 +1,39 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + gtest, + tinycmmc, +}: + +stdenv.mkDerivation { + pname = "strutcpp"; + version = "0-unstable-2025-07-21"; + + src = fetchFromGitHub { + owner = "Grumbel"; + repo = "strutcpp"; + rev = "3c9cbf6cd0e09b34e464a0ff01aca99290d79870"; + sha256 = "sha256-pyLNbjvhGjEOGcj4Krtcm/Rms2rvBfWD1lqrEmm7gnI="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + gtest + tinycmmc + ]; + + cmakeFlags = [ + "-DBUILD_TESTS=ON" + ]; + + doCheck = true; + + meta = { + description = "Collection of string utilities"; + maintainers = [ lib.maintainers.SchweGELBin ]; + platforms = lib.platforms.linux; + license = lib.licenses.free; + }; +} 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/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix index dfe8a6633d64..ff2cf9437eff 100644 --- a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix +++ b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix @@ -1,23 +1,23 @@ { - version = "1.22.6"; + version = "1.23.0"; x86_64-linux = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.6/linux/amd64/sysdig-cli-scanner"; - hash = "sha256-aOwvxIxq1h66YKJGnFVIFTcA/tq0CseeNLe6pfLobkI="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.23.0/linux/amd64/sysdig-cli-scanner"; + hash = "sha256-7J2hz9p5QphMtC1PNVsicLuDnubjs26siT+Yctf5P9A="; }; aarch64-linux = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.6/linux/arm64/sysdig-cli-scanner"; - hash = "sha256-m79OVmW+9D+941BX9xBwBxrZrDBBrFBDyjS8T6sE3m4="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.23.0/linux/arm64/sysdig-cli-scanner"; + hash = "sha256-EZS+p9/CAaeDJTCkW5Cr2hVcBzG4HDv4zwt7LuOrXrc="; }; x86_64-darwin = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.6/darwin/amd64/sysdig-cli-scanner"; - hash = "sha256-RGc+ZHkX4y6kDwzaZeGWpB3TLRvThUbPkriMDK7U3cQ="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.23.0/darwin/amd64/sysdig-cli-scanner"; + hash = "sha256-PNhdZsC1uhG8KQHEAKeqECBuObfGpflVShikaCojapk="; }; aarch64-darwin = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.6/darwin/arm64/sysdig-cli-scanner"; - hash = "sha256-mFHxETd96ZGJUYDXi6mjhfJDlozDAo4IHaoisbNhwwc="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.23.0/darwin/arm64/sysdig-cli-scanner"; + hash = "sha256-dZ9Fyk6UqJobZbSmEpIxvT1oZhfExaI/lSu4K/0eHI4="; }; } 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/tea/package.nix b/pkgs/by-name/te/tea/package.nix index 8b804c770f6f..ad6a1ff7de00 100644 --- a/pkgs/by-name/te/tea/package.nix +++ b/pkgs/by-name/te/tea/package.nix @@ -8,14 +8,14 @@ buildGoModule rec { pname = "tea"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitea { domain = "gitea.com"; owner = "gitea"; repo = "tea"; rev = "v${version}"; - sha256 = "sha256-jM/TR3bApWv0ci98Vb/0YPjlmLuO91WPY9eMHBInIQI="; + sha256 = "sha256-bphXaE5qPNzqn+PlzESZadpwbS6KryJEnL7hH/CBoTI="; }; vendorHash = "sha256-Y9YDwfubT+RR1v6BTFD+A8GP2ArQaIIoMJmak+Vcx88="; 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/ti/tinycmmc/package.nix b/pkgs/by-name/ti/tinycmmc/package.nix new file mode 100644 index 000000000000..796639ee45b3 --- /dev/null +++ b/pkgs/by-name/ti/tinycmmc/package.nix @@ -0,0 +1,27 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, +}: + +stdenv.mkDerivation { + pname = "tinycmmc"; + version = "0.1.0-unstable-2025-07-21"; + + src = fetchFromGitHub { + owner = "Grumbel"; + repo = "tinycmmc"; + rev = "caf1af301e388e97dca31ee7fdc12f17cff34f82"; + sha256 = "sha256-62ykvAIfOCXH+3bF1IkR+WukeJBLcYC/4Mv3ptqAxEM="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = { + description = "Tiny CMake Module Collections"; + maintainers = [ lib.maintainers.SchweGELBin ]; + platforms = lib.platforms.linux; + license = lib.licenses.zlib; + }; +} diff --git a/pkgs/by-name/ti/tinygettext/package.nix b/pkgs/by-name/ti/tinygettext/package.nix new file mode 100644 index 000000000000..7ea1ea0fc1b9 --- /dev/null +++ b/pkgs/by-name/ti/tinygettext/package.nix @@ -0,0 +1,31 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + tinycmmc, + libiconv, +}: + +stdenv.mkDerivation { + pname = "tinygettext"; + version = "0.1.0-unstable-2025-05-07"; + + src = fetchFromGitHub { + owner = "tinygettext"; + repo = "tinygettext"; + rev = "ef4164639004d7de5bf8ab28ed0e85ea521b7c5e"; + sha256 = "sha256-if+uiVzDA3J+0HM6bVcXvm4lk82TmQmFHG4MtaxIFCk="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ tinycmmc ]; + propagatedBuildInputs = [ libiconv ]; + + meta = { + description = "A simple gettext replacement that works directly on .po files"; + maintainers = [ lib.maintainers.SchweGELBin ]; + platforms = lib.platforms.linux; + license = lib.licenses.zlib; + }; +} 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/to/toolhive/package.nix b/pkgs/by-name/to/toolhive/package.nix new file mode 100644 index 000000000000..3271d421732c --- /dev/null +++ b/pkgs/by-name/to/toolhive/package.nix @@ -0,0 +1,55 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + testers, + toolhive, +}: + +buildGoModule (finalAttrs: { + pname = "toolhive"; + version = "0.0.47"; + + src = fetchFromGitHub { + owner = "stacklok"; + repo = "toolhive"; + tag = "v${finalAttrs.version}"; + hash = "sha256-FXJUEEyCw7ChuzmSAzwXd2LoJXT6vpH+j3muXx5TjPI="; + }; + + vendorHash = "sha256-aP923ezK4/2zTaU9QQLUmNN6KIddOaTlpsYMT2flRaE="; + + # Build only the main CLI and operator binaries + subPackages = [ + "cmd/thv" + "cmd/thv-operator" + ]; + + doCheck = true; + + passthru = { + updateScript = nix-update-script { }; + tests = { + version = testers.testVersion { + package = toolhive; + command = "thv version"; + version = "ToolHive build-unknown"; + }; + }; + }; + + meta = { + description = "Run any MCP server — securely, instantly, anywhere"; + longDescription = '' + ToolHive is an open-source tool for deploying Model Context Protocol (MCP) + servers with a focus on security and ease of use. It provides a CLI to + discover and deploy MCP servers, run servers in isolated containers, + manage server configurations, and auto-configure clients like GitHub Copilot. + ''; + homepage = "https://github.com/stacklok/toolhive"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ thrix ]; + mainProgram = "thv"; + }; +}) 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/tr/tremc/package.nix b/pkgs/by-name/tr/tremc/package.nix index 5268128e41fa..213185c421d2 100644 --- a/pkgs/by-name/tr/tremc/package.nix +++ b/pkgs/by-name/tr/tremc/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, python3Packages, x11Support ? !stdenv.hostPlatform.isDarwin, xclip ? null, @@ -10,36 +9,20 @@ useGeoIP ? false, # Require /var/lib/geoip-databases/GeoIP.dat }: let - wrapperPath = lib.makeBinPath ( - lib.optional x11Support xclip ++ lib.optional stdenv.hostPlatform.isDarwin pbcopy - ); + version = "0.9.5"; in -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "tremc"; - version = "0.9.3"; - format = "other"; + inherit version; + pyproject = false; src = fetchFromGitHub { owner = "tremc"; repo = "tremc"; - rev = version; - hash = "sha256-219rntmetmj1JFG+4NyYMFTWmrHKJL7fnLoMIvnTP4Y="; + tag = version; + hash = "sha256-t7GH3flTLN8O+nnv/kwwzu5x3VoCyF11bqb1EJ8LQs8="; }; - patches = [ - # Remove when tremc > 0.9.3 is released - (fetchpatch { - url = "https://github.com/tremc/tremc/commit/a8aaf9a6728a9ef3d8f13b3603456b0086122891.patch"; - hash = "sha256-+HYdWTbcpvZqjshdHLZ+Svmr6U/aKFc3sy0aka6rn/A="; - name = "support-transmission-4.patch"; - }) - ]; - - buildInputs = with python3Packages; [ - python - wrapPython - ]; - pythonPath = with python3Packages; [ @@ -51,18 +34,19 @@ python3Packages.buildPythonApplication rec { dontBuild = true; doCheck = false; - makeWrapperArgs = [ "--prefix PATH : ${lib.escapeShellArg wrapperPath}" ]; + makeFlags = [ "DESTDIR=${placeholder "out"}" ]; - installPhase = '' - make DESTDIR=$out install - wrapPythonPrograms - ''; + makeWrapperArgs = [ + "--prefix PATH : ${ + lib.makeBinPath (lib.optional x11Support xclip ++ lib.optional stdenv.hostPlatform.isDarwin pbcopy) + }" + ]; - meta = with lib; { + meta = { description = "Curses interface for transmission"; mainProgram = "tremc"; homepage = "https://github.com/tremc/tremc"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ kashw2 ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ kashw2 ]; }; } diff --git a/pkgs/by-name/tr/trezor-suite/package.nix b/pkgs/by-name/tr/trezor-suite/package.nix index 6b460db45daf..17682c637a59 100644 --- a/pkgs/by-name/tr/trezor-suite/package.nix +++ b/pkgs/by-name/tr/trezor-suite/package.nix @@ -10,7 +10,7 @@ let pname = "trezor-suite"; - version = "25.9.3"; + version = "25.10.1"; suffix = { @@ -24,8 +24,8 @@ let hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-mDEqlIxDKHD2xcwcnvehMJExytNBmvhp5iDIKBb/FfxY44We6SAknsocbeWPqq5XLkUbFjjG07IWGtZzdqTj7A=="; - x86_64-linux = "sha512-rxCTYvi+I5ymlS9N4Y2ffIt5ZSgXf6U24mNKe1FNo5++6NfCXFf4vMWJreQ2TNUHsa8V0IixXrtar7AdWCpYQQ=="; + aarch64-linux = "sha512-dqtnWxybR+QTc1cvh72Nm7zkDh7zy6qbAh36b4IGGjARb8X/cEkGMIR2t9E/5pylW6z5gBC7ZpthvdjsiKi1dg=="; + x86_64-linux = "sha512-NBja0kDi43DQ/nJKfAR5+vwbDG/JLr1NKi2OT8CQ5PNeV7Q+4vW5NjsQ9eZyaFwDwSxMPlSzYE3nKcjW0XSiWA=="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/tr/trustymail/package.nix b/pkgs/by-name/tr/trustymail/package.nix index 38c1ae1066d3..7bf821b7025e 100644 --- a/pkgs/by-name/tr/trustymail/package.nix +++ b/pkgs/by-name/tr/trustymail/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "trustymail"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "cisagov"; repo = "trustymail"; tag = "v${version}"; - hash = "sha256-t8Z/jMCqxqCpurQWejT7tnW9l0xMkgsD6Dfe5PZ9OqA="; + hash = "sha256-EA8RomXREDAHZIuq8x+t6w7V1ErUOuuo0TUyaxIgdR8="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/ts/tslib/package.nix b/pkgs/by-name/ts/tslib/package.nix index b4e4a575dd01..ec21279b1272 100644 --- a/pkgs/by-name/ts/tslib/package.nix +++ b/pkgs/by-name/ts/tslib/package.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-2YJDADh/WCksAEIjngAdji98YGmwjpvxSBZkxAwFc7k="; }; + patches = [ + # CMake 4 dropped support of versions lower than 3.5 + ./tslib-1.23-cmake4.patch + ]; + nativeBuildInputs = [ cmake ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ts/tslib/tslib-1.23-cmake4.patch b/pkgs/by-name/ts/tslib/tslib-1.23-cmake4.patch new file mode 100644 index 000000000000..d9f6b3ce0c5d --- /dev/null +++ b/pkgs/by-name/ts/tslib/tslib-1.23-cmake4.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,7 +8,7 @@ + # + # + +-cmake_minimum_required(VERSION 3.3) ++cmake_minimum_required(VERSION 3.10) + + project(tslib LANGUAGES C) + \ No newline at end of file diff --git a/pkgs/by-name/ub/ubus/package.nix b/pkgs/by-name/ub/ubus/package.nix index 5c28c5aab3a5..ae59682cff6f 100644 --- a/pkgs/by-name/ub/ubus/package.nix +++ b/pkgs/by-name/ub/ubus/package.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation { pname = "ubus"; - version = "unstable-2023-12-18"; + version = "unstable-202-10-17"; src = fetchgit { url = "https://git.openwrt.org/project/ubus.git"; - rev = "65bb027054def3b94a977229fd6ad62ddd32345b"; - hash = "sha256-n82Ub0IiuvWbnlDCoN+0hjo/1PbplEbc56kuOYMrHxQ="; + rev = "60e04048a0e2f3e33651c19e62861b41be4c290f"; + hash = "sha256-fjxO77z+do5gZ7nLwHbC14UnP9cmZ5eANNn4X6Sudn0="; }; cmakeFlags = [ "-DBUILD_LUA=OFF" ]; diff --git a/pkgs/by-name/uc/uci/package.nix b/pkgs/by-name/uc/uci/package.nix index d6318106a3fe..1e7eaf22700b 100644 --- a/pkgs/by-name/uc/uci/package.nix +++ b/pkgs/by-name/uc/uci/package.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation { pname = "uci"; - version = "unstable-2023-08-10"; + version = "unstable-2025-10-12"; src = fetchgit { url = "https://git.openwrt.org/project/uci.git"; - rev = "5781664d5087ccc4b5ab58505883231212dbedbc"; - hash = "sha256-8MyFaZdAMh5oMPO/5QyNT+Or57eBL3mamJLblGGoF9g="; + rev = "57c1e8cd2c051d755ca861a9ab38a8049d2e3f95"; + hash = "sha256-/Ian7WoBvm9nmniHdVTEIyRW1BPTmOe3O0v59aDaXc0="; }; hardeningDisable = [ "all" ]; diff --git a/pkgs/by-name/uc/uclient/package.nix b/pkgs/by-name/uc/uclient/package.nix index a80896b15c92..af69a84ab72e 100644 --- a/pkgs/by-name/uc/uclient/package.nix +++ b/pkgs/by-name/uc/uclient/package.nix @@ -5,23 +5,29 @@ cmake, pkg-config, libubox, + ucode, + json_c, }: stdenv.mkDerivation { pname = "uclient"; - version = "unstable-2023-04-13"; + version = "unstable-2025-10-03"; src = fetchgit { url = "https://git.openwrt.org/project/uclient.git"; - rev = "007d945467499f43656b141171d31f5643b83a6c"; - hash = "sha256-A47dyVc2MtOL6aImZ0b3SMWH2vzjfAXzRAOF4nfH6S0="; + rev = "dc909ca71bc884c0e5362e1d7cc7808696cb2add"; + hash = "sha256-jrhLBB3Mb7FvxMtKxG7e7D/hcyygTjx868POGtF+Dcc="; }; nativeBuildInputs = [ cmake pkg-config ]; - buidInputs = [ libubox ]; + buildInputs = [ + libubox + ucode + json_c + ]; preConfigure = '' sed -e 's|ubox_include_dir libubox/ustream-ssl.h|ubox_include_dir libubox/ustream-ssl.h HINTS ${libubox}/include|g' \ @@ -36,6 +42,5 @@ stdenv.mkDerivation { maintainers = with maintainers; [ mkg20001 ]; mainProgram = "uclient-fetch"; platforms = platforms.all; - broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/uc/ucode/package.nix b/pkgs/by-name/uc/ucode/package.nix index d3e1c4e603a2..30fb32cbcb2f 100644 --- a/pkgs/by-name/uc/ucode/package.nix +++ b/pkgs/by-name/uc/ucode/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "JavaScript-like language with optional templating"; homepage = "https://github.com/jow-/ucode"; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ mkg20001 ]; }; } diff --git a/pkgs/by-name/ud/udebug/package.nix b/pkgs/by-name/ud/udebug/package.nix index eb21aab56c84..ab8f9c99bb8a 100644 --- a/pkgs/by-name/ud/udebug/package.nix +++ b/pkgs/by-name/ud/udebug/package.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation { pname = "udebug"; - version = "unstable-2023-12-06"; + version = "unstable-2025-09-28"; src = fetchgit { url = "https://git.openwrt.org/project/udebug.git"; - rev = "6d3f51f9fda706f0cf4732c762e4dbe8c21e12cf"; - hash = "sha256-5dowoFZn9I2IXMQ3Pz+2Eo3rKfihLzjca84MytQIXcU="; + rev = "5327524e715332daaebf6b04c155d2880d230979"; + hash = "sha256-Zcbbo7Jo7JxNSjUlbB2m2Id8crdxzKc/QFeduPGvows="; }; buildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation { mainProgram = "udebugd"; homepage = "https://git.openwrt.org/?p=project/udebug.git;a=summary"; license = licenses.free; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ mkg20001 ]; }; } diff --git a/pkgs/by-name/ui/uitest/package.nix b/pkgs/by-name/ui/uitest/package.nix new file mode 100644 index 000000000000..9eff2ef5b47f --- /dev/null +++ b/pkgs/by-name/ui/uitest/package.nix @@ -0,0 +1,34 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + tinycmmc, +}: + +stdenv.mkDerivation { + pname = "uitest"; + version = "0-unstable-2024-05-26"; + + src = fetchFromGitHub { + owner = "Grumbel"; + repo = "uitest"; + rev = "d845427140cbcbce99bb6c72919199ac5f033784"; + sha256 = "sha256-xD2Ecs9hW3lcQW6RNcjVhGX/eor2RbCHHXohTafC9y0="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ tinycmmc ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" + ''; + + meta = { + description = "Simple testing framework for interactive tests"; + maintainers = [ lib.maintainers.SchweGELBin ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3; + }; +} diff --git a/pkgs/by-name/uq/uqmi/package.nix b/pkgs/by-name/uq/uqmi/package.nix index 6ee2d0f28f04..f4706afbf70d 100644 --- a/pkgs/by-name/uq/uqmi/package.nix +++ b/pkgs/by-name/uq/uqmi/package.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation { pname = "uqmi"; - version = "unstable-2024-01-16"; + version = "unstable-2025-07-30"; src = fetchgit { url = "https://git.openwrt.org/project/uqmi.git"; - rev = "c3488b831ce6285c8107704156b9b8ed7d59deb3"; - hash = "sha256-O5CeLk0WYuBs3l5xBUk9kXDRMzFvYSRoqP28KJ5Ztos="; + rev = "7914da43cddaaf6cfba116260c81e6e9adffd5ab"; + hash = "sha256-Ny5Jd/6N1nTcv2GGP1YLFe+ljn15sUQJVAEVPvYtz3M="; }; postPatch = '' @@ -33,13 +33,9 @@ stdenv.mkDerivation { ]; env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ - # Needed with GCC 12 but breaks on darwin (with clang) or older gcc - "-Wno-error=dangling-pointer" - "-Wno-error=maybe-uninitialized" - ] - ++ lib.optionals stdenv.cc.isClang [ - "-Wno-error=sometimes-uninitialized" + lib.optionals stdenv.cc.isClang [ + # error: unknown warning option '-Wno-dangling-pointer' [-Werror,-Wunknown-warning-option] + "-Wno-error=unknown-warning-option" ] ); 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/vi/viber/package.nix b/pkgs/by-name/vi/viber/package.nix index a2847e7d5206..158bde24d1cb 100644 --- a/pkgs/by-name/vi/viber/package.nix +++ b/pkgs/by-name/vi/viber/package.nix @@ -1,11 +1,13 @@ { - fetchurl, lib, stdenv, + fetchurl, dpkg, makeWrapper, alsa-lib, + bintools, brotli, + cairo, cups, curl, dbus, @@ -13,53 +15,73 @@ fontconfig, freetype, glib, + gsm, gst_all_1, harfbuzz, lcms, + libbluray, libcap, + libdrm, libevent, + libgbm, libGL, libGLU, libkrb5, + libmng, + libopenmpt, libopus, libpulseaudio, + librsvg, + libtheora, + libtiff, + libva, + libvdpau, + libwebp, libxkbcommon, libxkbfile, libxml2, libxslt, - libwebp, - libgbm, + mtdev, nspr, nss, + numactl, + ocl-icd, + openjpeg, openssl, snappy, - systemd, + speex, + systemdLibs, + tslib, + twolame, + wavpack, wayland, xorg, + xvidcore, zlib, zstd, + zvbi, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "viber"; - version = "23.2.0.3"; + version = "24.9.0.3"; src = fetchurl { # Taking Internet Archive snapshot of a specific version to avoid breakage # on new versions - url = "https://web.archive.org/web/20240824071651/https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; - hash = "sha256-9WHiI2WlsgEhCPkrQoAunmF6lSb2n5RgQJ2+sdnSShM="; + url = "https://web.archive.org/web/20250830135453/https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; + hash = "sha256-i7fG8Sdl/v5QAyTsCh6OKe4BDYnQ0jBJgSdqMOrkLNo="; }; - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = [ dpkg ]; - - dontUnpack = true; + nativeBuildInputs = [ + dpkg + makeWrapper + ]; libPath = lib.makeLibraryPath [ alsa-lib brotli + cairo cups curl dbus @@ -67,37 +89,53 @@ stdenv.mkDerivation { fontconfig freetype glib + gsm + gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gstreamer harfbuzz lcms + libbluray libcap + libdrm libevent - libGLU + libgbm libGL + libGLU libkrb5 + libmng + libopenmpt libopus libpulseaudio + librsvg + libtheora + libtiff + libva + libvdpau + libwebp libxkbcommon libxkbfile libxml2 libxslt - libwebp - libgbm + mtdev nspr nss + numactl + ocl-icd + openjpeg openssl snappy + speex stdenv.cc.cc - systemd + systemdLibs + tslib + twolame + wavpack wayland - zlib - zstd - xorg.libICE xorg.libSM xorg.libX11 - xorg.libxcb xorg.libXcomposite xorg.libXcursor xorg.libXdamage @@ -108,44 +146,45 @@ stdenv.mkDerivation { xorg.libXrender xorg.libXScrnSaver xorg.libXtst + xorg.libxcb xorg.xcbutilimage xorg.xcbutilkeysyms xorg.xcbutilrenderutil xorg.xcbutilwm + xvidcore + zlib + zstd + zvbi ]; installPhase = '' - dpkg-deb -x $src $out - mkdir -p $out/bin + runHook preInstall - # Soothe nix-build "suspicions" - chmod -R g-w $out + cp -r . $out for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true - patchelf --set-rpath $libPath:$out/opt/viber/lib:$out/lib $file || true + patchelf --set-interpreter ${bintools.dynamicLinker} "$file" || true + patchelf --set-rpath ${finalAttrs.libPath}:$out/opt/viber/lib $file || true done + mkdir $out/bin # qt.conf is not working, so override everything using environment variables - wrapProgram $out/opt/viber/Viber \ + makeWrapper $out/opt/viber/Viber $out/bin/viber \ --set QT_QPA_PLATFORM "xcb" \ --set QT_PLUGIN_PATH "$out/opt/viber/plugins" \ --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \ --set QML2_IMPORT_PATH "$out/opt/viber/qml" - ln -s $out/opt/viber/Viber $out/bin/viber mv $out/usr/share $out/share rm -rf $out/usr - # Fix the desktop link substituteInPlace $out/share/applications/viber.desktop \ - --replace /opt/viber/Viber $out/opt/viber/Viber \ - --replace /usr/share/ $out/share/ - + --replace-fail "/opt/viber/" "$out/opt/viber/" # Fix libxml2 breakage. See https://github.com/NixOS/nixpkgs/pull/396195#issuecomment-2881757108 - mkdir -p "$out/lib" ln -s "${lib.getLib libxml2}/lib/libxml2.so" "$out/opt/viber/lib/libxml2.so.2" + + runHook postInstall ''; dontStrip = true; @@ -159,5 +198,4 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ jagajaga ]; }; - -} +}) diff --git a/pkgs/by-name/vs/vscode-solidity-server/package.nix b/pkgs/by-name/vs/vscode-solidity-server/package.nix index d70eb8b90b97..aa91cf45f815 100644 --- a/pkgs/by-name/vs/vscode-solidity-server/package.nix +++ b/pkgs/by-name/vs/vscode-solidity-server/package.nix @@ -4,6 +4,8 @@ fetchFromGitHub, pkg-config, libsecret, + stdenv, + clang_20, }: buildNpmPackage { @@ -19,7 +21,7 @@ buildNpmPackage { npmDepsHash = "sha256-zXhWtPuiu+CRk712KskuHP4vglogJmFoCak6qWczPFM="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks keytar buildInputs = [ libsecret ]; diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 74906ea972a5..3d70418c08f5 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-faZ4/CdCxxpx2mVtLvMvzlcdokk/bkaGgLynQnqiBBI=", - "version": "0.2025.10.08.08.12.stable_03" + "hash": "sha256-kcTQTOxe2swK8Ntn2mYesgK1Jo9+xlYQtu6MsZVr+yk=", + "version": "0.2025.10.15.08.12.stable_01" }, "linux_x86_64": { - "hash": "sha256-PfHWgzQYbz+JX+5DNkyjnfzycZZFZtW1plWYtcFiIks=", - "version": "0.2025.10.08.08.12.stable_03" + "hash": "sha256-VqJteZNtupyL/wV21NCe3yY4PGtL39QO5P7eHRf6v5g=", + "version": "0.2025.10.15.08.12.stable_01" }, "linux_aarch64": { - "hash": "sha256-OfI+sm7/wpFSEoRSGr4XLO1WhY7nXoN1oLDJHNE7cws=", - "version": "0.2025.10.08.08.12.stable_03" + "hash": "sha256-B/VicadRluk0Pkg6vqzbNm6k59YkRvgfN58phfQSpXc=", + "version": "0.2025.10.15.08.12.stable_01" } } 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/we/wesnoth/package.nix b/pkgs/by-name/we/wesnoth/package.nix index 16663c625477..0c03fa0d7b7f 100644 --- a/pkgs/by-name/we/wesnoth/package.nix +++ b/pkgs/by-name/we/wesnoth/package.nix @@ -23,10 +23,12 @@ lua5_4, curl, nix-update-script, + enableDevel ? false, }: let boost = boost186; + suffix = lib.optionalString enableDevel "-devel"; # wesnoth requires lua built with c++, see https://github.com/wesnoth/wesnoth/pull/8234 lua = lua5_4.override { postConfigure = '' @@ -36,14 +38,18 @@ let in stdenv.mkDerivation (finalAttrs: { - pname = "wesnoth"; - version = "1.18.5"; + pname = "wesnoth${suffix}"; + version = if enableDevel then "1.19.16.1" else "1.18.5"; src = fetchFromGitHub { owner = "wesnoth"; repo = "wesnoth"; tag = finalAttrs.version; - hash = "sha256-0VZJAmaCg12x4S07H1kl5s2NGMEo/NSVnzMniREmPJk="; + hash = + if enableDevel then + "sha256-ekpyQnP5r3jl98qyNkO6SwUGc9qvz2OTidUu0k3m28c=" + else + "sha256-0VZJAmaCg12x4S07H1kl5s2NGMEo/NSVnzMniREmPJk="; }; nativeBuildInputs = [ @@ -73,10 +79,31 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DENABLE_SYSTEM_LUA=ON" + "-DBINARY_SUFFIX=${suffix}" ]; + postPatch = lib.optionalString (suffix != "") '' + mv packaging/org.wesnoth.Wesnoth.desktop packaging/org.wesnoth.Wesnoth${suffix}.desktop + mv packaging/org.wesnoth.Wesnoth.appdata.xml packaging/org.wesnoth.Wesnoth${suffix}.appdata.xml + + substituteInPlace packaging/org.wesnoth.Wesnoth${suffix}.desktop \ + --replace-fail "Name=Battle for Wesnoth" "Name=Battle for Wesnoth${suffix}" \ + --replace-fail "Exec=sh -c \"wesnoth >/dev/null 2>&1\"" "Exec=sh -c \"wesnoth${suffix} >/dev/null 2>&1\"" \ + --replace-fail "Exec=sh -c \"wesnoth -e >/dev/null 2>&1\"" "Exec=sh -c \"wesnoth${suffix} -e >/dev/null 2>&1\"" + + substituteInPlace packaging/org.wesnoth.Wesnoth${suffix}.appdata.xml \ + --replace-fail "Battle for Wesnoth" "Battle for Wesnoth${suffix}" \ + --replace-fail "org.wesnoth.Wesnoth" "org.wesnoth.Wesnoth${suffix}" \ + --replace-fail "wesnoth" "wesnoth${suffix}" \ + --replace-fail "wesnothd" "wesnothd${suffix}" + + substituteInPlace CMakeLists.txt \ + --replace-fail "org.wesnoth.Wesnoth.desktop" "org.wesnoth.Wesnoth${suffix}.desktop" \ + --replace-fail "org.wesnoth.Wesnoth.appdata.xml" "org.wesnoth.Wesnoth${suffix}.appdata.xml" + ''; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - app_name="The Battle for Wesnoth" + app_name="The Battle for Wesnoth${suffix}" app_bundle="$out/Applications/$app_name.app" app_contents="$app_bundle/Contents" mkdir -p "$app_contents" @@ -85,8 +112,8 @@ stdenv.mkDerivation (finalAttrs: { mv $out/share/wesnoth "$app_contents/Resources" pushd ../projectfiles/Xcode substitute Info.plist "$app_contents/Info.plist" \ - --replace-fail ''\'''${EXECUTABLE_NAME}' wesnoth \ - --replace-fail '$(PRODUCT_BUNDLE_IDENTIFIER)' org.wesnoth.Wesnoth \ + --replace-fail ''\'''${EXECUTABLE_NAME}' wesnoth${suffix} \ + --replace-fail '$(PRODUCT_BUNDLE_IDENTIFIER)' org.wesnoth.Wesnoth${suffix} \ --replace-fail ''\'''${PRODUCT_NAME}' "$app_name" cp -r Resources/SDLMain.nib "$app_contents/Resources/" install -m0644 Resources/{container-migration.plist,icon.icns} "$app_contents/Resources" @@ -94,22 +121,27 @@ stdenv.mkDerivation (finalAttrs: { # Make the game and dedicated server binary available for shell users mkdir -p "$out/bin" - ln -s "$app_contents/MacOS/wesnothd" "$out/bin/wesnothd" + ln -s "$app_contents/MacOS/wesnothd${suffix}" "$out/bin/wesnothd${suffix}" # Symlinking the game binary is unsifficient as it would be unable to # find the bundle resources - cat << EOF > "$out/bin/wesnoth" + cat << EOF > "$out/bin/wesnoth${suffix}" #!${stdenvNoCC.shell} open -na "$app_bundle" --args "\$@" EOF - chmod +x "$out/bin/wesnoth" + chmod +x "$out/bin/wesnoth${suffix}" ''; passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" - # the minor release number also denotes if this is a beta release: - # even is stable, odd is beta - "^(\\d+\\.\\d*[02468]\\.\\d+)$" + ( + if enableDevel then + # Devel matches odd minor release numbers + "^(\\d+\\.\\d*[13579]\\.\\d+.*)$" + else + # Stable matches even minor release numbers + "^(\\d+\\.\\d*[02468]\\.\\d+)$" + ) ]; }; @@ -131,6 +163,6 @@ stdenv.mkDerivation (finalAttrs: { iedame ]; platforms = lib.platforms.unix; - mainProgram = "wesnoth"; + mainProgram = "wesnoth${suffix}"; }; }) diff --git a/pkgs/by-name/ws/wstsound/package.nix b/pkgs/by-name/ws/wstsound/package.nix new file mode 100644 index 000000000000..2464faaf69ed --- /dev/null +++ b/pkgs/by-name/ws/wstsound/package.nix @@ -0,0 +1,64 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + gtest, + tinycmmc, + libmodplug, + libogg, + libvorbis, + mpg123, + openal, + opusfile, + libopus, +}: + +stdenv.mkDerivation { + pname = "wstsound"; + version = "0.3.0-unstable-2025-07-21"; + + src = fetchFromGitHub { + owner = "WindstilleTeam"; + repo = "wstsound"; + rev = "2c7b00dc1af52432185dc28c4ae87c09c9f4f444"; + sha256 = "sha256-fus1ydypnDDHsQwMkYyZuRikZLbZXLlc/cY8Qol5Hwo="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + gtest + tinycmmc + ]; + propagatedBuildInputs = [ + libmodplug + libogg + libvorbis + mpg123 + openal + opusfile + libopus + ]; + + cmakeFlags = [ + "-DWARNINGS=ON" + "-DWERROR=ON" + "-DBUILD_TESTS=ON" + "-DBUILD_EXTRA=ON" + ]; + + # Test "openal_info fails" + doCheck = false; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "COMMAND openal_info" "COMMAND openal-info" + ''; + + meta = { + description = "Windstille Sound Library"; + maintainers = [ lib.maintainers.SchweGELBin ]; + platforms = lib.platforms.linux; + license = lib.licenses.free; + }; +} diff --git a/pkgs/by-name/xd/xdgcpp/package.nix b/pkgs/by-name/xd/xdgcpp/package.nix new file mode 100644 index 000000000000..ef8162e9fa15 --- /dev/null +++ b/pkgs/by-name/xd/xdgcpp/package.nix @@ -0,0 +1,27 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, +}: + +stdenv.mkDerivation { + pname = "xdgcpp"; + version = "0-unstable-2024-05-26"; + + src = fetchFromGitHub { + owner = "Grumbel"; + repo = "xdgcpp"; + rev = "e2c40c081e2ee2d315d1d0b3ae5981d5fd77260e"; + sha256 = "sha256-eujYRUw8UpDFgEvjHUPsJ/QJN+A+hzcebfgteM9kvXM="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = { + description = "Implementation of the XDG Base Directory Specification in C++"; + maintainers = [ lib.maintainers.SchweGELBin ]; + platforms = lib.platforms.linux; + license = lib.licenses.lgpl3; + }; +} 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 e1ff47ab49fa..1331c38b9e24 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -265761,7 +265761,7 @@ self: { license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; } - ) { inherit (pkgs) webkitgtk_4_0; }; + ) { webkitgtk_4_0 = null; }; gi-javascriptcore6 = callPackage ( { @@ -266713,7 +266713,7 @@ self: { badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; } - ) { inherit (pkgs) webkitgtk_4_0; }; + ) { webkitgtk_4_0 = null; }; gi-webkit2webextension = callPackage ( { @@ -266773,7 +266773,7 @@ self: { hydraPlatforms = lib.platforms.none; broken = true; } - ) { inherit (pkgs) webkitgtk_4_0; }; + ) { webkitgtk_4_0 = null; }; gi-webkitwebprocessextension = callPackage ( { @@ -674308,7 +674308,7 @@ self: { ) { inherit (pkgs) gtk3; - inherit (pkgs) webkitgtk_4_0; + webkitgtk_4_0 = null; }; tibetan-utils = callPackage ( @@ -721971,7 +721971,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/intel-oneapi/base.nix b/pkgs/development/libraries/intel-oneapi/base.nix new file mode 100644 index 000000000000..065c9dabe9c8 --- /dev/null +++ b/pkgs/development/libraries/intel-oneapi/base.nix @@ -0,0 +1,254 @@ +{ + lib, + fetchurl, + zlib, + rdma-core, + libpsm2, + ucx, + numactl, + level-zero, + pkg-config, + libdrm, + elfutils, + xorg, + glib, + nss, + nspr, + dbus, + at-spi2-atk, + cups, + gtk3, + pango, + cairo, + mesa, + expat, + libxkbcommon, + eudev, + alsa-lib, + ncurses5, + bzip2, + gdbm, + libxcrypt-legacy, + freetype, + gtk2, + gdk-pixbuf, + fontconfig, + libuuid, + sqlite, + + # The list of components to install; + # Either [ "all" ], [ "default" ], or a custom list of components. + # If you want to install all default components plus an extra one, pass [ "default" ] + # Note that changing this will also change the `buildInputs` of the derivation. + # The default value is not "default" because some of the components in the defualt set are currently broken. + components ? [ + "intel.oneapi.lin.advisor" + "intel.oneapi.lin.dpcpp-cpp-compiler" + "intel.oneapi.lin.dpcpp_dbg" + "intel.oneapi.lin.vtune" + "intel.oneapi.lin.mkl.devel" + ], + + intel-oneapi, + + # For tests + runCommand, + libffi, + stdenv, +}: +intel-oneapi.mkIntelOneApi (fa: { + pname = "intel-oneapi-base-toolkit"; + + src = fetchurl { + url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/3b7a16b3-a7b0-460f-be16-de0d64fa6b1e/intel-oneapi-base-toolkit-2025.2.1.44_offline.sh"; + hash = "sha256-oVURJZG6uZ3YvYefUuqeakbaVR47ZgWduBV6bS6r5Dk="; + }; + + versionYear = "2025"; + versionMajor = "2"; + versionMinor = "1"; + versionRel = "44"; + + inherit components; + + # Figured out by looking at autoPatchelfHook failure output + depsByComponent = rec { + advisor = [ + libdrm + zlib + gtk2 + gdk-pixbuf + at-spi2-atk + glib + pango + gdk-pixbuf + cairo + fontconfig + glib + freetype + xorg.libX11 + xorg.libXxf86vm + xorg.libXext + xorg.libxcb + xorg.libXcomposite + xorg.libXdamage + xorg.libXfixes + xorg.libXrandr + nss + dbus + cups + mesa + expat + libxkbcommon + eudev + alsa-lib + ncurses5 + bzip2 + libuuid + gdbm + libxcrypt-legacy + sqlite + nspr + ]; + dpcpp-cpp-compiler = [ + zlib + level-zero + ]; + dpcpp_dbg = [ + level-zero + zlib + ]; + dpcpp-ct = [ zlib ]; + mpi = [ + zlib + rdma-core + libpsm2 + ucx + libuuid + numactl + level-zero + libffi + ]; + pti = [ level-zero ]; + vtune = [ + libdrm + elfutils + zlib + xorg.libX11 + xorg.libXext + xorg.libxcb + xorg.libXcomposite + xorg.libXdamage + xorg.libXfixes + xorg.libXrandr + glib + nss + dbus + at-spi2-atk + cups + gtk3 + pango + cairo + mesa + expat + libxkbcommon + eudev + alsa-lib + at-spi2-atk + ncurses5 + bzip2 + libuuid + gdbm + libxcrypt-legacy + sqlite + nspr + ]; + mkl = mpi ++ pti; + }; + + autoPatchelfIgnoreMissingDeps = [ + # Needs to be dynamically loaded as it depends on the hardware + "libcuda.so.1" + # All too old, not in nixpkgs anymore + "libffi.so.6" + "libgdbm.so.4" + "libopencl-clang.so.14" + ]; + + passthru.updateScript = intel-oneapi.mkUpdateScript { + inherit (fa) pname; + file = "base.nix"; + downloadPage = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/base-toolkit-download.html?packages=oneapi-toolkit&oneapi-toolkit-os=linux&oneapi-lin=offline"; + }; + + passthru.tests = { + mkl-libs = stdenv.mkDerivation { + name = "intel-oneapi-test-mkl-libs"; + unpackPhase = '' + cp ${./test.c} test.c + ''; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ intel-oneapi.base ]; + + buildPhase = '' + # This will fail if no libs with mkl- in their name are found + libs="$(pkg-config --list-all | cut -d\ -f1 | grep mkl-)" + for lib in $libs; do + echo "Testing that the build succeeds with $lib" >&2 + gcc test.c -o test-with-$lib $(pkg-config --cflags --libs $lib) + done + ''; + + doCheck = true; + + checkPhase = '' + for lib in $libs; do + echo "Testing that the executable built with $lib runs" >&2 + ./test-with-$lib + done + ''; + + installPhase = '' + touch "$out" + ''; + }; + + all-binaries-run = runCommand "intel-oneapi-test-all-binaries-run" { } '' + # .*-32: 32-bit executables can't be properly patched by patchelf + # IMB-.*: all fail with a weird "bad file descriptor" error + # fi_info, fi_pingpong: exits with 1 even if ran with `--help` + # gdb-openapi: Python not initialized + # hydra_bstrap_proxy, hydra_nameserver, hydra_pmi_proxy: doesn't respect --help + # mpirun: can't find mpiexec.hydra for some reason + # sycl-ls, sycl-trace: doesn't respect --help + regex_skip="(.*-32)|(IMB-.*)|fi_info|fi_pingpong|gdb-oneapi|hydra_bstrap_proxy|hydra_nameserver|hydra_pmi_proxy|mpirun|sycl-ls|sycl-trace" + export I_MPI_ROOT="${intel-oneapi.base}/mpi/latest" + for bin in "${intel-oneapi.base}"/bin/*; do + if [[ "$bin" =~ $regex_skip ]] || [ ! -f "$bin" ] || [[ ! -x "$bin" ]]; then + echo "skipping $bin" + continue + fi + echo "trying to run $bin --help or -help" + "$bin" --help || "$bin" -help + done + touch "$out" + ''; + }; + + meta = { + description = "Intel oneAPI Base Toolkit"; + homepage = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/base-toolkit.html"; + license = with lib.licenses; [ + intel-eula + issl + asl20 + ]; + maintainers = with lib.maintainers; [ + balsoft + ]; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/development/libraries/intel-oneapi/default.nix b/pkgs/development/libraries/intel-oneapi/default.nix new file mode 100644 index 000000000000..217756b9a9c1 --- /dev/null +++ b/pkgs/development/libraries/intel-oneapi/default.nix @@ -0,0 +1,188 @@ +{ + lib, + callPackage, + stdenv, + ncurses5, + bc, + bubblewrap, + autoPatchelfHook, + python3, + libgcc, + glibc, + writeShellScript, + writeText, + writeTextFile, + + # For the updater script + writeShellApplication, + curl, + jq, + htmlq, + common-updater-scripts, + writableTmpDirAsHomeHook, +}: + +{ + mkIntelOneApi = lib.extendMkDerivation { + constructDrv = stdenv.mkDerivation; + + excludeDrvArgNames = [ + "depsByComponent" + "components" + ]; + + extendDrvArgs = + fa: + { + pname, + versionYear, + versionMajor, + versionMinor, + versionRel, + src, + meta, + depsByComponent ? { }, + postInstall ? "", + components ? [ "default" ], + ... + }@args: + let + shortName = name: builtins.elemAt (lib.splitString "." name) 3; + in + { + version = "${fa.versionYear}.${fa.versionMajor}.${fa.versionMinor}.${fa.versionRel}"; + + nativeBuildInputs = [ + # Installer wants tput + ncurses5 + # Used to check if there's enough disk space + bc + bubblewrap + + autoPatchelfHook + writableTmpDirAsHomeHook + ]; + + buildInputs = [ + # For patchShebangs + python3 + ] + # autoPatchelfHook will add these libraries to RPATH as required + ++ lib.concatMap ( + comp: + if comp == "all" || comp == "default" then + lib.concatLists (builtins.attrValues depsByComponent) + else + depsByComponent.${shortName comp} or [ ] + ) components; + + phases = [ + "installPhase" + "fixupPhase" + ]; + + # See https://software.intel.com/content/www/us/en/develop/documentation/installation-guide-for-intel-oneapi-toolkits-linux/top/installation/install-with-command-line.html + installPhase = '' + runHook preInstall + # The installer expects that the installation directory is already present + mkdir -p "$out" + + # Required for the installer to find libstdc++ + export LD_LIBRARY_PATH="${lib.makeLibraryPath [ libgcc.lib ]}" + + # The installer is an insane four-stage rube goldberg machine: + # 1. Our $src (bash script) unpacks install.sh (bash script) + # 2. install.sh unpacks bootstrapper (dylinked binary with hardcoded interpreter in /lib) + # 3. bootstrapper unpacks installer (dylinked binary with hardcoded interpreter and libraries in /lib) + # 4. installer installs the actual components we need + # + # While stage 1 allows to "only extract", other stages always try running the next executable down, and remove stuff if they fail. + # I'm afraid this is the cleanest solution for now. + mkdir -p fhs-root/{lib,lib64} + ln -s "${glibc}/lib/"* fhs-root/lib/ + ln -s "${glibc}/lib/"* fhs-root/lib64/ + bwrap \ + --bind fhs-root / \ + --bind /nix /nix \ + --ro-bind /bin /bin \ + --dev /dev \ + --proc /proc \ + bash "$src" \ + -a \ + --silent \ + --eula accept \ + --install-dir "$out" \ + --components ${lib.concatStringsSep ":" components} + + # Non-reproducible + rm -rf "$out"/logs + # This contains broken symlinks and doesn't seem to be useful + rm -rf "$out"/.toolkit_linking_tool + + ln -s "$out/$versionYear.$versionMajor"/{lib,etc,bin,share,opt} "$out" + + runHook postInstall + ''; + }; + }; + + mkUpdateScript = + { + pname, + downloadPage, + file, + }: + writeShellApplication { + name = "update-intel-oneapi"; + runtimeInputs = [ + curl + jq + htmlq + common-updater-scripts + ]; + text = '' + download_page=${lib.escapeShellArg downloadPage} + pname=${lib.escapeShellArg pname} + nixpkgs="$(git rev-parse --show-toplevel)" + packageDir="$nixpkgs/pkgs/by-name/in/intel-oneapi" + file="$packageDir"/${lib.escapeShellArg file} + + echo 'Figuring out the download URL' >&2 + + # Intel helpfully gives us a wget command to run so that we can download the toolkit installer, as part of their product page. + # This variable will contain that command (wget https://...), we will extract the URL from it. + wget_command="$(curl "$download_page" \ + | htmlq 'code' --text \ + | grep "wget.*$pname.*sh")" + + regex="wget (.*$pname.([0-9]+)[.]([0-9]+)[.]([0-9]+)[.]([0-9]+)_offline[.]sh)" + if [[ "$wget_command" =~ $regex ]]; then + url="''${BASH_REMATCH[1]}" + versionYear="''${BASH_REMATCH[2]}" + versionMajor="''${BASH_REMATCH[3]}" + versionMinor="''${BASH_REMATCH[4]}" + versionRel="''${BASH_REMATCH[5]}" + else + echo "'$wget_command' does not match the expected format $regex" >&2 + exit 1 + fi + + if [[ "$(grep 'url =' "$file")" =~ "$url" ]] && [[ "''${BASH_REMATCH[0]}" == "$url" ]]; then + echo "The URL is the same ($url), skipping update" >&2 + else + echo "The new download URL is $url, prefetching it to store" >&2 + hash="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --quiet "$url")")" + fi + + sed -i "s|versionYear = \".*\";|versionYear = \"$versionYear\";|" "$file" + sed -i "s|versionMajor = \".*\";|versionMajor = \"$versionMajor\";|" "$file" + sed -i "s|versionMinor = \".*\";|versionMinor = \"$versionMinor\";|" "$file" + sed -i "s|versionRel = \".*\";|versionRel = \"$versionRel\";|" "$file" + sed -i "s|url = \".*\";|url = \"$url\";|" "$file" + sed -i "s|hash = \".*\";|hash = \"$hash\";|" "$file" + ''; + }; + + base = callPackage ./base.nix { }; + hpc = callPackage ./hpc.nix { }; +} diff --git a/pkgs/development/libraries/intel-oneapi/hpc.nix b/pkgs/development/libraries/intel-oneapi/hpc.nix new file mode 100644 index 000000000000..181205a0ef76 --- /dev/null +++ b/pkgs/development/libraries/intel-oneapi/hpc.nix @@ -0,0 +1,83 @@ +{ + lib, + fetchurl, + + # The list of components to install; + # Either [ "all" ], [ "default" ], or a custom list of components. + # If you want to install all default components plus an extra one, pass [ "default" ] + # Note that changing this will also change the `buildInputs` of the derivation. + # + # If you want other components listed of the toolkit, consider using intel-oneapi.base instead; + # This are specifically the components that are not present there. + components ? [ + "intel.oneapi.lin.dpcpp-cpp-compiler" + "intel.oneapi.lin.ifort-compiler" + "intel.oneapi.lin.mpi.devel" + "intel.oneapi.lin.tbb.devel" + ], + + intel-oneapi, + zlib, + rdma-core, + libpsm2, + ucx, + libuuid, + numactl, + level-zero, + libffi, +}: +intel-oneapi.mkIntelOneApi (fa: { + pname = "intel-oneapi-hpc-toolkit"; + + src = fetchurl { + url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/2d2a6686-ff06-44ce-baf0-ab84f8dafa89/intel-oneapi-hpc-toolkit-2025.2.1.44_offline.sh"; + hash = "sha256-SC0eDu4TGf9bZB8aAX4AnIvguTpP0afOj9JqA63QSPs="; + }; + + versionYear = "2025"; + versionMajor = "2"; + versionMinor = "1"; + versionRel = "44"; + + inherit components; + + depsByComponent = { + mpi = [ + zlib + rdma-core + libpsm2 + ucx + libuuid + numactl + level-zero + libffi + ]; + pti = [ level-zero ]; + ifort-compiler = [ ]; + }; + + autoPatchelfIgnoreMissingDeps = [ + # Needs to be dynamically loaded as it depends on the hardware + "libcuda.so.1" + ]; + + passthru.updateScript = intel-oneapi.mkUpdateScript { + inherit (fa) pname; + file = "hpc.nix"; + downloadPage = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/hpc-toolkit-download.html?packages=hpc-toolkit&hpc-toolkit-os=linux&hpc-toolkit-lin=offline"; + }; + + meta = { + description = "Intel oneAPI HPC Toolkit"; + homepage = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/hpc-toolkit.html"; + license = with lib.licenses; [ + intel-eula + issl + asl20 + ]; + maintainers = with lib.maintainers; [ + balsoft + ]; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/development/libraries/intel-oneapi/test.c b/pkgs/development/libraries/intel-oneapi/test.c new file mode 100644 index 000000000000..9413ac0c68e9 --- /dev/null +++ b/pkgs/development/libraries/intel-oneapi/test.c @@ -0,0 +1,12 @@ +#include + +#include + +int main() { + float u[] = {1., 2., 3.}; + float v[] = {4., 5., 6.}; + + float dp = cblas_sdot(3, u, 1, v, 1); + + assert(dp == 32.); +} diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix index 86aef1036258..1804f4587546 100644 --- a/pkgs/development/libraries/libubox/default.nix +++ b/pkgs/development/libraries/libubox/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation { pname = "libubox"; - version = "0-unstable-2025-07-23"; + version = "0-unstable-2025-10-14"; src = fetchgit { url = "https://git.openwrt.org/project/libubox.git"; - rev = "49056d178f42da98048a5d4c23f83a6f6bc6dd80"; - hash = "sha256-sk5r18M0hJ+8CrC2G/rb+XqUmUGer2VBrVbuReHj1dM="; + rev = "7d6b9d98d0bdd4e14aedeb7908c28e4b318c8191"; + hash = "sha256-SBw83zT/tMvmndo4bZ19sLWc493G2jefMhrvqjQ6WJc="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index cbbddf3d33e4..527f716a686d 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch2, bash, cmake, cfitsio, @@ -17,22 +18,36 @@ fftw, gtest, udevCheckHook, + versionCheckHook, indi-full, }: stdenv.mkDerivation (finalAttrs: { pname = "indilib"; - version = "2.1.5.1"; + version = "2.1.6"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${finalAttrs.version}"; - hash = "sha256-mbY3iDLRcQ+pis26u6pHzB43ureaKH7KYPkV0CwHU/E="; + hash = "sha256-0+ZC9NoanBDojYz/ufZUpUQB++vnMcUYtG1UmmVGbTg="; }; + # fixes version number. This commit is directly after the tagged commit in master + # should be removed with the next release + patches = [ + (fetchpatch2 { + url = "https://github.com/indilib/indi/commit/91e3e35250126887a856e90b6a0a30697fb01545.patch?full_index=1"; + hash = "sha256-ho1S+A6gTQ9ELy/QE14S6daXyMN+vASFbXa2vMWdqR8="; + }) + ]; + nativeBuildInputs = [ cmake + ]; + + nativeInstallCheckInputs = [ + versionCheckHook udevCheckHook ]; @@ -86,6 +101,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Implementation of the INDI protocol for POSIX operating systems"; changelog = "https://github.com/indilib/indi/releases/tag/v${finalAttrs.version}"; license = licenses.lgpl2Plus; + mainProgram = "indiserver"; maintainers = with maintainers; [ sheepforce returntoreality diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index 57a0371090f6..45ee14aec7ed 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -9,7 +9,6 @@ coreutils, cfitsio, fetchFromGitHub, - fetchpatch, gtest, libusb1, libusb-compat-0_1, @@ -42,12 +41,13 @@ }: let + thirdparty_version = "2.1.6.2"; fxload = libusb1.override { withExamples = true; }; src-3rdparty = fetchFromGitHub { owner = "indilib"; repo = "indi-3rdparty"; - rev = "v${indilib.version}"; - hash = "sha256-+WBQdu1iWleHf6xC4SK69y505wqZ36IUM4xnh1fnc6s="; + rev = "v${thirdparty_version}"; + hash = "sha256-FMvdm7dkOkRlmbPNeQjh0jd+2bOinzW13QPP2NnOr/M="; }; buildIndi3rdParty = @@ -58,7 +58,7 @@ let cmakeFlags ? [ ], postInstall ? "", doCheck ? true, - version ? indilib.version, + version ? thirdparty_version, src ? src-3rdparty, meta ? { }, ... @@ -551,14 +551,6 @@ in indi-astarbox = buildIndi3rdParty { pname = "indi-astarbox"; buildInputs = [ indilib ]; - # TODO patch already upstream, remove with version > 2.1.5.1 - patches = [ - (fetchpatch { - url = "https://github.com/indilib/indi-3rdparty/commit/c347000ec227a5ef98911aab34c7b08a91509cba.patch"; - hash = "sha256-M3b4ySoGJRpfNmBaagjDaeEPKqwaVgRUWaQY626SGBI="; - stripLen = 1; - }) - ]; }; indi-astroasis = buildIndi3rdParty { @@ -713,15 +705,6 @@ in glib zlib ]; - # TODO patch already upstream, remove with version > 2.1.5.1 - patches = [ - (fetchpatch { - url = "https://github.com/indilib/indi-3rdparty/commit/c33c08b50093698e2aa73d73783d96f85df488a9.patch"; - hash = "sha256-EQ2G9gTexf9FESCAR28f2cwzvH4TOAA8bvyJCxFv/E8="; - stripLen = 1; - }) - ]; - }; indi-gphoto = buildIndi3rdParty { diff --git a/pkgs/development/libraries/ustream-ssl/default.nix b/pkgs/development/libraries/ustream-ssl/default.nix index e618431bb01c..28d42d6fd27b 100644 --- a/pkgs/development/libraries/ustream-ssl/default.nix +++ b/pkgs/development/libraries/ustream-ssl/default.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation { pname = "ustream-ssl"; - version = "0-unstable-2024-03-26"; + version = "0-unstable-2025-10-03"; src = fetchgit { url = "https://git.openwrt.org/project/ustream-ssl.git"; - rev = "7621339d7694abef5da5e5353ac440f2d39dcecb"; - hash = "sha256-No0Pk8KbkT7W4Rav7W3rMKEJISbp7RRoRx7t6LPMxlk="; + rev = "5a81c108d20e24724ed847cc4be033f2a74e6635"; + hash = "sha256-IC5740+1YT3TDayath3Md3hdjuml1S1A/OWYd0GxbDc="; }; preConfigure = '' 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/ocaml-modules/chacha/default.nix b/pkgs/development/ocaml-modules/chacha/default.nix deleted file mode 100644 index f5d6c4c1008b..000000000000 --- a/pkgs/development/ocaml-modules/chacha/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - lib, - buildDunePackage, - fetchFromGitHub, - fetchpatch, - ocaml, - - alcotest, - cstruct, - mirage-crypto, -}: - -buildDunePackage rec { - pname = "chacha"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "abeaumont"; - repo = "ocaml-chacha"; - rev = version; - hash = "sha256-PmeiFloU0k3SqOK1VjaliiCEzDzrzyMSasgnO5fJS1k="; - }; - - # Ensure compatibility with cstruct ≥ 6.1.0 - patches = [ - (fetchpatch { - url = "https://github.com/abeaumont/ocaml-chacha/commit/fbe4a0a808226229728a68f278adf370251196fd.patch"; - sha256 = "sha256-y7X9toFDrgdv3qmFmUs7K7QS+Gy45rRLulKy48m7uqc="; - }) - ]; - - propagatedBuildInputs = [ - cstruct - mirage-crypto - ]; - - # alcotest isn't available for OCaml < 4.05 due to fmt - doCheck = lib.versionAtLeast ocaml.version "4.05"; - checkInputs = [ alcotest ]; - - meta = { - homepage = "https://github.com/abeaumont/ocaml-chacha"; - description = "ChaCha20, ChaCha12 and ChaCha8 encryption functions, in OCaml"; - longDescription = '' - An OCaml implementation of ChaCha functions, both ChaCha20 and the reduced - ChaCha8 and ChaCha12 functions. The hot loop is implemented in C for efficiency - reasons. - ''; - license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ fufexan ]; - broken = true; # Not compatible with mirage-crypto ≥ 1.0 - }; -} diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix index 7fb990255e8b..1c44a92bf2a1 100644 --- a/pkgs/development/ocaml-modules/dns/default.nix +++ b/pkgs/development/ocaml-modules/dns/default.nix @@ -16,15 +16,15 @@ ohex, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "dns"; - version = "10.1.0"; + version = "10.2.1"; minimalOCamlVersion = "4.13"; src = fetchurl { - url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz"; - hash = "sha256-XG/qUUzsOccy5xdkZD6PuViN7gOMmRwYSsy+07QeN9I="; + url = "https://github.com/mirage/ocaml-dns/releases/download/v${finalAttrs.version}/dns-${finalAttrs.version}.tbz"; + hash = "sha256-tIjPTFFP1X1KLLKbmdQjSuaEXv8NXnmxBZ93n3NCR4o="; }; propagatedBuildInputs = [ @@ -51,4 +51,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/dns/resolver.nix b/pkgs/development/ocaml-modules/dns/resolver.nix index e687badef235..d4ba0ba198ec 100644 --- a/pkgs/development/ocaml-modules/dns/resolver.nix +++ b/pkgs/development/ocaml-modules/dns/resolver.nix @@ -15,6 +15,7 @@ tls, tls-mirage, dnssec, + ca-certs-nss, alcotest, }: @@ -39,6 +40,7 @@ buildDunePackage { tcpip tls tls-mirage + ca-certs-nss ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix index 2a2235c14a6a..084a5d32b1c5 100644 --- a/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/pkgs/development/ocaml-modules/sedlex/default.nix @@ -13,8 +13,8 @@ let param = if lib.versionAtLeast ppxlib.version "0.26.0" then { - version = "3.6"; - sha256 = "sha256-NiNqur7sce6dxictVB+saOC1c4N/EO/3Ici/icsGkIA="; + version = "3.7"; + sha256 = "sha256-ucqrJkzS6cVogGUf1vU8oBpSryneMBqTjzxwsOi6Egs="; } else { @@ -24,20 +24,20 @@ let in let - unicodeVersion = "16.0.0"; + unicodeVersion = "17.0.0"; baseUrl = "https://www.unicode.org/Public/${unicodeVersion}"; DerivedCoreProperties = fetchurl { url = "${baseUrl}/ucd/DerivedCoreProperties.txt"; - sha256 = "sha256-OdNRYfKVRJf2ngi9uecBST9Haj0wIi3iACj+2jbB2r0="; + hash = "sha256-JMf+0RlcSC+q79XB5+uCHF7h+23gfs26pktWqZ2iLAg="; }; DerivedGeneralCategory = fetchurl { url = "${baseUrl}/ucd/extracted/DerivedGeneralCategory.txt"; - sha256 = "sha256-dnardVpB74IQhGAjhWnmCtZcGR3a/mGzbGdl7BNT8pM="; + hash = "sha256-1i5bq3DKdPCZND9xIk+gUcsf3WGhq0XASIxEz8C2EC4="; }; PropList = fetchurl { url = "${baseUrl}/ucd/PropList.txt"; - sha256 = "sha256-U9YUUI4qCyMFqKohzWDZk96TJs32WZNmDfzORQNUhYM="; + hash = "sha256-Ew3N3Kra8HEAi9/OHndD4E/fvJEIhvAX2fmskx2MZN0="; }; atLeast31 = lib.versionAtLeast param.version "3.1"; in diff --git a/pkgs/development/python-modules/aioairq/default.nix b/pkgs/development/python-modules/aioairq/default.nix index 9ea35440fe9f..d5c84610f1fc 100644 --- a/pkgs/development/python-modules/aioairq/default.nix +++ b/pkgs/development/python-modules/aioairq/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { hash = "sha256-CliY2MfkRfpOmWM70vDRxG6tY2eoaPiRFHb0qt2Kmyw="; }; + __darwinAllowLocalNetworking = true; + build-system = [ setuptools ]; dependencies = [ 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/automower-ble/default.nix b/pkgs/development/python-modules/automower-ble/default.nix index 4c335e0f52dd..e266da0ae2ed 100644 --- a/pkgs/development/python-modules/automower-ble/default.nix +++ b/pkgs/development/python-modules/automower-ble/default.nix @@ -1,6 +1,7 @@ { lib, bleak, + bleak-retry-connector, buildPythonPackage, fetchFromGitHub, setuptools, @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "automower-ble"; - version = "0.2.7"; + version = "0.2.8"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,12 +20,15 @@ buildPythonPackage rec { owner = "alistair23"; repo = "AutoMower-BLE"; tag = version; - hash = "sha256-oOwSbGzTGXWm3Vmsui4k1lPRnT8+aIs6sk1DK/aRxzs="; + hash = "sha256-GawjNtk2mEBo9Xe1k1z0tk1RWU0N0JddeC6NZbnLpxc="; }; build-system = [ setuptools ]; - dependencies = [ bleak ]; + dependencies = [ + bleak + bleak-retry-connector + ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -33,6 +37,7 @@ buildPythonPackage rec { meta = { description = "Module to connect to Husqvarna Automower Connect"; homepage = "https://github.com/alistair23/AutoMower-BLE"; + changelog = "https://github.com/alistair23/AutoMower-BLE/releases/tag/${src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 8e047ecdc56a..0ec58fa99c7a 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -358,13 +358,13 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.40.54"; + version = "1.40.55"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-4hqe2peaRRk16zGW3j774VuUcOa/kCdAbR9tCsCLM54="; + hash = "sha256-oRra+OrHfE7Uwbe/ckGwzZrQI9wcF8SbRfNa30wht/8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 1228535ab1f3..6d399c408e44 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.40.54"; + version = "1.40.55"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-+zinlKsriW+cwjfsclVGdGrMr/0084JHWo0bmMoQeOE="; + hash = "sha256-V8iXiwu+QKn6Kf3lZN6KBGeaIj9DCpfQOtpi7BEiMa8="; }; nativeBuildInputs = [ setuptools ]; 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/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 5a20c5a1fb05..22acb6f48d67 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "iamdata"; - version = "0.1.202510171"; + version = "0.1.202510181"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${version}"; - hash = "sha256-u31TViNjoNhzzUoK2WAgAkHh+EFjFjYp1O1HGxbGAYk="; + hash = "sha256-C9wTZ5cBs7vzAnesEVj8blHoKd7pzYIbMeNGbO6q9lM="; }; build-system = [ hatchling ]; 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/kiss-headers/default.nix b/pkgs/development/python-modules/kiss-headers/default.nix index 79011b9660bf..8e858c60945a 100644 --- a/pkgs/development/python-modules/kiss-headers/default.nix +++ b/pkgs/development/python-modules/kiss-headers/default.nix @@ -29,9 +29,12 @@ buildPythonPackage rec { pytest-cov-stub ]; + preCheck = '' + rm -rf src # cause pycache conflict + ''; + disabledTestPaths = [ # Tests require internet access - "kiss_headers/__init__.py" "tests/test_serializer.py" "tests/test_with_http_request.py" ]; diff --git a/pkgs/development/python-modules/mrsqm/default.nix b/pkgs/development/python-modules/mrsqm/default.nix index e8a2a0ffea8b..e6828479a5dd 100644 --- a/pkgs/development/python-modules/mrsqm/default.nix +++ b/pkgs/development/python-modules/mrsqm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mrsqm"; - version = "4"; + version = "0.0.7"; pyproject = true; build-system = [ @@ -28,8 +28,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mlgig"; repo = "mrsqm"; - tag = "r${version}"; - hash = "sha256-59f18zItV3K6tXcg1v1q2Z8HYrQB8T0ntaaqjxeAEbM="; + tag = "v.${version}"; + hash = "sha256-5K6vCU0HExnmYNThZNDCbEtII9bUGauxDtKkJXe/85Q="; }; buildInputs = [ fftw ]; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index b6b32d3f0a3b..ae9b79cabbee 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -62,16 +62,16 @@ in "sha256-MqxsI64KEyipR0iiaifc42HQLHsVIFMmtvN2/Vx1EJU="; mypy-boto3-amp = - buildMypyBoto3Package "amp" "1.40.29" - "sha256-LHVI54tJakPFTh0l+YZMJQV9X6+smUNJBee0u8WO5ro="; + buildMypyBoto3Package "amp" "1.40.55" + "sha256-21GPpp3jvggAtA6U8dKuaSIc9UBObYSDhEzp3KWiK5c="; mypy-boto3-amplify = buildMypyBoto3Package "amplify" "1.40.54" "sha256-8nNBUlGXVoracAltiBNWohK7yG8z6Q0KGupyOS9/Tpc="; mypy-boto3-amplifybackend = - buildMypyBoto3Package "amplifybackend" "1.40.19" - "sha256-XxeDxB9uvOSFDPrnuSGHYhuAY9m9WrGX+j0I2IQ2Cnw="; + buildMypyBoto3Package "amplifybackend" "1.40.55" + "sha256-m4XafAYt1vUe1nesd5lX2Lrt/6aeXWHTR3DUX0YkvdM="; mypy-boto3-amplifyuibuilder = buildMypyBoto3Package "amplifyuibuilder" "1.40.0" @@ -94,8 +94,8 @@ in "sha256-n0P3k9Bs7ckTEim/cHXLQzt5qsjxzq59TYlOair61mU="; mypy-boto3-appconfigdata = - buildMypyBoto3Package "appconfigdata" "1.40.0" - "sha256-/6S/GdXeAYY9wdapWjcrCyaDmeijp6kSy63m0ITW3fs="; + buildMypyBoto3Package "appconfigdata" "1.40.55" + "sha256-Unxc01GzvKZGiKlW3o3ZrEZXthJPlMY1tu0vnUgYmq4="; mypy-boto3-appfabric = buildMypyBoto3Package "appfabric" "1.40.15" @@ -106,16 +106,16 @@ in "sha256-eBbaAv0NU/VcaZNNPaBvU2pt7rXNm2DwqZ0xtoX2WwU="; mypy-boto3-appintegrations = - buildMypyBoto3Package "appintegrations" "1.40.0" - "sha256-7su8sPB0QUQi+5ZQd701JYNVqpoIww3q0N4puBcszT4="; + buildMypyBoto3Package "appintegrations" "1.40.55" + "sha256-JYfNdS/e3ftDshlXoVVTfw2+zQUuGy+rpdM0dIrD7dM="; mypy-boto3-application-autoscaling = buildMypyBoto3Package "application-autoscaling" "1.40.0" "sha256-XMvGnZjdb8sQ8QES1CkZD7VkditEdudUGPVaYwF25Fk="; mypy-boto3-application-insights = - buildMypyBoto3Package "application-insights" "1.40.19" - "sha256-UNaLgX1dogngrhDFGhVi4FC4mAhkH2dW+Sk/4sAPh9M="; + buildMypyBoto3Package "application-insights" "1.40.55" + "sha256-JWzHe+4UxLenKYXdNXhShTGWTGDFgWx6O8TAfxEaWPI="; mypy-boto3-applicationcostprofiler = buildMypyBoto3Package "applicationcostprofiler" "1.40.20" @@ -138,8 +138,8 @@ in "sha256-NgOa+Na/gU7IrtEJ8bVMJaSCNgTnGreX2TsjsAlIN+Y="; mypy-boto3-arc-zonal-shift = - buildMypyBoto3Package "arc-zonal-shift" "1.40.18" - "sha256-+CR5RYb8rFZxC5Vl208nRf9RT0Dhd7w1s0vdkefAhM4="; + buildMypyBoto3Package "arc-zonal-shift" "1.40.55" + "sha256-as/i/8ByPLcr91nEwv+Qaq/Y8Rpi1qaVyMyDU7SMbc4="; mypy-boto3-athena = buildMypyBoto3Package "athena" "1.40.0" @@ -198,8 +198,8 @@ in "sha256-5qaK+piVZhvHqBJgGteNsvmMZG5y6fvLD4W8qASfcL0="; mypy-boto3-chime-sdk-meetings = - buildMypyBoto3Package "chime-sdk-meetings" "1.40.43" - "sha256-vhWKoKhIJbB9Em7EA1IMdrSUTBFIgkAOxrdAeepCjbg="; + buildMypyBoto3Package "chime-sdk-meetings" "1.40.55" + "sha256-KMEuqXWo3YwQ3z0zQFZ7ySk3shgXaPE0q2nx9lSP12c="; mypy-boto3-chime-sdk-messaging = buildMypyBoto3Package "chime-sdk-messaging" "1.40.34" @@ -230,8 +230,8 @@ in "sha256-PYL1UEOCyGrRlaG4CiqC9zWHw34bY2hk67hd1DvXmls="; mypy-boto3-cloudfront = - buildMypyBoto3Package "cloudfront" "1.40.50" - "sha256-jw169fraZHj0tHiu8ZJTqLu/FrBWVBnePNvtp6V3UUs="; + buildMypyBoto3Package "cloudfront" "1.40.55" + "sha256-3md69cxJv7R4cXqznJtz4+r6MvFw22EckaYzCfBJS28="; mypy-boto3-cloudhsm = buildMypyBoto3Package "cloudhsm" "1.40.15" @@ -306,8 +306,8 @@ in "sha256-NNVGx+fN0apfT84GbtQjK6YX30bIomIPUaK9RFOsrVQ="; mypy-boto3-codestar-notifications = - buildMypyBoto3Package "codestar-notifications" "1.40.17" - "sha256-uzTn5MwCM6dkY5P9/tLfZqOfdKVvBClMxMkG9vgnx/4="; + buildMypyBoto3Package "codestar-notifications" "1.40.55" + "sha256-MWnreUSpk4QdquRu1X4/HL9imPSYgl4fJz1BxJvcyPk="; mypy-boto3-cognito-identity = buildMypyBoto3Package "cognito-identity" "1.40.15" @@ -382,8 +382,8 @@ in "sha256-VBJsQqd5m5RfO+tJklYHd+pk2zqpqyDXO4BmRGdFxS4="; mypy-boto3-datasync = - buildMypyBoto3Package "datasync" "1.40.42" - "sha256-utMenSLve20f+TKyA5xeoAGTEPlizo7uQJSEKt2gq68="; + buildMypyBoto3Package "datasync" "1.40.55" + "sha256-0PHiMXZVyihKJTXEXP8U1fPt7LLGx+4EsJhXbk6VzTY="; mypy-boto3-dax = buildMypyBoto3Package "dax" "1.40.38" @@ -430,8 +430,8 @@ in "sha256-dtw54zAzP4HddWx0kZr7SzxmWiKCiiP6g4+aDRRid2k="; mypy-boto3-ds = - buildMypyBoto3Package "ds" "1.40.42" - "sha256-gKzshS6Q6O/lTAsrkuXOvKkGz+ECRlmSeb5NxNCBim8="; + buildMypyBoto3Package "ds" "1.40.55" + "sha256-obbn0FjZQDwFucsnH3N1+zfe1aWFE5PWHUWiLAeupqA="; mypy-boto3-dynamodb = buildMypyBoto3Package "dynamodb" "1.40.44" @@ -446,8 +446,8 @@ in "sha256-jtkx0kbI7SB74U5uWyGdVhKMlsy/T82lz3P89k8LMPA="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.40.53" - "sha256-SCjXpXIBjg31/0OknDgJfBBvVCf8gUSDiuD4IGETGeA="; + buildMypyBoto3Package "ec2" "1.40.55" + "sha256-jMHwCR2d2aIiVyzdB/g/XdW53XR4Kqd0XQAF87CEkSo="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.40.20" @@ -514,24 +514,24 @@ in "sha256-n5aa7oK/37pT1f+xFXu8Sp3LfO1UAcUljCqdtSZ/fPQ="; mypy-boto3-es = - buildMypyBoto3Package "es" "1.40.15" - "sha256-nIRSeL+cX4FVozkogF455I0kGhNJUOMauQPOxCtju50="; + buildMypyBoto3Package "es" "1.40.55" + "sha256-6APIM38Kf9r2QefCAgXcAc9UPUT6+ymH1nu/WYRHcjU="; mypy-boto3-events = - buildMypyBoto3Package "events" "1.40.0" - "sha256-NifbOgZ8Q0oUnKchIt04RgMMDBXMiwJJCKDmax3j4Es="; + buildMypyBoto3Package "events" "1.40.55" + "sha256-mu4434uXtTV2eq8rymiN7uqLDoncFwmdi0slIucwSjQ="; mypy-boto3-evidently = - buildMypyBoto3Package "evidently" "1.40.19" - "sha256-v4FSQ3YR4s9hgu7SBhHWebkgSmDFDN5qf1/XKo2zlvs="; + buildMypyBoto3Package "evidently" "1.40.55" + "sha256-r71o2OkpgGBxh5gy23+OFHqCU0QI6Z/rQSBjDagMfB0="; mypy-boto3-finspace = - buildMypyBoto3Package "finspace" "1.40.18" - "sha256-jB4Yb1hX9P8bhY0cprew6S1VgG4G/IVo3OlGuAojQ38="; + buildMypyBoto3Package "finspace" "1.40.55" + "sha256-7P/MvdQjYmNgda7EZ8GSI0mLPe3o19ETSspd8wL23Ag="; mypy-boto3-finspace-data = - buildMypyBoto3Package "finspace-data" "1.40.17" - "sha256-fePfBO2KWcMACejuSer80O2LCEuwh/pjA6wkEpUL9os="; + buildMypyBoto3Package "finspace-data" "1.40.55" + "sha256-CQzN5qc5N34JKeF0gKoIzVb5wtdc8r2uar+Q6Y2Gd3g="; mypy-boto3-firehose = buildMypyBoto3Package "firehose" "1.40.0" @@ -613,8 +613,8 @@ in "sha256-A9nivPF85KQUnfo2aF6a50NTSxox2OlXXS4MuxNnZ1g="; mypy-boto3-imagebuilder = - buildMypyBoto3Package "imagebuilder" "1.40.41" - "sha256-vGem/ZZqqYL3sjrf2gTlMx/YTB+lHcG9lJcJLjGRkOk="; + buildMypyBoto3Package "imagebuilder" "1.40.55" + "sha256-v56hBI3Gl4FzwyFumRZRZb0Q4LXPjiLAgjZubWl5/aM="; mypy-boto3-importexport = buildMypyBoto3Package "importexport" "1.40.0" @@ -637,8 +637,8 @@ in "sha256-0AUK0HaqmoLVbbLDcsagUZX7KkFF9zU7obO0BmcK8+s="; mypy-boto3-iot-data = - buildMypyBoto3Package "iot-data" "1.40.6" - "sha256-fEw3aD8FGyvuQMmr80Fb9pk/IRXa0ZVHXt5Lptahnoc="; + buildMypyBoto3Package "iot-data" "1.40.55" + "sha256-bMEIZVMtrTmhfJTyVdpeBcGOPbIEwgEWGWYb9coHDPk="; mypy-boto3-iot-jobs-data = buildMypyBoto3Package "iot-jobs-data" "1.40.0" @@ -657,8 +657,8 @@ in "sha256-kLN+S5x9XMO8TovR57hwXnqQvC6K+JwHncgmrLFOpFY="; mypy-boto3-iotdeviceadvisor = - buildMypyBoto3Package "iotdeviceadvisor" "1.40.15" - "sha256-E6Y+2g7LsW7wbF1t/SAiFN5S9p0+4vwNykkJdl19voA="; + buildMypyBoto3Package "iotdeviceadvisor" "1.40.55" + "sha256-/W7eNwqtW8gJNJ/Z1W5jDo/wQXcbXOXfJYG+DaMR1QE="; mypy-boto3-iotevents = buildMypyBoto3Package "iotevents" "1.40.15" @@ -685,12 +685,12 @@ in "sha256-nGCezdRTJ4uq7aSd0mGSOvk+/Rn4KKeCAc++KgPxRAg="; mypy-boto3-iotthingsgraph = - buildMypyBoto3Package "iotthingsgraph" "1.40.15" - "sha256-ZBh/vd5cNWOv0kk30gFXNnDrfCmlSUr8mKypEYucUgc="; + buildMypyBoto3Package "iotthingsgraph" "1.40.55" + "sha256-xeWpQxCprqde9tjTR+oA3mgbfBPnUDQRwZrab0Edpww="; mypy-boto3-iottwinmaker = - buildMypyBoto3Package "iottwinmaker" "1.40.0" - "sha256-UuQ4NUIV3ofY8/+q1dBm3DprGx//lOqngX+zzQIwvn8="; + buildMypyBoto3Package "iottwinmaker" "1.40.55" + "sha256-tJqYpF3z0HWRTHQmHjRyqnS3hCUxFUqsyScHnsiVnlA="; mypy-boto3-iotwireless = buildMypyBoto3Package "iotwireless" "1.40.0" @@ -721,8 +721,8 @@ in "sha256-IOj6WGiMgCtbLlZ+AHvSAYZFYLxBiXWUA1VKDPBBe+Y="; mypy-boto3-kendra-ranking = - buildMypyBoto3Package "kendra-ranking" "1.40.35" - "sha256-k8g4A54sQvehWCgxaV15zE5vVvJLS6hBrLMDEjGlXxs="; + buildMypyBoto3Package "kendra-ranking" "1.40.55" + "sha256-GEFn9IMnqSQ+J0OP2Vu0zbKbx5/RmKpjO06GK494kI8="; mypy-boto3-keyspaces = buildMypyBoto3Package "keyspaces" "1.40.54" @@ -737,8 +737,8 @@ in "sha256-wKaV5LpNWviCW+R1kiEEUdi91BE42Q5/fdq7FpqkGaM="; mypy-boto3-kinesis-video-media = - buildMypyBoto3Package "kinesis-video-media" "1.40.19" - "sha256-PrKUrdt2F3QnznSfJjLt+cbMvSd6bhc0qPD0c8OAKn4="; + buildMypyBoto3Package "kinesis-video-media" "1.40.55" + "sha256-lMj1MhhWJeoSVaUPdELCDIOZCtL2rrgsNerHElczlEk="; mypy-boto3-kinesis-video-signaling = buildMypyBoto3Package "kinesis-video-signaling" "1.40.15" @@ -765,8 +765,8 @@ in "sha256-0+dJmIiBbQPcy6xbmn/qjvAyI84YF5AvGJFzZBQAP3g="; mypy-boto3-lakeformation = - buildMypyBoto3Package "lakeformation" "1.40.19" - "sha256-NMF0B6cBjIFJl7CKrwxj89oFJeYnDhpdkmCTJdXa3w0="; + buildMypyBoto3Package "lakeformation" "1.40.55" + "sha256-IcUBufhnr3GfgJ0FG/JTwo0EgNZBtgKvTd6TtyttWRQ="; mypy-boto3-lambda = buildMypyBoto3Package "lambda" "1.40.50" @@ -789,16 +789,16 @@ in "sha256-beE9BjjI8wZFwDy0Xzv0/BmRjunfJlJ0qASf4yfpxpE="; mypy-boto3-license-manager = - buildMypyBoto3Package "license-manager" "1.40.0" - "sha256-9Afe020suiP14DlvvGETT+3wlUfPWC3qW+47SAxwHuI="; + buildMypyBoto3Package "license-manager" "1.40.55" + "sha256-d9i0AUux2ChlTnW2UWJ/de9KRYc8HtvLSFENETuy72U="; mypy-boto3-license-manager-linux-subscriptions = buildMypyBoto3Package "license-manager-linux-subscriptions" "1.40.0" "sha256-pfIQS9as02Gm4mHUc3q3gMKRHz+wT/lRKHWUc2ugt1s="; mypy-boto3-license-manager-user-subscriptions = - buildMypyBoto3Package "license-manager-user-subscriptions" "1.40.48" - "sha256-hp2jCL1IkXluhEyexdawQvwLfk+9pUVjKlnE9dkVnxc="; + buildMypyBoto3Package "license-manager-user-subscriptions" "1.40.55" + "sha256-NP3FOwMuz5k0wk+ofCEzyVOKyZSO+TITyb67V82tHgM="; mypy-boto3-lightsail = buildMypyBoto3Package "lightsail" "1.40.53" @@ -845,8 +845,8 @@ in "sha256-lw7LeVq/o8RFK9P62vQ7iR+jZfH/OOZY2AirYqDltSw="; mypy-boto3-marketplace-catalog = - buildMypyBoto3Package "marketplace-catalog" "1.40.0" - "sha256-C33HMjDet8ZhC2CUlr0xkYlLQpIOMKjhbqKw7CPz+Tg="; + buildMypyBoto3Package "marketplace-catalog" "1.40.55" + "sha256-UqI1ypP3nBu8cc1bFg4RWtOUm5BbE4lA2zvAvbWTQac="; mypy-boto3-marketplace-entitlement = buildMypyBoto3Package "marketplace-entitlement" "1.40.54" @@ -857,8 +857,8 @@ in "sha256-7gZOd0TBAWyyY7g85UXAjp4miV08qfB20B6YQww360w="; mypy-boto3-mediaconnect = - buildMypyBoto3Package "mediaconnect" "1.40.46" - "sha256-IjfRXktKU9nJlBJhET307e+nvbwqCucIj0E2dpwuZO4="; + buildMypyBoto3Package "mediaconnect" "1.40.55" + "sha256-18sD6lfs5Y9BBp3j8c/TVjI/3KZbO6pKuYPYKir1NQY="; mypy-boto3-mediaconvert = buildMypyBoto3Package "mediaconvert" "1.40.17" @@ -913,8 +913,8 @@ in "sha256-XyB7/8zj4pU/+cxqhEf2WMoBoo/J12lOrlL0WD2Nhic="; mypy-boto3-migration-hub-refactor-spaces = - buildMypyBoto3Package "migration-hub-refactor-spaces" "1.40.18" - "sha256-SVy3+tok3qsJv76TiaOIPVSnJiGxfuPgAYT+bi3Kxss="; + buildMypyBoto3Package "migration-hub-refactor-spaces" "1.40.55" + "sha256-1boWE6O9IJ1UZyV1NGbGQiHeQ1qFhOxFTnHXCM5Jha0="; mypy-boto3-migrationhub-config = buildMypyBoto3Package "migrationhub-config" "1.40.54" @@ -949,12 +949,12 @@ in "sha256-5aD/9ACgD/76bPpbZlqHXn0biTxr9wyiLpTyIdxMKYs="; mypy-boto3-network-firewall = - buildMypyBoto3Package "network-firewall" "1.40.39" - "sha256-ZJT+qoOmgMRj3f0mIxDJ7wuPhlQykdbXOyeo6YYQmOg="; + buildMypyBoto3Package "network-firewall" "1.40.55" + "sha256-ldifobuZtba1jApWN5eswPa1dmSvd/a9yAS/wzPxz30="; mypy-boto3-networkmanager = - buildMypyBoto3Package "networkmanager" "1.40.0" - "sha256-6lhlo52AWSKFBNXKMr2zEZF+uyvtRCHNcE5/qPR8xGs="; + buildMypyBoto3Package "networkmanager" "1.40.55" + "sha256-YYoVn8ECRbtJlljdEaVA4X6UgKiBKpnfq4RSkH7StwQ="; mypy-boto3-nimble = buildMypyBoto3Package "nimble" "1.35.0" @@ -985,8 +985,8 @@ in "sha256-JEuEjo0htTuDCZx2nNJK2Zq59oSUqkMf4BrNamerfVk="; mypy-boto3-organizations = - buildMypyBoto3Package "organizations" "1.40.27" - "sha256-LdBoeGucR8RzewzflvN1dtCtr8+asp3ggmtV6HuUQm8="; + buildMypyBoto3Package "organizations" "1.40.55" + "sha256-bBOPCYyZP96tBPWnMDRsOhRQO2K+Ros4dRkpVhiju2Y="; mypy-boto3-osis = buildMypyBoto3Package "osis" "1.40.54" @@ -1025,8 +1025,8 @@ in "sha256-vuOhtYDVqnB4Xn5dzE3N93b7ZWalyvPwTx01CHFzSNo="; mypy-boto3-pi = - buildMypyBoto3Package "pi" "1.40.19" - "sha256-kpZHz/E6ES5zUyqhTYN/9OMBEQtrf+uOz85spmIeQEc="; + buildMypyBoto3Package "pi" "1.40.55" + "sha256-PqK4IfA5JcI5Cg4ymR9uoTF3YLs6vu0l0Gl4e7af2Y8="; mypy-boto3-pinpoint = buildMypyBoto3Package "pinpoint" "1.40.18" @@ -1129,8 +1129,8 @@ in "sha256-qPJ/kxKiVat3aj6aVLDgIYpoGlpsrF7kjfxJ9UWbV0o="; mypy-boto3-rolesanywhere = - buildMypyBoto3Package "rolesanywhere" "1.40.0" - "sha256-9AfMYmfGgFYxbGF1UYLBEtCkmYtlPNtD0q2MHmbJUWw="; + buildMypyBoto3Package "rolesanywhere" "1.40.55" + "sha256-CoF3Aw759lxUzg9iRCfKofDkbq/idAIy4Eu4L7yrRL0="; mypy-boto3-route53 = buildMypyBoto3Package "route53" "1.40.23" @@ -1145,8 +1145,8 @@ in "sha256-WTZGKD2w3/OW41VKgk/l9KdBnggip8CDTesbtiK/Hic="; mypy-boto3-route53-recovery-readiness = - buildMypyBoto3Package "route53-recovery-readiness" "1.40.16" - "sha256-oo6Vpu6SfuJKw1aqX8x6oIlLUJbHa2lNfPx5kfQMo8M="; + buildMypyBoto3Package "route53-recovery-readiness" "1.40.55" + "sha256-lz/yPloTNQOFgT7+FvkxQFFW1bBG+Ew1VVrd718UPDA="; mypy-boto3-route53domains = buildMypyBoto3Package "route53domains" "1.40.23" @@ -1189,8 +1189,8 @@ in "sha256-p3zQ7rWP78gg2bBYdpGgVi2f771qZk+jwwxBcoQJwjk="; mypy-boto3-sagemaker-geospatial = - buildMypyBoto3Package "sagemaker-geospatial" "1.40.18" - "sha256-yzqISXyDj1FhqTvct8hc+1L1Iutnq29hSGnPAarBE+M="; + buildMypyBoto3Package "sagemaker-geospatial" "1.40.55" + "sha256-VtcgEoZH1zACZvNGEfy3gDsNVqa3A8JfwTfbd6agL3E="; mypy-boto3-sagemaker-metrics = buildMypyBoto3Package "sagemaker-metrics" "1.40.0" @@ -1261,8 +1261,8 @@ in "sha256-nQ2tvjrYiAvx/NH7u0F+Ys15hYfQz4sVERpw9IH2RQQ="; mypy-boto3-signer = - buildMypyBoto3Package "signer" "1.40.18" - "sha256-1SQFGuDDU8MkciZtGjkLhY0zFyIPkwvgYXJLoYEK1oI="; + buildMypyBoto3Package "signer" "1.40.55" + "sha256-B60F/Q2FlLuNCGZuxSZ3A9QSAMFMgFOO0AFLzmTdyoU="; mypy-boto3-simspaceweaver = buildMypyBoto3Package "simspaceweaver" "1.40.16" @@ -1341,8 +1341,8 @@ in "sha256-PKD1uLbQHrySwD8nMt/OHqkGbu1qWyEYM2KzMMM+VR4="; mypy-boto3-swf = - buildMypyBoto3Package "swf" "1.40.0" - "sha256-qkE3rF32WkR56WB5pu3dKJLCLY5e1rvMDPYAruyj9O8="; + buildMypyBoto3Package "swf" "1.40.55" + "sha256-zer2dqLkBLe1CA5I6+9DavQPvVLtrGFoxi50BRDOI3s="; mypy-boto3-synthetics = buildMypyBoto3Package "synthetics" "1.40.44" @@ -1357,12 +1357,12 @@ in "sha256-QXykPDFwDXTY44JyYNYRBvG9/rBVmtisFKrmp6UKIQM="; mypy-boto3-timestream-write = - buildMypyBoto3Package "timestream-write" "1.40.19" - "sha256-yNvBlR2lXUMJkAUGSncExJqF85Iu9iqQWdDBGAVWgnE="; + buildMypyBoto3Package "timestream-write" "1.40.55" + "sha256-cdyFlcNg9F5RPYJ8xuLm1G1plHQDhRe2YQZqUv+wk8U="; mypy-boto3-tnb = - buildMypyBoto3Package "tnb" "1.40.0" - "sha256-SfZ4sYKJic9iQfWxUQEdV233Y5NbITHWjC3Vt+hFpHA="; + buildMypyBoto3Package "tnb" "1.40.55" + "sha256-Jzl2BKfgW5EK0GbjUP+BFqNOeEiFvlMMlgzaJxgaFzs="; mypy-boto3-transcribe = buildMypyBoto3Package "transcribe" "1.40.52" @@ -1401,8 +1401,8 @@ in "sha256-OM6g8hX/ZPIg9cEMmCqEJfCXU/tsNUN2deqEm6HoFd4="; mypy-boto3-wellarchitected = - buildMypyBoto3Package "wellarchitected" "1.40.17" - "sha256-YCjVBZlqyrA72U/Y18Wt4j2FRLAi0YnkLYx/i9BAg34="; + buildMypyBoto3Package "wellarchitected" "1.40.55" + "sha256-oD/sVVMrRUBW5brBaCyNeNfHU4ZAWgfiqcgEwTxN00c="; mypy-boto3-wisdom = buildMypyBoto3Package "wisdom" "1.40.0" 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/netbox-topology-views/default.nix b/pkgs/development/python-modules/netbox-topology-views/default.nix index 007a94a6225a..5ec93614badc 100644 --- a/pkgs/development/python-modules/netbox-topology-views/default.nix +++ b/pkgs/development/python-modules/netbox-topology-views/default.nix @@ -10,7 +10,7 @@ }: buildPythonPackage rec { pname = "netbox-topology-views"; - version = "4.3.0"; + version = "4.4.0"; pyproject = true; disabled = python.pythonVersion != netbox.python.pythonVersion; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "netbox-community"; repo = "netbox-topology-views"; tag = "v${version}"; - hash = "sha256-K8hG2M8uWPk9+7u21z+hmedOovievkMNpn3p7I4+6t4="; + hash = "sha256-HsG5joHdqVuL6viBwZ8AyvFBCLmcq0YB+2ehLO5gsFc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix index 7d5dc73a56e5..614c5717a237 100644 --- a/pkgs/development/python-modules/nox/default.nix +++ b/pkgs/development/python-modules/nox/default.nix @@ -12,6 +12,7 @@ argcomplete, colorlog, dependency-groups, + humanize, jinja2, packaging, tomli, @@ -28,7 +29,7 @@ buildPythonPackage rec { pname = "nox"; - version = "2025.05.01"; + version = "2025.10.16"; pyproject = true; disabled = pythonOlder "3.12"; @@ -37,7 +38,7 @@ buildPythonPackage rec { owner = "wntrblm"; repo = "nox"; tag = version; - hash = "sha256-qH8oh7tmiJkXOobyDZMRZ62w2sRHJF8sh4PX+6s7M70="; + hash = "sha256-oRVDGHw/0HkHLtzcSZL2Aj1uxuRS/ms66cBPDQjJ17I="; }; build-system = [ hatchling ]; @@ -47,6 +48,7 @@ buildPythonPackage rec { attrs colorlog dependency-groups + humanize packaging virtualenv ] @@ -65,7 +67,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook writableTmpDirAsHomeHook - ]; + ] + ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "nox" ]; 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/optimistix/default.nix b/pkgs/development/python-modules/optimistix/default.nix index c46ddfa1daf8..271ab8520c73 100644 --- a/pkgs/development/python-modules/optimistix/default.nix +++ b/pkgs/development/python-modules/optimistix/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "optimistix"; - version = "0.0.10"; + version = "0.0.11"; pyproject = true; src = fetchFromGitHub { owner = "patrick-kidger"; repo = "optimistix"; tag = "v${version}"; - hash = "sha256-stVPHzv0XNd0I31N2Cj0QYrMmhImyx0cablqZfKBFrM="; + hash = "sha256-tTE/f1dYDpTmrqL1D7h7UyqT2gN9+Y1mNJZcjmdHtno="; }; build-system = [ hatchling ]; @@ -53,18 +53,23 @@ buildPythonPackage rec { pytest-xdist ]; - pytestFlags = [ - # Since jax 0.5.3: - # DeprecationWarning: shape requires ndarray or scalar arguments, got at position 0. In a future JAX release this will be an error. - "-Wignore::DeprecationWarning" - ]; - disabledTests = [ # assert Array(False, dtype=bool) # + where Array(False, dtype=bool) = tree_allclose(Array(0.12993518, dtype=float64), Array(0., dtype=float64, weak_type=True), atol=0.0001, rtol=0.0001) "test_least_squares" ]; + disabledTestPaths = [ + # Require circular dependency diffrax + "tests/test_compat.py" + "tests/test_fixed_point.py" + "tests/test_lbfgs_linear_operator.py" + "tests/test_least_squares.py" + "tests/test_minimise.py" + "tests/test_misc.py" + "tests/test_root_find.py" + ]; + meta = { description = "Nonlinear optimisation (root-finding, least squares, ...) in JAX+Equinox"; homepage = "https://github.com/patrick-kidger/optimistix"; 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/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix index e19dc798fd69..b994f1b4803c 100644 --- a/pkgs/development/python-modules/policy-sentry/default.nix +++ b/pkgs/development/python-modules/policy-sentry/default.nix @@ -6,7 +6,6 @@ fetchFromGitHub, orjson, pytestCheckHook, - pythonOlder, pyyaml, requests, schema, @@ -15,16 +14,14 @@ buildPythonPackage rec { pname = "policy-sentry"; - version = "0.14.0"; + version = "0.14.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "salesforce"; repo = "policy_sentry"; tag = version; - hash = "sha256-zfqQLABn//qktrFSCm42WClRYAe3yWZoxnWjI9n1jWQ="; + hash = "sha256-o4l4jkh9ZNqc3Jovd10KUQLDBLn0sPWdgScq5Q2qd14="; }; build-system = [ setuptools ]; 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/pylacus/default.nix b/pkgs/development/python-modules/pylacus/default.nix index e75298bb7a8c..10551ce6489e 100644 --- a/pkgs/development/python-modules/pylacus/default.nix +++ b/pkgs/development/python-modules/pylacus/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pylacus"; - version = "1.18.0"; + version = "1.19.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "PyLacus"; tag = "v${version}"; - hash = "sha256-N0FGjT/Jq5n2J2omk/W1tsjiAZY4WlsEs33ErKOuCl4="; + hash = "sha256-Ezp/aFTETvU1bOZZvMlZn0XmaLWoOd6l8s0n5lIqV2w="; }; build-system = [ poetry-core ]; 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/pymobiledevice3/default.nix b/pkgs/development/python-modules/pymobiledevice3/default.nix index 301251829f6a..4204cb8df42c 100644 --- a/pkgs/development/python-modules/pymobiledevice3/default.nix +++ b/pkgs/development/python-modules/pymobiledevice3/default.nix @@ -48,14 +48,14 @@ buildPythonPackage rec { pname = "pymobiledevice3"; - version = "4.27.3"; + version = "4.27.5"; pyproject = true; src = fetchFromGitHub { owner = "doronz88"; repo = "pymobiledevice3"; tag = "v${version}"; - hash = "sha256-YYRDsE/rfTAnjDrJ0sMLeTyKshhl8NXhdspQUql2RAE="; + hash = "sha256-dfbh1NvM/XccsGnJ7iTBzkdc31eOSaDs8671cibLI14="; }; build-system = [ diff --git a/pkgs/development/python-modules/pynut2/default.nix b/pkgs/development/python-modules/pynut2/default.nix index 44c687f12592..a00f3d32dcfb 100644 --- a/pkgs/development/python-modules/pynut2/default.nix +++ b/pkgs/development/python-modules/pynut2/default.nix @@ -3,12 +3,14 @@ buildPythonPackage, fetchFromGitHub, requests, + standard-telnetlib, + setuptools, }: buildPythonPackage rec { pname = "pynut2"; version = "2.1.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mezz64"; @@ -17,7 +19,12 @@ buildPythonPackage rec { sha256 = "1lg7n1frndfgw73s0ssl1h7kc6zxm7fpiwlc6v6d60kxzaj1dphx"; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ + requests + standard-telnetlib + ]; pythonImportsCheck = [ "pynut2.nut2" ]; 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/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix index 3b1094388f60..a51d9d831cf8 100644 --- a/pkgs/development/python-modules/pyvesync/default.nix +++ b/pkgs/development/python-modules/pyvesync/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvesync"; - version = "3.1.0"; + version = "3.1.2"; pyproject = true; src = fetchFromGitHub { owner = "webdjoe"; repo = "pyvesync"; tag = version; - hash = "sha256-ZoEQbMV3ofE5pV7nbYOqzXq3/7a2pkDKx88894kzU7Y="; + hash = "sha256-SZ1ZL79f1FHTnNEU9oew8JcWA20NphIX4fXr3NS7THU="; }; build-system = [ setuptools ]; 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/segyio/add_missing_cstdint.patch b/pkgs/development/python-modules/segyio/add_missing_cstdint.patch deleted file mode 100644 index 2c26d6e454b1..000000000000 --- a/pkgs/development/python-modules/segyio/add_missing_cstdint.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 64f06c0643f1f8691a8f2757496b60f1ab98c866 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sa=C3=AFd=20Benaissa?= -Date: Fri, 8 Dec 2023 21:51:32 +0100 -Subject: [PATCH] Add include for cstdint, fix segyio build on fedora - ---- - lib/experimental/segyio/segyio.hpp | 1 + - python/segyio/segyio.cpp | 1 + - python/setup.py | 2 +- - 3 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/experimental/segyio/segyio.hpp b/lib/experimental/segyio/segyio.hpp -index 706f07ff5..7ba3ffb99 100644 ---- a/lib/experimental/segyio/segyio.hpp -+++ b/lib/experimental/segyio/segyio.hpp -@@ -13,6 +13,7 @@ - #include - - #include -+#include - - /* - * KNOWN ISSUES AND TODOs: -diff --git a/python/segyio/segyio.cpp b/python/segyio/segyio.cpp -index 76da965c3..bd8a8622e 100644 ---- a/python/segyio/segyio.cpp -+++ b/python/segyio/segyio.cpp -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - #if PY_MAJOR_VERSION >= 3 - #define IS_PY3K -diff --git a/python/setup.py b/python/setup.py -index 6c6553bc7..654075be9 100644 ---- a/python/setup.py -+++ b/python/setup.py -@@ -1,6 +1,6 @@ - import os - import sys --import skbuild -+import skbuild # pip install scikit-build - import setuptools - - long_description = """ diff --git a/pkgs/development/python-modules/segyio/default.nix b/pkgs/development/python-modules/segyio/default.nix index 1346623c9807..ed8276efe92f 100644 --- a/pkgs/development/python-modules/segyio/default.nix +++ b/pkgs/development/python-modules/segyio/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, cmake, ninja, scikit-build, @@ -15,12 +16,11 @@ buildPythonPackage rec { pyproject = false; # Built with cmake patches = [ - # https://github.com/equinor/segyio/pull/570 - ./add_missing_cstdint.patch - # https://github.com/equinor/segyio/pull/576/ - ./fix-setuptools.patch - ./explicitly-cast.patch - ./numpy-2.patch + # Bump minimum CMake version to 3.11 + (fetchpatch { + url = "https://github.com/equinor/segyio/commit/3e2cbe6ca6d4bc7d4f4d95666f5d2983836e8461.patch?full_index=1"; + hash = "sha256-sOBHi8meMSkxEZy0AXwebAnIVPatpwQHd+4Co5zIhLQ="; + }) ]; postPatch = '' diff --git a/pkgs/development/python-modules/segyio/explicitly-cast.patch b/pkgs/development/python-modules/segyio/explicitly-cast.patch deleted file mode 100644 index 7030f07e5f72..000000000000 --- a/pkgs/development/python-modules/segyio/explicitly-cast.patch +++ /dev/null @@ -1,32 +0,0 @@ -From eafe8476566e1d8e8b9a486ca808685cb439a767 Mon Sep 17 00:00:00 2001 -From: Sveinung Rundhovde -Date: Mon, 29 Jul 2024 10:46:35 +0200 -Subject: [PATCH] Explicitly cast from BinField to int - -Parsing segyio.BinField type as int in PyArg_ParseTuple is no longer -possible. ---- - python/segyio/open.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/python/segyio/open.py b/python/segyio/open.py -index cd902c15..80bc3a5b 100644 ---- a/python/segyio/open.py -+++ b/python/segyio/open.py -@@ -166,8 +166,8 @@ def open(filename, mode="r", iline = 189, - f = segyio.SegyFile(fd, - filename = str(filename), - mode = mode, -- iline = iline, -- xline = xline, -+ iline = int(iline), -+ xline = int(xline), - endian = endian, - ) - -@@ -189,4 +189,4 @@ def open(filename, mode="r", iline = 189, - if ignore_geometry: - return f - -- return infer_geometry(f, metrics, iline, xline, strict) -+ return infer_geometry(f, metrics, int(iline), int(xline), strict) diff --git a/pkgs/development/python-modules/segyio/fix-setuptools.patch b/pkgs/development/python-modules/segyio/fix-setuptools.patch deleted file mode 100644 index 42b4260434ad..000000000000 --- a/pkgs/development/python-modules/segyio/fix-setuptools.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6df089258c2ef4356427263f652cff0c053c6173 Mon Sep 17 00:00:00 2001 -From: Sveinung Rundhovde -Date: Fri, 26 Jul 2024 15:03:33 +0200 -Subject: [PATCH] Fix attribute error in setup.py - -This line was causing a error due to an update to scikit-build. The -issue was that the setuptools.command.test module is not put into the -symbol table by the setuptools import, but it was put there during the -skbuild import causing it to be available. Due to changes in -scikit-build this is no longer the case and the line gives an -AttributError. - -The rationale for this line was that scikit-builds test command implied -develop (this was obnoxious), something that is no longer true. There is -thus no longer any reason to keep this line, so we can fix this issue by -simply removing it. ---- - python/setup.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/python/setup.py b/python/setup.py -index 6c6553bc..6bae62f0 100644 ---- a/python/setup.py -+++ b/python/setup.py -@@ -95,7 +95,6 @@ def src(x): - # supported OS X release 10.9 - '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.9', - ], -- cmdclass = { 'test': setuptools.command.test.test }, - classifiers = [ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Other Environment', diff --git a/pkgs/development/python-modules/segyio/numpy-2.patch b/pkgs/development/python-modules/segyio/numpy-2.patch deleted file mode 100644 index fa8b1d41002c..000000000000 --- a/pkgs/development/python-modules/segyio/numpy-2.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 75b2156a6414e2464eb15663004b8ab928374135 Mon Sep 17 00:00:00 2001 -From: Sveinung Rundhovde -Date: Tue, 30 Jul 2024 08:32:56 +0200 -Subject: [PATCH] Fix test failing due to Numpy 2.0 promotion rules - -From Numpy 2.0 adding a numpy.float32 and a Python numeric type returns -a numy.float32 when it previously returned a numpy.float64. This changes -the behavior when using the Python builtin sum function on a -numpy.float32 array as the internal computations now will be performed -as numpy.float32 additions when it used to be numpy.float64. - -Passing a numpy.double(0) as a start value to the innermost sum forces -the old behavior and provides consistent results for Numpy 1 and 2. ---- - python/test/segyio_c.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/python/test/segyio_c.py b/python/test/segyio_c.py -index 45fe95d89..b1e144d9d 100644 ---- a/python/test/segyio_c.py -+++ b/python/test/segyio_c.py -@@ -540,10 +540,10 @@ def read_line(f, metrics, iline_idx, xline_idx): - buf = numpy.zeros((len(iline_idx), samples), dtype=numpy.single) - - f.getline(xline_trace0, len(iline_idx), xline_stride, offsets, buf) -- assert sum(sum(buf)) == approx(800.061169624, abs=1e-6) -+ assert sum(sum(buf), numpy.double(0)) == approx(800.061169624, abs=1e-6) - - f.getline(iline_trace0, len(xline_idx), iline_stride, offsets, buf) -- assert sum(sum(buf)) == approx(305.061146736, abs=1e-6) -+ assert sum(sum(buf), numpy.double(0)) == approx(305.061146736, abs=1e-6) - - f.close() - diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix index 797f9b71a849..36fa6c553bf5 100644 --- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix +++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "universal-silabs-flasher"; - version = "0.0.35"; + version = "0.0.36"; pyproject = true; src = fetchFromGitHub { owner = "NabuCasa"; repo = "universal-silabs-flasher"; tag = "v${version}"; - hash = "sha256-6NOcEH1UUicZHKOQ91o4l7JiC1Qwpc8vWyRR7TRENqs="; + hash = "sha256-NKsVgbcUHJsqGrpCqCbBT+LLJp9+BjUGKbE4Cx0uv8Y="; }; postPatch = '' 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/ruby-modules/with-packages/default.nix b/pkgs/development/ruby-modules/with-packages/default.nix index 96bb7018cc29..8e63fa12edaa 100644 --- a/pkgs/development/ruby-modules/with-packages/default.nix +++ b/pkgs/development/ruby-modules/with-packages/default.nix @@ -96,6 +96,8 @@ let inherit wrappedRuby; gems = selected; }; + + meta.mainProgram = "ruby"; }; in 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/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix index 332cf7aea9ec..bddf56345a9c 100644 --- a/pkgs/development/tools/misc/cvise/default.nix +++ b/pkgs/development/tools/misc/cvise/default.nix @@ -13,6 +13,8 @@ pebble, psutil, pytestCheckHook, + testers, + cvise, }: buildPythonApplication rec { @@ -78,6 +80,16 @@ buildPythonApplication rec { "test_simple_reduction" ]; + passthru = { + tests = { + # basic syntax check + help-output = testers.testVersion { + package = cvise; + command = "cvise --version"; + }; + }; + }; + meta = with lib; { homepage = "https://github.com/marxin/cvise"; description = "Super-parallel Python port of C-Reduce"; diff --git a/pkgs/development/tools/misc/cvise/unifdef.patch b/pkgs/development/tools/misc/cvise/unifdef.patch index d15ca6dce0bd..e584730d6146 100644 --- a/pkgs/development/tools/misc/cvise/unifdef.patch +++ b/pkgs/development/tools/misc/cvise/unifdef.patch @@ -1,6 +1,7 @@ ---- a/cvise.py -+++ b/cvise.py -@@ -93,4 +93,5 @@ def find_external_programs(): +--- a/cvise/utils/externalprograms.py ++++ b/cvise/utils/externalprograms.py +@@ -43,5 +43,6 @@ def find_external_programs(): + # Special case for clang-format programs['clang-format'] = '@CLANG_FORMAT_PATH@' + programs['unifdef'] = '@UNIFDEF@' diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index e94887da7ad0..aab9065f8ed7 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -24,6 +24,7 @@ writeShellScriptBin, yarn, yarn-berry_4, + runCommand, swift, @@ -72,10 +73,7 @@ let exec ${yarn}/bin/yarn "$@" ''; - uvWheels = stdenv.mkDerivation { - name = "uv-wheels"; - phases = [ "installPhase" ]; - + uvWheels = runCommand "uv-wheels" { # otherwise, it's too long of a string passAsFile = [ "installCommand" ]; installCommand = '' @@ -98,9 +96,7 @@ let fi '') pythonDeps )); - - installPhase = ''bash $installCommandPath''; - }; + } "bash $installCommandPath"; in python3Packages.buildPythonApplication rec { 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/custom-lovelace-modules/advanced-camera-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix index 71ae421cb9cf..f623b11c07c8 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "advanced-camera-card"; - version = "7.18.3"; + version = "7.19.0"; src = fetchzip { url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip"; - hash = "sha256-eNyfXRSF2nSct4+iQoOCkbcN3vmzmIenlO/ng7ThPzM="; + hash = "sha256-3HWkKUPuQ6rSIxvMiyXe5MNvmKMIS3sCv+KYOGMEun8="; }; # TODO: build from source once yarn berry support lands in nixpkgs 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/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index df62ae38885a..670a974307b6 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { pname = "apache-jena"; - version = "5.5.0"; + version = "5.6.0"; src = fetchurl { url = "mirror://apache/jena/binaries/apache-jena-${version}.tar.gz"; - hash = "sha256-atRcW9U3PjX/E3QhTa6dBfvb19Rb3n6ROpLeGinGD1U="; + hash = "sha256-s5qmzKBrED7U1Qm0Lu5RI5QIiFnfK1NnqFiSe/H85yg="; }; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/tools/filesystems/ceph/arrow-cpp-19.nix b/pkgs/tools/filesystems/ceph/arrow-cpp-19.nix index d4226feffb52..eb2d7ecc628c 100644 --- a/pkgs/tools/filesystems/ceph/arrow-cpp-19.nix +++ b/pkgs/tools/filesystems/ceph/arrow-cpp-19.nix @@ -106,6 +106,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-WTpe/eT3himlCHN/R78w1sF0HG859mE2ZN70U+9N8Ag="; stripLen = 1; }) + (fetchpatch2 { + name = "cmake-fix.patch"; + url = "https://github.com/apache/arrow/commit/48c0bbbd4a2eedcca518caeb7f7547c7988dc740.patch?full_index=1"; + hash = "sha256-i/vZy/61VYP+mo1AxfoiBSjTip04vhFOh3hGjHCJy6g="; + stripLen = 1; # applying patch from within `cpp/` subdirectory + }) ]; # versions are all taken from diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 11e7fff175a6..5e8bc57366ed 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -386,6 +386,12 @@ rec { # * # * ./boost-1.86-PyModule.patch + + (fetchpatch2 { + name = "ceph-cmake-4.patch"; + url = "https://gitlab.alpinelinux.org/ashpool/aports/-/raw/d22b70eafe33c3daabe4eea6913c5be87d9463ad/community/ceph19/cpp_redis.patch"; + hash = "sha256-wxPIsYt25CjXhJ6kmr/MXwFD58Sl4y4W+r9jAMND+uw="; + }) ]; nativeBuildInputs = [ 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/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ee010b6a3e04..201c83f142dd 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -180,14 +180,14 @@ lib.makeExtensible ( nix_2_31 = addTests "nix_2_31" self.nixComponents_2_31.nix-everything; nixComponents_2_32 = nixDependencies.callPackage ./modular/packages.nix rec { - version = "2.32.0"; + version = "2.32.1"; inherit (self.nix_2_31.meta) maintainers teams; otherSplices = generateSplicesForNixComponents "nixComponents_2_32"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; tag = version; - hash = "sha256-OOd7dFe0tX0CVPygR7U6cqs5fiJAvFO1el1QmjDG1GM="; + hash = "sha256-pApD0gpaklYkgZ9oZCtuAcAcYeUxR9FUOAlOtflZr+Q="; }; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index caaf2dee01c9..75e67409a343 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2742,6 +2742,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; @@ -2756,6 +2758,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 0d7ccf875783..ae377e821efc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1882,6 +1882,8 @@ with pkgs; coreboot-configurator = libsForQt5.callPackage ../tools/misc/coreboot-configurator { }; + intel-oneapi = callPackage ../development/libraries/intel-oneapi { }; + sway-unwrapped = callPackage ../by-name/sw/sway-unwrapped/package.nix { wlroots = wlroots_0_19; }; @@ -8807,19 +8809,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 { }; @@ -11635,6 +11631,7 @@ with pkgs; k3s_1_31 k3s_1_32 k3s_1_33 + k3s_1_34 ; k3s = k3s_1_33; @@ -13397,8 +13394,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; }; @@ -13635,9 +13630,7 @@ 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 { }) xonotic-data @@ -14224,8 +14217,6 @@ with pkgs; inherit (gnome2) gtkglext; }; - convertall = qt5.callPackage ../applications/science/misc/convertall { }; - faissWithCuda = faiss.override { cudaSupport = true; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 6463b9a32430..86e4c306066e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -232,8 +232,6 @@ let cfstream = callPackage ../development/ocaml-modules/cfstream { }; - chacha = callPackage ../development/ocaml-modules/chacha { }; - checkseum = callPackage ../development/ocaml-modules/checkseum { }; chrome-trace = callPackage ../development/ocaml-modules/chrome-trace { }; @@ -2252,6 +2250,7 @@ let } // lib.optionalAttrs config.allowAliases { biocaml = throw "biocaml has been removed"; # 2025-06-04 + chacha = throw "chacha has been removed because it has been marked as broken since at least November 2024. It is now vendored inside mirage-crypto, consider using that instead."; # Added 2025-10-11 gd4o = throw "ocamlPackages.gd4o is not maintained, use ocamlPackages.gd instead"; ocaml-vdom = throw "2023-10-09: ocamlPackages.ocaml-vdom was renamed to ocamlPackages.vdom"; } 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",