diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 1abdb322d531..c3236691e3d9 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -96,6 +96,8 @@ - `conduwuit` was removed due to upstream ceasing development and deleting their repository. For existing data, a migration to `matrix-conduit`, `matrix-continuwuity` or `matrix-tuwunel` may be possible. +- `asciidoctor-with-extension` had its `asciidoctor-mathematical` extension removed, because it fails to build, and it is not maintained properly. + - The `ghcInfo` and `controlPhases` functions have been removed from `haskell.lib.compose` and `haskell.lib`. They were unused and would return incorrect results. - Instead of using `controlPhases`, the `doCheck` attribute of derivations can be accessed which is more accurate. `doBenchmark` can't be introspected at the moment. diff --git a/nixos/modules/services/desktop-managers/cosmic.nix b/nixos/modules/services/desktop-managers/cosmic.nix index 342e1d7e3d5a..4a3e6982b933 100644 --- a/nixos/modules/services/desktop-managers/cosmic.nix +++ b/nixos/modules/services/desktop-managers/cosmic.nix @@ -89,10 +89,13 @@ in cosmic-screenshot cosmic-term cosmic-wallpapers + glib hicolor-icon-theme + networkmanagerapplet playerctl pop-icon-theme pop-launcher + pulseaudio xdg-user-dirs ] ++ lib.optionals config.services.flatpak.enable [ diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 9dd5fc38be37..0615f0885c27 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5074,14 +5074,14 @@ final: prev: { fennel-vim = buildVimPlugin { pname = "fennel.vim"; - version = "2020-11-15"; + version = "2025-04-01"; src = fetchFromGitHub { - owner = "bakpakin"; + owner = "micampe"; repo = "fennel.vim"; - rev = "30b9beabad2c4f09b9b284caf5cd5666b6b4dc89"; - sha256 = "1fvcn4q87d594nzxlj1597bmrixzlfqnl7k8f547skvvywx09kii"; + rev = "0a5c89e7f31d2721a36f7043ee98e24e22e6325e"; + sha256 = "12hcvc2c2dgxqs6x333fdc7f1fn4jz9vm6vm2g8iwlfhm70bcaab"; }; - meta.homepage = "https://github.com/bakpakin/fennel.vim/"; + meta.homepage = "https://github.com/micampe/fennel.vim/"; meta.hydraPlatforms = [ ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 45494b1ea38f..cd225e247ce3 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -388,7 +388,7 @@ https://github.com/pteroctopus/faster.nvim/,HEAD, https://github.com/konfekt/fastfold/,, https://github.com/madskjeldgaard/faust-nvim/,HEAD, https://github.com/lilydjwg/fcitx.vim/,fcitx5, -https://github.com/bakpakin/fennel.vim/,, +https://github.com/micampe/fennel.vim/,, https://github.com/wincent/ferret/,, https://github.com/bogado/file-line/,, https://github.com/lewis6991/fileline.nvim/,, diff --git a/pkgs/by-name/ca/cargo-mobile2/package.nix b/pkgs/by-name/ca/cargo-mobile2/package.nix index 19393089819f..99d9709259f9 100644 --- a/pkgs/by-name/ca/cargo-mobile2/package.nix +++ b/pkgs/by-name/ca/cargo-mobile2/package.nix @@ -10,7 +10,7 @@ let pname = "cargo-mobile2"; - version = "0.21.0"; + version = "0.21.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -18,14 +18,14 @@ rustPlatform.buildRustPackage { owner = "tauri-apps"; repo = "cargo-mobile2"; rev = "cargo-mobile2-v${version}"; - hash = "sha256-cWOEjXfbUn0aOl53d9mqQHSRvowVsOOy+mtd0+c935Y="; + hash = "sha256-w95UAtAP11jaW4EqprGv+duBf81rLv8y7+Ej5SFeRAs="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 # sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-WS4emnsXotVXQblMcy7165lBvK1423Bi41gXPY5FA9I="; + cargoHash = "sha256-Aa4Iubl8l+tss0ClF93RqVUsB4Jg4/MQCeKSr/iY5tA="; preBuild = '' mkdir -p $out/share/ diff --git a/pkgs/by-name/co/colloid-gtk-theme/package.nix b/pkgs/by-name/co/colloid-gtk-theme/package.nix index cfb00d16cabc..79d6bd2c1687 100644 --- a/pkgs/by-name/co/colloid-gtk-theme/package.nix +++ b/pkgs/by-name/co/colloid-gtk-theme/package.nix @@ -2,7 +2,6 @@ lib, stdenvNoCC, fetchFromGitHub, - gnome-themes-extra, gtk-engine-murrine, jdupes, sassc, @@ -55,14 +54,14 @@ lib.checkListOfEnum "colloid-gtk-theme: theme variants" tweaks stdenvNoCC.mkDerivation - rec { + (finalAttrs: { inherit pname; version = "2025-07-31"; src = fetchFromGitHub { owner = "vinceliuice"; repo = "colloid-gtk-theme"; - tag = version; + tag = finalAttrs.version; hash = "sha256-0pXbeeBAkk6v2DBWfUYhWWdyrQhgr/JfDbhyS33maMM="; }; @@ -71,10 +70,6 @@ lib.checkListOfEnum "colloid-gtk-theme: theme variants" sassc ]; - buildInputs = [ - gnome-themes-extra - ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; @@ -98,11 +93,11 @@ lib.checkListOfEnum "colloid-gtk-theme: theme variants" runHook postInstall ''; - meta = with lib; { + meta = { description = "Modern and clean Gtk theme"; homepage = "https://github.com/vinceliuice/Colloid-gtk-theme"; - license = licenses.gpl3Only; - platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; - } + }) diff --git a/pkgs/by-name/cr/crosvm/package.nix b/pkgs/by-name/cr/crosvm/package.nix index 4bdfd762a9ea..9bcb2f6a1069 100644 --- a/pkgs/by-name/cr/crosvm/package.nix +++ b/pkgs/by-name/cr/crosvm/package.nix @@ -21,18 +21,18 @@ rustPlatform.buildRustPackage { pname = "crosvm"; - version = "0-unstable-2025-09-30"; + version = "0-unstable-2025-10-15"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "85695a5b4fe5bea29925cbb905ff7557242a14c3"; - hash = "sha256-zaUjpqDKvvRDY0TOc892g5ehc1o5itv1O9E+YSrve0U="; + rev = "b516534fef1658536e76cfcb958db424c1a764b5"; + hash = "sha256-FZu/eWEZ9j/gBL9mYFB29aT3MF95hjRS075pAmv8SjA="; fetchSubmodules = true; }; separateDebugInfo = true; - cargoHash = "sha256-l1uyCGyLhrP5JNABQ+3uvPRYNOl9YB3ndOcxNTDaSv0="; + cargoHash = "sha256-ROj0qOnePzkuzck6jXgjvOM9ksL/ubZOxOtku1B7dZA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fa/fastmail-desktop/package.nix b/pkgs/by-name/fa/fastmail-desktop/package.nix new file mode 100644 index 000000000000..5e0bb16ac1dc --- /dev/null +++ b/pkgs/by-name/fa/fastmail-desktop/package.nix @@ -0,0 +1,34 @@ +{ + lib, + stdenvNoCC, + fetchzip, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "fastmail-desktop"; + version = "1.0.0"; + + src = fetchzip { + url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-${finalAttrs.version}-arm64-mac.zip"; + hash = "sha256-wIWU0F08wEQeLjbZz2LqahfyeOfowC+dDQkeMZI6gbk="; + stripRoot = false; + }; + + installPhase = '' + mkdir -p $out/Applications + cp -R Fastmail.app $out/Applications/ + ''; + + dontBuild = true; + + # Fastmail is notarized + dontFixup = true; + + meta = { + description = "Dedicated desktop app for Fastmail"; + homepage = "https://www.fastmail.com/blog/desktop-app/"; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = [ lib.maintainers.Enzime ]; + platforms = [ "aarch64-darwin" ]; + }; +}) diff --git a/pkgs/by-name/fl/fluent-gtk-theme/package.nix b/pkgs/by-name/fl/fluent-gtk-theme/package.nix index a2dc6a21bf3a..5bbc44052e29 100644 --- a/pkgs/by-name/fl/fluent-gtk-theme/package.nix +++ b/pkgs/by-name/fl/fluent-gtk-theme/package.nix @@ -3,7 +3,6 @@ stdenvNoCC, fetchFromGitHub, gitUpdater, - gnome-themes-extra, gtk-engine-murrine, jdupes, sassc, @@ -74,8 +73,6 @@ lib.checkListOfEnum "${pname}: theme variants" sassc ]; - buildInputs = [ gnome-themes-extra ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; postPatch = '' diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix index 07803a8d1754..6bbb8df57cd2 100644 --- a/pkgs/by-name/fr/freetube/package.nix +++ b/pkgs/by-name/fr/freetube/package.nix @@ -20,13 +20,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "freetube"; - version = "0.23.11"; + version = "0.23.12"; src = fetchFromGitHub { owner = "FreeTubeApp"; repo = "FreeTube"; tag = "v${finalAttrs.version}-beta"; - hash = "sha256-AmT0zNqFJEG1qjMBgMTUKmEsZrJqocxRzPkTl25HiUs="; + hash = "sha256-DH5uT3dPDFZnFYoiMjxpNouNDRbWDctVqvDwHpUlnkY="; }; # Darwin requires writable Electron dist diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix index 2c40adfc6276..0d6bfc29aa1d 100644 --- a/pkgs/by-name/fr/frigate/package.nix +++ b/pkgs/by-name/fr/frigate/package.nix @@ -13,14 +13,14 @@ }: let - version = "0.16.1"; + version = "0.16.2"; src = fetchFromGitHub { name = "frigate-${version}-source"; owner = "blakeblackshear"; repo = "frigate"; tag = "v${version}"; - hash = "sha256-Uhqs9n4igP9+BtIHiEiurjvKfo2prIXnnVXqyPDbzQ8="; + hash = "sha256-8Lm4iLRdMqgZvy24WS1SOkbj855c2t9yg8n91WMg5Fg="; }; frigate-web = callPackage ./web.nix { diff --git a/pkgs/by-name/mu/music-assistant/frontend.nix b/pkgs/by-name/mu/music-assistant/frontend.nix index f1d0308166cb..2732e5d4bdac 100644 --- a/pkgs/by-name/mu/music-assistant/frontend.nix +++ b/pkgs/by-name/mu/music-assistant/frontend.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "music-assistant-frontend"; - version = "2.15.1"; + version = "2.15.3"; pyproject = true; src = fetchPypi { pname = "music_assistant_frontend"; inherit version; - hash = "sha256-l6SKBMqP2FrjVUmywDXf0I4Te0qbzufUVR7frWAzrks="; + hash = "sha256-atwFGd6KplVPw4e6rHrNlXmMCsozL56lCVYVWCg9RPs="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/mu/music-assistant/librespot.patch b/pkgs/by-name/mu/music-assistant/librespot.patch index 5e130993be65..eabb310dd5f6 100644 --- a/pkgs/by-name/mu/music-assistant/librespot.patch +++ b/pkgs/by-name/mu/music-assistant/librespot.patch @@ -1,25 +1,26 @@ diff --git a/music_assistant/providers/spotify/helpers.py b/music_assistant/providers/spotify/helpers.py -index 8b6c4e78f5f3f64c9dc6206028177c99ed0542ed..25ed6e468b393d2da74167e3c2ac4bdcd2e2699e 100644 +index 6f87b44f46b64805ef6799a54d596fd1684017f1..23de7fc2145619dd4f02551e81cb383f2b79fa15 100644 --- a/music_assistant/providers/spotify/helpers.py +++ b/music_assistant/providers/spotify/helpers.py @@ -4,6 +4,7 @@ from __future__ import annotations - + import os import platform +from shutil import which - + from music_assistant.helpers.process import check_output - + @@ -20,12 +21,8 @@ async def get_librespot_binary() -> str: except OSError: return None - + - base_path = os.path.join(os.path.dirname(__file__), "bin") - system = platform.system().lower().replace("darwin", "macos") - architecture = platform.machine().lower() - - if bridge_binary := await check_librespot( + if librespot_binary := await check_librespot( - os.path.join(base_path, f"librespot-{system}-{architecture}") + which("librespot") ): - return bridge_binary + return librespot_binary + diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index 4faee79f70f4..c9a6459a3346 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -15,13 +15,13 @@ let music-assistant-frontend = self.callPackage ./frontend.nix { }; music-assistant-models = super.music-assistant-models.overridePythonAttrs (oldAttrs: rec { - version = "1.1.45"; + version = "1.1.47"; src = fetchFromGitHub { owner = "music-assistant"; repo = "models"; tag = version; - hash = "sha256-R1KkMe9dVl5J1DjDsFhSYVebpiqBkXZSqkLrd7T8gFg="; + hash = "sha256-NNKF61CRBe+N9kY+JUa77ClHSJ9RhpsiheMg7Ytyq2M="; }; postPatch = '' @@ -47,14 +47,14 @@ assert python.pkgs.buildPythonApplication rec { pname = "music-assistant"; - version = "2.5.8"; + version = "2.6.0"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "server"; tag = version; - hash = "sha256-7Q+BYw7wnT7QdqrDjagaxupzD0iKTc26z4TfxNtugdA="; + hash = "sha256-e596gvj+ZZDQzyBVfI50nO0a0eZifrkQVhUNNP2Jj8A="; }; patches = [ diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix index ef0d35c06fde..611e3a2afeae 100644 --- a/pkgs/by-name/mu/music-assistant/providers.nix +++ b/pkgs/by-name/mu/music-assistant/providers.nix @@ -1,10 +1,14 @@ # Do not edit manually, run ./update-providers.py { - version = "2.5.8"; + version = "2.6.0"; providers = { airplay = ps: [ ]; + alexa = + ps: with ps; [ + alexapy + ]; apple_music = ps: [ ]; # missing pywidevine audible = @@ -68,8 +72,17 @@ ]; listenbrainz_scrobble = ps: [ ]; # missing liblistenbrainz + lrclib = ps: [ + ]; musicbrainz = ps: [ ]; + musiccast = + ps: with ps; [ + aiomusiccast + setuptools + ]; + nugs = ps: [ + ]; opensubsonic = ps: with ps; [ py-opensonic @@ -117,6 +130,8 @@ ps: with ps; [ aioslimproto ]; + subsonic_scrobble = ps: [ + ]; template_player_provider = ps: [ ]; test = ps: [ diff --git a/pkgs/by-name/ne/networkmanagerapplet/package.nix b/pkgs/by-name/ne/networkmanagerapplet/package.nix index 252a54c71b3e..98de9077f661 100644 --- a/pkgs/by-name/ne/networkmanagerapplet/package.nix +++ b/pkgs/by-name/ne/networkmanagerapplet/package.nix @@ -73,6 +73,10 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py + + # Prevent applet from autostarting in COSMIC, which has its own built-in network applet + substituteInPlace nm-applet.desktop.in \ + --replace-fail "NotShowIn=KDE;GNOME;" "NotShowIn=KDE;GNOME;COSMIC;" ''; passthru = { diff --git a/pkgs/by-name/ne/nextpnr/package.nix b/pkgs/by-name/ne/nextpnr/package.nix index f293b4e6351b..56a680a6284c 100644 --- a/pkgs/by-name/ne/nextpnr/package.nix +++ b/pkgs/by-name/ne/nextpnr/package.nix @@ -80,6 +80,9 @@ stdenv.mkDerivation rec { "-DHIMBAECHEL_GOWIN_DEVICES=all" "-DHIMBAECHEL_PRJBEYOND_DB=${prjbeyond_src}" + # https://github.com/YosysHQ/nextpnr/issues/1578 + # `Compatibility with CMake < 3.5 has been removed from CMake.` + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ] ++ (lib.optional enableGui "-DBUILD_GUI=ON"); diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix index e451c93130a8..5124b0f8856f 100644 --- a/pkgs/by-name/po/polarity/package.nix +++ b/pkgs/by-name/po/polarity/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "polarity"; - version = "latest-unstable-2025-10-09"; + version = "latest-unstable-2025-10-14"; src = fetchFromGitHub { owner = "polarity-lang"; repo = "polarity"; - rev = "08e5ab1593ec2658bcd87b8e915098c218112691"; - hash = "sha256-cJDdPUNx7greggrNXuRJ+vq+cr8FlacaSNGIamJSdck="; + rev = "cd882ce79d4ebd4527f87386dba32574cefc9535"; + hash = "sha256-aRFAWIp8luAofr/5rSNYZQgjsZFeU8xvTE7RrnHRKKI="; }; - cargoHash = "sha256-ikjFczHc7iPUAksbo9URQN4YCz6DP61p5HhOEhZTqo0="; + cargoHash = "sha256-yU+P8CqefuyDDYiaoslQ58HsXDT6iKzmNYekZwaaL3A="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/ta/taco/package.nix b/pkgs/by-name/ta/taco/package.nix index 5cf747348056..4dd472fd36b1 100644 --- a/pkgs/by-name/ta/taco/package.nix +++ b/pkgs/by-name/ta/taco/package.nix @@ -37,6 +37,14 @@ stdenv.mkDerivation (finalAttrs: { rm -rf python_bindings/pybind11/* cp -r ${finalAttrs.src-new-pybind11}/* python_bindings/pybind11 find python_bindings/pybind11 -exec chmod +w {} \; + + # CMake4 no longer support version < 3.5 + substituteInPlace CMakeLists.txt --replace-fail \ + "cmake_minimum_required(VERSION 3.4.0 FATAL_ERROR)" \ + "cmake_minimum_required(VERSION 3.5)" + substituteInPlace apps/tensor_times_vector/CMakeLists.txt --replace-fail \ + "cmake_minimum_required(VERSION 2.8.12)" \ + "cmake_minimum_required(VERSION 3.5)" ''; # Remove test cases from cmake build as they violate modern C++ expectations diff --git a/pkgs/by-name/ta/talosctl/package.nix b/pkgs/by-name/ta/talosctl/package.nix index f43b941547e4..7ac6a74005ce 100644 --- a/pkgs/by-name/ta/talosctl/package.nix +++ b/pkgs/by-name/ta/talosctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; tag = "v${version}"; - hash = "sha256-r78O/FdsfD29wM6fcbuwYea/b7J60iAdtrw4CEBM/mo="; + hash = "sha256-6nm0KgENOHUdyJllvnhBNlxDGL3G8gg4KqhTkTRE32o="; }; - vendorHash = "sha256-T8lJjJfCLpQIsmCW/FQk/CJstyH6u/gNZ6R+COH909M="; + vendorHash = "sha256-NLyWzkagiP6zeeB4o6CI9UBPH6a5JGhPu1QGyiovBfM="; ldflags = [ "-s" diff --git a/pkgs/development/libraries/libint/default.nix b/pkgs/development/libraries/libint/default.nix index 5dbd4e287070..50140fcc6cb4 100644 --- a/pkgs/development/libraries/libint/default.nix +++ b/pkgs/development/libraries/libint/default.nix @@ -128,7 +128,7 @@ assert ( let pname = "libint"; - version = "2.11.1"; + version = "2.11.2"; meta = { description = "Library for the evaluation of molecular integrals of many-body operators over Gaussian functions"; @@ -151,7 +151,7 @@ let owner = "evaleev"; repo = "libint"; rev = "v${version}"; - hash = "sha256-oV/RWWfD0Kf2egI40fV8z2atG+4Cs+9+Wvy0euNNjtM="; + hash = "sha256-pqv3lpaLtbSNi1oC361YeCg57Bb8jQ8eNzU3q4US1vc="; }; # Replace hardcoded "/bin/rm" with normal "rm" diff --git a/pkgs/development/python-modules/pykalman/default.nix b/pkgs/development/python-modules/pykalman/default.nix index 4d8b902b46b7..1be45692ea17 100644 --- a/pkgs/development/python-modules/pykalman/default.nix +++ b/pkgs/development/python-modules/pykalman/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { scikit-base ]; + pythonRelaxDeps = [ "scikit-base" ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pykalman" ]; diff --git a/pkgs/development/python-modules/scikit-base/default.nix b/pkgs/development/python-modules/scikit-base/default.nix index 899224d58602..8afe652ec3f4 100644 --- a/pkgs/development/python-modules/scikit-base/default.nix +++ b/pkgs/development/python-modules/scikit-base/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "scikit-base"; - version = "0.12.6"; + version = "0.13.0"; pyproject = true; src = fetchFromGitHub { owner = "sktime"; repo = "skbase"; tag = "v${version}"; - hash = "sha256-c9hQBZV+PWI6ZViocUYqryhvDg0nJ6Qxdx6zwIV0fes="; + hash = "sha256-fZytQprnp4WAxTJxXp+AAe7xDRfcxaCAELPS6eAfK4g="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/godot/4.5/default.nix b/pkgs/development/tools/godot/4.5/default.nix index 0db38e4de8b3..ef4e38e5d920 100644 --- a/pkgs/development/tools/godot/4.5/default.nix +++ b/pkgs/development/tools/godot/4.5/default.nix @@ -1,11 +1,11 @@ { - version = "4.5-stable"; - hash = "sha256-ENDgZBM/bgL+Wlvy6GhE8a5Lyj44OqH7nOF3y74Bf/8="; + version = "4.5.1-stable"; + hash = "sha256-8iMhn40y7aVL6Xjvo34ZtfygJYWwDmCnTxUJcV3AQCI="; default = { - exportTemplatesHash = "sha256-N12DtmF5T5F0bS3sm1aamdTST4WnDE7ABoqvsYtVHVM="; + exportTemplatesHash = "sha256-GZivN/E4doTiwhHNtIPa9JL8ZNxrEglr3c3KJbaRDIY="; }; mono = { - exportTemplatesHash = "sha256-rRGCBdiuMEurhPqTdZC9G0OpVnu3+CvneGeMiRzoWLs="; + exportTemplatesHash = "sha256-xCVjMGG7SfQ5C9zs4rnOaLOwvjxxCVtAZE2PbxexFG4="; nugetDeps = ./deps.json; }; } diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix index bdd87b4a96b5..a50cf1bb6c1a 100644 --- a/pkgs/development/tools/godot/common.nix +++ b/pkgs/development/tools/godot/common.nix @@ -426,8 +426,7 @@ let # Fix a crash in the mono test project build. It no longer seems to # happen in 4.4, but an existing fix couldn't be identified. ./CSharpLanguage-fix-crash-in-reload_assemblies-after-.patch - ] - ++ lib.optional (lib.versionAtLeast version "4.5") ./fix-freetype-link-error.patch; + ]; postPatch = '' # this stops scons from hiding e.g. NIX_CFLAGS_COMPILE diff --git a/pkgs/development/tools/godot/fix-freetype-link-error.patch b/pkgs/development/tools/godot/fix-freetype-link-error.patch deleted file mode 100644 index 6ae73c6aa68b..000000000000 --- a/pkgs/development/tools/godot/fix-freetype-link-error.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub -index 0a52ef46c5..c932900037 100644 ---- a/modules/freetype/SCsub -+++ b/modules/freetype/SCsub -@@ -62,9 +62,9 @@ if env["builtin_freetype"]: - if env["brotli"]: - env_freetype.Append(CPPDEFINES=["FT_CONFIG_OPTION_USE_BROTLI"]) - -- env_freetype.Prepend(CPPEXTPATH=[thirdparty_dir + "/include"]) -+ env_freetype.Prepend(CPPPATH=[thirdparty_dir + "/include"]) - # Also needed in main env for scene/ -- env.Prepend(CPPEXTPATH=[thirdparty_dir + "/include"]) -+ env.Prepend(CPPPATH=[thirdparty_dir + "/include"]) - - env_freetype.Append(CPPDEFINES=["FT2_BUILD_LIBRARY", "FT_CONFIG_OPTION_USE_PNG", "FT_CONFIG_OPTION_SYSTEM_ZLIB"]) - \ No newline at end of file diff --git a/pkgs/development/tools/godot/update.sh b/pkgs/development/tools/godot/update.sh index 1cf654b70d87..ac2606c39c12 100755 --- a/pkgs/development/tools/godot/update.sh +++ b/pkgs/development/tools/godot/update.sh @@ -14,7 +14,7 @@ nix-update "$attr".godot \ [[ $(nix eval --raw -f. "$attr".godot) != "$prev_version" ]] || exit 0 fetch_deps=$(nix build -f. "$attr".godot-mono.fetch-deps --print-out-paths --no-link) -"$fetch_deps" +"$fetch_deps" >&2 update-source-version "$attr".godot.export-templates-bin --ignore-same-version --file="$file" update-source-version "$attr".godot-mono.export-templates-bin --ignore-same-version --file="$file" diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix index b6a42f8e0b7e..42bb7a201b75 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "material-you-utilities"; - version = "2.0.16"; + version = "2.0.21"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "material-you-utilities"; tag = version; - hash = "sha256-VHOH1DHVTksMJCBb/8wiFXm+7zXZaxrCl3CylqA8K5M="; + hash = "sha256-rGwa5vP0Wka9w1m4s6q8stqSe1QVu2US59/RnMOR8+A="; }; - npmDepsHash = "sha256-5aYD8r6KjgDtxnjDbEwXH5Mlp2kaeCYtXYZ7oY9n6J0="; + npmDepsHash = "sha256-Coc8SOqc2tElx3HzzUsYxc+eKkdjkbROh8LvPB2Iro8="; postPatch = '' # Remove git dependency from rspack config diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile b/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile index 12c132a81d1c..a13c8e6750bc 100644 --- a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile +++ b/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile @@ -4,7 +4,6 @@ gem 'asciidoctor-bibtex' gem 'asciidoctor-diagram' gem 'asciidoctor-epub3' gem 'asciidoctor-html5s' -gem 'asciidoctor-mathematical' gem 'asciidoctor-multipage' gem 'asciidoctor-pdf' gem 'asciidoctor-reducer' diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock index 203407169bda..cc72aec9ea67 100644 --- a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock +++ b/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock @@ -29,10 +29,6 @@ GEM asciidoctor-html5s (0.5.1) asciidoctor (>= 1.5.7, < 3.0) thread_safe (~> 0.3.4) - asciidoctor-mathematical (0.3.5) - asciidoctor (~> 2.0) - asciimath (~> 2.0) - mathematical (~> 1.6.0) asciidoctor-multipage (0.0.19) asciidoctor (>= 2.0.11, < 2.1) asciidoctor-pdf (2.3.19) @@ -50,7 +46,6 @@ GEM asciidoctor (~> 2.0) asciidoctor-revealjs (5.1.0) asciidoctor (>= 2.0.0, < 3.0.0) - asciimath (2.0.5) bibtex-ruby (6.1.0) latex-decode (~> 0.0) racc (~> 1.7) @@ -75,8 +70,6 @@ GEM hashery (2.1.2) latex-decode (0.4.0) logger (1.6.1) - mathematical (1.6.20) - ruby-enum (>= 0.4, < 2.0) matrix (0.4.2) mime-types (3.6.0) logger @@ -119,7 +112,6 @@ GEM ffi (~> 1.0) rexml (3.3.9) rouge (4.4.0) - ruby-enum (1.0.0) ruby-rc4 (0.1.5) rubyzip (2.3.2) sass (3.7.4) @@ -141,7 +133,6 @@ DEPENDENCIES asciidoctor-diagram asciidoctor-epub3 asciidoctor-html5s - asciidoctor-mathematical asciidoctor-multipage asciidoctor-pdf asciidoctor-reducer @@ -151,4 +142,4 @@ DEPENDENCIES rouge BUNDLED WITH - 2.5.16 + 2.5.22 diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix b/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix index f03701683895..6eae05955d11 100644 --- a/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix +++ b/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix @@ -134,21 +134,6 @@ }; version = "0.5.1"; }; - asciidoctor-mathematical = { - dependencies = [ - "asciidoctor" - "asciimath" - "mathematical" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1lxfq7qn3ql642pva6jh3h1abm9j9daxg5icfn1h73k6cjsmcisp"; - type = "gem"; - }; - version = "0.3.5"; - }; asciidoctor-multipage = { dependencies = [ "asciidoctor" ]; groups = [ "default" ]; @@ -204,16 +189,6 @@ }; version = "5.1.0"; }; - asciimath = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ny2qql3lgh7gx54psji2lm4mmbwyiwy00a17w26rjyh6cy55491"; - type = "gem"; - }; - version = "2.0.5"; - }; bibtex-ruby = { dependencies = [ "latex-decode" @@ -363,17 +338,6 @@ }; version = "1.6.1"; }; - mathematical = { - dependencies = [ "ruby-enum" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0y103dvfjswm5r0xafyjrw6ybvz1qrqfa4lvpk9gdhbzwpaiwy4r"; - type = "gem"; - }; - version = "1.6.20"; - }; matrix = { groups = [ "default" ]; platforms = [ ]; @@ -617,16 +581,6 @@ }; version = "4.4.0"; }; - ruby-enum = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ry6ha94a5jqbj5y3x9k0szyy3jgnsfyxvva98nivg6yx1dfyrz7"; - type = "gem"; - }; - version = "1.0.0"; - }; ruby-rc4 = { groups = [ "default" ]; platforms = [ ];