diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index e3a882b1afb1..523210b93b80 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -57,12 +57,11 @@ sigtool, sqlite, replaceVars, - systemd, + systemdLibs, tree-sitter, texinfo, webkitgtk_4_0, wrapGAppsHook3, - writeText, zlib, # Boolean flags @@ -88,7 +87,7 @@ withPgtk ? false, withSelinux ? stdenv.hostPlatform.isLinux, withSQLite3 ? true, - withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, + withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdLibs, withToolkitScrollBars ? true, withTreeSitter ? true, withWebP ? true, @@ -322,7 +321,7 @@ stdenv.mkDerivation (finalAttrs: { sqlite ] ++ lib.optionals withSystemd [ - systemd + systemdLibs ] ++ lib.optionals withTreeSitter [ tree-sitter diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix index 936fc38925dc..a68f24ea0653 100644 --- a/pkgs/applications/editors/vim/plugins/aliases.nix +++ b/pkgs/applications/editors/vim/plugins/aliases.nix @@ -102,6 +102,7 @@ mapAliases ( neoinclude = neoinclude-vim; neomru = neomru-vim; neosnippet = neosnippet-vim; + neuron-nvim = throw "neuron.nvim has been removed: archived repository 2023-02-19"; # Added 2025-09-10 nvim-ts-rainbow = throw "nvim-ts-rainbow has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30 nvim-ts-rainbow2 = throw "nvim-ts-rainbow2 has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30 The_NERD_Commenter = nerdcommenter; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 002cd05082d8..682c90a0004e 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -9983,19 +9983,6 @@ final: prev: { meta.hydraPlatforms = [ ]; }; - neuron-nvim = buildVimPlugin { - pname = "neuron.nvim"; - version = "2022-02-27"; - src = fetchFromGitHub { - owner = "oberblastmeister"; - repo = "neuron.nvim"; - rev = "c44032ece3cb71a9ce45043d246828cd1cef002c"; - sha256 = "0r8qybg1pikp49v9v0zh79q7fxx8kh8rwafvyqghf5yb0ixcjiis"; - }; - meta.homepage = "https://github.com/oberblastmeister/neuron.nvim/"; - meta.hydraPlatforms = [ ]; - }; - neuron-vim = buildVimPlugin { pname = "neuron.vim"; version = "2023-07-06"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 9447e31c576b..69a698a075f9 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2281,13 +2281,6 @@ assertNoAdditions { ]; }; - neuron-nvim = super.neuron-nvim.overrideAttrs { - dependencies = with self; [ - plenary-nvim - telescope-nvim - ]; - }; - neovim-trunk = super.neovim-trunk.overrideAttrs { dependencies = with self; [ plenary-nvim diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index c1c02d13e65e..eed9a04b48f8 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -766,7 +766,6 @@ https://github.com/Xuyuanp/nerdtree-git-plugin/,, https://github.com/2KAbhishek/nerdy.nvim/,HEAD, https://github.com/miversen33/netman.nvim/,HEAD, https://github.com/prichrd/netrw.nvim/,HEAD, -https://github.com/oberblastmeister/neuron.nvim/,, https://github.com/fiatjaf/neuron.vim/,, https://github.com/Olical/nfnl/,main, https://github.com/joeveiga/ng.nvim/,HEAD, diff --git a/pkgs/applications/editors/vscode/extensions/ndonfris.fish-lsp/default.nix b/pkgs/applications/editors/vscode/extensions/ndonfris.fish-lsp/default.nix index 03578ad17b86..331cb3624005 100644 --- a/pkgs/applications/editors/vscode/extensions/ndonfris.fish-lsp/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ndonfris.fish-lsp/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ndonfris"; name = "fish-lsp"; - version = "0.1.13"; - hash = "sha256-jPBcSQHuSvvWfc4KdtTkUJkx/fGYiAANFjABe4DzopQ="; + version = "0.1.14"; + hash = "sha256-1OUVZJ5TTeR2nChRPSU5ViLAaUAovtqOk9kq408iW84="; }; meta = { diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index aa00f5cb9e34..8b7ec987251f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -768,13 +768,13 @@ "vendorHash": "sha256-fP6brpY/wRI1Yjgapzi+FfOci65gxWeOZulXbGdilrE=" }, "linode": { - "hash": "sha256-zqMknrd8W49RijEVn1TlsV3PT1KGmtdAZUE+Gj8AI5g=", + "hash": "sha256-CSxYyKDHYCAZyVQaPabQ/qks4aEIxN/Oc109luEcaXc=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v3.1.1", + "rev": "v3.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ormU5oDUFb0FQK2L6NDGD/GRy4XXuoFTnq6VKSDVtSw=" + "vendorHash": "sha256-nRJmUQW9vCmqnVgsw4JGozLbxkVVDYUa0Hot5mA4vaM=" }, "linuxbox": { "hash": "sha256-svQRz1/PdVLpHoxOam1sfRTwHqgqs4ohJQs3IPMMAM4=", @@ -885,13 +885,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-4l7q9umrbic4lOKMtTWwBDRHMJUlVyrl5un7KAYYiAM=", + "hash": "sha256-Lmt3ZIrFW/NPLlWlOlXH/sxh4CpBPAJfsJOjjQy9uZA=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.66.0", + "rev": "v3.68.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-+ogtadT0zekeaynXQCwDBrD+bBnKUsyzLGPQyLsCSR8=" + "vendorHash": "sha256-7eRDz/MAKYnUsBAJOSssqzdSfsRSboQX4E/8qBjnGDk=" }, "nexus": { "hash": "sha256-Lm5CZ+eBDUNIL2KuK/iKc5dTif7P+E9II714vwvYuyU=", diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 135096230344..32effa80debb 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -194,8 +194,8 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.13.1"; - hash = "sha256-PuC2wOEEMFaiR9eyF3yI6PLSkqnT/MWdy6RZo6B9zWM="; + version = "1.13.2"; + hash = "sha256-YzPX1PYm8lj3kxOtpenOsiE6zEW8Gq+4UifyP6qDqGw="; vendorHash = "sha256-UcsB5cTae55meJ945fvgowch4EBdaTET2+t5KWvpPQ8="; patches = [ ./provider-path-0_15.patch ]; passthru = { diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 288ccfa194db..28e3ac87a3d0 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -70,7 +70,10 @@ stdenv.mkDerivation rec { mainProgram = "celestia"; changelog = "https://github.com/CelestiaProject/Celestia/releases/tag/${version}"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ hjones2199 ]; + maintainers = with lib.maintainers; [ + hjones2199 + returntoreality + ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 346a7d64222f..d0e91615eb62 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -106,7 +106,7 @@ let versionAtLeast ; - inherit (stdenvNoCC) hostPlatform targetPlatform; + inherit (stdenvNoCC) buildPlatform hostPlatform targetPlatform; includeFortifyHeaders' = if includeFortifyHeaders != null then @@ -445,6 +445,13 @@ stdenvNoCC.mkDerivation { inherit nixSupport; inherit defaultHardeningFlags; + } + // optionalAttrs cc.langGo or false { + # So gccgo looks more like go for buildGoModule + + inherit (targetPlatform.go) GOOS GOARCH GOARM; + + CGO_ENABLED = 1; }; dontBuild = true; @@ -873,6 +880,9 @@ stdenvNoCC.mkDerivation { + optionalString cc.langFortran or false '' hardening_unsupported_flags+=" format" '' + + optionalString cc.langGo or false '' + hardening_unsupported_flags+=" format" + '' + optionalString targetPlatform.isWasm '' hardening_unsupported_flags+=" stackprotector fortify pie pic" '' diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix index 45df933e0ac1..ef9037f5dda6 100644 --- a/pkgs/by-name/al/aliyun-cli/package.nix +++ b/pkgs/by-name/al/aliyun-cli/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.299"; + version = "3.0.300"; src = fetchFromGitHub { owner = "aliyun"; repo = "aliyun-cli"; tag = "v${version}"; - hash = "sha256-9312AWM6yzF8asL7+ziU3C4VtsFV6vrPZS4so09P4vw="; + hash = "sha256-PB53qvkavN2xgWCjPTi1JuKE+KioL6QscjFEVVKTO10="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ba/badkeys/package.nix b/pkgs/by-name/ba/badkeys/package.nix index 4035dc26541a..9e48ffbf4064 100644 --- a/pkgs/by-name/ba/badkeys/package.nix +++ b/pkgs/by-name/ba/badkeys/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "badkeys"; - version = "0.0.13"; + version = "0.0.14"; pyproject = true; src = fetchFromGitHub { owner = "badkeys"; repo = "badkeys"; tag = "v${version}"; - hash = "sha256-xukdaqyQKEnwPmAN4WZqeLo5g2tJxPehabTyDgCv8q4="; + hash = "sha256-+vG0/RO36JPJQ6PB7y6PBAqs4KkMRR21GdTdx/UHHKE="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ba/baikal/package.nix b/pkgs/by-name/ba/baikal/package.nix index fcdff1452489..32213d3922ff 100644 --- a/pkgs/by-name/ba/baikal/package.nix +++ b/pkgs/by-name/ba/baikal/package.nix @@ -3,18 +3,18 @@ fetchFromGitHub, lib, }: -php.buildComposerProject rec { +php.buildComposerProject2 (finalAttrs: { pname = "baikal"; version = "0.10.1"; src = fetchFromGitHub { owner = "sabre-io"; repo = "Baikal"; - tag = version; + tag = finalAttrs.version; hash = "sha256-YQQwTdwfHQZdUhO5HbScj/Bl8ype7TtPI3lHjvz2k04="; }; # It doesn't provide a composer.lock file, we have to generate manually. composerLock = ./composer.lock; - vendorHash = "sha256-R9DlgrULUJ02wBOGIdOQrcKiATSSZ/UApYODQ8485Qs="; + vendorHash = "sha256-dYg7cULL4gquR5EenA0lD9ZC9Ge4qNwFFDNhELKgSso="; meta = { description = "Lightweight CalDAV+CardDAV server that offers an extensive web interface with easy management of users, address books and calendars"; @@ -22,4 +22,4 @@ php.buildComposerProject rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ wrvsrx ]; }; -} +}) diff --git a/pkgs/by-name/bi/bilibili/sources.nix b/pkgs/by-name/bi/bilibili/sources.nix index 169b8b9212ca..f3d9c76e1a27 100644 --- a/pkgs/by-name/bi/bilibili/sources.nix +++ b/pkgs/by-name/bi/bilibili/sources.nix @@ -1,6 +1,6 @@ # Generated by ./update.sh - do not update manually! { - version = "1.17.1-2"; - arm64-hash = "sha256-oSqNQbzj1l60/BvVJ3OBmIfkqTM/Ll9U5IIQ55nBQAc="; - x86_64-hash = "sha256-nD5ET8CFBFlvcldyt6QnewfXm60Ec1yFyDHoOBcOY9g="; + version = "1.17.1-6"; + arm64-hash = "sha256-Vp5BqePWV7yu3+e29t0r4VQL322u4g0owR3GUEmHasA="; + x86_64-hash = "sha256-/ga1KOArFq0Nv/CqfyA3BabGuXiJkHeV3mZn9J5qKXI="; } diff --git a/pkgs/by-name/bl/bluej/package.nix b/pkgs/by-name/bl/bluej/package.nix index 7d71ce926e62..e4a97dbe2d0a 100644 --- a/pkgs/by-name/bl/bluej/package.nix +++ b/pkgs/by-name/bl/bluej/package.nix @@ -2,59 +2,97 @@ lib, stdenv, fetchurl, - openjdk17, - openjfx17, + makeDesktopItem, + copyDesktopItems, + unzip, + openjdk21, + openjfx21, glib, - dpkg, + gsettings-desktop-schemas, + gtk3, wrapGAppsHook3, + imagemagick, + nix-update-script, }: let - openjdk = openjdk17.override { + openjdk = openjdk21.override { enableJavaFX = true; - openjfx_jdk = openjfx17.override { withWebKit = true; }; + openjfx_jdk = openjfx21.override { withWebKit = true; }; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bluej"; - version = "5.2.0"; + version = "5.5.0"; src = fetchurl { - # We use the deb here. First instinct might be to go for the "generic" JAR - # download, but that is actually a graphical installer that is much harder - # to unpack than the deb. - url = "https://www.bluej.org/download/files/BlueJ-linux-${ - builtins.replaceStrings [ "." ] [ "" ] version - }.deb"; - sha256 = "sha256-sOT86opMa9ytxJlfURIsD06HiP+j+oz3lQ0DqmLV1wE="; + url = "https://github.com/k-pet-group/BlueJ-Greenfoot/releases/download/BLUEJ-RELEASE-${finalAttrs.version}/BlueJ-generic-${finalAttrs.version}.jar"; + sha256 = "sha256-UClhTH/9oFfhjYsScBvmD4cKZUJwuAsiyRTiVkPAV0o="; }; + unpackPhase = '' + runHook preUnpack + + unzip -d jar ${finalAttrs.src} + unzip -d dist jar/bluej-dist.jar + + runHook postUnpack + ''; + + sourceRoot = "dist"; + nativeBuildInputs = [ - dpkg wrapGAppsHook3 + copyDesktopItems + imagemagick + unzip + ]; + buildInputs = [ + glib + gtk3 ]; - buildInputs = [ glib ]; dontWrapGApps = true; + desktopItems = [ + (makeDesktopItem { + name = "BlueJ"; + desktopName = "BlueJ"; + exec = "BlueJ"; + icon = "bluej"; + comment = "A simple powerful Java IDE"; + categories = [ + "Application" + "Development" + ]; + }) + ]; + installPhase = '' runHook preInstall - mkdir -p $out - cp -r usr/* $out + mkdir -p $out/lib - rm -r $out/share/bluej/jdk - rm -r $out/share/bluej/javafx - rm -r $out/share/bluej/javafx-*.jar + cp -r ./lib $out/lib/bluej + + mkdir -p $out/share/icons/hicolor/{16x16,32x32,48x48,64x64,128x128,256x256}/apps + + for dimension in 16x16 32x32 48x48 64x64 128x128 256x256; do + magick convert ./icons/bluej-icon-512-embossed.png -geometry $dimension\ + $out/share/icons/hicolor/$dimension/apps/bluej.png + done makeWrapper ${openjdk}/bin/java $out/bin/bluej \ "''${gappsWrapperArgs[@]}" \ - --add-flags "-Dawt.useSystemAAFontSettings=gasp -Xmx512M \ + --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \ + --add-flags "-Dawt.useSystemAAFontSettings=on \ --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED \ - -cp $out/share/bluej/boot.jar bluej.Boot" + -cp $out/lib/bluej/boot.jar bluej.Boot" runHook postInstall ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Simple integrated development environment for Java"; homepage = "https://www.bluej.org/"; @@ -64,8 +102,8 @@ stdenv.mkDerivation rec { classpathException20 ]; mainProgram = "bluej"; - maintainers = with lib.maintainers; [ chvp ]; + maintainers = with lib.maintainers; [ weirdrock ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/bo/bold/deps.nix b/pkgs/by-name/bo/bold/deps.nix index 3c6362a0207b..6baa84eaff57 100644 --- a/pkgs/by-name/bo/bold/deps.nix +++ b/pkgs/by-name/bo/bold/deps.nix @@ -4,17 +4,17 @@ linkFarm "zig-packages" [ { - name = "12207252f0592e53e8794d5a41409791d5c8c70e0de67bfba48844406619847cc971"; + name = "zig_dis_x86_64-0.0.1-bnhOUXf6AwDf1MpMgHZImLwqhFbUp2Fl_MoxhtPEeo4N"; path = fetchzip { - url = "https://github.com/kubkon/zig-dis-x86_64/archive/5203b9affc5045e000ae7963d988e155e98e396d.tar.gz"; - hash = "sha256-JmrutmOUQ+UEs9CDSM46AFQMcmBNzj/n1c1lzQBuAbA="; + url = "https://github.com/kubkon/zig-dis-x86_64/archive/48c399d7f9d879f46a69d4a06af3fa0699286ba5.tar.gz"; + hash = "sha256-JsuAWOZnwtBikyHQma4SFfkDP7kPDE1qxPnQpCzx8m0="; }; } { - name = "1220e8870ca83e47b98807e89b5b636072413f6c09f9b26037e4c98c55e4960ac55a"; + name = "zig_yaml-0.1.0-C1161miEAgBCwL3YAEQZwV_4GyaaT2Xqj9nKB6hNe_TL"; path = fetchzip { - url = "https://github.com/kubkon/zig-yaml/archive/325dbdd276604dccf184c32fef9600b0ac48343d.tar.gz"; - hash = "sha256-09r+LTrYHExHo1OtAMKIPTF9cj5GsDEd0FKCj++vwaw="; + url = "https://github.com/kubkon/zig-yaml/archive/refs/tags/0.1.1.tar.gz"; + hash = "sha256-HfxM1MgdlnnD13LG9AWULu/jy5zMRa3nkLUqkKj1RC4="; }; } ] diff --git a/pkgs/by-name/bo/bold/package.nix b/pkgs/by-name/bo/bold/package.nix index 91e827dc23f8..e9438a35a704 100644 --- a/pkgs/by-name/bo/bold/package.nix +++ b/pkgs/by-name/bo/bold/package.nix @@ -3,28 +3,40 @@ stdenv, fetchFromGitHub, callPackage, - zig_0_13, + zig_0_14, versionCheckHook, gitUpdater, + fetchpatch, }: +let + zig = zig_0_14; +in stdenv.mkDerivation (finalAttrs: { pname = "bold"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "kubkon"; repo = "bold"; tag = "v${finalAttrs.version}"; - hash = "sha256-7sn/8SIoT/JGdza8SpX+8usiVhqugVVMaLU1a1oMdj8="; + hash = "sha256-9qq0RIeplv/Y/6ilr6Nv+DAT8xx3e2SoDugCckxXw+M="; }; + patches = [ + # Correct version + (fetchpatch { + url = "https://github.com/kubkon/bold/commit/e8a3245b1f03ea8ba7136d76807400610c068bac.patch"; + hash = "sha256-UdicLUoH7ApnKxoI91hDcuO/NSINLkxb2h9sA9NShfw="; + }) + ]; + postPatch = '' ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p ''; nativeBuildInputs = [ - zig_0_13.hook + zig.hook ]; doInstallCheck = true; diff --git a/pkgs/by-name/cf/cfitsio/package.nix b/pkgs/by-name/cf/cfitsio/package.nix index d2b6324d92c4..679d01068bfa 100644 --- a/pkgs/by-name/cf/cfitsio/package.nix +++ b/pkgs/by-name/cf/cfitsio/package.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/docs/changes.txt"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ + returntoreality xbreak hjones2199 ]; diff --git a/pkgs/by-name/cl/clash-rs/Cargo.patch b/pkgs/by-name/cl/clash-rs/Cargo.patch new file mode 100644 index 000000000000..495f4b398622 --- /dev/null +++ b/pkgs/by-name/cl/clash-rs/Cargo.patch @@ -0,0 +1,50 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1462,7 +1462,7 @@ + "sha2", + "shadowquic", + "shadowsocks", +- "smoltcp 0.12.0 (git+https://github.com/smoltcp-rs/smoltcp.git?rev=ac32e64)", ++ "smoltcp 0.12.0", + "socket2 0.6.0", + "tempfile", + "thiserror 2.0.15", +@@ -4439,7 +4439,7 @@ + "etherparse 0.16.0", + "futures", + "rand 0.8.5", +- "smoltcp 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smoltcp 0.12.0", + "spin 0.9.8", + "tokio", + "tokio-util", +@@ -6892,20 +6892,6 @@ + ] + + [[package]] +-name = "smoltcp" +-version = "0.12.0" +-source = "git+https://github.com/smoltcp-rs/smoltcp.git?rev=ac32e64#ac32e643a4b7e09161193071526b3ca5a0deedb5" +-dependencies = [ +- "bitflags 1.3.2", +- "byteorder", +- "cfg-if", +- "defmt 0.3.100", +- "heapless", +- "log", +- "managed", +-] +- +-[[package]] + name = "socket2" + version = "0.4.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -9231,7 +9217,7 @@ + "netstack-lwip", + "netstack-smoltcp", + "rand 0.9.2", +- "smoltcp 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smoltcp 0.12.0", + "socket2 0.6.0", + "tokio", + "tracing", diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix index 29e996040e9f..ff1c67a6eee1 100644 --- a/pkgs/by-name/cl/clash-rs/package.nix +++ b/pkgs/by-name/cl/clash-rs/package.nix @@ -6,24 +6,32 @@ versionCheckHook, cmake, pkg-config, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "clash-rs"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "Watfaq"; repo = "clash-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-HkIsflsLTQdvetgamLt6LbYxOpv1+FQ/e/PzJjKOfq4="; + hash = "sha256-OwoDvcGpuU2x6O3+rBJSXGS2VoeFt/oVgFWUaCUyC8E="; }; - cargoHash = "sha256-Qh/YxNO/DtVBj6Eiloc3+Fs+dQqvAXSe+5lCer0F2zs="; + cargoHash = "sha256-HKW6bOkHkBINwA2tgaKHEozKzT4n54roj6W989JUoAQ="; + + cargoPatches = [ ./Cargo.patch ]; patches = [ ./unbounded-shifts.patch ]; + postPatch = '' + substituteInPlace clash-lib/Cargo.toml \ + --replace-fail ', git = "https://github.com/smoltcp-rs/smoltcp.git", rev = "ac32e64"' "" + ''; + nativeBuildInputs = [ cmake pkg-config @@ -56,6 +64,13 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; versionCheckProgramArg = "--version"; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^v([0-9.]+)$" + ]; + }; + meta = { description = "Custom protocol, rule based network proxy software"; homepage = "https://github.com/Watfaq/clash-rs"; diff --git a/pkgs/by-name/cl/clusterctl/package.nix b/pkgs/by-name/cl/clusterctl/package.nix index 166580a926a3..513a07706f9d 100644 --- a/pkgs/by-name/cl/clusterctl/package.nix +++ b/pkgs/by-name/cl/clusterctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-OZhlHLbe/6RYcBos4QeshRq0YDDt/vDvwafV6uyJWr8="; + hash = "sha256-rm88e5GmWpP9lwtVT9mCrQuxilC2R+f73/yHEPbpMsk="; }; - vendorHash = "sha256-kQ/hbeOoNO+F5NE2ZyEA902YCA/O6KbOrNwv1+tvSJM="; + vendorHash = "sha256-UcvdN9t8+YD3eQ4BdV905xwtaHsHTTisIsqPgZhMCnU="; subPackages = [ "cmd/clusterctl" ]; diff --git a/pkgs/by-name/co/cosmic-reader/package.nix b/pkgs/by-name/co/cosmic-reader/package.nix new file mode 100644 index 000000000000..9197bdea2b00 --- /dev/null +++ b/pkgs/by-name/co/cosmic-reader/package.nix @@ -0,0 +1,81 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + just, + libcosmicAppHook, + fontconfig, + freetype, + gumbo, + harfbuzz, + jbig2dec, + lcms2, + leptonica, + libjpeg, + openjpeg, + tesseract, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cosmic-reader"; + version = "0-unstable-2025-08-29"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-reader"; + rev = "b877809273243f0630b250fd60f12fff48e0bd22"; + hash = "sha256-kJApZgQkHDP6lD9E2vPLyVGQ0o/xibm83N9CfIJAd0A="; + }; + + cargoHash = "sha256-4ofAtZN3FpYwNahinldALbdEJA5lDwa+CUsVIISnSTc="; + + nativeBuildInputs = [ + just + libcosmicAppHook + rustPlatform.bindgenHook + ]; + + buildInputs = [ + fontconfig + freetype + gumbo + harfbuzz + jbig2dec + lcms2 + leptonica + libjpeg + openjpeg + tesseract + ]; + + dontUseJustBuild = true; + dontUseJustCheck = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" + ]; + + env.VERGEN_GIT_SHA = finalAttrs.src.rev; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch=HEAD" + ]; + }; + + meta = { + description = "PDF reader for the COSMIC Desktop Environment"; + homepage = "https://github.com/pop-os/cosmic-reader"; + license = lib.licenses.gpl3Only; + mainProgram = "cosmic-reader"; + platforms = lib.platforms.linux; + teams = [ lib.teams.cosmic ]; + }; +}) diff --git a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix index 7b0d3adb4292..6aee2d5d8ff6 100644 --- a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix +++ b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "fcitx5-pinyin-moegirl"; - version = "20250810"; + version = "20250909"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict"; - hash = "sha256-PuuW43+uu9Vasy33KW1IKb2uK2mh8M/V9fVCVp1QZl0="; + hash = "sha256-wtMLjgHb1IRkc0G/R5HDlF+r7/ooR9XxgFth3Lo+7ws="; }; dontUnpack = true; diff --git a/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix index 41a4240bea3f..809f255647ad 100644 --- a/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix +++ b/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "fcitx5-pinyin-zhwiki"; version = "0.2.5"; - date = "20250731"; + date = "20250823"; src = fetchurl { url = "https://github.com/felixonmars/fcitx5-pinyin-zhwiki/releases/download/${finalAttrs.version}/zhwiki-${finalAttrs.date}.dict"; - hash = "sha256-pS2fVLfihJGgKA1XsW1x0VanfhjHgDGtsqedpmvdUnE="; + hash = "sha256-cD0FKxPvdQfcrfR/Fh4aNb+pK/IFiFLyvg8LhnYI+vs="; }; dontUnpack = true; diff --git a/pkgs/by-name/fo/fooyin/package.nix b/pkgs/by-name/fo/fooyin/package.nix index e2341b74e49b..3f10ba5aaf4d 100644 --- a/pkgs/by-name/fo/fooyin/package.nix +++ b/pkgs/by-name/fo/fooyin/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, cmake, pkg-config, alsa-lib, @@ -17,18 +18,18 @@ libopenmpt, game-music-emu, SDL2, - fetchpatch, + icu, }: stdenv.mkDerivation (finalAttrs: { pname = "fooyin"; - version = "0.8.1"; + version = "0.9.1"; src = fetchFromGitHub { owner = "ludouzi"; repo = "fooyin"; - rev = "v" + finalAttrs.version; - hash = "sha256-pkzBuJkZs76m7I/9FPt5GxGa8v2CDNR8QAHaIAuKN4w="; + tag = "v" + finalAttrs.version; + hash = "sha256-549AtdldAPFengQsVXMnZI0mVzUwgKgUKAfR0Ro3s2I="; }; buildInputs = [ @@ -38,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: { kdePackages.qtwayland taglib ffmpeg + icu kdsingleapplication # output plugins alsa-lib @@ -66,20 +68,21 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "INSTALL_FHS" true) ]; + env.LANG = "C.UTF-8"; + # Remove after next release patches = [ (fetchpatch { - name = "qbrush.patch"; - url = "https://github.com/fooyin/fooyin/commit/e44e08abb33f01fe85cc896170c55dbf732ffcc9.patch"; - hash = "sha256-soDj/SFctxxsnkePv4dZgyDHYD2eshlEziILOZC4ddM="; + name = "multi-track-fix.patch"; + url = "https://github.com/fooyin/fooyin/commit/cffe88058e96c44e563e927d8a4a903e28246020.patch"; + hash = "sha256-qNAR3xHZHzI/4RCWKzBbv1mX39xs7KMo/TpaDUYvSvc="; }) ]; - env.LANG = "C.UTF-8"; - meta = { description = "Customisable music player"; homepage = "https://www.fooyin.org/"; + changelog = "https://github.com/fooyin/fooyin/blob/${finalAttrs.src.rev}/CHANGELOG.md"; downloadPage = "https://github.com/fooyin/fooyin"; mainProgram = "fooyin"; license = lib.licenses.gpl3Only; diff --git a/pkgs/by-name/gh/gh-dash/package.nix b/pkgs/by-name/gh/gh-dash/package.nix index 71c1b6f0249f..e56a7c2f369c 100644 --- a/pkgs/by-name/gh/gh-dash/package.nix +++ b/pkgs/by-name/gh/gh-dash/package.nix @@ -32,7 +32,7 @@ buildGoModule rec { meta = { changelog = "https://github.com/dlvhdr/gh-dash/releases/tag/${src.rev}"; description = "Github Cli extension to display a dashboard with pull requests and issues"; - homepage = "https://github.com/dlvhdr/gh-dash"; + homepage = "https://www.gh-dash.dev"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ amesgen ]; mainProgram = "gh-dash"; diff --git a/pkgs/by-name/ha/habitat/package.nix b/pkgs/by-name/ha/habitat/package.nix index d43f99862d36..882ec4cbe1df 100644 --- a/pkgs/by-name/ha/habitat/package.nix +++ b/pkgs/by-name/ha/habitat/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "habitat"; - version = "1.6.1244"; + version = "1.6.1245"; src = fetchFromGitHub { owner = "habitat-sh"; repo = "habitat"; rev = version; - hash = "sha256-BNrBhDNR8sIafC9mgfL+1Q8c6BbjpFgLBElusydY/2o="; + hash = "sha256-n2ylJSCXPnnPHadfZaRS/3vxtnvkXhiTzCyObK7hmEk="; }; - cargoHash = "sha256-U4m3KzlU7XambNdwsdFuI5QPv2Fkm7Dwe264SRdHLak="; + cargoHash = "sha256-JMIAHupv3da71j5ID5ZR0mD7ZLLj4ktIs0aQrdWi3jU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index 56afa174378f..06d900cad541 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -8,10 +8,10 @@ }: stdenv.mkDerivation rec { pname = "halo"; - version = "2.21.7"; + version = "2.21.8"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar"; - hash = "sha256-uHM/rqKwHs+THH4+jdGXfbPe2A+NtkbN2OUcsnJL8R0="; + hash = "sha256-S7+6ky5FWI1/44XELfh55cQkDePiEzU6mcuFVV77VrM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hi/hibernate/gen-manpages.patch b/pkgs/by-name/hi/hibernate/gen-manpages.patch deleted file mode 100644 index cdbacc86bafa..000000000000 --- a/pkgs/by-name/hi/hibernate/gen-manpages.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- hibernate-script-1.98.1/gen-manpages.sh 2008-03-31 09:40:29.000000000 +0200 -+++ hibernate-script-1.98.1/gen-manpages.sh 2008-04-01 15:58:11.000000000 +0200 -@@ -254,7 +254,7 @@ BEGIN { - } - - # Create a copy of hibernate.sh with only the help items --TMPF=`mktemp /tmp/tmp.hibernate.XXXXXX` -+TMPF=`mktemp "$TMPDIR/tmp.hibernate.XXXXXX"` - awk '{ - if ((substr($0, 1, 1) != "#") && (match($0, "AddConfigHelp") || match($0, "AddOptionHelp")) && (match($0, "\\(\\)") == 0)) { - print $0; diff --git a/pkgs/by-name/hi/hibernate/hibernate.patch b/pkgs/by-name/hi/hibernate/hibernate.patch deleted file mode 100644 index 24de1637d3ce..000000000000 --- a/pkgs/by-name/hi/hibernate/hibernate.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- hibernate-script-1.98.1/hibernate.sh 2008-03-31 09:40:29.000000000 +0200 -+++ hibernate-script-1.98.1/hibernate.sh 2008-04-01 18:24:23.000000000 +0200 -@@ -224,7 +224,7 @@ FindXServer() { - - xauth="`get_env_var_of_process $xpid XAUTHORITY`" - xhome="`get_env_var_of_process $xpid HOME`" -- xuser=`/bin/ls -ld /proc/$xpid/ | awk '{print $3}'` -+ xuser=`ls -ld /proc/$xpid/ | awk '{print $3}'` - [ -z $xauth ] && [ -n $xhome ] && [ -f $xhome/.Xauthority ] && xauth=$xhome/.Xauthority - - [ -z $xauth ] && continue -@@ -273,14 +273,14 @@ UsingSuspendMethod() { - # chain. - SortSuspendBits() { - # explicit path required to be ash compatible. -- /bin/echo -ne "$SUSPEND_BITS" | sort -n -+ echo -ne "$SUSPEND_BITS" | sort -n - } - - # SortResumeBits: Returns a list of functions registered in the correct order - # to call for resuming, prefixed by their position number. - SortResumeBits() { - # explicit path required to be ash compatible. -- /bin/echo -ne "$RESUME_BITS" | sort -rn -+ echo -ne "$RESUME_BITS" | sort -rn - } - - # WrapHelpText: takes text from stdin, wraps it with an indent of 5 and width -@@ -557,7 +557,7 @@ LoadScriptlets() { - CURRENT_SOURCED_SCRIPTLET="" - for scriptlet_dir in $SCRIPTLET_PATH ; do - [ -d "$scriptlet_dir" ] || continue -- [ -z "`/bin/ls -1 $scriptlet_dir`" ] && continue -+ [ -z "`ls -1 $scriptlet_dir`" ] && continue - for scriptlet in $scriptlet_dir/* ; do - # Avoid editor backup files. - case "$scriptlet" in *~|*.bak) continue ;; esac diff --git a/pkgs/by-name/hi/hibernate/install.patch b/pkgs/by-name/hi/hibernate/install.patch deleted file mode 100644 index ae296b955ac8..000000000000 --- a/pkgs/by-name/hi/hibernate/install.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- hibernate-script-1.98.1/install.sh 2008-03-31 09:40:29.000000000 +0200 -+++ hibernate-script-1.98.1/install.sh 2008-04-01 15:50:46.000000000 +0200 -@@ -63,7 +63,7 @@ fi - cp -a blacklisted-modules $BLACKLIST - - # Test if they have anything in there, and warn them --if /bin/ls $OLD_SCRIPTLET_DIR/* > /dev/null 2>&1 ; then -+if ls $OLD_SCRIPTLET_DIR/* > /dev/null 2>&1 ; then - echo " **" - echo " ** You have scriptlets already installed in $OLD_SCRIPTLET_DIR" - echo " ** Since version 0.95, these have moved to $SCRIPTLET_DIR." diff --git a/pkgs/by-name/hi/hibernate/package.nix b/pkgs/by-name/hi/hibernate/package.nix deleted file mode 100644 index d870047c7cd8..000000000000 --- a/pkgs/by-name/hi/hibernate/package.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - gawk, -}: - -let - version = "2.0"; -in -stdenv.mkDerivation { - pname = "hibernate"; - inherit version; - src = fetchurl { - url = "http://tuxonice.nigelcunningham.com.au/files/hibernate-script-${version}.tar.gz"; - sha256 = "0ib5bac3spbcwmhf8f9apjbll8x7fgqj4k1s5q3srijh793rfifh"; - }; - - patches = [ - ./install.patch - ./gen-manpages.patch - ./hibernate.patch - ]; - - buildInputs = [ gawk ]; - - installPhase = '' - # FIXME: Storing config files under `$out/etc' is not very useful. - - substituteInPlace "hibernate.sh" --replace \ - 'SWSUSP_D="/etc/hibernate"' "SWSUSP_D=\"$out/etc/hibernate\"" - - # Remove all references to `/bin' and `/sbin'. - for i in scriptlets.d/* - do - substituteInPlace "$i" --replace "/bin/" "" --replace "/sbin/" "" - done - - PREFIX="$out" CONFIG_PREFIX="$out" ./install.sh - - ln -s "$out/share/hibernate/scriptlets.d" "$out/etc/hibernate" - ''; - - meta = { - description = "`hibernate' script for swsusp and Tux-on-Ice"; - mainProgram = "hibernate"; - longDescription = '' - This package provides the `hibernate' script, a command-line utility - that saves the computer's state to disk and switches it off, turning - it into "hibernation". It works both with Linux swsusp and Tux-on-Ice. - ''; - - license = lib.licenses.gpl2Plus; - homepage = "http://www.tuxonice.net/"; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/by-name/jh/jhentai/package.nix b/pkgs/by-name/jh/jhentai/package.nix index 754711de2579..7fcf0db0acfa 100644 --- a/pkgs/by-name/jh/jhentai/package.nix +++ b/pkgs/by-name/jh/jhentai/package.nix @@ -14,13 +14,13 @@ flutter329.buildFlutterApplication rec { pname = "jhentai"; - version = "8.0.10+297"; + version = "8.0.10+299"; src = fetchFromGitHub { owner = "jiangtian616"; repo = "JHenTai"; tag = "v${version}"; - hash = "sha256-/wmovLEjRzKU5mSM6yqWnPcT/Gt3kyLDHa/ssDx2xrc="; + hash = "sha256-gRWYwWKGFeEsBUk4zkGYe8eAnJsf1lk6msEWK9bzk6U="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/ka/karabiner-elements/package.nix b/pkgs/by-name/ka/karabiner-elements/package.nix index 9d38473ed99d..1377ccd15a08 100644 --- a/pkgs/by-name/ka/karabiner-elements/package.nix +++ b/pkgs/by-name/ka/karabiner-elements/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "karabiner-elements"; - version = "15.4.0"; + version = "15.5.0"; src = fetchurl { url = "https://github.com/pqrs-org/Karabiner-Elements/releases/download/v${finalAttrs.version}/Karabiner-Elements-${finalAttrs.version}.dmg"; - hash = "sha256-VOIi5TPOp71o59vSxNztiZgseAA9Dqd8bC/8UhpFzKE="; + hash = "sha256-96NQxmnU1W/g2O1Ll7qsslclFzsBPnHDJ+hmNpaUUXA="; }; outputs = [ diff --git a/pkgs/by-name/ku/kubectl-df-pv/package.nix b/pkgs/by-name/ku/kubectl-df-pv/package.nix index 6a2c9facde0b..a8ef78791b03 100644 --- a/pkgs/by-name/ku/kubectl-df-pv/package.nix +++ b/pkgs/by-name/ku/kubectl-df-pv/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubectl-df-pv"; - version = "0.3.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "yashbhutwala"; repo = "kubectl-df-pv"; rev = "v${version}"; - hash = "sha256-FxKqkxLMNfCXuahKTMod6kWKZ/ucYeIEFcS8BmpbLWg="; + hash = "sha256-dGWGPamVD/26iEgKQcWGKpFIMMlDivFpD/XzmjCr8pQ="; }; - vendorHash = "sha256-YkDPgN7jBvYveiyU8N+3Ia52SEmlzC0TGBQjUuIAaw0="; + vendorHash = "sha256-J15tCwYiVSPa2hSB3DMFtVW9Uer7pFMCD1OpCobnYMc="; meta = { description = "df-like utility for persistent volumes on Kubernetes"; diff --git a/pkgs/by-name/la/last-resort/package.nix b/pkgs/by-name/la/last-resort/package.nix index fb1a4e5411c5..5c7821f1066f 100644 --- a/pkgs/by-name/la/last-resort/package.nix +++ b/pkgs/by-name/la/last-resort/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "last-resort"; - version = "16.000"; + version = "17.000"; src = fetchurl { url = "https://github.com/unicode-org/last-resort-font/releases/download/${version}/LastResortHE-Regular.ttf"; - hash = "sha256-YMSKv8BenyujNZnE3LpAEF0eznHTdh8LJvdaOLWxeJU="; + hash = "sha256-OpNv4jeenhZKj5gZCVy/U9kwWi0IUy2b5bSW9L5FvN4="; }; dontUnpack = true; diff --git a/pkgs/by-name/la/lazyjj/package.nix b/pkgs/by-name/la/lazyjj/package.nix index c3edc36842a5..64e3a0a57499 100644 --- a/pkgs/by-name/la/lazyjj/package.nix +++ b/pkgs/by-name/la/lazyjj/package.nix @@ -8,23 +8,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "lazyjj"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Cretezy"; repo = "lazyjj"; tag = "v${finalAttrs.version}"; - hash = "sha256-BmME+LpYv3Ynpbo/k9pA5qcNmv7XLPXasPvHW4QalwY="; + hash = "sha256-xpRuXefP2agcZojvAUvODDOFJoEyTiMztJM3VNCeryA="; }; - postPatch = '' - substituteInPlace Cargo.toml \ - --replace-fail \ - 'version = "0.5.0"' \ - 'version = "0.6.0"' - ''; - - cargoHash = "sha256-bQNLhQAUw2JgThC+RiNC5ap8D6a4JgflV2whXKu7QF8="; + cargoHash = "sha256-LLbMR3FT5Ci7A9TlhRtU0rpMilXZXb4DH85/R776OQY="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/li/libnova/package.nix b/pkgs/by-name/li/libnova/package.nix index 3d240a605965..6b9cab2464e7 100644 --- a/pkgs/by-name/li/libnova/package.nix +++ b/pkgs/by-name/li/libnova/package.nix @@ -25,7 +25,10 @@ stdenv.mkDerivation rec { mainProgram = "libnovaconfig"; homepage = "http://libnova.sf.net"; license = licenses.gpl2; - maintainers = with maintainers; [ hjones2199 ]; + maintainers = with maintainers; [ + hjones2199 + returntoreality + ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/li/librtprocess/package.nix b/pkgs/by-name/li/librtprocess/package.nix index 8796373c6776..109157f0743a 100644 --- a/pkgs/by-name/li/librtprocess/package.nix +++ b/pkgs/by-name/li/librtprocess/package.nix @@ -25,7 +25,10 @@ stdenv.mkDerivation rec { description = "Highly optimized library for processing RAW images"; homepage = "https://github.com/CarVac/librtprocess"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ hjones2199 ]; + maintainers = with maintainers; [ + hjones2199 + returntoreality + ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/li/libtorrent/package.nix b/pkgs/by-name/li/libtorrent-rakshasa/package.nix similarity index 79% rename from pkgs/by-name/li/libtorrent/package.nix rename to pkgs/by-name/li/libtorrent-rakshasa/package.nix index 6220a50b0082..9ac72e30088e 100644 --- a/pkgs/by-name/li/libtorrent/package.nix +++ b/pkgs/by-name/li/libtorrent-rakshasa/package.nix @@ -1,30 +1,32 @@ # Note: this is rakshasa's version of libtorrent, used mainly by rtorrent. # *Do not* mistake it by libtorrent-rasterbar, used by Deluge, qbitttorent etc. { - lib, - stdenv, - fetchFromGitHub, autoreconfHook, cppunit, + curl, + fetchFromGitHub, + lib, + nix-update-script, openssl, pkg-config, + stdenv, zlib, - gitUpdater, }: stdenv.mkDerivation (finalAttrs: { - pname = "rakshasa-libtorrent"; - version = "0.15.6"; + pname = "libtorrent-rakshasa"; + version = "0.16.0"; src = fetchFromGitHub { owner = "rakshasa"; repo = "libtorrent"; - rev = "v${finalAttrs.version}"; - hash = "sha256-udEe9VyUzPXuCTrB3U3+XCbVWvfTT7xNvJJkLSQrRt4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-CtLRZK384IlfXoXLIpdXWa8s9M0n0EopKrJGrK6xq3c="; }; nativeBuildInputs = [ autoreconfHook + curl pkg-config ]; @@ -36,13 +38,13 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--enable-aligned=yes" ]; - passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + passthru.updateScript = nix-update-script { }; enableParallelBuilding = true; meta = { - homepage = "https://github.com/rakshasa/libtorrent"; description = "BitTorrent library written in C++ for *nix, with focus on high performance and good code"; + homepage = "https://github.com/rakshasa/libtorrent"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ebzzry diff --git a/pkgs/by-name/ma/matrix-tuwunel/doctest-fix.patch b/pkgs/by-name/ma/matrix-tuwunel/doctest-fix.patch new file mode 100644 index 000000000000..18c47bdde3e3 --- /dev/null +++ b/pkgs/by-name/ma/matrix-tuwunel/doctest-fix.patch @@ -0,0 +1,13 @@ +diff --git i/src/core/utils/debug.rs w/src/core/utils/debug.rs +index 31163a54..859dd9a9 100644 +--- i/src/core/utils/debug.rs ++++ w/src/core/utils/debug.rs +@@ -28,7 +28,7 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + /// use tuwunel_core::utils::debug::slice_truncated; + /// + /// #[tracing::instrument(fields(foos = slice_truncated(foos, 42)))] +-/// fn bar(foos: &[&str]); ++/// fn bar(foos: &[&str]) { } + /// ``` + pub fn slice_truncated( + slice: &[T], diff --git a/pkgs/by-name/ma/matrix-tuwunel/package.nix b/pkgs/by-name/ma/matrix-tuwunel/package.nix index f51d689da539..d997594e2435 100644 --- a/pkgs/by-name/ma/matrix-tuwunel/package.nix +++ b/pkgs/by-name/ma/matrix-tuwunel/package.nix @@ -85,16 +85,20 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-tuwunel"; - version = "1.3.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "matrix-construct"; repo = "tuwunel"; tag = "v${finalAttrs.version}"; - hash = "sha256-RuvGoXe/O48mQ4/rN+fh2N1NZ4uhvdtI1q4tRM/bRSE="; + hash = "sha256-41oQfqdsHjm3fBaG+y+Q7eru7LzSIwOc6K5A29Jmt2c="; }; - cargoHash = "sha256-LwVJe9EqBT7x7eBTzvo4Lu1geNI7CWpsIDNWL8AAg+U="; + cargoHash = "sha256-bTLKsWsma+a4ZD5ujJJ0xYvk769umIsTNE21KUTJj0U="; + + patches = [ + ./doctest-fix.patch + ]; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix index de2f50baabae..1cd1f76ddc59 100644 --- a/pkgs/by-name/mi/mimir/package.nix +++ b/pkgs/by-name/mi/mimir/package.nix @@ -7,13 +7,13 @@ }: buildGoModule rec { pname = "mimir"; - version = "2.17.0"; + version = "2.17.1"; src = fetchFromGitHub { rev = "mimir-${version}"; owner = "grafana"; repo = "mimir"; - hash = "sha256-auA063TveLtfLD7W1/RuN4COljiwKqz0K/l2vwtxPTQ="; + hash = "sha256-Ob0l+C5LnFL1yl76/cdSX83bHEcamPlb9Sau8rMO2sM="; }; vendorHash = null; diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index ca05f95f8c56..89ccc2ebc1c8 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.437"; + version = "0.0.438"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-NWqk6XOcFwNHfILTisq7SFd88tRce5bTnE25+Ktu4CE="; + hash = "sha256-Va4DFAsFgJLffuFauZfujOYQhAn0dtR4oPP4zAWBkTo="; }; - vendorHash = "sha256-BYPwEct3t3JB4xHf9jiy59JnOMZu4NpelX46RAAJD+0="; + vendorHash = "sha256-WKRKwzpB6+bp/RSrb67ZcQjZXVGQe7xvTHGShebh3l4="; subPackages = [ "cmd/nsc" diff --git a/pkgs/by-name/na/nanoblogger/package.nix b/pkgs/by-name/na/nanoblogger/package.nix deleted file mode 100644 index db9b13872a01..000000000000 --- a/pkgs/by-name/na/nanoblogger/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - fetchurl, - lib, - stdenv, - bash, -}: - -stdenv.mkDerivation rec { - version = "3.5-rc1"; - pname = "nanoblogger"; - - src = fetchurl { - url = "mirror://sourceforge/nanoblogger/${pname}-${version}.tar.gz"; - sha256 = "09mv52a5f0h3das8x96irqyznm69arfskx472b7w3b9q4a2ipxbq"; - }; - - installPhase = '' - mkdir -p $out/bin - cp -r * $out - cat > $out/bin/nb << EOF - #!${bash}/bin/bash - $out/nb "\$@" - EOF - chmod 755 $out/bin/nb - ''; - - meta = { - description = "Small weblog engine written in Bash for the command line"; - homepage = "https://nanoblogger.sourceforge.net/"; - license = lib.licenses.gpl2; - mainProgram = "nb"; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/by-name/nw/nwipe/package.nix b/pkgs/by-name/nw/nwipe/package.nix index b610921a5471..22e7c5002e80 100644 --- a/pkgs/by-name/nw/nwipe/package.nix +++ b/pkgs/by-name/nw/nwipe/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "nwipe"; - version = "0.38"; + version = "0.39"; src = fetchFromGitHub { owner = "martijnvanbrummelen"; repo = "nwipe"; rev = "v${version}"; - sha256 = "sha256-idSIdq7DKhSwuR1xe9JEws0jIh1juCaz2eSeKvd85D4="; + sha256 = "sha256-uWsN4DWzmipx/+gfMl8GXTg3pSKT0UPOkqVfdHfUPdA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index cc7aa4d6606c..170949f1ee6c 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -9,13 +9,13 @@ }: let pname = "open-webui"; - version = "0.6.26"; + version = "0.6.28"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; tag = "v${version}"; - hash = "sha256-ourzYHwVSlM4nqEbkKf6PsNfNkW8quXdcBSW0p16pIg="; + hash = "sha256-677M1IxWhdJ3AO8DPlW4eUYnOo/mCNu+11IPdaey9ks="; }; frontend = buildNpmPackage rec { @@ -26,13 +26,13 @@ let # must match lock file in open-webui # TODO: should we automate this? # TODO: with JQ? "jq -r '.packages["node_modules/pyodide"].version' package-lock.json" - pyodideVersion = "0.28.0"; + pyodideVersion = "0.28.2"; pyodide = fetchurl { - hash = "sha256-4YwDuhcWPYm40VKfOEqPeUSIRQl1DDAdXEUcMuzzU7o="; + hash = "sha256-MQIRdOj9yVVsF+nUNeINnAfyA6xULZFhyjuNnV0E5+c="; url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2"; }; - npmDepsHash = "sha256-xZtES8qZ7MTt/OviEqGmGO3D3BuOpMGHjnBuSsdFJgM="; + npmDepsHash = "sha256-vsgdf7+h16VBF+bTxzdNeHNzsYV65KWNZ6Ga3N7fB5A="; # See https://github.com/open-webui/open-webui/issues/15880 npmFlags = [ @@ -161,7 +161,6 @@ python3Packages.buildPythonApplication rec { pillow pinecone-client playwright - posthog psutil pyarrow pycrdt diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 50eff0923428..4b652eb0f54f 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -22,12 +22,12 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "0.6.8"; + version = "0.7.1"; src = fetchFromGitHub { owner = "sst"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-Df4IZGiI42YozCjGNwKTkIcV/atxBsc8j3ust22DN0g="; + hash = "sha256-RU4Qq2xGPOdK/GxHAcAaJYrx31ZhZ/fFuOmvyqqr538="; }; tui = buildGoModule { @@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { modRoot = "packages/tui"; - vendorHash = "sha256-8pwVQVraLSE1DRL6IFMlQ/y8HQ8464N/QwAS8Faloq4="; + vendorHash = "sha256-u7jomV6lzr5QMICJ20ED6oAe7euXjsRUjuPl/YiTBfk="; subPackages = [ "cmd/opencode" ]; diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix index 76dd0012c267..3b2ffa8e5725 100644 --- a/pkgs/by-name/or/orchard/package.nix +++ b/pkgs/by-name/or/orchard/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.38.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = "orchard"; rev = version; - hash = "sha256-FKawq1GN7Uz3NGmqw3za8+X4bZiFyFPMxM5PPtpKDrs="; + hash = "sha256-pobhMJkCa8GiaBjpOq5y6FTaoBBq97NlByLcOfbdDLI="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -24,7 +24,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-GYAcRC9OMhlOax1s33SrgtbbAlyE9w8Zn4AL7bQrcNk="; + vendorHash = "sha256-cdOuMX1PRRCFWfIf6Z2tVSgJDsuj6aC99qnnCKJzPQQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ph/phd2/package.nix b/pkgs/by-name/ph/phd2/package.nix index 8ffd39b974da..e2779819db6f 100644 --- a/pkgs/by-name/ph/phd2/package.nix +++ b/pkgs/by-name/ph/phd2/package.nix @@ -55,7 +55,10 @@ stdenv.mkDerivation rec { description = "Telescope auto-guidance application"; changelog = "https://github.com/OpenPHDGuiding/phd2/releases/tag/v${version}"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ hjones2199 ]; + maintainers = with lib.maintainers; [ + hjones2199 + returntoreality + ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index 0211bdc9c551..c1cac87f4917 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pixi"; - version = "0.53.0"; + version = "0.54.2"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "pixi"; tag = "v${finalAttrs.version}"; - hash = "sha256-cWoepvnolVyUyDlYakxQLNkOOP9ZbBwe5EaWbYTz+Gs="; + hash = "sha256-/hAe8clZatU3OyaH+5/Nd0tfEPQqM5c/R4EZUlRaPlA="; }; - cargoHash = "sha256-3Sd+EjpSYbexmnUAwLps/Hrj7anpyurbzZlVs2hZk4E="; + cargoHash = "sha256-aWNVGTFmqgguk7i2S3AySTpwwdlsGMn0iXmCM0MKS1k="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pr/protoc-gen-go/package.nix b/pkgs/by-name/pr/protoc-gen-go/package.nix index d14b5cbd2c5d..97f6e31f48a6 100644 --- a/pkgs/by-name/pr/protoc-gen-go/package.nix +++ b/pkgs/by-name/pr/protoc-gen-go/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.36.8"; + version = "1.36.9"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - hash = "sha256-uDgLBqeyTQavcCF+wcLsc/7VCaOvPPLVGt9isw4O0R8="; + hash = "sha256-//2U57dTDCxEABVQG/2Wc15huH5DZMPb9V9S8fyjRjs="; }; vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E="; diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix index 4fc393aa2338..1d1f453ba5c8 100644 --- a/pkgs/by-name/ra/railway/package.nix +++ b/pkgs/by-name/ra/railway/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "railway"; - version = "4.6.3"; + version = "4.7.3"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-rCgl0s05AecF6reyYySVH+oxtWPDCLxZEm3L1WmxA1k="; + hash = "sha256-1I9YpM89m5NsUYzsFkknMcMJDsOnZEeqXRLhdaCuVNI="; }; - cargoHash = "sha256-sOr/vafZLt25yO0chwbtHxPucevLvny/33Gf/J4Bt6Q="; + cargoHash = "sha256-2FuK72cyOCEeIjzIoU4cGjHsPvG/yo1sT5TiFK8vNfw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ri/rime-moegirl/package.nix b/pkgs/by-name/ri/rime-moegirl/package.nix index af12a31c0bf1..d599fab6c184 100644 --- a/pkgs/by-name/ri/rime-moegirl/package.nix +++ b/pkgs/by-name/ri/rime-moegirl/package.nix @@ -5,10 +5,10 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "rime-moegirl"; - version = "20250810"; + version = "20250909"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict.yaml"; - hash = "sha256-/Yv/2kigtpNvnWlHYTJBMUlMV5i5toteaLiDJ0kDoZg="; + hash = "sha256-wsxtiTOg9/yzdkhTuLwdfLev0MAzXWID96bq1AyJN6k="; }; dontUnpack = true; diff --git a/pkgs/by-name/ri/rime-zhwiki/package.nix b/pkgs/by-name/ri/rime-zhwiki/package.nix index 95fba1f22899..1aaf9b2db16f 100644 --- a/pkgs/by-name/ri/rime-zhwiki/package.nix +++ b/pkgs/by-name/ri/rime-zhwiki/package.nix @@ -5,10 +5,10 @@ }: stdenvNoCC.mkDerivation { pname = "rime-zhwiki"; - version = "20240909"; + version = "20250823"; src = fetchurl { - url = "https://github.com/felixonmars/fcitx5-pinyin-zhwiki/releases/download/0.2.5/zhwiki-20240909.dict.yaml"; - hash = "sha256-ZQ8orW7jEbPtOEvYYxdnTJGTwdXVZBEWjUMYR93vOCE="; + url = "https://github.com/felixonmars/fcitx5-pinyin-zhwiki/releases/download/0.2.5/zhwiki-20250823.dict.yaml"; + hash = "sha256-on8oYS/5K24R1wWhsz276B6hA7rHVd124uFHx2Ent70="; }; dontUnpack = true; diff --git a/pkgs/by-name/ro/rote/package.nix b/pkgs/by-name/ro/rote/package.nix deleted file mode 100644 index b139fae6c098..000000000000 --- a/pkgs/by-name/ro/rote/package.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - ncurses, -}: - -stdenv.mkDerivation rec { - pname = "rote"; - version = "0.2.8"; - - src = fetchurl { - sha256 = "05v1lw99jv4cwxl7spyi7by61j2scpdsvx809x5cga7dm5dhlmky"; - url = "mirror://sourceforge/rote/${pname}-${version}.tar.gz"; - }; - - buildInputs = [ ncurses ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Our Own Terminal Emulation Library"; - mainProgram = "rote-config"; - longDescription = '' - ROTE is a simple C library for VT102 terminal emulation. It allows the - programmer to set up virtual 'screens' and send them data. The virtual - screens will emulate the behavior of a VT102 terminal, interpreting - escape sequences, control characters and such. The library supports - ncurses as well so that you may render the virtual screen to the real - screen when you need to. - ''; - homepage = "https://rote.sourceforge.net/"; - license = licenses.lgpl21; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix index c4e8959394e2..cb0f536e6d41 100644 --- a/pkgs/by-name/rt/rtorrent/package.nix +++ b/pkgs/by-name/rt/rtorrent/package.nix @@ -1,32 +1,33 @@ { - lib, - stdenv, autoreconfHook, cppunit, curl, fetchFromGitHub, installShellFiles, + lib, libtool, - libtorrent, + libtorrent-rakshasa, + lua5_4_compat, ncurses, + nixosTests, + nix-update-script, openssl, pkg-config, - zlib, - nixosTests, - gitUpdater, + stdenv, + versionCheckHook, withLua ? false, - lua5_4_compat, + zlib, }: stdenv.mkDerivation (finalAttrs: { - pname = "rakshasa-rtorrent"; - version = "0.15.6"; + pname = "rtorrent"; + version = "0.16.0"; src = fetchFromGitHub { owner = "rakshasa"; repo = "rtorrent"; - rev = "v${finalAttrs.version}"; - hash = "sha256-B/5m1JXdUpczUMNN4cy5p6YurjmRFxMQHG3cQFSmZSs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-+lpivm3MXbuJ4XYhK5OaASpqpDKcCdW7JCFjQYBYCSA="; }; outputs = [ @@ -34,10 +35,6 @@ stdenv.mkDerivation (finalAttrs: { "man" ]; - passthru = { - inherit libtorrent; - }; - nativeBuildInputs = [ autoreconfHook installShellFiles @@ -48,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { cppunit curl libtool - libtorrent + libtorrent-rakshasa ncurses openssl zlib @@ -61,13 +58,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals withLua [ "--with-lua" ]; - passthru = { - updateScript = gitUpdater { rev-prefix = "v"; }; - tests = { - inherit (nixosTests) rtorrent; - }; - }; - enableParallelBuilding = true; postInstall = '' @@ -75,16 +65,26 @@ stdenv.mkDerivation (finalAttrs: { install -Dm644 doc/rtorrent.rc-example -t $out/share/doc/rtorrent/rtorrent.rc ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "-h"; + + passthru = { + inherit libtorrent-rakshasa; + tests = { inherit (nixosTests) rtorrent; }; + updateScript = nix-update-script { }; + }; + meta = { - homepage = "https://rakshasa.github.io/rtorrent/"; description = "Ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; + homepage = "https://rakshasa.github.io/rtorrent/"; license = lib.licenses.gpl2Plus; + mainProgram = "rtorrent"; maintainers = with lib.maintainers; [ ebzzry codyopel thiagokokada ]; platforms = lib.platforms.unix; - mainProgram = "rtorrent"; }; }) diff --git a/pkgs/by-name/se/segger-jlink/package.nix b/pkgs/by-name/se/segger-jlink/package.nix index e8fd58074cb4..11f0aa1ebda9 100644 --- a/pkgs/by-name/se/segger-jlink/package.nix +++ b/pkgs/by-name/se/segger-jlink/package.nix @@ -4,6 +4,11 @@ fetchurl, callPackage, autoPatchelfHook, + cpio, + gzip, + makeWrapper, + rsync, + xar, udev, config, acceptLicense ? config.segger-jlink.acceptLicense or false, @@ -20,7 +25,7 @@ let inherit (source) version; - url = "https://www.segger.com/downloads/jlink/JLink_Linux_V${version}_${platform.name}.tgz"; + url = "https://www.segger.com/downloads/jlink/JLink_${platform.os}_V${version}_${platform.name}.${platform.ext}"; src = assert @@ -55,117 +60,176 @@ let qt4-bundled = callPackage ./qt4-bundled.nix { inherit src version; }; -in -stdenv.mkDerivation { - pname = "segger-jlink"; - inherit src version; - - nativeBuildInputs = [ - autoPatchelfHook - ] - ++ lib.optionals (!headless) [ - copyDesktopItems - ]; - - buildInputs = lib.optionals (!headless) [ - qt4-bundled - ]; - - # Udev is loaded late at runtime - appendRunpaths = [ - "${udev}/lib" - ]; - - dontConfigure = true; - dontBuild = true; - - desktopItems = lib.optionals (!headless) ( - map - ( - entry: - (makeDesktopItem { - name = entry; - exec = entry; - icon = "applications-utilities"; - desktopName = entry; - genericName = "SEGGER ${entry}"; - categories = [ "Development" ]; - type = "Application"; - terminal = false; - startupNotify = false; - }) - ) - [ - "JFlash" - "JFlashLite" - "JFlashSPI" - "JLinkConfig" - "JLinkGDBServer" - "JLinkLicenseManager" - "JLinkRTTViewer" - "JLinkRegistration" - "JLinkRemoteServer" - "JLinkSWOViewer" - "JLinkUSBWebServer" - "JMem" - ] - ); - - installPhase = '' - runHook preInstall - - mkdir -p $out/opt/SEGGER/JLink - - ${lib.optionalString (!headless) '' - # Install binaries and runtime files into /opt/SEGGER/JLink - mv J* ETC GDBServer Firmwares $out/opt/SEGGER/JLink - - # Link executables into /bin/ - mkdir -p $out/bin - for binr in $out/opt/SEGGER/JLink/*Exe; do - binrlink=''${binr#"$out/opt/SEGGER/JLink/"} - ln -s $binr $out/bin/$binrlink - # Create additional symlinks without "Exe" suffix - binrlink=''${binrlink/%Exe} - ln -s $binr $out/bin/$binrlink - done - - # Copy special alias symlinks - for slink in $(find $out/opt/SEGGER/JLink/. -type l); do - cp -P -n $slink $out/bin || true - rm $slink - done - ''} - - # Install libraries - install -Dm444 libjlinkarm.so* -t $out/lib - for libr in $out/lib/libjlinkarm.*; do - ln -s $libr $out/opt/SEGGER/JLink - done - - # Install docs and examples - mkdir -p $out/share - mv Doc $out/share/docs - mv Samples $out/share/examples - - # Install udev rules - install -Dm444 99-jlink.rules -t $out/lib/udev/rules.d/ - - runHook postInstall - ''; - - passthru.updateScript = ./update.py; - - meta = with lib; { - description = "J-Link Software and Documentation pack"; - homepage = "https://www.segger.com/downloads/jlink/#J-LinkSoftwareAndDocumentationPack"; - changelog = "https://www.segger.com/downloads/jlink/ReleaseNotes_JLink.html"; - license = licenses.unfree; - platforms = attrNames supported; - maintainers = with maintainers; [ - FlorianFranzen - h7x4 - stargate01 + buildAttrsLinux = { + nativeBuildInputs = [ + autoPatchelfHook + ] + ++ lib.optionals (!headless) [ + copyDesktopItems ]; + + buildInputs = lib.optionals (!headless) [ + qt4-bundled + ]; + + # Udev is loaded late at runtime + appendRunpaths = [ + "${udev}/lib" + ]; + + desktopItems = lib.optionals (!headless) ( + map + ( + entry: + (makeDesktopItem { + name = entry; + exec = entry; + icon = "applications-utilities"; + desktopName = entry; + genericName = "SEGGER ${entry}"; + categories = [ "Development" ]; + type = "Application"; + terminal = false; + startupNotify = false; + }) + ) + [ + "JFlash" + "JFlashLite" + "JFlashSPI" + "JLinkConfig" + "JLinkGDBServer" + "JLinkLicenseManager" + "JLinkRTTViewer" + "JLinkRegistration" + "JLinkRemoteServer" + "JLinkSWOViewer" + "JLinkUSBWebServer" + "JMem" + ] + ); + + installPhase = '' + runHook preInstall + + mkdir -p $out/opt/SEGGER/JLink + + ${lib.optionalString (!headless) '' + # Install binaries and runtime files into /opt/SEGGER/JLink + mv J* ETC GDBServer Firmwares $out/opt/SEGGER/JLink + + # Link executables into /bin/ + mkdir -p $out/bin + for binr in $out/opt/SEGGER/JLink/*Exe; do + binrlink=''${binr#"$out/opt/SEGGER/JLink/"} + ln -s $binr $out/bin/$binrlink + # Create additional symlinks without "Exe" suffix + binrlink=''${binrlink/%Exe} + ln -s $binr $out/bin/$binrlink + done + + # Copy special alias symlinks + for slink in $(find $out/opt/SEGGER/JLink/. -type l); do + cp -P -n $slink $out/bin || true + rm $slink + done + ''} + + # Install libraries + install -Dm444 libjlinkarm.so* -t $out/lib + for libr in $out/lib/libjlinkarm.*; do + ln -s $libr $out/opt/SEGGER/JLink + done + + # Install docs and examples + mkdir -p $out/share + mv Doc $out/share/docs + mv Samples $out/share/examples + + # Install udev rules + install -Dm444 99-jlink.rules -t $out/lib/udev/rules.d/ + + runHook postInstall + ''; }; -} + + buildAttrsDarwin = { + nativeBuildInputs = [ + cpio + gzip # gunzip + makeWrapper + rsync + xar + ]; + + unpackPhase = '' + runHook preUnpack + + xar -xf $src + + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + # segger package + mkdir JLINK + pushd JLINK + cat ../JLink.pkg/Payload | gunzip -dc | cpio -i + rsync -rtl ./Applications $out/ + popd + + # By default, the package unpacks a symlink to an absolute path: + # JLink -> /Applications/SEGGER/JLink_V824 + # ... replace with a relative symlink to the package contents themselves. + ln -rsf $out/Applications/SEGGER/{JLink_V${version},JLink} + + # autoPatchelfHook is broken, manually wrap binaries before linking them into $out/bin + LDPATH=$out/Applications/SEGGER/JLink_V${version} + mkdir -p $out/bin + find $out -type f -executable ! -name "*.dylib" -print0 | while read -d $'\0' e; do + wrapProgram "$e" --set LD_LIBRARY_PATH $LDPATH --set DYLD_LIBRARY_PATH $LDPATH + ln -rs "$e" $out/bin/ + done + + runHook postInstall + ''; + + }; + + buildAttrs = + if stdenv.isLinux then + buildAttrsLinux + else if stdenv.isDarwin then + buildAttrsDarwin + else + throw "platform not supported"; + +in +stdenv.mkDerivation ( + finalAttrs: + buildAttrs + // { + pname = "segger-jlink"; + inherit src version; + + dontConfigure = true; + dontBuild = true; + + passthru.updateScript = ./update.py; + + meta = { + description = "J-Link Software and Documentation pack"; + homepage = "https://www.segger.com/downloads/jlink/#J-LinkSoftwareAndDocumentationPack"; + changelog = "https://www.segger.com/downloads/jlink/ReleaseNotes_JLink.html"; + license = lib.licenses.unfree; + platforms = lib.attrNames supported; + maintainers = with lib.maintainers; [ + FlorianFranzen + h7x4 + stargate01 + ]; + }; + } +) diff --git a/pkgs/by-name/se/segger-jlink/source.nix b/pkgs/by-name/se/segger-jlink/source.nix index ac8be277d278..1eb982ce80e5 100644 --- a/pkgs/by-name/se/segger-jlink/source.nix +++ b/pkgs/by-name/se/segger-jlink/source.nix @@ -1,19 +1,39 @@ { - version = "810"; + version = "824"; x86_64-linux = { + os = "Linux"; name = "x86_64"; - hash = "sha256-cnax7D4T5On356mZrd/waH62IXP6BNSJtCM0rw0RnDo="; + ext = "tgz"; + hash = "sha256-TsNlwApXdbkHEI+pG9NVK7pJkKdvFYGIGgn+9xJ9q8A="; }; i686-linux = { + os = "Linux"; name = "i386"; - hash = "sha256-ERpzSVK7IxriDTH1wkLsiioqV99fRkMIlg0Pd+V+h7g="; + ext = "tgz"; + hash = "sha256-Gs4iifvchFY0d39bhQ61lX/TPGjCKPRidkJQbva91gA="; }; aarch64-linux = { + os = "Linux"; name = "arm64"; - hash = "sha256-l+mxhK85GnGLKspXeEy2JOJ+fA8DVIr36tLVCBp7MhU="; + ext = "tgz"; + hash = "sha256-YowEzJ//idmZ4eznPNgEW142ApsnvkboGAWfDCHfIS0="; }; armv7l-linux = { + os = "Linux"; name = "arm"; - hash = "sha256-DFIaIq57HQbpur2vep1pO/VDOo913b17x3eWhq4wL40="; + ext = "tgz"; + hash = "sha256-mLl/qNtxMfFOe/M0fCZnnebei7E2ON4gvE9Q7XIufag="; + }; + aarch64-darwin = { + os = "MacOSX"; + name = "arm64"; + ext = "pkg"; + hash = "sha256-GKlWof4XdxEwW7G8YmhdfjjJpXEXICqWapI7fly8Uvg="; + }; + x86_64-darwin = { + os = "MacOSX"; + name = "x86_64"; + ext = "pkg"; + hash = "sha256-LWLUdzNVkN60qET7vhvLCoepg7kuHPqs2bZspRzZkGo="; }; } diff --git a/pkgs/by-name/se/segger-jlink/update.py b/pkgs/by-name/se/segger-jlink/update.py index 73e5e274ab69..35e8586beb67 100755 --- a/pkgs/by-name/se/segger-jlink/update.py +++ b/pkgs/by-name/se/segger-jlink/update.py @@ -5,16 +5,20 @@ import requests import subprocess from bs4 import BeautifulSoup +from collections import namedtuple from pathlib import Path from tempfile import NamedTemporaryFile from textwrap import indent, dedent +Arch = namedtuple('Architecture', ['os', 'name', 'ext']) ARCH_MAP = { - 'x86_64-linux': 'x86_64', - 'i686-linux': 'i386', - 'aarch64-linux': 'arm64', - 'armv7l-linux': 'arm', + 'x86_64-linux': Arch(os='Linux', name='x86_64', ext='tgz'), + 'i686-linux': Arch(os='Linux', name='i386', ext='tgz'), + 'aarch64-linux': Arch(os='Linux', name='arm64', ext='tgz'), + 'armv7l-linux': Arch(os='Linux', name='arm', ext='tgz'), + 'aarch64-darwin': Arch(os='MacOSX', name='arm64', ext='pkg'), + 'x86_64-darwin': Arch(os='MacOSX', name='x86_64', ext='pkg'), } @@ -37,7 +41,11 @@ def find_latest_jlink_version() -> str: return version.removeprefix('V').replace('.', '') -def nar_hash(url: str) -> str: +def nar_hash(version: str, arch: Arch) -> str: + ''' + Return the nar hash of 'version' for 'source'. + ''' + url = f"https://www.segger.com/downloads/jlink/JLink_{arch.os}_V{version}_{arch.name}.{arch.ext}" try: response = requests.post(url, data={'accept_license_agreement': 'accepted'}) response.raise_for_status() @@ -56,21 +64,15 @@ def nar_hash(url: str) -> str: return output.strip() -def calculate_package_hashes(version: str) -> list[tuple[str, str, str]]: - result = [] - for (arch_nix, arch_web) in ARCH_MAP.items(): - url = f"https://www.segger.com/downloads/jlink/JLink_Linux_V{version}_{arch_web}.tgz"; - nhash = nar_hash(url) - result.append((arch_nix, arch_web, nhash)) - return result - - -def update_source(version: str, package_hashes: list[tuple[str, str, str]]): +def update_source(version: str): content = f'version = "{version}";\n' - for arch_nix, arch_web, nhash in package_hashes: + for arch_nix, arch in ARCH_MAP.items(): + nhash = nar_hash(version, arch) content += dedent(f''' {arch_nix} = {{ - name = "{arch_web}"; + os = "{arch.os}"; + name = "{arch.name}"; + ext = "{arch.ext}"; hash = "{nhash}"; }};''').strip() + '\n' @@ -81,7 +83,4 @@ def update_source(version: str, package_hashes: list[tuple[str, str, str]]): if __name__ == '__main__': - version = find_latest_jlink_version() - package_hashes = calculate_package_hashes(version) - update_source(version, package_hashes) - + update_source(find_latest_jlink_version()) diff --git a/pkgs/by-name/si/siril/package.nix b/pkgs/by-name/si/siril/package.nix index 551ae7542570..f4757be44259 100644 --- a/pkgs/by-name/si/siril/package.nix +++ b/pkgs/by-name/si/siril/package.nix @@ -103,7 +103,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Astrophotographic image processing tool"; license = lib.licenses.gpl3Plus; changelog = "https://gitlab.com/free-astro/siril/-/blob/HEAD/ChangeLog"; - maintainers = with lib.maintainers; [ hjones2199 ]; + maintainers = with lib.maintainers; [ + hjones2199 + returntoreality + ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/sp/spawn_fcgi/package.nix b/pkgs/by-name/sp/spawn_fcgi/package.nix index 1daf28bb0a17..c20d8f39db53 100644 --- a/pkgs/by-name/sp/spawn_fcgi/package.nix +++ b/pkgs/by-name/sp/spawn_fcgi/package.nix @@ -1,28 +1,26 @@ { lib, stdenv, - fetchsvn, - autoconf, - automake, + fetchurl, + meson, + ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spawn-fcgi"; - version = "1.6.4"; + version = "1.6.6"; - src = fetchsvn { - url = "svn://svn.lighttpd.net/spawn-fcgi/tags/spawn-fcgi-${version}"; - sha256 = "07r6nwbg4881mdgp0hqh80c4x9wb7jg6cgc84ghwhfbd2abc2iq5"; + src = fetchurl { + url = "https://download.lighttpd.net/spawn-fcgi/releases-1.6.x/spawn-fcgi-${finalAttrs.version}.tar.xz"; + hash = "sha256-yWI0XuzwVT7dm/XPYe5F59EYN/NANwZ/vaFlz0rdzhg="; }; nativeBuildInputs = [ - automake - autoconf + meson + ninja ]; - preConfigure = '' - ./autogen.sh - ''; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-implicit-function-declaration"; meta = with lib; { homepage = "https://redmine.lighttpd.net/projects/spawn-fcgi"; @@ -32,4 +30,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = with platforms; unix; }; -} +}) diff --git a/pkgs/by-name/te/tegaki-zinnia-japanese/package.nix b/pkgs/by-name/te/tegaki-zinnia-japanese/package.nix deleted file mode 100644 index 5d31375643a1..000000000000 --- a/pkgs/by-name/te/tegaki-zinnia-japanese/package.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - unzip, -}: - -stdenv.mkDerivation { - pname = "tegaki-zinnia-japanese"; - version = "0.3"; - - src = fetchurl { - url = "http://www.tegaki.org/releases/0.3/models/tegaki-zinnia-japanese-0.3.zip"; - sha256 = "1nmg9acxhcqly9gwkyb9m0hpy76fll91ywk4b1q4xms0ajxip1h7"; - }; - - meta = with lib; { - description = "Japanese handwriting model for the Zinnia engine"; - homepage = "http://tegaki.org/"; - license = licenses.lgpl21; - platforms = platforms.unix; - maintainers = [ ]; - }; - - nativeBuildInputs = [ unzip ]; - - makeFlags = [ "installpath=$(out)/share/tegaki/models/zinnia/" ]; -} diff --git a/pkgs/by-name/te/tet/package.nix b/pkgs/by-name/te/tet/package.nix deleted file mode 100644 index f7bf33c98e13..000000000000 --- a/pkgs/by-name/te/tet/package.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - fetchurl, - lib, - stdenv, -}: - -stdenv.mkDerivation ({ - version = "3.8"; - pname = "tet"; - - src = fetchurl { - url = "http://tetworks.opengroup.org/downloads/38/software/Sources/3.8/tet3.8-src.tar.gz"; - sha256 = "1j57hv56df38w249l595b8rsgmsyvjkbysai03a9724gax5jl9av"; - }; - - patchPhase = "chmod +x configure"; - - configurePhase = "./configure -t lite"; - - buildPhase = "cd src; make; cd -"; - - installPhase = "cd src; make install; cd -; cp -vr $PWD $out"; - - meta = { - description = "Test Environment Toolkit is used in test applications like The Open Group's UNIX Certification program and the Free Standards Group's LSB Certification program"; - homepage = "https://tetworks.opengroup.org/Products/tet.htm"; - license = lib.licenses.artistic1; - platforms = lib.platforms.unix; - maintainers = [ ]; - }; -}) diff --git a/pkgs/by-name/ti/tile38/package.nix b/pkgs/by-name/ti/tile38/package.nix index 5fd0424d0965..ec911bdb268e 100644 --- a/pkgs/by-name/ti/tile38/package.nix +++ b/pkgs/by-name/ti/tile38/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "tile38"; - version = "1.36.1"; + version = "1.36.2"; src = fetchFromGitHub { owner = "tidwall"; repo = "tile38"; tag = version; - hash = "sha256-65zUbnnksLCWCsOjO8xzyhJ2IKhPg6tttywvApzf7mw="; + hash = "sha256-VUNDVZT3ENsVHj+ZMOAXgbZTGMdmo0TCXN/ecpN2Xs8="; }; - vendorHash = "sha256-J8kWsbU8onvXeVLGGBX9P6hYuGy50fG+m1nFg6phBMk="; + vendorHash = "sha256-YiivAh7aXeVuvI9V1ayvqjJ658Hu8/1icvRbqq2QeI0="; subPackages = [ "cmd/tile38-cli" diff --git a/pkgs/by-name/ug/ugs/package.nix b/pkgs/by-name/ug/ugs/package.nix index de8cd6239ec4..840a831d362b 100644 --- a/pkgs/by-name/ug/ugs/package.nix +++ b/pkgs/by-name/ug/ugs/package.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { pname = "ugs"; - version = "2.1.15"; + version = "2.1.17"; src = fetchzip { url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${version}/UniversalGcodeSender.zip"; - hash = "sha256-IzDcMe8seISyF4Eg4CPDsCj2DDFknFgCkajhLoL3YrM="; + hash = "sha256-7Ed3oz6E/9pEX01Xk1UokRxo5vf80JrcdBaPoT7hgm4="; }; dontUnpack = true; diff --git a/pkgs/by-name/wc/wcslib/package.nix b/pkgs/by-name/wc/wcslib/package.nix index d4f7dafa7bcf..cd9eb0750cd7 100644 --- a/pkgs/by-name/wc/wcslib/package.nix +++ b/pkgs/by-name/wc/wcslib/package.nix @@ -40,7 +40,10 @@ stdenv.mkDerivation rec { and their conversion to image coordinate systems. This is the standard library for this purpose in astronomy. ''; - maintainers = with lib.maintainers; [ hjones2199 ]; + maintainers = with lib.maintainers; [ + hjones2199 + returntoreality + ]; license = lib.licenses.lgpl3Plus; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/wr/wrtag/package.nix b/pkgs/by-name/wr/wrtag/package.nix index 3d18966d52f2..63342ff1d1e9 100644 --- a/pkgs/by-name/wr/wrtag/package.nix +++ b/pkgs/by-name/wr/wrtag/package.nix @@ -8,16 +8,16 @@ }: buildGoModule (finalAttrs: { pname = "wrtag"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "sentriz"; repo = "wrtag"; tag = "v${finalAttrs.version}"; - hash = "sha256-fYxtZnOO4+uU6p8p7uNPDnIinUT+TYXfO3G17PtcqQA="; + hash = "sha256-I4lvkyw2vJH29CdNhNc1qhlFdIq00QHPRlaP13UjlJQ="; }; - vendorHash = "sha256-Baz5oCKh26+t30ZyjfdYt3YobWAxSRwk12wdFEVPLRY="; + vendorHash = "sha256-bqqt/p4wzYpz/nkM9ZgzVYHo/I5bUkG/pvY6irx6Z+w="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index a128aa45da26..60c64bf7abe4 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "1.0.0"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.12"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; tag = "v${version}"; - hash = "sha256-02ciRYc5aQ1nES/uctKUWwyBM9dO0hZ5OEWC5MT4Nuo="; + hash = "sha256-uJQWKgmlNwuvIXfK6fFHngaSncgaDJJ36vkOLGWB/lY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aiovodafone/default.nix b/pkgs/development/python-modules/aiovodafone/default.nix index d7cf9c1ad6ba..58544c789d9d 100644 --- a/pkgs/development/python-modules/aiovodafone/default.nix +++ b/pkgs/development/python-modules/aiovodafone/default.nix @@ -2,6 +2,7 @@ lib, aiohttp, beautifulsoup4, + colorlog, buildPythonPackage, fetchFromGitHub, poetry-core, @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "aiovodafone"; - version = "1.1.0"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiovodafone"; tag = "v${version}"; - hash = "sha256-xz5NilxPN5KyC4NYmx4Ax0L3khtD2oo3s7gxXWclCI4="; + hash = "sha256-i4zsOHauKPq2b9LfWd4HYe04oOambbibHfNrJLiSSYw="; }; build-system = [ poetry-core ]; @@ -29,6 +30,7 @@ buildPythonPackage rec { dependencies = [ aiohttp beautifulsoup4 + colorlog ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/airportsdata/default.nix b/pkgs/development/python-modules/airportsdata/default.nix index 8c0c586c92c3..d50c31b13981 100644 --- a/pkgs/development/python-modules/airportsdata/default.nix +++ b/pkgs/development/python-modules/airportsdata/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "airportsdata"; - version = "20250811"; + version = "20250909.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "mborsetti"; repo = "airportsdata"; tag = "v${version}"; - hash = "sha256-MJMZzRyahh39qldgbObApneKrN9qgU9HSW2zgpk0jfQ="; + hash = "sha256-c6OFzYI6YOIZvpEsYbzLqT6q0CYNczRcKLb+6cKy2fQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index baf4491c78b2..dcb2884f4844 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aws-adfs"; - version = "2.12.0"; + version = "2.12.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "venth"; repo = "aws-adfs"; tag = "v${version}"; - hash = "sha256-TYfKeLe1zp6d5/JPURAcCAfjtaiWHkkmP1+zE+PiiR4="; + hash = "sha256-U1ptI/VynHArJ1SwX4LanHB0f4U38YZO9XDCXcLBu+s="; }; build-system = [ diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix index fd34cef6ec6b..6147ee418a4f 100644 --- a/pkgs/development/python-modules/awslambdaric/default.nix +++ b/pkgs/development/python-modules/awslambdaric/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, isPy27, pytestCheckHook, - autoconf271, + autoconf, automake, cmake, gcc, @@ -35,7 +35,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - autoconf271 + autoconf automake cmake libtool diff --git a/pkgs/development/python-modules/bidsschematools/default.nix b/pkgs/development/python-modules/bidsschematools/default.nix index 015bf64f8832..e4b7642bb168 100644 --- a/pkgs/development/python-modules/bidsschematools/default.nix +++ b/pkgs/development/python-modules/bidsschematools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bidsschematools"; - version = "1.0.14"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "bidsschematools"; inherit version; - hash = "sha256-Kj3vxue6dGdFV2gzYr6SBa3D1s/X+KV/izWR6kMKOKE="; + hash = "sha256-cVVfI2Sie6ase/+Gm1GB/2SqGAxeVnJRgLQwEmJ8DgY="; }; build-system = [ diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 145aee974616..4b2f31610076 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.40.26"; + version = "1.40.27"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-+fdTiIHt0H6/qxvXiQryvQuCnrsW2TGGCEXUSORQWi0="; + hash = "sha256-0PC11/PsEACqI/Tt2pYEZ2eHpVaxdGsqduHoMkNtbGw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index afead4787c34..232389d55040 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.26"; + version = "1.40.27"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-yJgzQl+HgWx2maxBasq+jQFvp8ejWgnCRVlAgZqFRT4="; + hash = "sha256-AicOiBPMx/xNBvc2ZT5aHXbo7i3VYPhex22srJfqQB8="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/clickhouse-cityhash/default.nix b/pkgs/development/python-modules/clickhouse-cityhash/default.nix index 87094e3f5244..1ef113b016a6 100644 --- a/pkgs/development/python-modules/clickhouse-cityhash/default.nix +++ b/pkgs/development/python-modules/clickhouse-cityhash/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, cython, fetchPypi, + fetchpatch, pythonOlder, setuptools, }: @@ -24,6 +25,15 @@ buildPythonPackage rec { setuptools ]; + patches = [ + (fetchpatch { + # Cython 3.1 removed long() function. + # https://github.com/xzkostyan/clickhouse-cityhash/pull/6 + url = "https://github.com/thevar1able/clickhouse-cityhash/commit/1109fc80e24cb44ec9ee2885e1e5cce7141c7ad8.patch"; + hash = "sha256-DcmASvDK160IokC5OuZoXpAHKbBOReGs96SU7yW9Ncc="; + }) + ]; + doCheck = false; pythonImportsCheck = [ "clickhouse_cityhash" ]; diff --git a/pkgs/development/python-modules/deltalake/default.nix b/pkgs/development/python-modules/deltalake/default.nix index d889edd86b69..670bb3e4de8a 100644 --- a/pkgs/development/python-modules/deltalake/default.nix +++ b/pkgs/development/python-modules/deltalake/default.nix @@ -3,8 +3,8 @@ buildPythonPackage, fetchPypi, rustPlatform, + arro3-core, pyarrow, - pyarrow-hotfix, openssl, stdenv, libiconv, @@ -14,30 +14,32 @@ pytest-benchmark, pytest-cov-stub, pytest-mock, + pytest-timeout, pandas, + deprecated, azure-storage-blob, }: buildPythonPackage rec { pname = "deltalake"; - version = "0.25.5"; + version = "1.1.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Fz5Lg/z/EPJkdK4RcWHD8r3V9EwwwgRjwktri1IOdlY="; + hash = "sha256-s/iWYoh2zARl3M+0DPdur5d8a1URl+jinaMPBFeruEE="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-6SGVKJu01MzZxJv29PZKea+Z2YwAnvzbdDlnA4R6Az0="; + hash = "sha256-JYstNjd/KC9xp2h72vkQfin/LXNTXeb0hLpGUiGgRlE="; }; env.OPENSSL_NO_VENDOR = 1; dependencies = [ - pyarrow - pyarrow-hotfix + arro3-core + deprecated ]; buildInputs = [ @@ -64,26 +66,19 @@ buildPythonPackage rec { pytest-benchmark pytest-cov-stub pytest-mock + pytest-timeout azure-storage-blob + pyarrow ]; preCheck = '' # For paths in test to work, we have to be in python dir - cp pyproject.toml python/ cd python # In tests we want to use deltalake that we have built rm -rf deltalake ''; - pytestFlags = [ - "--benchmark-disable" - ]; - - disabledTestMarks = [ - "integration" - ]; - meta = with lib; { description = "Native Rust library for Delta Lake, with bindings into Python"; homepage = "https://github.com/delta-io/delta-rs"; diff --git a/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix index a07008071675..dadc1e727472 100644 --- a/pkgs/development/python-modules/duckduckgo-search/default.nix +++ b/pkgs/development/python-modules/duckduckgo-search/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "duckduckgo-search"; - version = "9.5.4"; + version = "9.5.5"; pyproject = true; src = fetchFromGitHub { owner = "deedy5"; repo = "ddgs"; tag = "v${version}"; - hash = "sha256-iqa2OviyAfpKDM6ghfo5FcCqEacY7vxSra2ePPvm2D0="; + hash = "sha256-Pwl6fCEBj+eUXYEf4wCTw1fpKZh3j4IVC6SW0Vqcmf4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lazrs/default.nix b/pkgs/development/python-modules/lazrs/default.nix index f0c24b250675..c2aeee90c992 100644 --- a/pkgs/development/python-modules/lazrs/default.nix +++ b/pkgs/development/python-modules/lazrs/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { pname = "lazrs"; - version = "0.7.0"; + version = "0.8.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-UxkbNRwdn6RfdEcWmDhL9CveFFmTCWRfudTDU/D7fyQ="; + hash = "sha256-Ij6nRxQO83TJysnLImqg/FuyWYj8ITiiTUFSuoGd044="; }; nativeBuildInputs = [ @@ -23,7 +23,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoVendor { inherit src; inherit pname version; - hash = "sha256-GVb34eznC5/TA/SpvDq9uJ9M3nUTfx0KyfRFd4WUyCI="; + hash = "sha256-9OQKybY6R1yYWgx5cLcRv2pRRWKUhrKH+MoTBuBHH6E="; }; pythonImportsCheck = [ "lazrs" ]; diff --git a/pkgs/development/python-modules/mmengine/default.nix b/pkgs/development/python-modules/mmengine/default.nix index 52d2ff2a84c7..0217e140b77b 100644 --- a/pkgs/development/python-modules/mmengine/default.nix +++ b/pkgs/development/python-modules/mmengine/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, @@ -117,6 +118,18 @@ buildPythonPackage rec { # AttributeError: type object 'MagicMock' has no attribute ... "tests/test_fileio/test_backends/test_petrel_backend.py::TestPetrelBackend" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # RuntimeError: attempt to insert nil object from objects[1] + "tests/test_visualizer/test_visualizer.py::TestVisualizer::test_draw_featmap" + "tests/test_visualizer/test_visualizer.py::TestVisualizer::test_show" + + # AssertionError: torch.bfloat16 != torch.float32 + "tests/test_runner/test_amp.py::TestAmp::test_autocast" + + # ValueError: User specified autocast device_type must be cuda or cpu, but got mps + "tests/test_runner/test_runner.py::TestRunner::test_test" + "tests/test_runner/test_runner.py::TestRunner::test_val" ]; disabledTests = [ @@ -133,8 +146,16 @@ buildPythonPackage rec { # AssertionError: os is not "test_lazy_module" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Fails when max-jobs is set to use fewer processes than cores + # for example `AssertionError: assert 14 == 4` + "test_setup_multi_processes" ]; + # torch.distributed.DistNetworkError: The server socket has failed to bind. + __darwinAllowLocalNetworking = true; + meta = { description = "Library for training deep learning models based on PyTorch"; homepage = "https://github.com/open-mmlab/mmengine"; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 730c7dcb97e3..33ca2ef2c0d4 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -150,8 +150,8 @@ rec { "sha256-p8jnTJigD8QuLe3vjZwE7ZyGgBblpSdM0II0Cr/xFS8="; mypy-boto3-autoscaling = - buildMypyBoto3Package "autoscaling" "1.40.0" - "sha256-tBk+8scAVeO8YMNDWWW4uQK8V+X9YLUP80vm3euq3gs="; + buildMypyBoto3Package "autoscaling" "1.40.27" + "sha256-lnejEICkgHqQWfiN3LyNIHzDjfpgP2GlAr6acRP/wFo="; mypy-boto3-autoscaling-plans = buildMypyBoto3Package "autoscaling-plans" "1.40.20" @@ -258,8 +258,8 @@ rec { "sha256-ghgArlI9Z/rk9kM6k6b+0x/Fugp7q25+uV+Y2dZFtSU="; mypy-boto3-cloudwatch = - buildMypyBoto3Package "cloudwatch" "1.40.0" - "sha256-SbEKbGXjkvk+jIXQHToTj+yzhUX1ob8VzT4awbWUAWs="; + buildMypyBoto3Package "cloudwatch" "1.40.27" + "sha256-81COvDAaq4MASZCpALSWhT9WTdTf0LgurwY44MPs0mc="; mypy-boto3-codeartifact = buildMypyBoto3Package "codeartifact" "1.40.17" @@ -338,8 +338,8 @@ rec { "sha256-eukD7L3JzqvzK5mW9ESu9L62id1EHGhYdy+afYowtAc="; mypy-boto3-connect = - buildMypyBoto3Package "connect" "1.40.20" - "sha256-o/l/NL1TFTp5sADIjKmcMjp9L5V2IV8u72rHMHLrEy8="; + buildMypyBoto3Package "connect" "1.40.27" + "sha256-s3kpG48q6+oecn9d1gyntSjTlYBu0bWyt7yb5EqNoQs="; mypy-boto3-connect-contact-lens = buildMypyBoto3Package "connect-contact-lens" "1.40.0" @@ -877,8 +877,8 @@ rec { "sha256-T3Ba5a0ogaaNqOs93jww/OT2UgHZzy9k6YGpkN9DlYY="; mypy-boto3-mediapackagev2 = - buildMypyBoto3Package "mediapackagev2" "1.40.0" - "sha256-NRpCHPEXgFazLRtyvzkztliGFtm2eIq4b1CVNaxIXQ0="; + buildMypyBoto3Package "mediapackagev2" "1.40.27" + "sha256-wJZ7kfDwF+GLMvkLfOHTrW/fIPsMKD2mJJJmirEpApY="; mypy-boto3-mediastore = buildMypyBoto3Package "mediastore" "1.40.17" @@ -985,8 +985,8 @@ rec { "sha256-JEuEjo0htTuDCZx2nNJK2Zq59oSUqkMf4BrNamerfVk="; mypy-boto3-organizations = - buildMypyBoto3Package "organizations" "1.40.8" - "sha256-ow9D1wgdHpZkyZEoytfMX8HMyrJxXGw3aKnNZEIrn1U="; + buildMypyBoto3Package "organizations" "1.40.27" + "sha256-LdBoeGucR8RzewzflvN1dtCtr8+asp3ggmtV6HuUQm8="; mypy-boto3-osis = buildMypyBoto3Package "osis" "1.40.20" @@ -1173,8 +1173,8 @@ rec { "sha256-HPAyUwvfUNZl3Ts3H0evVO7UifAiiwrDPyYJ4titkqA="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.40.25" - "sha256-n0J5zoHTKuovhScGAPMdG9s5zPPgkXUV0aTTXqDVIAU="; + buildMypyBoto3Package "sagemaker" "1.40.27" + "sha256-OlMvXXiV/PGIqL4IRQuyRpm4RboyH+SDnQKJ2HWuqsw="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.40.16" diff --git a/pkgs/development/python-modules/podman/default.nix b/pkgs/development/python-modules/podman/default.nix index c71211fafb7d..82fc7e7cb3be 100644 --- a/pkgs/development/python-modules/podman/default.nix +++ b/pkgs/development/python-modules/podman/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "podman"; - version = "5.5.0"; + version = "5.6.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "containers"; repo = "podman-py"; tag = "v${version}"; - hash = "sha256-c8uU5WZsZufi/QNJkXh2Z1bmoM/oOm6+rggm4J+pnIc="; + hash = "sha256-VlPhW0FL51EQQRlDrd0F3ByXu/xpydXLSCM5umzpIW0="; }; build-system = [ setuptools ]; @@ -61,6 +61,12 @@ buildPythonPackage rec { "VolumesIntegrationTest" ]; + disabledTestPaths = [ + # Access to the host's filesystem + "podman/tests/integration/test_container_create.py" + "podman/tests/unit/test_utils.py" + ]; + meta = with lib; { description = "Python bindings for Podman's RESTful API"; homepage = "https://github.com/containers/podman-py"; diff --git a/pkgs/development/python-modules/pyngo/default.nix b/pkgs/development/python-modules/pyngo/default.nix index df98a27e4ed7..78cf970ed4ef 100644 --- a/pkgs/development/python-modules/pyngo/default.nix +++ b/pkgs/development/python-modules/pyngo/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pyngo"; - version = "2.4.0"; + version = "2.4.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "yezz123"; repo = "pyngo"; tag = version; - hash = "sha256-88GMMGTGiy2So05Og75eFd8RA9uSXBSkwgFJjRjYMGQ="; + hash = "sha256-vLQz4qjxOnMUZ/SCR7XSg6yCv5ms0eCpm4Azgi8AeSA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvisa-sim/default.nix b/pkgs/development/python-modules/pyvisa-sim/default.nix index 0dc5ab72663f..a93c71ee461b 100644 --- a/pkgs/development/python-modules/pyvisa-sim/default.nix +++ b/pkgs/development/python-modules/pyvisa-sim/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "pyvisa-sim"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; src = fetchPypi { pname = "pyvisa_sim"; inherit version; - hash = "sha256-fVpnLKSK25SL5hbwYSuFMrHu5mSvZ8Gt8Qv/Tjv7+NA="; + hash = "sha256-EbEGWOIVJwjuraDIZifYlMTRFIQxLwLTzzhRlrS8hw8="; }; build-system = [ diff --git a/pkgs/development/python-modules/quaternion/default.nix b/pkgs/development/python-modules/quaternion/default.nix index ee3d6637c60c..10ec92522049 100644 --- a/pkgs/development/python-modules/quaternion/default.nix +++ b/pkgs/development/python-modules/quaternion/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "quaternion"; - version = "2024.0.10"; + version = "2024.0.12"; pyproject = true; src = fetchFromGitHub { owner = "moble"; repo = "quaternion"; tag = "v${version}"; - hash = "sha256-jkaSxnq1i5DZP7unbKktJWFmsDNc1ZGOKMcN9SiObMg="; + hash = "sha256-HZDzzXf9lsvxa5yLayYvk3lgutEw0gEH8m0jkzwMAF8="; }; build-system = [ diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 9f15789497d2..c22613adaf6c 100644 --- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "snowflake-sqlalchemy"; - version = "1.7.6"; + version = "1.7.7"; pyproject = true; src = fetchFromGitHub { owner = "snowflakedb"; repo = "snowflake-sqlalchemy"; tag = "v${version}"; - hash = "sha256-8Q4cqfldSilBpj/1/4u5HRUDT8fD9MPzVGcokYt0dJA="; + hash = "sha256-2JZVG2du6ANzRSfWgzVceQxhwn8tYt9L6vMv2eUlPzM="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index f135ab45a5f1..f9b8138936f4 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1457"; + version = "3.0.1458"; pyproject = true; src = fetchFromGitHub { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-kXoegYr6m5z3FQXV3V18rKl0Pkknz4Xl/CXtOnN6zPU="; + hash = "sha256-Vqme0yr5L/QmNrQnUzINTU0AY9elwOmse/SbIBDjBJ4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix index 9858b9081012..e0750a8217fc 100644 --- a/pkgs/development/python-modules/testcontainers/default.nix +++ b/pkgs/development/python-modules/testcontainers/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "testcontainers"; - version = "4.12.0"; + version = "4.13.0"; pyproject = true; src = fetchFromGitHub { owner = "testcontainers"; repo = "testcontainers-python"; tag = "testcontainers-v${version}"; - hash = "sha256-y1fX2XQeEPNP1NZVYh0RazqA76BJC9doIalMsWS6MY8="; + hash = "sha256-BCtuSMYU0hZ8+CxQfykR2RK/XWwtvRVkxSeV+U3AITA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/textual-image/default.nix b/pkgs/development/python-modules/textual-image/default.nix index 63f53c35153a..96fcf00bcb56 100644 --- a/pkgs/development/python-modules/textual-image/default.nix +++ b/pkgs/development/python-modules/textual-image/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "textual-image"; - version = "0.8.3"; + version = "0.8.4"; pyproject = true; src = fetchFromGitHub { owner = "lnqs"; repo = "textual-image"; tag = "v${version}"; - hash = "sha256-XbQs3E2Zl6Jdq0QVSdF6LexnmEmlZEm9BmWZK+dyBjo="; + hash = "sha256-tmQxCSlcUZy0oEk+EX7Bny75GZ3SOGSRXCNbyo1vLf8="; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index b5e4edd75edc..e2c537d977e4 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -5,6 +5,7 @@ buildPythonPackage, pythonAtLeast, fetchFromGitHub, + fetchpatch, symlinkJoin, autoAddDriverRunpath, @@ -145,6 +146,20 @@ let hash = "sha256-c7L7WZVVEnXMOTPBoSp7jhkl9d4TA4sj11QvOSWTDIE="; }; + patches = [ + # fix Hopper build failure + # https://github.com/Dao-AILab/flash-attention/pull/1719 + # https://github.com/Dao-AILab/flash-attention/pull/1723 + (fetchpatch { + url = "https://github.com/Dao-AILab/flash-attention/commit/dad67c88d4b6122c69d0bed1cebded0cded71cea.patch"; + hash = "sha256-JSgXWItOp5KRpFbTQj/cZk+Tqez+4mEz5kmH5EUeQN4="; + }) + (fetchpatch { + url = "https://github.com/Dao-AILab/flash-attention/commit/e26dd28e487117ee3e6bc4908682f41f31e6f83a.patch"; + hash = "sha256-NkCEowXSi+tiWu74Qt+VPKKavx0H9JeteovSJKToK9A="; + }) + ]; + dontConfigure = true; # vllm-flash-attn normally relies on `git submodule update` to fetch cutlass and composable_kernel diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix index 7cd4b77d1824..0e06cff8efb0 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "mushroom"; - version = "4.5.0"; + version = "5.0.4"; src = fetchFromGitHub { owner = "piitaya"; repo = "lovelace-mushroom"; rev = "v${version}"; - hash = "sha256-D2timeWumiB21i0v1ji2J3dbi2b5ViFw2n1+rV1ommo="; + hash = "sha256-joN/uUO7TSYu1iUJnk7N0cyZfbwgqvAJtX+zgr1L5HU="; }; - npmDepsHash = "sha256-Xu0BxCB8WCx8qioaaN1iNkrJRF1tN2SEGw1N5Msg2Uo="; + npmDepsHash = "sha256-gFlxmDod9jblTAm2EzmUBTeRo8zQDtPwU+t+k5AdQXA="; installPhase = '' runHook preInstall diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 4d1ce16921c4..063de5ff1f08 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,36 +1,36 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.193.0"; + version = "3.194.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.193.0-linux-x64.tar.gz"; - sha256 = "1ssm227zph1ysi2dz1biash90xxdbs5advdb5x8j4qw1523rl40m"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.194.0-linux-x64.tar.gz"; + sha256 = "1v5mfjwxv6ajqcbvkxrim5nnijwx0jrjd7lz6ayh20plnal9imlm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.42.0-linux-amd64.tar.gz"; sha256 = "1ppijk93zazfhdfwxdg47xwfvc4s70mir8dpcll5a08xrjccjv9f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v9.0.1-linux-amd64.tar.gz"; - sha256 = "1jql72iwqhxyk5z03fjals4581nf839nq9pjxzcjbvkq0fq3wa0i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v9.1.0-linux-amd64.tar.gz"; + sha256 = "1065l1ahklhl9b8f4lkaa6lv748lqqhpv8w3crgnznddnrz0g1sn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.84.0-linux-amd64.tar.gz"; - sha256 = "0nr8lq20483v13m72ywmsvghkbw4icqf68cbpn5zrw0midi5lscy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.85.0-linux-amd64.tar.gz"; + sha256 = "1bdmay56vhl6y0b6hdxlyy5j07z1ccl6n8mb39pywsxa242z3m1q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.0-linux-amd64.tar.gz"; sha256 = "07zkrskavhxaghnhdcmprhcpblvz5zvwsypr11vnq0vjjv1vy406"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.26.0-linux-amd64.tar.gz"; - sha256 = "0b3pw0v6gzqbp4p4khld9ia9vk0x7mv8m11llb1bvksaj21nl474"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.27.0-linux-amd64.tar.gz"; + sha256 = "0f803nf55gbhmiink6l8jnd7l04rj56czifs0yfv9j9hibp86hh8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.6.0-linux-amd64.tar.gz"; - sha256 = "0b2qwl5481hj077svp9mf0jqf5d18vq7nnhwl4mikag7ddf2b9vn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.7.0-linux-amd64.tar.gz"; + sha256 = "0f1vlzn3dagn78h2c07q573k1bshg47iz5x7bq1a44x1yjmkh3il"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-linux-amd64.tar.gz"; @@ -141,12 +141,12 @@ sha256 = "1vh28r2gk85a82c7jsa95n21my19hzavkyc9pjdpw517r63gvyjw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.2.1-linux-amd64.tar.gz"; - sha256 = "14wz8fjkv52z0p2bdh4c6ay6sh8ja0jvzyw3yi4j106b2wq2bvxc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.0-linux-amd64.tar.gz"; + sha256 = "0vdrh5ss7vlmyv0a0mvrj2w9mrsazqrl7hcvwn5riym4ba0daq03"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.11.4-linux-amd64.tar.gz"; - sha256 = "0qznn0lncblhmzclrznblv569s1gkxh1zmh98zxyg5g4h2zz1zci"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.0-linux-amd64.tar.gz"; + sha256 = "04akqqyla391haixb4iasxd3a62y2hlpzv19vdd51w3xw76g687l"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.0-linux-amd64.tar.gz"; @@ -163,32 +163,32 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.193.0-darwin-x64.tar.gz"; - sha256 = "1waq90b9m63fgj17s0xpxafdxrpp9qyjxpcdhwjqlfpnnbq4kpf5"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.194.0-darwin-x64.tar.gz"; + sha256 = "0afdq6v88hzr23lpfggb84hbgcfsqg38c4kyx0n8wpk1sjnxq6bk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.42.0-darwin-amd64.tar.gz"; sha256 = "114g6kzkqyi4ghh9s2bs2fb4x688f7a821yrnw85fhcb4q590ia2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v9.0.1-darwin-amd64.tar.gz"; - sha256 = "1fi6y9y151b0c3389p2f7a3m28ay9ka0r57ynpnb8jawflgnx6bc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v9.1.0-darwin-amd64.tar.gz"; + sha256 = "0kaa0wzf03j0s1wq3xw50yknai0qbkw2x2xjrxmw26x7y243f143"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.84.0-darwin-amd64.tar.gz"; - sha256 = "1zchdhnsc6f1q5q8nd1712k0rcs67qziliwbiw4inraw2l11njsh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.85.0-darwin-amd64.tar.gz"; + sha256 = "1hf7cbagw75cssml8jimnwsrafxfhgzs01l6jcjmhqzbjzv78avl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.0-darwin-amd64.tar.gz"; sha256 = "0a0yv352abz9av6rkjpwz5k3q7jikhhvbkf8jd7pa387hfzqchrh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.26.0-darwin-amd64.tar.gz"; - sha256 = "12zh6cincr7k0pw9fa3r3yfxnwjmsmd6kp31ds585xyz1l9gicn4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.27.0-darwin-amd64.tar.gz"; + sha256 = "1slg7cbw2ab9pqiniycbsd78jskhvqgahc06hy58h8sjgrsxvc5n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.6.0-darwin-amd64.tar.gz"; - sha256 = "0b2kl4818wh3wlw4nzl875x8m91f5vfg706pba5pdw3b59891n66"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.7.0-darwin-amd64.tar.gz"; + sha256 = "1a2pqy80034xm7syg6hfswrgj1bbvh643bllc5gfc7270p7vx05i"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-darwin-amd64.tar.gz"; @@ -299,12 +299,12 @@ sha256 = "1ji9zz1r7rj57w7spf6mwa9fxl1jgiy0qmxvlia21hpj60b536f5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.2.1-darwin-amd64.tar.gz"; - sha256 = "050zdywwjxvkw2qlmxgxmj9cca3xsdrbqs7yfa7a2c182gnim17w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.0-darwin-amd64.tar.gz"; + sha256 = "097kjmmyqdwaa9ghn228d52sjj2ypr3kqbgkfxvjmq494b5mf74s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.11.4-darwin-amd64.tar.gz"; - sha256 = "0sg6j8z1cyzhji2fm61q6mjl5yyfcsfhyi413jyp3d5wkx3spaf2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.0-darwin-amd64.tar.gz"; + sha256 = "0qpqhx7m5m8r3p3clddg0xkp1gm43pd3c7xcq1g3n02cbi44cimx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.0-darwin-amd64.tar.gz"; @@ -321,32 +321,32 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.193.0-linux-arm64.tar.gz"; - sha256 = "1zs5radachwb3lfqa183r12ak249kj7khrrdcw3l8b33d2yj1dvi"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.194.0-linux-arm64.tar.gz"; + sha256 = "0haghclmldw2dh6wqzjyni9f73inqd3ygfrh15y1bybiig5vcm73"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.42.0-linux-arm64.tar.gz"; sha256 = "04ld832v18f3qsjd1zy11j4ai2gjdb5qmc1w70x1lk5zqi6mmndc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v9.0.1-linux-arm64.tar.gz"; - sha256 = "0dhcqkkmfvryy6smj972jr7z6qaq9kaw8qvlv68b9wgix126dp6s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v9.1.0-linux-arm64.tar.gz"; + sha256 = "0lsyrcyfl29313pas8gch8lqmmh9irqcyaailzf531i0r75yi6xc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.84.0-linux-arm64.tar.gz"; - sha256 = "0ar11glj329wj64fqwbjwivk3xq893aa1hmnjq3700v8xg3caqdc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.85.0-linux-arm64.tar.gz"; + sha256 = "16fr46kvi83qcy56lnp626mjifjsq00djz827hvgrbb08b3ha77l"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.0-linux-arm64.tar.gz"; sha256 = "1qbd2hjbv202afcsm3kfjr50h3a2bnzips29l7a863k8vcd6bhmm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.26.0-linux-arm64.tar.gz"; - sha256 = "10s6m8arvasspmnwdlffir3x88c4yyvr10jj08aix6ap878sxrlf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.27.0-linux-arm64.tar.gz"; + sha256 = "1yix633zcpr0wnnq1ipc9yx4h2kdp8p5ygk06nsxif4vg055l11y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.6.0-linux-arm64.tar.gz"; - sha256 = "0g6kmy5raalxm2wlai71sh70w6vvfgphh2x79fqwn4llmqmrbdvh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.7.0-linux-arm64.tar.gz"; + sha256 = "1a21bl4h9xwdlajhmks8wqd8v7fbnc0i66vx515p6l6mx1shrshv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-linux-arm64.tar.gz"; @@ -457,12 +457,12 @@ sha256 = "1zbm7ql3rqypqmckbmlzbiy4akmqjkbzfkl7788q6sm7xh6bm8q1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.2.1-linux-arm64.tar.gz"; - sha256 = "0nc4yn7y2wlkarn2n7s4nl9fkhqjprl1cswnrybbhdi6h3hf1zjn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.0-linux-arm64.tar.gz"; + sha256 = "1csiv24nmg1c8vb0ay36lsw7dpfim5hr9b3rhdawpsyjdi5s4hsd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.11.4-linux-arm64.tar.gz"; - sha256 = "1p95vhwl44iq6yd9ycccwa2sbhcx6x5pxwk21wbzy5lsg8nhsa2h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.0-linux-arm64.tar.gz"; + sha256 = "1zgfw9bc6dlr299lyyrgssawhmf1w344r2xdi46vah865ysdqs72"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.0-linux-arm64.tar.gz"; @@ -479,32 +479,32 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.193.0-darwin-arm64.tar.gz"; - sha256 = "0gf8in5gcnzwkarnia71da27ypmacgfj0fphdb6hjy7mfd4z8w36"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.194.0-darwin-arm64.tar.gz"; + sha256 = "0f7gcy9qfd918ijb4v9gkc98w52w02g02vafi18dw0yb6ajqq21n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.42.0-darwin-arm64.tar.gz"; sha256 = "1afm9ng48h5zf07jas6bgyq0jsn0r9gs3bm7dmwrf41vfin75kw0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v9.0.1-darwin-arm64.tar.gz"; - sha256 = "184s2cmnn8nn17bvkgbsxfhllc4bi86m1awa77n2rc7gcszj203h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v9.1.0-darwin-arm64.tar.gz"; + sha256 = "1jg74cslbxh741r19z8p4p9sgyn0qlf9vqd8gfdjv5cxa7phl2bm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.84.0-darwin-arm64.tar.gz"; - sha256 = "1xda796x88qgki6crqzqy60h2ddxs9n6axr7b8dbhrf2mssrk5lr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.85.0-darwin-arm64.tar.gz"; + sha256 = "08pwk72k8iyf8vjkz8vs03fbwmy45y3073hvlfhmmjz1j41rs8xa"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.0-darwin-arm64.tar.gz"; sha256 = "063y0bhim02sydknk5ijsb0574f80rv3hsqv2h63iz6pj1si5sfd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.26.0-darwin-arm64.tar.gz"; - sha256 = "10g7mir6cgdpwvai6qdccl72wqi2zqpkn401vhli41z2dcv0gpnb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.27.0-darwin-arm64.tar.gz"; + sha256 = "0irjxgh90dgjfp392whyzkj7l2q7dhbsbg6sz386pdjm67q28x4y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.6.0-darwin-arm64.tar.gz"; - sha256 = "1i1xzsvpy60igksj9x25nn8b473hbhzg6whhjdk45ic8z8n5n5pq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.7.0-darwin-arm64.tar.gz"; + sha256 = "03fms51zwzwgd8bzn56y7kagnznvx9ghsxp5k4l76lafb8sz148i"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-darwin-arm64.tar.gz"; @@ -615,12 +615,12 @@ sha256 = "1qih4kprfaa82p7mg4zg8amy8vp4c76vqkmwf3df2x8bn69jdrc0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.2.1-darwin-arm64.tar.gz"; - sha256 = "0zl97iwv90qp1rwnpfb95abjc8g5zl3gkxy0r3gm5ni60073046p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.0-darwin-arm64.tar.gz"; + sha256 = "1p3nb3aazr47kiprq7k3js6x8jk87dsql6d4qkn6c60mbrm9mlal"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.11.4-darwin-arm64.tar.gz"; - sha256 = "0zb2v0mjqzvgasb8xi8svi7770hp8fabga7whd4vybdcildwp83s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.0-darwin-arm64.tar.gz"; + sha256 = "1jxp2935998ddg68aiq2vzn5dv9pza66wg63ni7f2p1kq8ls8jji"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.0-darwin-arm64.tar.gz"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e3f64a8458c0..c0a8bebea550 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1156,6 +1156,7 @@ mapAliases { hawknl = throw "'hawknl' has been removed as it was unmaintained and the upstream unavailable"; # Added 2025-05-07 HentaiAtHome = hentai-at-home; # Added 2024-06-12 hiawatha = throw "hiawatha has been removed, since it is no longer actively supported upstream, nor well maintained in nixpkgs"; # Added 2025-09-10 + hibernate = throw "hibernate has been removed due to lack of maintenance"; # Added 2025-09-10 hiddify-app = throw "hiddify-app has been removed, since it is unmaintained"; # added 2025-08-20 hll2390dw-cups = throw "The hll2390dw-cups package was dropped since it was unmaintained."; # Added 2024-06-21 hoarder = throw "'hoarder' has been renamed to 'karakeep'"; # Added 2025-04-21 @@ -1355,6 +1356,7 @@ mapAliases { libsoup = lib.warnOnInstantiate "‘libsoup’ has been renamed to ‘libsoup_2_4’" libsoup_2_4; # Added 2024-12-02 libstdcxx5 = throw "libstdcxx5 is severly outdated and has been removed"; # Added 2024-11-24 libtensorflow-bin = libtensorflow; # Added 2022-09-25 + libtorrent = throw "'libtorrent' has been renamed to 'libtorrent-rakshasa' for clearer distinction from 'libtorrent-rasterbar'"; # Added 2025-09-10 libtorrentRasterbar = throw "'libtorrentRasterbar' has been renamed to/replaced by 'libtorrent-rasterbar'"; # Converted to throw 2024-10-17 libtorrentRasterbar-1_2_x = throw "'libtorrentRasterbar-1_2_x' has been renamed to/replaced by 'libtorrent-rasterbar-1_2_x'"; # Converted to throw 2024-10-17 libtorrentRasterbar-2_0_x = throw "'libtorrentRasterbar-2_0_x' has been renamed to/replaced by 'libtorrent-rasterbar-2_0_x'"; # Converted to throw 2024-10-17 @@ -1664,6 +1666,7 @@ mapAliases { ### N ### namazu = throw "namazu has been removed, as it was broken"; # Added 2025-08-25 + nanoblogger = throw "nanoblogger has been removed as upstream stopped developement in 2013"; # Added 2025-09-10 ncdu_2 = ncdu; # Added 2022-07-22 neocities-cli = neocities; # Added 2024-07-31 neocomp = throw "neocomp has been remove because it fails to build and was unmaintained upstream"; # Added 2025-04-28 @@ -1957,6 +1960,8 @@ mapAliases { plv8 = throw "'plv8' has been removed. Use 'postgresqlPackages.plv8' instead."; # Added 2025-07-19 postcss-cli = throw "postcss-cli has been removed because it was broken"; # added 2025-03-24 postgis = throw "'postgis' has been removed. Use 'postgresqlPackages.postgis' instead."; # Added 2025-07-19 + tegaki-zinnia-japanese = throw "'tegaki-zinnia-japanese' has been removed due to lack of maintenance"; # Added 2025-09-10 + tet = throw "'tet' has been removed for lack of maintenance"; # Added 2025-10-12 tex-match = throw "'tex-match' has been removed due to lack of maintenance upstream. Consider using 'hieroglyphic' instead"; # Added 2024-09-24 texinfo5 = throw "'texinfo5' has been removed from nixpkgs"; # Added 2024-09-10 timescaledb = throw "'timescaledb' has been removed. Use 'postgresqlPackages.timescaledb' instead."; # Added 2025-07-19 @@ -2126,6 +2131,7 @@ mapAliases { rofi-wayland = throw "'rofi-wayland' has been merged into 'rofi'"; # Added 2025-09-06 rofi-wayland-unwrapped = throw "'rofi-wayland-unwrapped' has been merged into 'rofi-unwrapped'"; # Added 2025-09-06 root5 = throw "root5 has been removed from nixpkgs because it's a legacy version"; # Added 2025-07-17 + rote = throw "rote has been removed due to lack of upstream maintenance"; # Added 2025-09-10 rnix-hashes = throw "'rnix-hashes' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 rpiboot-unstable = throw "'rpiboot-unstable' has been renamed to/replaced by 'rpiboot'"; # Converted to throw 2024-10-17 rr-unstable = rr; # Added 2022-09-17