diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 347b35e84e6d..565dd0b5eb88 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4338,12 +4338,6 @@ githubId = 3471749; name = "Claudio Bley"; }; - cbourjau = { - email = "christianb@posteo.de"; - github = "cbourjau"; - githubId = 3288058; - name = "Christian Bourjau"; - }; cbrewster = { email = "cbrewster@hey.com"; github = "cbrewster"; diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix index dbc41aa53523..70d3e15e6e36 100644 --- a/nixos/modules/services/ttys/kmscon.nix +++ b/nixos/modules/services/ttys/kmscon.nix @@ -33,12 +33,12 @@ in kmscon is a kms/dri-based userspace virtual terminal implementation. It supports a richer feature set than the standard linux console VT, including full unicode support, and when the video card supports drm - should be much faster. + should be much faster ''; package = mkPackageOption pkgs "kmscon" { }; - hwRender = mkEnableOption "3D hardware acceleration to render the console."; + hwRender = mkEnableOption "3D hardware acceleration to render the console"; fonts = mkOption { description = "Fonts used by kmscon, in order of priority."; @@ -63,7 +63,9 @@ in nullOr (nonEmptyListOf fontType); }; - useXkbConfig = mkEnableOption "configure keymap from xserver keyboard settings."; + useXkbConfig = mkEnableOption "" // { + description = "Whether to configure keymap from xserver keyboard settings."; + }; extraConfig = mkOption { description = "Extra contents of the kmscon.conf file."; diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index cbe0175ac57a..6cd51efbf60a 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -1080,7 +1080,7 @@ in proxyWebsockets = true; }; - locations."/api/v1/streaming/" = { + locations."/api/v1/streaming" = { proxyPass = "http://mastodon-streaming"; proxyWebsockets = true; }; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index e47b2645959f..7dfe635d81a8 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -81,7 +81,6 @@ callPackage ./generic.nix rec { maintainers = with lib.maintainers; [ synthetica bobby285271 - ludovicopiero ]; mainProgram = "codium"; platforms = [ diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix index 52c880e10e9a..62d941899e5f 100644 --- a/pkgs/applications/emulators/libretro/cores/fbneo.nix +++ b/pkgs/applications/emulators/libretro/cores/fbneo.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fbneo"; - version = "0-unstable-2025-08-30"; + version = "0-unstable-2025-09-12"; src = fetchFromGitHub { owner = "libretro"; repo = "fbneo"; - rev = "4aa5e5b8ef4fc94143680fda8c598839bb336bdc"; - hash = "sha256-xO4v5BO9V/ECoM/Mr5weDlpPJCOzRnYMTlaSkO/UiYg="; + rev = "1f7783651749e42a0e580acb5f5a1b5f43cc1467"; + hash = "sha256-ltjBzAGfUrB5Rl+0ugI6HIFptiCwhfIDOCeUQpHJsR4="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/mame.nix b/pkgs/applications/emulators/libretro/cores/mame.nix index 471993cb12f2..643afe13598c 100644 --- a/pkgs/applications/emulators/libretro/cores/mame.nix +++ b/pkgs/applications/emulators/libretro/cores/mame.nix @@ -9,13 +9,13 @@ }: mkLibretroCore { core = "mame"; - version = "0-unstable-2025-08-18"; + version = "0-unstable-2025-09-04"; src = fetchFromGitHub { owner = "libretro"; repo = "mame"; - rev = "d9f594146b6c43b7b15ee2569d1175e62030f0cb"; - hash = "sha256-sQZUuAwCYy4YKaiPPt+0q8lblqb7U7kiGWk2kYK3Kmk="; + rev = "e42c983a90d3334bed659ecc12939ca935bef1c3"; + hash = "sha256-HfLxZ9OWX++hvT7ru8OOtYGFmfwVlLqne3n/vjdn7CY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/graphics/tesseract/wrapper.nix b/pkgs/applications/graphics/tesseract/wrapper.nix index 8ac5058ceebc..bcf38d2ab29c 100644 --- a/pkgs/applications/graphics/tesseract/wrapper.nix +++ b/pkgs/applications/graphics/tesseract/wrapper.nix @@ -58,34 +58,42 @@ let passthru = { inherit tesseractBase languages tessdata; }; # Only run test when all languages are available - test = lib.optionalAttrs (enableLanguages == null) { - tests.default = - runCommand "tesseract-test-ocr" - { - buildInputs = [ - tesseractWithData - imagemagick - ]; - } - '' - text="hello nix" + test = + runCommand "tesseract-test-ocr" + { + buildInputs = [ + tesseractWithData + imagemagick + ]; + } + '' + text="hello nix" - convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 \ - -fill black -annotate +5+20 "$text" /tmp/test-img.png 2>/dev/null - ocrResult=$(tesseract /tmp/test-img.png - | tr -d "\f") + convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 \ + -fill black -annotate +5+20 "$text" /tmp/test-img.png 2>/dev/null + ocrResult=$(tesseract /tmp/test-img.png - | tr -d "\f") - if [[ $ocrResult != $text ]]; then - echo "OCR test failed" - echo "expected: '$text'" - echo "actual: '$ocrResult'" - exit 1 - fi - touch $out - ''; - }; + if [[ $ocrResult != $text ]]; then + echo "OCR test failed" + echo "expected: '$text'" + echo "actual: '$ocrResult'" + exit 1 + fi + touch $out + ''; tesseract = - (if enableLanguages == [ ] then tesseractBase else tesseractWithData) // passthru // test; + (if enableLanguages == [ ] then tesseractBase else tesseractWithData).overrideAttrs + (old: { + passthru = + (old.passthru or { }) + // passthru + // lib.optionalAttrs (enableLanguages == null) { + tests = (old.passthru.tests or { }) // { + default = test; + }; + }; + }); in if enableLanguagesHash == null then tesseract diff --git a/pkgs/by-name/ba/bash-preexec/package.nix b/pkgs/by-name/ba/bash-preexec/package.nix index 3eb7a82f4dfb..6ca0b8f337bc 100644 --- a/pkgs/by-name/ba/bash-preexec/package.nix +++ b/pkgs/by-name/ba/bash-preexec/package.nix @@ -15,8 +15,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "rcaloras"; repo = "bash-preexec"; - rev = version; - sha256 = "sha256-4DzbeIiUX7iXy2CeSvRC2X+XnjVk+/UiMbM/dLHx7zU="; + tag = version; + hash = "sha256-4DzbeIiUX7iXy2CeSvRC2X+XnjVk+/UiMbM/dLHx7zU="; }; nativeCheckInputs = [ bats ]; @@ -26,30 +26,39 @@ stdenvNoCC.mkDerivation { dontBuild = true; patchPhase = '' + runHook prePatch + # Needed since the tests expect that HISTCONTROL is set. sed -i '/setup()/a HISTCONTROL=""' test/bash-preexec.bats # Skip tests failing with Bats 1.5.0. # See https://github.com/rcaloras/bash-preexec/issues/121 sed -i '/^@test.*IFS/,/^}/d' test/bash-preexec.bats + + runHook postPatch ''; checkPhase = '' + runHook preCheck bats test + runHook postCheck ''; installPhase = '' - install -Dm755 $src/bash-preexec.sh $out/share/bash/bash-preexec.sh + runHook preInstall + install -Dm755 bash-preexec.sh $out/share/bash/bash-preexec.sh + runHook postInstall ''; - meta = with lib; { + meta = { description = "Preexec and precmd functions for Bash just like Zsh"; - license = licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/rcaloras/bash-preexec"; - maintainers = [ - maintainers.hawkw - maintainers.rycee + changelog = "https://github.com/rcaloras/bash-preexec/releases/tag/${version}"; + maintainers = with lib.maintainers; [ + hawkw + rycee ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/ca/cariddi/package.nix b/pkgs/by-name/ca/cariddi/package.nix index 5a81dff095e2..3600a6b075f4 100644 --- a/pkgs/by-name/ca/cariddi/package.nix +++ b/pkgs/by-name/ca/cariddi/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cariddi"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "edoardottt"; repo = "cariddi"; tag = "v${version}"; - hash = "sha256-T9d1j2XH3D1JDb02jM3dXEs9FTXLpl8VXXNCJfFi5Kk="; + hash = "sha256-FIsbkDqXi/a0hfO8AqqCJgreHidDd3rtSNeu9qDXPZk="; }; - vendorHash = "sha256-RMqyD4OlymjlUFoTsLNd+wo1hhYaEsyqpKj1JHuW5FM="; + vendorHash = "sha256-XEk3U4E0WeDvn6JVBILRj5KD/DFJcz03qglMrPU+ksY="; ldflags = [ "-w" diff --git a/pkgs/by-name/de/deck/package.nix b/pkgs/by-name/de/deck/package.nix index 48b7c92f5a30..bfcb23b67c28 100644 --- a/pkgs/by-name/de/deck/package.nix +++ b/pkgs/by-name/de/deck/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "deck"; - version = "1.47.0"; + version = "1.51.0"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; tag = "v${version}"; - hash = "sha256-k/cAybKJq/s5PcEMjT92dZlue9XpEeeHwICHk8ex3G8="; + hash = "sha256-N9vF51GdaWjILLHUSNPh7E490lorgO0xN6Np5AEkz4Y="; }; nativeBuildInputs = [ installShellFiles ]; @@ -27,7 +27,7 @@ buildGoModule rec { ]; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-nKKCz7T6HLCBwQjPV/kpzgtR8yNiZS/Ta0H1DlKaLk8="; + vendorHash = "sha256-G2mRj1IQi8hxVfqpc5JeSyAb3ADlcmCNNZPJGwefx1k="; postInstall = '' installShellCompletion --cmd deck \ diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix index 412d32c9e8d0..06d921eedb2e 100644 --- a/pkgs/by-name/fi/firebase-tools/package.nix +++ b/pkgs/by-name/fi/firebase-tools/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "14.15.1"; + version = "14.16.0"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; tag = "v${version}"; - hash = "sha256-+wYvxsBnZBvCh98E6Th+uEnxnKnZTKv807mqST8wbJo="; + hash = "sha256-6gChudAEAlZOy++wys+xHS8VmmsLfiGKtHszMWFjLRE="; }; - npmDepsHash = "sha256-EhUJj1kSMslCXhgzCEiVn+4DSmRfvj/nh3OmaZCh/bk="; + npmDepsHash = "sha256-r+yMoSgJRwkT1liaH0bAzSx3xLnGjF68OkTNf72pSHg="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/pkgs/by-name/fi/firezone-headless-client/package.nix b/pkgs/by-name/fi/firezone-headless-client/package.nix index edec556fd575..04005009e9c8 100644 --- a/pkgs/by-name/fi/firezone-headless-client/package.nix +++ b/pkgs/by-name/fi/firezone-headless-client/package.nix @@ -6,15 +6,15 @@ }: rustPlatform.buildRustPackage rec { pname = "firezone-headless-client"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "firezone"; repo = "firezone"; tag = "headless-client-${version}"; - hash = "sha256-qApafuIakVlwBiKN0YaYm4KwZAmSqrtXftPEg+VwsJE="; + hash = "sha256-Tu0Bq/Axj05dCRCd1eB7CiOXQ5n4i8hnE3ZiGCQ5ZdY="; }; - cargoHash = "sha256-Fp3c3ot2ET3gWrqKs+TI4XXjIDFxcEFBBl7irZrsgmE="; + cargoHash = "sha256-wlf+TtrRG7hHNav7WqLn2DSX9QkKFVzyiKP5CRdXlNY="; sourceRoot = "${src.name}/rust"; buildAndTestSubdir = "headless-client"; RUSTFLAGS = "--cfg system_certs"; diff --git a/pkgs/by-name/fx/fx/package.nix b/pkgs/by-name/fx/fx/package.nix index e20c8feb646d..1cbe08409dd0 100644 --- a/pkgs/by-name/fx/fx/package.nix +++ b/pkgs/by-name/fx/fx/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "fx"; - version = "39.0.4"; + version = "39.1.0"; src = fetchFromGitHub { owner = "antonmedv"; repo = "fx"; tag = finalAttrs.version; - hash = "sha256-0zBEyEKy465PZDiZgH+NpermO/7f1GD0hB0wJFbiNz4="; + hash = "sha256-k8BrH3tRc6RM6PG93MRLR/uJGyo953vYH2v4eBBhPrI="; }; - vendorHash = "sha256-7x0nbgMzEJznDH6Wf5iaTYXLh/2IGUSeSVvb0UKKTOQ="; + vendorHash = "sha256-C4TqFRECIFzc6TyAJ2yj97t2BVHXBovIV3iIjNhm7ek="; ldflags = [ "-s" ]; diff --git a/pkgs/by-name/gh/gh-f/package.nix b/pkgs/by-name/gh/gh-f/package.nix index ddc78892b432..b169a7f26bbc 100644 --- a/pkgs/by-name/gh/gh-f/package.nix +++ b/pkgs/by-name/gh/gh-f/package.nix @@ -15,13 +15,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "gh-f"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "gh-f"; tag = "v${finalAttrs.version}"; - hash = "sha256-rMGyiXniW3M4JnsWufXcsU8mL8KlrIRGGgbQT6utnuc="; + hash = "sha256-quljviONCNnXC7QxTWE64PNt8IYr2GnaYq0cM/Pcl68="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/id/ideamaker/package.nix b/pkgs/by-name/id/ideamaker/package.nix index 778de36bbc44..1711200a3c8a 100644 --- a/pkgs/by-name/id/ideamaker/package.nix +++ b/pkgs/by-name/id/ideamaker/package.nix @@ -1,144 +1,71 @@ { - stdenv, autoPatchelfHook, - cacert, common-updater-scripts, + copyDesktopItems, curl, dpkg, + e2fsprogs, fetchurl, - fetchzip, + gnutls, + gtk3, + jq, lib, - libcork, libGLU, + libpsl, libsForQt5, + libredirect, + libX11, + lz4, makeDesktopItem, - openssl, + makeWrapper, + nghttp2, shared-mime-info, + stdenv, writeShellApplication, + xkeyboardconfig, }: -stdenv.mkDerivation (finalAttrs: { +let pname = "ideamaker"; - version = "4.3.3.6560"; - src = - let - semver = lib.strings.concatStringsSep "." ( - lib.lists.init (builtins.splitVersion finalAttrs.version) - ); - in - fetchurl { - url = "https://download.raise3d.com/ideamaker/release/${semver}/ideaMaker_${finalAttrs.version}-ubuntu_amd64.deb"; - hash = "sha256-aTVWCTgnVKD16uhJUVz0vR7KPGJqCVj0xoL53Qi3IKM="; - }; + version = "5.2.2.8570"; + semver = lib.strings.concatStringsSep "." (lib.lists.init (builtins.splitVersion version)); + description = "Raise3D's 3D slicer software"; +in +stdenv.mkDerivation { + inherit pname version; + src = fetchurl { + url = "https://downcdn.raise3d.com/ideamaker/release/${semver}/ideaMaker_${version}-ubuntu_amd64.deb"; + hash = "sha256-kXcgVuuPTMWoOCrEztiedJrZrTbFx1xHyzzh4y2b0UA="; + }; nativeBuildInputs = [ autoPatchelfHook + copyDesktopItems dpkg + makeWrapper shared-mime-info - libsForQt5.wrapQtAppsHook ]; - buildInputs = - let - # we need curl 7.47.0, as the app segfaults on launch in 7.47.1 and beyond - # (tested with 7.47.1, 7.50.3, 7.62, 7.79.1, and 8.7.1) - curl_7_47_0 = - let - openssl_1_0_1u = openssl.overrideAttrs (previous: { - version = "1.0.1u"; - src = fetchurl { - url = "https://www.openssl.org/source/openssl-1.0.1u.tar.gz"; - hash = "sha256-QxK0yhIVtvLJcAdQPYDbgNUVf3b499P+u+a0xW/yZzk="; - }; - patches = [ ]; - withDocs = false; - outputs = lib.lists.remove "doc" previous.outputs; - meta.knownVulnerabilities = [ - "OpenSSL 1.0.1 reached its end of life 2016-12-31, see https://endoflife.software/applications/security-libraries/openssl." - "CVE-2021-4044" - "CVE-2016-7056" - ]; - }); - in - (curl.override { - gnutlsSupport = true; - gssSupport = false; - http2Support = false; - # while we use openssl, the configureFlag has since changed, so we manually set it below - opensslSupport = false; - pslSupport = false; - scpSupport = false; - }).overrideAttrs - (previous: { - version = "7.47.0"; - src = fetchzip { - url = "https://curl.se/download/curl-7.47.0.tar.lzma"; - hash = "sha256-XlZk1nJbSmiQp7jMSE2QRCY4C9w2us8BgosBSzlD4dE="; - }; - configureFlags = previous.configureFlags ++ [ - "--with-ca-bundle=${cacert}/etc/ssl/certs/ca-bundle.crt" - "--with-ssl=${lib.getLib openssl_1_0_1u}" - ]; - patches = [ ]; - # curl https://curl.se/docs/vuln-7.74.0.json | jq -r '.[].id' | sed 's/^/"/;s/$/"/' - meta.knownVulnerabilities = [ - "CURL-CVE-2024-2398" - "CURL-CVE-2023-46218" - "CURL-CVE-2023-38546" - "CURL-CVE-2023-38545" - "CURL-CVE-2023-28322" - "CURL-CVE-2023-28321" - "CURL-CVE-2023-28320" - "CURL-CVE-2023-27538" - "CURL-CVE-2023-27536" - "CURL-CVE-2023-27535" - "CURL-CVE-2023-27534" - "CURL-CVE-2023-27533" - "CURL-CVE-2023-23916" - "CURL-CVE-2022-43552" - "CURL-CVE-2022-32221" - "CURL-CVE-2022-35252" - "CURL-CVE-2022-32208" - "CURL-CVE-2022-32207" - "CURL-CVE-2022-32206" - "CURL-CVE-2022-32205" - "CURL-CVE-2022-27782" - "CURL-CVE-2022-27781" - "CURL-CVE-2022-27776" - "CURL-CVE-2022-27775" - "CURL-CVE-2022-27774" - "CURL-CVE-2022-22576" - "CURL-CVE-2021-22947" - "CURL-CVE-2021-22946" - "CURL-CVE-2021-22945" - "CURL-CVE-2021-22926" - "CURL-CVE-2021-22925" - "CURL-CVE-2021-22924" - "CURL-CVE-2021-22923" - "CURL-CVE-2021-22922" - "CURL-CVE-2021-22898" - "CURL-CVE-2021-22897" - "CURL-CVE-2021-22890" - "CURL-CVE-2021-22876" - ]; - }); - in - [ - (lib.getLib curl_7_47_0) - libcork - libGLU - libsForQt5.qtbase - libsForQt5.qtserialport - libsForQt5.quazip - ]; + dontWrapQtApps = true; + + buildInputs = [ + libGLU + lz4 + e2fsprogs + gnutls + gtk3 + nghttp2 + libpsl + libsForQt5.qtbase + libsForQt5.qt5.qtwayland + ]; installPhase = '' runHook preInstall - install -D usr/lib/x86_64-linux-gnu/ideamaker/ideamaker \ - $out/bin/ideamaker + mkdir -p $out/bin - patchelf --replace-needed libquazip.so.1 libquazip1-qt5.so \ - $out/bin/ideamaker + cp -r usr $out + cp -r usr/share $out/share mimetypeDir=$out/share/icons/hicolor/128x128/mimetypes mkdir -p ''$mimetypeDir @@ -151,70 +78,79 @@ stdenv.mkDerivation (finalAttrs: { install -D usr/share/ideamaker/icons/ideamaker-icon.png \ $out/share/pixmaps/ideamaker.png - ln -s ${finalAttrs.desktopItem}/share/applications $out/share/ + ln -sf $out/usr/lib/x86_64-linux-gnu/ideamaker/ideamaker $out/bin/ideamaker runHook postInstall ''; - desktopItem = makeDesktopItem { - name = "ideamaker"; - exec = "ideamaker"; - icon = "ideamaker"; - desktopName = "Ideamaker"; - comment = "ideaMaker - www.raise3d.com"; - categories = [ - "Qt" - "Utility" - "3DGraphics" - "Viewer" - "Engineering" - ]; - genericName = finalAttrs.meta.description; - mimeTypes = [ - "application/x-ideamaker" - "model/3mf" - "model/obj" - "model/stl" - "text/x.gcode" - ]; - noDisplay = false; - startupNotify = true; - terminal = false; - type = "Application"; - }; + preFixup = '' + wrapProgram $out/bin/ideamaker \ + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \ + --set QTCOMPOSE "${libX11.out}/share/X11/locale" \ + --set KDEDIRS "$HOME/.nix-profile:/nix/var/nix/profiles/default" \ + --set NIX_REDIRECTS /usr/share=$out/share/ + ''; + + postFixup = '' + patchelf \ + --add-needed libdbus-1.so.3 \ + "$out/usr/lib/x86_64-linux-gnu/ideamaker/libQt5DBus.so.5.15.2" + ''; + + desktopItems = [ + (makeDesktopItem { + name = "ideamaker"; + exec = "ideamaker"; + icon = "ideamaker"; + desktopName = "Ideamaker"; + comment = "ideaMaker - www.raise3d.com"; + categories = [ + "Qt" + "Utility" + "3DGraphics" + "Viewer" + "Engineering" + ]; + genericName = description; + mimeTypes = [ + "application/x-ideamaker" + "model/3mf" + "model/obj" + "model/stl" + "text/x.gcode" + ]; + noDisplay = false; + startupNotify = true; + terminal = false; + type = "Application"; + }) + ]; passthru.updateScript = lib.getExe (writeShellApplication { name = "ideamaker-update-script"; runtimeInputs = [ curl common-updater-scripts + jq ]; text = '' - set -eu -o pipefail - - release_page=$(mktemp) - curl -s https://www.raise3d.com/download/ideamaker-all-versions/ > "$release_page" - - latest_stable_version=$( - sed -nE '/Beta|Alpha/! s/.*Version ([0-9]+\.[0-9]+\.[0-9]+).*/\1/p' "$release_page" | \ - head -n 1 - ) - - latest_stable_build_number=$( - sed -nE "s/.*ideaMaker_$latest_stable_version\.([0-9]+).*/\1/p" "$release_page" | head -n 1 - ) - - update-source-version ideamaker "$latest_stable_version.$latest_stable_build_number" + update-source-version ideamaker "$( + curl 'https://api.raise3d.com/ideamakerio-v1.1/hq/ofpVersionControl/find' -X 'POST' \ + | jq -r '.data.release_version.linux_64_deb_url' \ + | sed -E 's#.*/release/([0-9]+\.[0-9]+\.[0-9]+)/ideaMaker_\1\.([0-9]+).*#\1.\2#' + )" ''; }); meta = { - homepage = "https://www.raise3d.com/ideamaker/"; + inherit description; changelog = "https://www.raise3d.com/download/ideamaker-release-notes/"; - description = "Raise3D's 3D slicer software"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + homepage = "https://www.raise3d.com/ideamaker/"; license = lib.licenses.unfree; - platforms = [ "x86_64-linux" ]; + mainProgram = "ideamaker"; maintainers = with lib.maintainers; [ cjshearer ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; -}) +} diff --git a/pkgs/by-name/ir/iredis/package.nix b/pkgs/by-name/ir/iredis/package.nix index 9a8845d9eded..cc056602a991 100644 --- a/pkgs/by-name/ir/iredis/package.nix +++ b/pkgs/by-name/ir/iredis/package.nix @@ -7,20 +7,21 @@ python3.pkgs.buildPythonApplication rec { pname = "iredis"; - version = "1.15.1"; + version = "1.15.2"; pyproject = true; src = fetchFromGitHub { owner = "laixintao"; repo = "iredis"; tag = "v${version}"; - hash = "sha256-ZA4q2Z3X9zhzW/TH8aRliVij8UxqDVUamhKcfVxWb/c="; + hash = "sha256-g/gQb9QOyfa7kyHCUZf/kLZRO5IE8389BUCYz8Sqr8o="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace-fail 'packaging = "^23.0"' 'packaging = "*"' \ - --replace-fail 'wcwidth = "0.1.9"' 'wcwidth = "*"' + --replace-fail 'wcwidth = "0.1.9"' 'wcwidth = "*"' \ + --replace-fail 'redis = "^5.0.0"' 'redis = "*"' ''; nativeBuildInputs = with python3.pkgs; [ @@ -64,12 +65,12 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "iredis" ]; - meta = with lib; { + meta = { description = "Terminal Client for Redis with AutoCompletion and Syntax Highlighting"; changelog = "https://github.com/laixintao/iredis/blob/${src.tag}/CHANGELOG.md"; homepage = "https://iredis.xbin.io/"; - license = licenses.bsd3; - maintainers = [ ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ phanirithvij ]; mainProgram = "iredis"; }; } diff --git a/pkgs/by-name/li/lighttpd/package.nix b/pkgs/by-name/li/lighttpd/package.nix index 51ecd3f05174..4e648abbc999 100644 --- a/pkgs/by-name/li/lighttpd/package.nix +++ b/pkgs/by-name/li/lighttpd/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { pname = "lighttpd"; - version = "1.4.81"; + version = "1.4.82"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz"; - sha256 = "sha256-19QsP9L9lLY8kVqn0Y9No8rFk33boz6Qn4HPUIQqWEA="; + sha256 = "sha256-q/50OR+cvWarFU6gfmTxlNvn6QbvTtR+s7DztGJGyWI="; }; separateDebugInfo = true; diff --git a/pkgs/by-name/ma/matrix-conduit/package.nix b/pkgs/by-name/ma/matrix-conduit/package.nix index 15d9958ff143..4bbd6dd8e167 100644 --- a/pkgs/by-name/ma/matrix-conduit/package.nix +++ b/pkgs/by-name/ma/matrix-conduit/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-conduit"; - version = "0.10.8"; + version = "0.10.9"; src = fetchFromGitLab { owner = "famedly"; repo = "conduit"; tag = "v${finalAttrs.version}"; - hash = "sha256-wSh1RPJt0gXp1U4aCBUASSVmvmroTPyhxpH1Exik4ds="; + hash = "sha256-rJyuR8Ie/JiNKNjQL21+Q1PWliEAm+lwGraGeDxEHyY="; }; - cargoHash = "sha256-3wQGKeLfBeASj82xqAXRhcuESX3CEgkf9P4K/AvquvQ="; + cargoHash = "sha256-4ZA+3f8Kt+1JAm9KXnMRxAF+X9z8HSJoJe6Ny63SlnA="; # Conduit enables rusqlite's bundled feature by default, but we'd rather use our copy of SQLite. preBuild = '' diff --git a/pkgs/by-name/mc/mcap-cli/package.nix b/pkgs/by-name/mc/mcap-cli/package.nix index 36cddb9a1c96..ce2bf85ac5b2 100644 --- a/pkgs/by-name/mc/mcap-cli/package.nix +++ b/pkgs/by-name/mc/mcap-cli/package.nix @@ -8,7 +8,7 @@ nix-update-script, }: let - version = "0.0.54"; + version = "0.0.55"; in buildGoModule { @@ -20,7 +20,7 @@ buildGoModule { repo = "mcap"; owner = "foxglove"; rev = "releases/mcap-cli/v${version}"; - hash = "sha256-b1Ngj8k2ZkI47lTwbLWTojtoMWQ54eJ8QN5Qd5ot9n4="; + hash = "sha256-3HV7FNlS91J089FgtKOQEXCzQEoDR39w0kBB8H88rSw="; }; vendorHash = "sha256-twuXJXiGhjTqlEZ3xD8G9CruSLxFC33PMs2GZadl1Ow="; diff --git a/pkgs/by-name/mi/mill/package.nix b/pkgs/by-name/mi/mill/package.nix index 4968f0cffd84..d6e4bb1fc27a 100644 --- a/pkgs/by-name/mi/mill/package.nix +++ b/pkgs/by-name/mi/mill/package.nix @@ -1,21 +1,32 @@ { - lib, - stdenv, + autoPatchelfHook, fetchurl, jre, + lib, makeWrapper, + sourcesJSON ? ./sources.json, + stdenvNoCC, + zlib, }: -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "mill"; - version = "0.12.14"; + version = "1.0.4"; - src = fetchurl { - url = "https://repo1.maven.org/maven2/com/lihaoyi/mill-dist/${finalAttrs.version}/mill-dist-${finalAttrs.version}.exe"; - hash = "sha256-2MyufFcgKH/bxVB83qXNESByAdgbzhyIHqAr36Bb9o0="; - }; + src = + let + source = (lib.importJSON sourcesJSON)."${stdenvNoCC.hostPlatform.system}"; + in + fetchurl { + url = "https://repo1.maven.org/maven2/com/lihaoyi/mill-dist-${source.artifact-suffix}/${finalAttrs.version}/mill-dist-${source.artifact-suffix}-${finalAttrs.version}.exe"; + inherit (source) hash; + }; - nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ zlib ]; + nativeBuildInputs = [ + makeWrapper + ] + ++ lib.optional stdenvNoCC.hostPlatform.isLinux autoPatchelfHook; dontUnpack = true; dontConfigure = true; @@ -26,19 +37,14 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -Dm555 "$src" "$out/bin/.mill-wrapped" - # can't use wrapProgram because it sets --argv0 - makeWrapper "$out/bin/.mill-wrapped" "$out/bin/mill" \ - --prefix PATH : "${jre}/bin" \ - --set JAVA_HOME "${jre}" - runHook postInstall - ''; - doInstallCheck = true; - # The default release is a script which will do an impure download - # just ensure that the application can run without network - installCheckPhase = '' - $out/bin/mill --help > /dev/null + install -Dm 555 $src $out/bin/.mill-wrapped + # can't use wrapProgram because it sets --argv0 + makeWrapper $out/bin/.mill-wrapped $out/bin/mill \ + --prefix PATH : "${jre}/bin" \ + --set-default JAVA_HOME "${jre}" + + runHook postInstall ''; meta = with lib; { @@ -57,6 +63,12 @@ stdenv.mkDerivation (finalAttrs: { scalavision zenithal ]; - platforms = lib.platforms.all; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; }) diff --git a/pkgs/by-name/mi/mill/sources.json b/pkgs/by-name/mi/mill/sources.json new file mode 100644 index 000000000000..d90987bf3973 --- /dev/null +++ b/pkgs/by-name/mi/mill/sources.json @@ -0,0 +1,18 @@ +{ + "aarch64-darwin": { + "artifact-suffix": "native-mac-aarch64", + "hash": "sha256-A9dShPyfkfTuRJ1/DkLwb/5NTRTxc7OY7Rd1h0Tzjos=" + }, + "x86_64-darwin": { + "artifact-suffix": "native-mac-amd64", + "hash": "sha256-zctTOVxFghF9z9PUQt3OO20Ul/qY8H/j6MPpFNpw+Ow=" + }, + "aarch64-linux": { + "artifact-suffix": "native-linux-aarch64", + "hash": "sha256-E+IMTkRP1a1TigpRyVHPu0assgHEbzbF8lv7Rsm2FOM=" + }, + "x86_64-linux": { + "artifact-suffix": "native-linux-amd64", + "hash": "sha256-rgAqlTCZc8nedUU2D+Klo3KY0z9sI0KJczdaugM3//8=" + } +} diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix index 5cc46c2ac552..1c029e710606 100644 --- a/pkgs/by-name/mo/monado/package.nix +++ b/pkgs/by-name/mo/monado/package.nix @@ -35,7 +35,6 @@ libXrandr, nix-update-script, onnxruntime, - opencv4, openhmd, openvr, orc, @@ -125,7 +124,8 @@ stdenv.mkDerivation (finalAttrs: { libXext libXrandr onnxruntime - opencv4 + # FIXME: OpenCV support causes a segfault on start. See https://github.com/NixOS/nixpkgs/issues/439075 + # opencv4 openhmd openvr orc diff --git a/pkgs/by-name/ne/neohtop/package.nix b/pkgs/by-name/ne/neohtop/package.nix index d135a5052316..67a99bc8052c 100644 --- a/pkgs/by-name/ne/neohtop/package.nix +++ b/pkgs/by-name/ne/neohtop/package.nix @@ -31,7 +31,11 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-t0REXcsy9XIIARiI7lkOc5lO/ZSL50KOUK+SMsXpjdM="; }; - cargoHash = "sha256-nFWF1ER3vk1G/MBw8to+lDJAv6HJNobhdPXV0hVERFE="; + cargoPatches = [ + # Remove when https://github.com/Abdenasser/neohtop/pull/187 is released + ./tauri-version.patch + ]; + cargoHash = "sha256-fl/slVYr5RExI9ab8YeX2Q8mF+cnR1R1rUg5i11ao4M="; cargoRoot = "src-tauri"; @@ -60,6 +64,6 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "NeoHtop"; license = lib.licenses.mit; platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ sandarukasa ]; }; }) diff --git a/pkgs/by-name/ne/neohtop/tauri-version.patch b/pkgs/by-name/ne/neohtop/tauri-version.patch new file mode 100644 index 000000000000..c2b3a41a53e0 --- /dev/null +++ b/pkgs/by-name/ne/neohtop/tauri-version.patch @@ -0,0 +1,250 @@ +diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock +index 7e91351..16af8fb 100644 +--- a/src-tauri/Cargo.lock ++++ b/src-tauri/Cargo.lock +@@ -379,6 +379,16 @@ version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + ++[[package]] ++name = "cookie" ++version = "0.18.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" ++dependencies = [ ++ "time", ++ "version_check", ++] ++ + [[package]] + name = "core-foundation" + version = "0.10.0" +@@ -762,15 +772,6 @@ dependencies = [ + "miniz_oxide", + ] + +-[[package]] +-name = "fluent-uri" +-version = "0.1.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d" +-dependencies = [ +- "bitflags 1.3.2", +-] +- + [[package]] + name = "fnv" + version = "1.0.7" +@@ -1507,41 +1508,18 @@ dependencies = [ + "wasm-bindgen", + ] + +-[[package]] +-name = "json-patch" +-version = "2.0.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc" +-dependencies = [ +- "jsonptr 0.4.7", +- "serde", +- "serde_json", +- "thiserror 1.0.65", +-] +- + [[package]] + name = "json-patch" + version = "3.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08" + dependencies = [ +- "jsonptr 0.6.3", ++ "jsonptr", + "serde", + "serde_json", + "thiserror 1.0.65", + ] + +-[[package]] +-name = "jsonptr" +-version = "0.4.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1c6e529149475ca0b2820835d3dce8fcc41c6b943ca608d32f35b449255e4627" +-dependencies = [ +- "fluent-uri", +- "serde", +- "serde_json", +-] +- + [[package]] + name = "jsonptr" + version = "0.6.3" +@@ -3146,9 +3124,9 @@ dependencies = [ + + [[package]] + name = "tao" +-version = "0.30.5" ++version = "0.30.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "63f1f6b2017cc33d7f6fc9c6186a2c0f5dfc985899a7b4fe9e64985c17533db3" ++checksum = "6682a07cf5bab0b8a2bd20d0a542917ab928b5edb75ebd4eda6b05cbaab872da" + dependencies = [ + "bitflags 2.6.0", + "cocoa", +@@ -3202,9 +3180,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + + [[package]] + name = "tauri" +-version = "2.0.6" ++version = "2.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d3889b392db6d32a105d3757230ea0220090b8f94c90d3e60b6c5eb91178ab1b" ++checksum = "e545de0a2dfe296fa67db208266cd397c5a55ae782da77973ef4c4fac90e9f2c" + dependencies = [ + "anyhow", + "bytes", +@@ -3239,7 +3217,7 @@ dependencies = [ + "tauri-runtime", + "tauri-runtime-wry", + "tauri-utils", +- "thiserror 1.0.65", ++ "thiserror 2.0.1", + "tokio", + "tray-icon", + "url", +@@ -3252,16 +3230,16 @@ dependencies = [ + + [[package]] + name = "tauri-build" +-version = "2.0.2" ++version = "2.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9f96827ccfb1aa40d55d0ded79562d18ba18566657a553f992a982d755148376" ++checksum = "7bd2a4bcfaf5fb9f4be72520eefcb61ae565038f8ccba2a497d8c28f463b8c01" + dependencies = [ + "anyhow", + "cargo_toml", + "dirs", + "glob", + "heck 0.5.0", +- "json-patch 3.0.1", ++ "json-patch", + "schemars", + "semver", + "serde", +@@ -3274,14 +3252,14 @@ dependencies = [ + + [[package]] + name = "tauri-codegen" +-version = "2.0.2" ++version = "2.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8947f16f47becd9e9cd39b74ee337fd1981574d78819be18e4384d85e5a0b82f" ++checksum = "bf79faeecf301d3e969b1fae977039edb77a4c1f25cc0a961be298b54bff97cf" + dependencies = [ + "base64 0.22.1", + "brotli", + "ico", +- "json-patch 2.0.0", ++ "json-patch", + "plist", + "png", + "proc-macro2", +@@ -3292,7 +3270,7 @@ dependencies = [ + "sha2", + "syn 2.0.87", + "tauri-utils", +- "thiserror 1.0.65", ++ "thiserror 2.0.1", + "time", + "url", + "uuid", +@@ -3301,9 +3279,9 @@ dependencies = [ + + [[package]] + name = "tauri-macros" +-version = "2.0.2" ++version = "2.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8bd1c8d4a66799d3438747c3a79705cd665a95d6f24cb5f315413ff7a981fe2a" ++checksum = "c52027c8c5afb83166dacddc092ee8fff50772f9646d461d8c33ee887e447a03" + dependencies = [ + "heck 0.5.0", + "proc-macro2", +@@ -3371,9 +3349,9 @@ dependencies = [ + + [[package]] + name = "tauri-runtime" +-version = "2.1.1" ++version = "2.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a1ef7363e7229ac8d04e8a5d405670dbd43dde8fc4bc3bc56105c35452d03784" ++checksum = "cce18d43f80d4aba3aa8a0c953bbe835f3d0f2370aca75e8dbb14bd4bab27958" + dependencies = [ + "dpi", + "gtk", +@@ -3383,16 +3361,16 @@ dependencies = [ + "serde", + "serde_json", + "tauri-utils", +- "thiserror 1.0.65", ++ "thiserror 2.0.1", + "url", + "windows", + ] + + [[package]] + name = "tauri-runtime-wry" +-version = "2.1.2" ++version = "2.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "62fa2068e8498ad007b54d5773d03d57c3ff6dd96f8c8ce58beff44d0d5e0d30" ++checksum = "9f442a38863e10129ffe2cec7bd09c2dcf8a098a3a27801a476a304d5bb991d2" + dependencies = [ + "gtk", + "http", +@@ -3428,7 +3406,7 @@ dependencies = [ + "html5ever", + "http", + "infer", +- "json-patch 3.0.1", ++ "json-patch", + "kuchikiki", + "log", + "memchr", +@@ -4429,12 +4407,13 @@ dependencies = [ + + [[package]] + name = "wry" +-version = "0.46.3" ++version = "0.47.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cd5cdf57c66813d97601181349c63b96994b3074fc3d7a31a8cce96e968e3bbd" ++checksum = "61ce51277d65170f6379d8cda935c80e3c2d1f0ff712a123c8bddb11b31a4b73" + dependencies = [ + "base64 0.22.1", + "block2", ++ "cookie", + "crossbeam-channel", + "dpi", + "dunce", +@@ -4459,6 +4438,7 @@ dependencies = [ + "soup3", + "tao-macros", + "thiserror 1.0.65", ++ "url", + "webkit2gtk", + "webkit2gtk-sys", + "webview2-com", +diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml +index 3af22fb..9bff78d 100644 +--- a/src-tauri/Cargo.toml ++++ b/src-tauri/Cargo.toml +@@ -11,7 +11,7 @@ tauri-build = { version = "2", features = [] } + [dependencies] + serde_json = "1.0" + serde = { version = "1.0", features = ["derive"] } +-tauri = { version = "2", features = ["macos-private-api"] } ++tauri = { version = "2.1.1", features = ["macos-private-api"] } + sysinfo = "0.29.0" + tauri-plugin-shell = "2" + tauri-plugin-os = "2" diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix index 0d87b4816c6f..c118a9ee47f4 100644 --- a/pkgs/by-name/ne/netbird/package.nix +++ b/pkgs/by-name/ne/netbird/package.nix @@ -68,16 +68,16 @@ let in buildGoModule (finalAttrs: { pname = "netbird-${componentName}"; - version = "0.56.0"; + version = "0.57.0"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; tag = "v${finalAttrs.version}"; - hash = "sha256-1jBVBN1/4WVXV6g3L27B+goFHhGcLSHDsPoNnQwt+sU="; + hash = "sha256-wWFIOzoA9FuNI4k0ofagW0ZGgMoGpD0dBozy2wMvcqk="; }; - vendorHash = "sha256-kvcRCRa4KyHFat7fwVw2VJETWIHAYK+/yH1crBZukDU="; + vendorHash = "sha256-ZjeTKj99BTSNFOvtywfmuXfYVxU3s9O2EwD/4IZodvs="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config; diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix index 360e39e54d72..2aa4bbf6baad 100644 --- a/pkgs/by-name/on/onnxruntime/package.nix +++ b/pkgs/by-name/on/onnxruntime/package.nix @@ -293,7 +293,6 @@ effectiveStdenv.mkDerivation rec { maintainers = with lib.maintainers; [ puffnfresh ck3d - cbourjau ]; }; } diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix index 61e223d3da74..ce24dceb1e04 100644 --- a/pkgs/by-name/os/osu-lazer-bin/package.nix +++ b/pkgs/by-name/os/osu-lazer-bin/package.nix @@ -10,23 +10,23 @@ let pname = "osu-lazer-bin"; - version = "2025.816.0"; + version = "2025.912.0"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Apple.Silicon.zip"; - hash = "sha256-5HMjI0+rb7FKwTYsLv2ltFyXL0DQT83/t2i4OpiwwIY="; + hash = "sha256-wGThpn4Yb3t02MYrn1Sg8S48ak6n09T1vPSpF5zEx7E="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Intel.zip"; - hash = "sha256-WqYY3FYHgURk1NKiVcF81GAKBYNPf1M/ZY/3/9XibzI="; + hash = "sha256-OWqCqAQx1e6TsVdvOezF3gvZ06tXFIEfNMb5LA4mf5s="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.AppImage"; - hash = "sha256-mOihQ8mtHEiq0FElkJiZl0mhBqPi8CoGowN358Jc72A="; + hash = "sha256-73UY3RJp0pFfbxRWX8qSnLeoZB/BRGtucmQClJP7Qwg="; }; } .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported."); diff --git a/pkgs/by-name/os/osu-lazer/deps.json b/pkgs/by-name/os/osu-lazer/deps.json index 12f99637b891..dc23860559ae 100644 --- a/pkgs/by-name/os/osu-lazer/deps.json +++ b/pkgs/by-name/os/osu-lazer/deps.json @@ -404,11 +404,6 @@ "version": "2.0.161401", "hash": "sha256-ke9rovup7UFVz2T6HYtHawwrs/XARLDQOwCysC2qDAs=" }, - { - "pname": "Microsoft.DotNet.PlatformAbstractions", - "version": "2.0.3", - "hash": "sha256-qRoDjAl3I8hYH6tQw06UVn5cf55avtTCjRDUzjUJAgg=" - }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", "version": "9.0.2", @@ -439,11 +434,6 @@ "version": "9.0.2", "hash": "sha256-WoTLgw/OlXhgN54Szip0Zpne7i/YTXwZ1ZLCPcHV6QM=" }, - { - "pname": "Microsoft.Extensions.DependencyModel", - "version": "2.0.3", - "hash": "sha256-itpwRYzmJZUt2kYJrrcq2IOwqqOskdbE3HMmD8GV/jY=" - }, { "pname": "Microsoft.Extensions.Features", "version": "9.0.2", @@ -544,11 +534,6 @@ "version": "2.21.0", "hash": "sha256-LZdDJkwQSVBLJfeE3SEckpi+EZcHIccHlhHoUxZ5FqE=" }, - { - "pname": "NativeLibraryLoader", - "version": "1.0.13", - "hash": "sha256-ENubvwbFy0ZB8I88xHTRkkjG8lrQ98jQ33IQoe4rcaM=" - }, { "pname": "NETStandard.Library", "version": "1.6.1", @@ -641,8 +626,8 @@ }, { "pname": "ppy.osu.Framework", - "version": "2025.808.0", - "hash": "sha256-XmetdqG3z66uhdfvY4iEmDAK8Zh2uXPk5Dm25raeYw4=" + "version": "2025.908.0", + "hash": "sha256-ywGPEtZqgeqgG7LJ459FfRy+JtCw9zChuYUHHY4QIcU=" }, { "pname": "ppy.osu.Framework.NativeLibs", @@ -656,8 +641,8 @@ }, { "pname": "ppy.osu.Game.Resources", - "version": "2025.815.0", - "hash": "sha256-DD9yPAmCJrCj/uix6HbRlbQZfyvLyIrKmLP4fZed5fo=" + "version": "2025.911.0", + "hash": "sha256-N7CPME+A+tPpojOe7HN7Vz49VwtcmRKCJK4IIdY0kFs=" }, { "pname": "ppy.osuTK.NS20", @@ -671,28 +656,28 @@ }, { "pname": "ppy.SDL3-CS", - "version": "2025.220.0", - "hash": "sha256-A43tJzQ779wQ76wkCxvZ39w3KapZwhUpKe1P4RcOvCQ=" + "version": "2025.828.0", + "hash": "sha256-3+ShJIv4TJuzPAIF7uiwOXVyb+5EpCAuIz1Ff0dPdhA=" }, { "pname": "ppy.Veldrid", - "version": "4.9.66-g086790861c", - "hash": "sha256-jnFiRUk+8EV5QMnormygSwm74U949FSqPKYNfMrkI54=" + "version": "4.9.69-ga405fe8484", + "hash": "sha256-aFn5I5HofCfUPE9yf/uuKzYZgPEDA+40QxzCV5CPsfM=" }, { "pname": "ppy.Veldrid.MetalBindings", - "version": "4.9.66-g086790861c", - "hash": "sha256-opJ2dRHQP6HPYHw7hM5iWgQeP38RMINv2dJmSF7PptA=" + "version": "4.9.69-ga405fe8484", + "hash": "sha256-PLwLXeFCje6Qj7Q1afeIFQJRuRPt2pKnrSqUeMOOtPU=" }, { "pname": "ppy.Veldrid.OpenGLBindings", - "version": "4.9.66-g086790861c", - "hash": "sha256-4zrLJpQVA9BiQP2XeKgW9L/1z3pazDCH46elQ02Un5E=" + "version": "4.9.69-ga405fe8484", + "hash": "sha256-l8XNsxVtLrzcq2R8TIjpLu+MNGglxjyk+Pxzo7lzvuY=" }, { "pname": "ppy.Veldrid.SPIRV", - "version": "1.0.15-gb66ebf81d2", - "hash": "sha256-+0dUQTBEU0pPjRhZXvBkWTUpmMFfM9E6FWWT6yHS/9I=" + "version": "1.0.15-g5911265ec3", + "hash": "sha256-XiA2gCiQzjsErPOF4TrbQBhnahFXHIVlsetlEOpPTeI=" }, { "pname": "ppy.Vk", @@ -824,11 +809,6 @@ "version": "4.3.2", "hash": "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA=" }, - { - "pname": "runtime.native.System", - "version": "4.0.0", - "hash": "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894=" - }, { "pname": "runtime.native.System", "version": "4.3.0", @@ -1034,11 +1014,6 @@ "version": "1.1.0", "hash": "sha256-oP64y/hYgoYo+heDFzmt6sWukTF0lDDFkB16eyoQfHE=" }, - { - "pname": "System.AppContext", - "version": "4.1.0", - "hash": "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs=" - }, { "pname": "System.AppContext", "version": "4.3.0", @@ -1119,11 +1094,6 @@ "version": "4.3.0", "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" }, - { - "pname": "System.Dynamic.Runtime", - "version": "4.0.11", - "hash": "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4=" - }, { "pname": "System.Dynamic.Runtime", "version": "4.3.0", @@ -1169,11 +1139,6 @@ "version": "4.3.0", "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" }, - { - "pname": "System.IO.FileSystem", - "version": "4.0.1", - "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0=" - }, { "pname": "System.IO.FileSystem", "version": "4.3.0", @@ -1429,11 +1394,6 @@ "version": "4.3.0", "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" }, - { - "pname": "System.Runtime.InteropServices.RuntimeInformation", - "version": "4.0.0", - "hash": "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4=" - }, { "pname": "System.Runtime.InteropServices.RuntimeInformation", "version": "4.3.0", diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix index 7a01a58959df..770591ef0b44 100644 --- a/pkgs/by-name/os/osu-lazer/package.nix +++ b/pkgs/by-name/os/osu-lazer/package.nix @@ -22,13 +22,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2025.816.0"; + version = "2025.912.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; tag = "${version}-lazer"; - hash = "sha256-ScCOqo0f8Ms0nai9zCIEkAKWySB7uZiU4lk2itQWLig="; + hash = "sha256-OpFiqGldVK0GpIlNopRhbFzb6tOvKnLr/zQeQvWPgmA="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix index e9f646dd4c3d..8569087b9db8 100644 --- a/pkgs/by-name/pc/pcloud/package.nix +++ b/pkgs/by-name/pc/pcloud/package.nix @@ -39,13 +39,13 @@ let pname = "pcloud"; - version = "1.14.15"; - code = "XZnIXD5ZeetbMDef3yJKjqE1C5hem0svBpPy"; + version = "1.14.16"; + code = "XZbJvD5ZfXtwygX5xg7F9ywtRup5H5sBvfhy"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip"; - hash = "sha256-/9JPGA4He1XXy5OhZvfWok3mjnbPZadXK2M8Irf363k="; + hash = "sha256-6K7QPr3MtZvRZt84N8+i8QZBaKHHeTY1bXMdO+wUCr0="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix index 23326ab144a4..5e048735e36e 100644 --- a/pkgs/by-name/re/re-isearch/package.nix +++ b/pkgs/by-name/re/re-isearch/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation { pname = "re-Isearch"; - version = "2.20220925.4.0a-unstable-2025-05-15"; + version = "2.20220925.4.0a-unstable-2025-09-11"; src = fetchFromGitHub { owner = "re-Isearch"; repo = "re-Isearch"; - rev = "35e939fd60948f112b668b06d2b8b75f2c7425d3"; - hash = "sha256-r7KUwx2SrfnpSknGSpzw33Qwp63htoKknrnmdOgA/9Y="; + rev = "26e44f3d66e7f19def909a8179f798f6a4fe0a8a"; + hash = "sha256-zAYdZrKx2xaNrPYS0BbNNA30TkMqqR8P7pCB/j9VBuY="; }; patches = [ diff --git a/pkgs/by-name/ro/rosa/package.nix b/pkgs/by-name/ro/rosa/package.nix index 84a77c85648f..756c7cdfa1c5 100644 --- a/pkgs/by-name/ro/rosa/package.nix +++ b/pkgs/by-name/ro/rosa/package.nix @@ -17,7 +17,7 @@ buildGoModule rec { owner = "openshift"; repo = "rosa"; rev = "v${version}"; - hash = "sha256-3smmsco9xgOv+xCo9QIAudbHjZ1s3sKLEQmLXXaylYQ="; + hash = "sha256-wRLdxnAD9wZeIwWiX+x/j2gaVv1/iEsy3jYIeb3hWoo="; }; vendorHash = null; diff --git a/pkgs/by-name/rs/rss2email/html2text-2025.4.15-compat.patch b/pkgs/by-name/rs/rss2email/html2text-2025.4.15-compat.patch new file mode 100644 index 000000000000..c0026c7881c3 --- /dev/null +++ b/pkgs/by-name/rs/rss2email/html2text-2025.4.15-compat.patch @@ -0,0 +1,250 @@ +From 6625fded5d55b89ce77e0dd5f1bd153428c3bdd2 Mon Sep 17 00:00:00 2001 +From: Brand Huntsman +Date: Mon, 5 May 2025 02:35:02 -0600 +Subject: [PATCH] Fix tests when using html2text 2025.4.15. + +https://github.com/Alir3z4/html2text/pull/431 changed the 'pre' tag +indentation spacing. + +Fixes #278. + +Reported-By: Luis Henriques +--- + test/data/tails/1.expected | 94 +++++++++++++++++++------------------- + test/data/tails/2.expected | 92 ++++++++++++++++++------------------- + 2 files changed, 93 insertions(+), 93 deletions(-) + +diff --git a/test/data/tails/1.expected b/test/data/tails/1.expected +index cd6238c..0feef24 100644 +--- a/test/data/tails/1.expected ++++ b/test/data/tails/1.expected +@@ -362,48 +362,48 @@ YzEuCgpUbyBkbyBhbiBhdXRvbWF0aWMgdXBncmFkZSB0byBUYWlscyA0LjExfnJjMToKCiAgICAx + LiBTdGFydCBUYWlscyA0LjIgb3IgbGF0ZXIgYW5kIFtzZXQgYW4gYWRtaW5pc3RyYXRpb24gcGFz + c3dvcmRdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvZG9jL2ZpcnN0X3N0ZXBzL3dlbGNvbWVfc2Ny + ZWVuL2FkbWluaXN0cmF0aW9uX3Bhc3N3b3JkL2luZGV4LmVuLmh0bWwpLgoKICAgIDIuIFJ1biB0 +-aGlzIGNvbW1hbmQgaW4gYSBfVGVybWluYWxfIDoKICAgICAgICAKICAgICAgICAgICAgICAgIGVj +-aG8gVEFJTFNfQ0hBTk5FTD1cImFscGhhXCIgfCBzdWRvIHRlZSAtYSAvZXRjL29zLXJlbGVhc2Ug +-JiYgXAogICAgICAgICAgICAgdGFpbHMtdXBncmFkZS1mcm9udGVuZC13cmFwcGVyCiAgICAgICAg +-CgpFbnRlciB0aGUgYWRtaW5pc3RyYXRpb24gcGFzc3dvcmQgd2hlbiBhc2tlZCBmb3IgdGhlICJw +-YXNzd29yZCBmb3IgYW1uZXNpYSIuCgogICAgMy4gQWZ0ZXIgdGhlIHVwZ3JhZGUgaXMgYXBwbGll +-ZCwgcmVzdGFydCBUYWlscyBhbmQgY2hvb3NlICoqQXBwbGljYXRpb25zICDilrggVGFpbHMg4pa4 +-IEFib3V0IFRhaWxzKiogdG8gdmVyaWZ5IHRoYXQgeW91IGFyZSBydW5uaW5nIFRhaWxzIDQuMTF+ +-cmMxLgoKICAqIElmIHlvdSBjYW5ub3QgZG8gYW4gYXV0b21hdGljIHVwZ3JhZGUgb3IgaWYgVGFp +-bHMgZmFpbHMgdG8gc3RhcnQgYWZ0ZXIgYW4gYXV0b21hdGljIHVwZ3JhZGUsIHBsZWFzZSB0cnkg +-dG8gZG8gYSBbbWFudWFsIHVwZ3JhZGVdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvZG9jL3VwZ3Jh +-ZGUvaW5kZXguZW4uaHRtbCNtYW51YWwpLgoKIyMgVG8gZG93bmxvYWQgNC4xMX5yYzEKCiMjIyBE +-aXJlY3QgZG93bmxvYWQKCiAgKiBbRm9yIFVTQiBzdGlja3MgKFVTQiBpbWFnZSldKGh0dHA6Ly9k +-bC5hbW5lc2lhLmJvdW0ub3JnL3RhaWxzL2FscGhhL3RhaWxzLWFtZDY0LTQuMTF+cmMxL3RhaWxz +-LWFtZDY0LTQuMTF+cmMxLmltZykgKFs/XShodHRwczovL3RhaWxzLmJvdW0ub3JnL2lraXdpa2ku +-Y2dpP2RvPWNyZWF0ZSZmcm9tPW5ld3MlMkZ0ZXN0XzQuMTEtcmMxJnBhZ2U9dG9ycmVudHMlMkZm +-aWxlcyUyRnRhaWxzLWFtZDY0LTQuMTF+cmMxLmltZy5zaWcpT3BlblBHUCBzaWduYXR1cmUpCgog +-ICogW0ZvciBEVkRzIGFuZCB2aXJ0dWFsIG1hY2hpbmVzIChJU08gaW1hZ2UpXShodHRwOi8vZGwu +-YW1uZXNpYS5ib3VtLm9yZy90YWlscy9hbHBoYS90YWlscy1hbWQ2NC00LjExfnJjMS90YWlscy1h +-bWQ2NC00LjExfnJjMS5pc28pIChbP10oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy9pa2l3aWtpLmNn +-aT9kbz1jcmVhdGUmZnJvbT1uZXdzJTJGdGVzdF80LjExLXJjMSZwYWdlPXRvcnJlbnRzJTJGZmls +-ZXMlMkZ0YWlscy1hbWQ2NC00LjExfnJjMS5pc28uc2lnKU9wZW5QR1Agc2lnbmF0dXJlKQoKIyMj +-IEJpdFRvcnJlbnQgZG93bmxvYWQKCiAgKiBbRm9yIFVTQiBzdGlja3MgKFVTQiBpbWFnZSldKGh0 +-dHBzOi8vdGFpbHMuYm91bS5vcmcvdG9ycmVudHMvZmlsZXMvdGFpbHMtYW1kNjQtNC4xMX5yYzEu +-aW1nLnRvcnJlbnQpCgogICogW0ZvciBEVkRzIGFuZCB2aXJ0dWFsIG1hY2hpbmVzIChJU08gaW1h +-Z2UpXShodHRwczovL3RhaWxzLmJvdW0ub3JnL3RvcnJlbnRzL2ZpbGVzL3RhaWxzLWFtZDY0LTQu +-MTF+cmMxLmlzby50b3JyZW50KQoKIyMgVG8gaW5zdGFsbCBUYWlscyBvbiBhIG5ldyBVU0Igc3Rp +-Y2sKCkZvbGxvdyBvdXIgaW5zdGFsbGF0aW9uIGluc3RydWN0aW9uczoKCiAgKiBbSW5zdGFsbCBm +-cm9tIFdpbmRvd3NdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvaW5zdGFsbC93aW4vdXNiL2luZGV4 +-LmVuLmh0bWwpCiAgKiBbSW5zdGFsbCBmcm9tIG1hY09TXShodHRwczovL3RhaWxzLmJvdW0ub3Jn +-L2luc3RhbGwvbWFjL3VzYi9pbmRleC5lbi5odG1sKQogICogW0luc3RhbGwgZnJvbSBMaW51eF0o +-aHR0cHM6Ly90YWlscy5ib3VtLm9yZy9pbnN0YWxsL2xpbnV4L3VzYi9pbmRleC5lbi5odG1sKQoK +-QWxsIHRoZSBkYXRhIG9uIHRoaXMgVVNCIHN0aWNrIHdpbGwgYmUgbG9zdC4KCiMgV2hhdCdzIGNv +-bWluZyB1cD8KClRhaWxzIDQuMTEgaXMgW3NjaGVkdWxlZF0oaHR0cHM6Ly90YWlscy5ib3VtLm9y +-Zy9jb250cmlidXRlL2NhbGVuZGFyLykgZm9yClNlcHRlbWJlciAyMi4KCkhhdmUgYSBsb29rIGF0 +-IG91ciBbcm9hZG1hcF0oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy9jb250cmlidXRlL3JvYWRtYXAp +-IHRvIHNlZQp3aGVyZSB3ZSBhcmUgaGVhZGluZyB0by4KCldlIG5lZWQgeW91ciBoZWxwIGFuZCB0 +-aGVyZSBhcmUgbWFueSB3YXlzIHRvIFtjb250cmlidXRlIHRvClRhaWxzXShodHRwczovL3RhaWxz +-LmJvdW0ub3JnL2NvbnRyaWJ1dGUvaW5kZXguZW4uaHRtbCkKKFtkb25hdGluZ10oaHR0cHM6Ly90 +-YWlscy5ib3VtLm9yZy9kb25hdGUvP3I9NC4xMS1yYzEpIGlzIG9ubHkgb25lIG9mIHRoZW0pLgpD +-b21lIFt0YWxrIHRvIHVzXShodHRwczovL3RhaWxzLmJvdW0ub3JnL2Fib3V0L2NvbnRhY3QvaW5k +-ZXguZW4uaHRtbCN0YWlscy0KZGV2KSEKCgoKVVJMOiBodHRwczovL3RhaWxzLmJvdW0ub3JnL25l +-d3MvdGVzdF80LjExLXJjMS8= ++aGlzIGNvbW1hbmQgaW4gYSBfVGVybWluYWxfIDoKICAgICAgICAgICAKICAgICAgICAgICBlY2hv ++IFRBSUxTX0NIQU5ORUw9XCJhbHBoYVwiIHwgc3VkbyB0ZWUgLWEgL2V0Yy9vcy1yZWxlYXNlICYm ++IFwKICAgICAgICAgICAgICAgIHRhaWxzLXVwZ3JhZGUtZnJvbnRlbmQtd3JhcHBlcgogICAgICAg ++ICAgIAoKRW50ZXIgdGhlIGFkbWluaXN0cmF0aW9uIHBhc3N3b3JkIHdoZW4gYXNrZWQgZm9yIHRo ++ZSAicGFzc3dvcmQgZm9yIGFtbmVzaWEiLgoKICAgIDMuIEFmdGVyIHRoZSB1cGdyYWRlIGlzIGFw ++cGxpZWQsIHJlc3RhcnQgVGFpbHMgYW5kIGNob29zZSAqKkFwcGxpY2F0aW9ucyAg4pa4IFRhaWxz ++IOKWuCBBYm91dCBUYWlscyoqIHRvIHZlcmlmeSB0aGF0IHlvdSBhcmUgcnVubmluZyBUYWlscyA0 ++LjExfnJjMS4KCiAgKiBJZiB5b3UgY2Fubm90IGRvIGFuIGF1dG9tYXRpYyB1cGdyYWRlIG9yIGlm ++IFRhaWxzIGZhaWxzIHRvIHN0YXJ0IGFmdGVyIGFuIGF1dG9tYXRpYyB1cGdyYWRlLCBwbGVhc2Ug ++dHJ5IHRvIGRvIGEgW21hbnVhbCB1cGdyYWRlXShodHRwczovL3RhaWxzLmJvdW0ub3JnL2RvYy91 ++cGdyYWRlL2luZGV4LmVuLmh0bWwjbWFudWFsKS4KCiMjIFRvIGRvd25sb2FkIDQuMTF+cmMxCgoj ++IyMgRGlyZWN0IGRvd25sb2FkCgogICogW0ZvciBVU0Igc3RpY2tzIChVU0IgaW1hZ2UpXShodHRw ++Oi8vZGwuYW1uZXNpYS5ib3VtLm9yZy90YWlscy9hbHBoYS90YWlscy1hbWQ2NC00LjExfnJjMS90 ++YWlscy1hbWQ2NC00LjExfnJjMS5pbWcpIChbP10oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy9pa2l3 ++aWtpLmNnaT9kbz1jcmVhdGUmZnJvbT1uZXdzJTJGdGVzdF80LjExLXJjMSZwYWdlPXRvcnJlbnRz ++JTJGZmlsZXMlMkZ0YWlscy1hbWQ2NC00LjExfnJjMS5pbWcuc2lnKU9wZW5QR1Agc2lnbmF0dXJl ++KQoKICAqIFtGb3IgRFZEcyBhbmQgdmlydHVhbCBtYWNoaW5lcyAoSVNPIGltYWdlKV0oaHR0cDov ++L2RsLmFtbmVzaWEuYm91bS5vcmcvdGFpbHMvYWxwaGEvdGFpbHMtYW1kNjQtNC4xMX5yYzEvdGFp ++bHMtYW1kNjQtNC4xMX5yYzEuaXNvKSAoWz9dKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvaWtpd2lr ++aS5jZ2k/ZG89Y3JlYXRlJmZyb209bmV3cyUyRnRlc3RfNC4xMS1yYzEmcGFnZT10b3JyZW50cyUy ++RmZpbGVzJTJGdGFpbHMtYW1kNjQtNC4xMX5yYzEuaXNvLnNpZylPcGVuUEdQIHNpZ25hdHVyZSkK ++CiMjIyBCaXRUb3JyZW50IGRvd25sb2FkCgogICogW0ZvciBVU0Igc3RpY2tzIChVU0IgaW1hZ2Up ++XShodHRwczovL3RhaWxzLmJvdW0ub3JnL3RvcnJlbnRzL2ZpbGVzL3RhaWxzLWFtZDY0LTQuMTF+ ++cmMxLmltZy50b3JyZW50KQoKICAqIFtGb3IgRFZEcyBhbmQgdmlydHVhbCBtYWNoaW5lcyAoSVNP ++IGltYWdlKV0oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy90b3JyZW50cy9maWxlcy90YWlscy1hbWQ2 ++NC00LjExfnJjMS5pc28udG9ycmVudCkKCiMjIFRvIGluc3RhbGwgVGFpbHMgb24gYSBuZXcgVVNC ++IHN0aWNrCgpGb2xsb3cgb3VyIGluc3RhbGxhdGlvbiBpbnN0cnVjdGlvbnM6CgogICogW0luc3Rh ++bGwgZnJvbSBXaW5kb3dzXShodHRwczovL3RhaWxzLmJvdW0ub3JnL2luc3RhbGwvd2luL3VzYi9p ++bmRleC5lbi5odG1sKQogICogW0luc3RhbGwgZnJvbSBtYWNPU10oaHR0cHM6Ly90YWlscy5ib3Vt ++Lm9yZy9pbnN0YWxsL21hYy91c2IvaW5kZXguZW4uaHRtbCkKICAqIFtJbnN0YWxsIGZyb20gTGlu ++dXhdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvaW5zdGFsbC9saW51eC91c2IvaW5kZXguZW4uaHRt ++bCkKCkFsbCB0aGUgZGF0YSBvbiB0aGlzIFVTQiBzdGljayB3aWxsIGJlIGxvc3QuCgojIFdoYXQn ++cyBjb21pbmcgdXA/CgpUYWlscyA0LjExIGlzIFtzY2hlZHVsZWRdKGh0dHBzOi8vdGFpbHMuYm91 ++bS5vcmcvY29udHJpYnV0ZS9jYWxlbmRhci8pIGZvcgpTZXB0ZW1iZXIgMjIuCgpIYXZlIGEgbG9v ++ayBhdCBvdXIgW3JvYWRtYXBdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvY29udHJpYnV0ZS9yb2Fk ++bWFwKSB0byBzZWUKd2hlcmUgd2UgYXJlIGhlYWRpbmcgdG8uCgpXZSBuZWVkIHlvdXIgaGVscCBh ++bmQgdGhlcmUgYXJlIG1hbnkgd2F5cyB0byBbY29udHJpYnV0ZSB0bwpUYWlsc10oaHR0cHM6Ly90 ++YWlscy5ib3VtLm9yZy9jb250cmlidXRlL2luZGV4LmVuLmh0bWwpCihbZG9uYXRpbmddKGh0dHBz ++Oi8vdGFpbHMuYm91bS5vcmcvZG9uYXRlLz9yPTQuMTEtcmMxKSBpcyBvbmx5IG9uZSBvZiB0aGVt ++KS4KQ29tZSBbdGFsayB0byB1c10oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy9hYm91dC9jb250YWN0 ++L2luZGV4LmVuLmh0bWwjdGFpbHMtCmRldikhCgoKClVSTDogaHR0cHM6Ly90YWlscy5ib3VtLm9y ++Zy9uZXdzL3Rlc3RfNC4xMS1yYzEv + + + SENT BY: "Tails - News: " +@@ -796,17 +796,17 @@ For more details, read our + # Known issues + + * Ledger wallets are not detected by _Electrum_ , with the following error message returned. ([#18080](https://gitlab.tails.boum.org/tails/tails/-/issues/18080)) +- ++ + "No hardware device detected" +- ++ + + Please try to execute the following command in a [root + terminal](https://tails.boum.org/doc/first_steps/welcome_screen/administration_password/index.en.html#open_root_terminal) + before starting _Electrum_ : + +- +- apt update && apt install python3-btchip/testing +- ++ ++ apt update && apt install python3-btchip/testing ++ + + See the list of [long-standing + issues](https://tails.boum.org/support/known_issues/index.en.html). +diff --git a/test/data/tails/2.expected b/test/data/tails/2.expected +index 7b48a67..7e9fd49 100644 +--- a/test/data/tails/2.expected ++++ b/test/data/tails/2.expected +@@ -933,47 +933,47 @@ bHMgNC4xMX5yYzE6CgogICAgMS4gU3RhcnQgVGFpbHMgNC4yIG9yIGxhdGVyIGFuZCBbc2V0IGFu + IGFkbWluaXN0cmF0aW9uIHBhc3N3b3JkXShodHRwczovL3RhaWxzLmJvdW0ub3JnL2RvYy9maXJz + dF9zdGVwcy93ZWxjb21lX3NjcmVlbi9hZG1pbmlzdHJhdGlvbl9wYXNzd29yZC9pbmRleC5lbi5o + dG1sKS4KCiAgICAyLiBSdW4gdGhpcyBjb21tYW5kIGluIGEgX1Rlcm1pbmFsXyA6CiAgICAgICAg +-CiAgICAgICAgICAgICAgICBlY2hvIFRBSUxTX0NIQU5ORUw9XCJhbHBoYVwiIHwgc3VkbyB0ZWUg +-LWEgL2V0Yy9vcy1yZWxlYXNlICYmIFwKICAgICAgICAgICAgIHRhaWxzLXVwZ3JhZGUtZnJvbnRl +-bmQtd3JhcHBlcgogICAgICAgIAoKRW50ZXIgdGhlIGFkbWluaXN0cmF0aW9uIHBhc3N3b3JkIHdo +-ZW4gYXNrZWQgZm9yIHRoZSAicGFzc3dvcmQgZm9yIGFtbmVzaWEiLgoKICAgIDMuIEFmdGVyIHRo +-ZSB1cGdyYWRlIGlzIGFwcGxpZWQsIHJlc3RhcnQgVGFpbHMgYW5kIGNob29zZSAqKkFwcGxpY2F0 +-aW9ucyAg4pa4IFRhaWxzIOKWuCBBYm91dCBUYWlscyoqIHRvIHZlcmlmeSB0aGF0IHlvdSBhcmUg +-cnVubmluZyBUYWlscyA0LjExfnJjMS4KCiAgKiBJZiB5b3UgY2Fubm90IGRvIGFuIGF1dG9tYXRp +-YyB1cGdyYWRlIG9yIGlmIFRhaWxzIGZhaWxzIHRvIHN0YXJ0IGFmdGVyIGFuIGF1dG9tYXRpYyB1 +-cGdyYWRlLCBwbGVhc2UgdHJ5IHRvIGRvIGEgW21hbnVhbCB1cGdyYWRlXShodHRwczovL3RhaWxz +-LmJvdW0ub3JnL2RvYy91cGdyYWRlL2luZGV4LmVuLmh0bWwjbWFudWFsKS4KCiMjIFRvIGRvd25s +-b2FkIDQuMTF+cmMxCgojIyMgRGlyZWN0IGRvd25sb2FkCgogICogW0ZvciBVU0Igc3RpY2tzIChV +-U0IgaW1hZ2UpXShodHRwOi8vZGwuYW1uZXNpYS5ib3VtLm9yZy90YWlscy9hbHBoYS90YWlscy1h +-bWQ2NC00LjExfnJjMS90YWlscy1hbWQ2NC00LjExfnJjMS5pbWcpIChbP10oaHR0cHM6Ly90YWls +-cy5ib3VtLm9yZy9pa2l3aWtpLmNnaT9kbz1jcmVhdGUmZnJvbT1uZXdzJTJGdGVzdF80LjExLXJj +-MSZwYWdlPXRvcnJlbnRzJTJGZmlsZXMlMkZ0YWlscy1hbWQ2NC00LjExfnJjMS5pbWcuc2lnKU9w +-ZW5QR1Agc2lnbmF0dXJlKQoKICAqIFtGb3IgRFZEcyBhbmQgdmlydHVhbCBtYWNoaW5lcyAoSVNP +-IGltYWdlKV0oaHR0cDovL2RsLmFtbmVzaWEuYm91bS5vcmcvdGFpbHMvYWxwaGEvdGFpbHMtYW1k +-NjQtNC4xMX5yYzEvdGFpbHMtYW1kNjQtNC4xMX5yYzEuaXNvKSAoWz9dKGh0dHBzOi8vdGFpbHMu +-Ym91bS5vcmcvaWtpd2lraS5jZ2k/ZG89Y3JlYXRlJmZyb209bmV3cyUyRnRlc3RfNC4xMS1yYzEm +-cGFnZT10b3JyZW50cyUyRmZpbGVzJTJGdGFpbHMtYW1kNjQtNC4xMX5yYzEuaXNvLnNpZylPcGVu +-UEdQIHNpZ25hdHVyZSkKCiMjIyBCaXRUb3JyZW50IGRvd25sb2FkCgogICogW0ZvciBVU0Igc3Rp +-Y2tzIChVU0IgaW1hZ2UpXShodHRwczovL3RhaWxzLmJvdW0ub3JnL3RvcnJlbnRzL2ZpbGVzL3Rh +-aWxzLWFtZDY0LTQuMTF+cmMxLmltZy50b3JyZW50KQoKICAqIFtGb3IgRFZEcyBhbmQgdmlydHVh +-bCBtYWNoaW5lcyAoSVNPIGltYWdlKV0oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy90b3JyZW50cy9m +-aWxlcy90YWlscy1hbWQ2NC00LjExfnJjMS5pc28udG9ycmVudCkKCiMjIFRvIGluc3RhbGwgVGFp +-bHMgb24gYSBuZXcgVVNCIHN0aWNrCgpGb2xsb3cgb3VyIGluc3RhbGxhdGlvbiBpbnN0cnVjdGlv +-bnM6CgogICogW0luc3RhbGwgZnJvbSBXaW5kb3dzXShodHRwczovL3RhaWxzLmJvdW0ub3JnL2lu +-c3RhbGwvd2luL3VzYi9pbmRleC5lbi5odG1sKQogICogW0luc3RhbGwgZnJvbSBtYWNPU10oaHR0 +-cHM6Ly90YWlscy5ib3VtLm9yZy9pbnN0YWxsL21hYy91c2IvaW5kZXguZW4uaHRtbCkKICAqIFtJ +-bnN0YWxsIGZyb20gTGludXhdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvaW5zdGFsbC9saW51eC91 +-c2IvaW5kZXguZW4uaHRtbCkKCkFsbCB0aGUgZGF0YSBvbiB0aGlzIFVTQiBzdGljayB3aWxsIGJl +-IGxvc3QuCgojIFdoYXQncyBjb21pbmcgdXA/CgpUYWlscyA0LjExIGlzIFtzY2hlZHVsZWRdKGh0 +-dHBzOi8vdGFpbHMuYm91bS5vcmcvY29udHJpYnV0ZS9jYWxlbmRhci8pIGZvcgpTZXB0ZW1iZXIg +-MjIuCgpIYXZlIGEgbG9vayBhdCBvdXIgW3JvYWRtYXBdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcv +-Y29udHJpYnV0ZS9yb2FkbWFwKSB0byBzZWUKd2hlcmUgd2UgYXJlIGhlYWRpbmcgdG8uCgpXZSBu +-ZWVkIHlvdXIgaGVscCBhbmQgdGhlcmUgYXJlIG1hbnkgd2F5cyB0byBbY29udHJpYnV0ZSB0bwpU +-YWlsc10oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy9jb250cmlidXRlL2luZGV4LmVuLmh0bWwpCihb +-ZG9uYXRpbmddKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvZG9uYXRlLz9yPTQuMTEtcmMxKSBpcyBv +-bmx5IG9uZSBvZiB0aGVtKS4KQ29tZSBbdGFsayB0byB1c10oaHR0cHM6Ly90YWlscy5ib3VtLm9y +-Zy9hYm91dC9jb250YWN0L2luZGV4LmVuLmh0bWwjdGFpbHMtCmRldikhCgpVUkw6IDxodHRwczov +-L3RhaWxzLmJvdW0ub3JnL25ld3MvdGVzdF80LjExLXJjMS8+Cgo= ++ICAgCiAgICAgICAgICAgZWNobyBUQUlMU19DSEFOTkVMPVwiYWxwaGFcIiB8IHN1ZG8gdGVlIC1h ++IC9ldGMvb3MtcmVsZWFzZSAmJiBcCiAgICAgICAgICAgICAgICB0YWlscy11cGdyYWRlLWZyb250 ++ZW5kLXdyYXBwZXIKICAgICAgICAgICAKCkVudGVyIHRoZSBhZG1pbmlzdHJhdGlvbiBwYXNzd29y ++ZCB3aGVuIGFza2VkIGZvciB0aGUgInBhc3N3b3JkIGZvciBhbW5lc2lhIi4KCiAgICAzLiBBZnRl ++ciB0aGUgdXBncmFkZSBpcyBhcHBsaWVkLCByZXN0YXJ0IFRhaWxzIGFuZCBjaG9vc2UgKipBcHBs ++aWNhdGlvbnMgIOKWuCBUYWlscyDilrggQWJvdXQgVGFpbHMqKiB0byB2ZXJpZnkgdGhhdCB5b3Ug ++YXJlIHJ1bm5pbmcgVGFpbHMgNC4xMX5yYzEuCgogICogSWYgeW91IGNhbm5vdCBkbyBhbiBhdXRv ++bWF0aWMgdXBncmFkZSBvciBpZiBUYWlscyBmYWlscyB0byBzdGFydCBhZnRlciBhbiBhdXRvbWF0 ++aWMgdXBncmFkZSwgcGxlYXNlIHRyeSB0byBkbyBhIFttYW51YWwgdXBncmFkZV0oaHR0cHM6Ly90 ++YWlscy5ib3VtLm9yZy9kb2MvdXBncmFkZS9pbmRleC5lbi5odG1sI21hbnVhbCkuCgojIyBUbyBk ++b3dubG9hZCA0LjExfnJjMQoKIyMjIERpcmVjdCBkb3dubG9hZAoKICAqIFtGb3IgVVNCIHN0aWNr ++cyAoVVNCIGltYWdlKV0oaHR0cDovL2RsLmFtbmVzaWEuYm91bS5vcmcvdGFpbHMvYWxwaGEvdGFp ++bHMtYW1kNjQtNC4xMX5yYzEvdGFpbHMtYW1kNjQtNC4xMX5yYzEuaW1nKSAoWz9dKGh0dHBzOi8v ++dGFpbHMuYm91bS5vcmcvaWtpd2lraS5jZ2k/ZG89Y3JlYXRlJmZyb209bmV3cyUyRnRlc3RfNC4x ++MS1yYzEmcGFnZT10b3JyZW50cyUyRmZpbGVzJTJGdGFpbHMtYW1kNjQtNC4xMX5yYzEuaW1nLnNp ++ZylPcGVuUEdQIHNpZ25hdHVyZSkKCiAgKiBbRm9yIERWRHMgYW5kIHZpcnR1YWwgbWFjaGluZXMg ++KElTTyBpbWFnZSldKGh0dHA6Ly9kbC5hbW5lc2lhLmJvdW0ub3JnL3RhaWxzL2FscGhhL3RhaWxz ++LWFtZDY0LTQuMTF+cmMxL3RhaWxzLWFtZDY0LTQuMTF+cmMxLmlzbykgKFs/XShodHRwczovL3Rh ++aWxzLmJvdW0ub3JnL2lraXdpa2kuY2dpP2RvPWNyZWF0ZSZmcm9tPW5ld3MlMkZ0ZXN0XzQuMTEt ++cmMxJnBhZ2U9dG9ycmVudHMlMkZmaWxlcyUyRnRhaWxzLWFtZDY0LTQuMTF+cmMxLmlzby5zaWcp ++T3BlblBHUCBzaWduYXR1cmUpCgojIyMgQml0VG9ycmVudCBkb3dubG9hZAoKICAqIFtGb3IgVVNC ++IHN0aWNrcyAoVVNCIGltYWdlKV0oaHR0cHM6Ly90YWlscy5ib3VtLm9yZy90b3JyZW50cy9maWxl ++cy90YWlscy1hbWQ2NC00LjExfnJjMS5pbWcudG9ycmVudCkKCiAgKiBbRm9yIERWRHMgYW5kIHZp ++cnR1YWwgbWFjaGluZXMgKElTTyBpbWFnZSldKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvdG9ycmVu ++dHMvZmlsZXMvdGFpbHMtYW1kNjQtNC4xMX5yYzEuaXNvLnRvcnJlbnQpCgojIyBUbyBpbnN0YWxs ++IFRhaWxzIG9uIGEgbmV3IFVTQiBzdGljawoKRm9sbG93IG91ciBpbnN0YWxsYXRpb24gaW5zdHJ1 ++Y3Rpb25zOgoKICAqIFtJbnN0YWxsIGZyb20gV2luZG93c10oaHR0cHM6Ly90YWlscy5ib3VtLm9y ++Zy9pbnN0YWxsL3dpbi91c2IvaW5kZXguZW4uaHRtbCkKICAqIFtJbnN0YWxsIGZyb20gbWFjT1Nd ++KGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvaW5zdGFsbC9tYWMvdXNiL2luZGV4LmVuLmh0bWwpCiAg ++KiBbSW5zdGFsbCBmcm9tIExpbnV4XShodHRwczovL3RhaWxzLmJvdW0ub3JnL2luc3RhbGwvbGlu ++dXgvdXNiL2luZGV4LmVuLmh0bWwpCgpBbGwgdGhlIGRhdGEgb24gdGhpcyBVU0Igc3RpY2sgd2ls ++bCBiZSBsb3N0LgoKIyBXaGF0J3MgY29taW5nIHVwPwoKVGFpbHMgNC4xMSBpcyBbc2NoZWR1bGVk ++XShodHRwczovL3RhaWxzLmJvdW0ub3JnL2NvbnRyaWJ1dGUvY2FsZW5kYXIvKSBmb3IKU2VwdGVt ++YmVyIDIyLgoKSGF2ZSBhIGxvb2sgYXQgb3VyIFtyb2FkbWFwXShodHRwczovL3RhaWxzLmJvdW0u ++b3JnL2NvbnRyaWJ1dGUvcm9hZG1hcCkgdG8gc2VlCndoZXJlIHdlIGFyZSBoZWFkaW5nIHRvLgoK ++V2UgbmVlZCB5b3VyIGhlbHAgYW5kIHRoZXJlIGFyZSBtYW55IHdheXMgdG8gW2NvbnRyaWJ1dGUg ++dG8KVGFpbHNdKGh0dHBzOi8vdGFpbHMuYm91bS5vcmcvY29udHJpYnV0ZS9pbmRleC5lbi5odG1s ++KQooW2RvbmF0aW5nXShodHRwczovL3RhaWxzLmJvdW0ub3JnL2RvbmF0ZS8/cj00LjExLXJjMSkg ++aXMgb25seSBvbmUgb2YgdGhlbSkuCkNvbWUgW3RhbGsgdG8gdXNdKGh0dHBzOi8vdGFpbHMuYm91 ++bS5vcmcvYWJvdXQvY29udGFjdC9pbmRleC5lbi5odG1sI3RhaWxzLQpkZXYpIQoKVVJMOiA8aHR0 ++cHM6Ly90YWlscy5ib3VtLm9yZy9uZXdzL3Rlc3RfNC4xMS1yYzEvPgoK + + --===============...==-- + +@@ -1951,17 +1951,17 @@ For more details, read our + # Known issues + + * Ledger wallets are not detected by _Electrum_ , with the following error message returned. ([#18080](https://gitlab.tails.boum.org/tails/tails/-/issues/18080)) +- ++ + "No hardware device detected" +- ++ + + Please try to execute the following command in a [root + terminal](https://tails.boum.org/doc/first_steps/welcome_screen/administration_password/index.en.html#open_root_terminal) + before starting _Electrum_ : + +- +- apt update && apt install python3-btchip/testing +- ++ ++ apt update && apt install python3-btchip/testing ++ + + See the list of [long-standing + issues](https://tails.boum.org/support/known_issues/index.en.html). diff --git a/pkgs/by-name/rs/rss2email/package.nix b/pkgs/by-name/rs/rss2email/package.nix index 143a3a9edc56..3ad52d6d5d7d 100644 --- a/pkgs/by-name/rs/rss2email/package.nix +++ b/pkgs/by-name/rs/rss2email/package.nix @@ -22,6 +22,8 @@ python3Packages.buildPythonApplication rec { url = "https://github.com/rss2email/rss2email/commit/b5c0e78006c2db6929b5ff50e8529de58a00412a.patch"; hash = "sha256-edmsi3I0acx5iF9xoAS9deSexqW2UtWZR/L7CgeZs/M="; }) + # https://github.com/rss2email/rss2email/pull/279 + ./html2text-2025.4.15-compat.patch (fetchpatch2 { name = "use-poetry-core.patch"; url = "https://github.com/rss2email/rss2email/commit/183a17aefe4eb66f898cf088519b1e845559f2bd.patch"; diff --git a/pkgs/by-name/si/sigil/package.nix b/pkgs/by-name/si/sigil/package.nix index c75a39e7f2dc..e15163489769 100644 --- a/pkgs/by-name/si/sigil/package.nix +++ b/pkgs/by-name/si/sigil/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "sigil"; - version = "2.6.0"; + version = "2.6.2"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; tag = version; - hash = "sha256-orOuY+gCh7X24jfnGgCbqRWDbtQqrlopYx9sWN2VawA="; + hash = "sha256-3+ODd0/kkXfAchsErLjy6FDHoyVP9VyxbINKMn3N/PM="; }; pythonPath = with python3Packages; [ lxml ]; diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix index bf3b6ecf3536..b3b13c42c954 100644 --- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix +++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix @@ -70,7 +70,9 @@ rustPlatform.buildRustPackage (finalAttrs: { substituteInPlace node/build_node_bridge.py \ --replace-fail "dst_base = 'libsignal_client_%s_%s' % (node_os_name, node_arch)" \ - "dst_base = '@signalapp+libsignal-client'" + "dst_base = '@signalapp+libsignal-client'" \ + --replace-fail "objcopy = shutil.which('%s-linux-gnu-objcopy' % cargo_target.split('-')[0]) or 'objcopy'" \ + "objcopy = os.getenv('OBJCOPY', 'objcopy')" ''; buildPhase = '' diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index 792f226f3ef5..01bf8349b79d 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -199,7 +199,7 @@ stdenv.mkDerivation (finalAttrs: { pnpm run generate pnpm exec electron-builder \ - --dir \ + --linux "dir:${stdenv.hostPlatform.node.arch}" \ --config.extraMetadata.environment=$SIGNAL_ENV \ -c.electronDist=electron-dist \ -c.electronVersion=${electron.version} diff --git a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix index f8c91cb06377..7e6f7ebd25a3 100644 --- a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix +++ b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preBuild export npm_config_nodedir=${nodejs} - pnpm run prebuildify + pnpm run prebuildify --strip false --arch "${stdenv.hostPlatform.node.arch}" --platform "${stdenv.hostPlatform.node.platform}" pnpm run build runHook postBuild diff --git a/pkgs/by-name/si/signal-desktop/webrtc.nix b/pkgs/by-name/si/signal-desktop/webrtc.nix index 51cdca0cfde5..fb40b250e1f5 100644 --- a/pkgs/by-name/si/signal-desktop/webrtc.nix +++ b/pkgs/by-name/si/signal-desktop/webrtc.nix @@ -1,6 +1,7 @@ { stdenv, lib, + buildPackages, ninja, gn, python3, @@ -13,6 +14,24 @@ rustc, }: +let + chromiumRosettaStone = { + cpu = + platform: + let + name = platform.parsed.cpu.name; + in + ( + { + "x86_64" = "x64"; + "i686" = "x86"; + "arm" = "arm"; + "aarch64" = "arm64"; + } + .${name} or (throw "no chromium Rosetta Stone entry for cpu: ${name}") + ); + }; +in stdenv.mkDerivation (finalAttrs: { pname = "signal-webrtc"; version = finalAttrs.gclientDeps."src".path.rev; @@ -59,7 +78,11 @@ stdenv.mkDerivation (finalAttrs: { ''; gnFlags = [ + # webrtc uses chromium's `src/build/BUILDCONFIG.gn`. many of these flags + # are copied from pkgs/applications/networking/browsers/chromium/common.nix. ''target_os="linux"'' + ''target_cpu="${chromiumRosettaStone.cpu stdenv.hostPlatform}"'' + ''pkg_config="${stdenv.cc.targetPrefix}pkg-config"'' "use_sysroot=false" "is_clang=false" "treat_warnings_as_errors=false" @@ -78,7 +101,20 @@ stdenv.mkDerivation (finalAttrs: { "rtc_include_tests=false" "rtc_enable_protobuf=false" - ''rust_sysroot_absolute="${rustc}"'' + ''rust_sysroot_absolute="${buildPackages.rustc}"'' + + # Build using the system toolchain (for Linux distributions): + # + # What you would expect to be called "target_toolchain" is + # actually called either "default_toolchain" or "custom_toolchain", + # depending on which part of the codebase you are in; see: + # https://chromium.googlesource.com/chromium/src/build/+/3c4595444cc6d514600414e468db432e0f05b40f/config/BUILDCONFIG.gn#17 + ''custom_toolchain="//build/toolchain/linux/unbundle:default"'' + ''host_toolchain="//build/toolchain/linux/unbundle:default"'' + ] + ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + ''host_toolchain="//build/toolchain/linux/unbundle:host"'' + ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:host"'' ]; ninjaFlags = [ "webrtc" ]; diff --git a/pkgs/by-name/tb/tbls/package.nix b/pkgs/by-name/tb/tbls/package.nix index 36f5f50048bf..069ed9c27927 100644 --- a/pkgs/by-name/tb/tbls/package.nix +++ b/pkgs/by-name/tb/tbls/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.87.0"; + version = "1.88.0"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; tag = "v${version}"; - hash = "sha256-u7zb0ohZlXlnJlgsXEp7ttNtAB4ZF3NXe3lPGpClp5M="; + hash = "sha256-NrRsP/VVcyNbSP/kedDekQsOGtvxKap3CjpTz5dW1TU="; }; - vendorHash = "sha256-6v3ypD+YWvCST5rM6YHUBGeQ5F1lwb2GKPcq/3XJeiY="; + vendorHash = "sha256-yfUCzTaZdjv5qNl71xc2+M2u1hrydDiFgaklk4CKPG0="; excludedPackages = [ "scripts/jsonschema" ]; diff --git a/pkgs/by-name/te/texstudio/package.nix b/pkgs/by-name/te/texstudio/package.nix index 8a4e6b39d86f..a1718d619f44 100644 --- a/pkgs/by-name/te/texstudio/package.nix +++ b/pkgs/by-name/te/texstudio/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "texstudio"; - version = "4.8.8"; + version = "4.8.9"; src = fetchFromGitHub { owner = "texstudio-org"; repo = "texstudio"; rev = finalAttrs.version; - hash = "sha256-e3kQnWjOe5dkFslDZ+pUgsMB0twDZEcQXYUaPtd+jHA="; + hash = "sha256-nI7aNZ7/IAjgjmHRO78uwkah8l+3m+w1ZQ096177eAU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/te/textual-paint/package.nix b/pkgs/by-name/te/textual-paint/package.nix deleted file mode 100644 index a512c4e173b7..000000000000 --- a/pkgs/by-name/te/textual-paint/package.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ - lib, - python3, - fetchFromGitHub, - fetchPypi, - fetchpatch, -}: - -let - python = python3.override { - self = python; - packageOverrides = _: super: { - pillow = super.pillow.overridePythonAttrs rec { - version = "9.5.0"; - format = "pyproject"; - - src = fetchPypi { - pname = "Pillow"; - inherit version; - hash = "sha256-v1SEedM2cm16Ds6252fhefveN4M65CeUYCYxoHDWMPE="; - }; - - patches = [ - # fix type handling for include and lib directories - (fetchpatch { - url = "https://github.com/python-pillow/Pillow/commit/0ec0a89ead648793812e11739e2a5d70738c6be5.patch"; - hash = "sha256-m5R5fLflnbJXbRxFlTjT2X3nKdC05tippMoJUDsJmy0="; - }) - ]; - }; - - textual = super.textual.overridePythonAttrs rec { - version = "0.27.0"; - - src = fetchFromGitHub { - owner = "Textualize"; - repo = "textual"; - rev = "v${version}"; - hash = "sha256-ag+sJFprYW3IpH+BiMR5eSRUFMBeVuOnF6GTTuXGBHw="; - }; - }; - }; - }; -in - -python.pkgs.buildPythonApplication rec { - pname = "textual-paint"; - version = "0.1.0"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "1j01"; - repo = "textual-paint"; - rev = "v${version}"; - hash = "sha256-ubBWK4aoa9+wyUED7CmWwjknWsWauR/mkurDgkKDiY8="; - }; - - nativeBuildInputs = [ - python.pkgs.setuptools - python.pkgs.wheel - ]; - - propagatedBuildInputs = with python.pkgs; [ - pillow - pyfiglet - pyperclip - rich - stransi - textual - ]; - - pythonImportsCheck = [ "textual_paint" ]; - - meta = with lib; { - description = "TUI image editor inspired by MS Paint"; - homepage = "https://github.com/1j01/textual-paint"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "textual-paint"; - }; -} diff --git a/pkgs/by-name/ti/ticpp/package.nix b/pkgs/by-name/ti/ticpp/package.nix deleted file mode 100644 index 5bbc2c31a50b..000000000000 --- a/pkgs/by-name/ti/ticpp/package.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, -}: - -stdenv.mkDerivation { - pname = "ticpp"; - version = "0-unstable-2019-01-09"; - - src = fetchFromGitHub { - owner = "wxFormBuilder"; - repo = "ticpp"; - rev = "eb79120ea16b847ce9f483a298a394050f463d6b"; - sha256 = "0xk4cy0xbkr6326cqd1vd6b2x0rfsx4iz2sq8f5jz3yl3slxgjm2"; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ "-DBUILD_TICPP_DLL=1" ]; - - installPhase = '' - cd .. - mkdir -p $out/lib - install build/*.{a,so} $out/lib - mkdir -p $out/include - install *.h $out/include - ''; - - meta = { - description = "Interface to TinyXML"; - license = lib.licenses.mit; - homepage = "https://github.com/wxFormBuilder/ticpp"; - }; - -} diff --git a/pkgs/by-name/ti/tigervnc/package.nix b/pkgs/by-name/ti/tigervnc/package.nix index a48108d4460a..f6e62e79d4f0 100644 --- a/pkgs/by-name/ti/tigervnc/package.nix +++ b/pkgs/by-name/ti/tigervnc/package.nix @@ -22,6 +22,8 @@ makeWrapper, nixosTests, ffmpeg, + autoconf, + automake, }: stdenv.mkDerivation (finalAttrs: { @@ -160,6 +162,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake gettext + autoconf + automake ] ++ lib.optionals stdenv.hostPlatform.isLinux ( with xorg; diff --git a/pkgs/by-name/tu/tun2proxy/package.nix b/pkgs/by-name/tu/tun2proxy/package.nix index f14cd2a49d4c..df97b6767837 100644 --- a/pkgs/by-name/tu/tun2proxy/package.nix +++ b/pkgs/by-name/tu/tun2proxy/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tun2proxy"; - version = "0.7.14"; + version = "0.7.15"; src = fetchCrate { pname = "tun2proxy"; inherit (finalAttrs) version; - hash = "sha256-rrBlCtimcQJ8487X5wxsWVk20v9UK0+0B6HRdzV5Sj0="; + hash = "sha256-Yyct1yGSXbZf49t4+8hP+V4ydyIi7zyff5IIqrTfJS0="; }; - cargoHash = "sha256-73SHsJUvPTvI3kxkpNI2Go11TWyQ8/SckuQBCkWjixA="; + cargoHash = "sha256-DhfUhjA8/+gmIe+91vVnK7Zca0x0r6lisTxPmg5yM8k="; env.GIT_HASH = "000000000000000000000000000000000000000000000000000"; diff --git a/pkgs/by-name/xl/xlife/package.nix b/pkgs/by-name/xl/xlife/package.nix index e6f58c5da24a..baf9f80f80eb 100644 --- a/pkgs/by-name/xl/xlife/package.nix +++ b/pkgs/by-name/xl/xlife/package.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation { description = "Conway's Game of Life and other cellular automata, for X"; license = licenses.hpndSellVariant; maintainers = with maintainers; [ djanatyn ]; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/biocutils/default.nix b/pkgs/development/python-modules/biocutils/default.nix new file mode 100644 index 000000000000..4c1a87281cf1 --- /dev/null +++ b/pkgs/development/python-modules/biocutils/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pytest-cov-stub, + setuptools, + setuptools-scm, + scipy, + pandas, + numpy, +}: + +buildPythonPackage rec { + pname = "biocutils"; + version = "0.2.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "BiocPy"; + repo = "BiocUtils"; + tag = "${version}"; + hash = "sha256-4LzXBP/cp+nqIOM5QZIa1QptkSfv3fqdACHEHjJUtsw="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ numpy ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + pandas + scipy + ]; + + pythonImportsCheck = [ "biocutils" ]; + + meta = { + description = "Miscellaneous utilities for BiocPy, mostly to mimic base functionality in R"; + homepage = "https://github.com/BiocPy/BiocUtils"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ b-rodrigues ]; + }; +} diff --git a/pkgs/development/python-modules/cf-xarray/default.nix b/pkgs/development/python-modules/cf-xarray/default.nix index c8cc0d1fd416..1ca3d047413b 100644 --- a/pkgs/development/python-modules/cf-xarray/default.nix +++ b/pkgs/development/python-modules/cf-xarray/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "cf-xarray"; - version = "0.10.7"; + version = "0.10.9"; pyproject = true; src = fetchFromGitHub { owner = "xarray-contrib"; repo = "cf-xarray"; tag = "v${version}"; - hash = "sha256-hFM3xZzal+i4H8wF83LDEL4nAJE1d59LNQgkcrLSE80="; + hash = "sha256-tYs+aZp/QbM166KNj4MjIjqS6LcuDCyXwghSoF5rj4M="; }; build-system = [ diff --git a/pkgs/development/python-modules/j2lint/default.nix b/pkgs/development/python-modules/j2lint/default.nix new file mode 100644 index 000000000000..c51312dc24c0 --- /dev/null +++ b/pkgs/development/python-modules/j2lint/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + jinja2, + setuptools, + fetchFromGitHub, + rich, + versionCheckHook, + pytestCheckHook, + pytest-cov-stub, +}: + +buildPythonPackage rec { + pname = "j2lint"; + version = "1.2.0"; + pyproject = true; + src = fetchFromGitHub { + owner = "aristanetworks"; + repo = "j2lint"; + rev = "v${version}"; + hash = "sha256-/3hd2RnyxX4CsqWvsmGB/5QoeQIsFhtG3nntHer0or8="; + }; + + build-system = [ setuptools ]; + dependencies = [ + jinja2 + rich + ]; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + + meta = with lib; { + homepage = "https://github.com/aristanetworks/j2lint"; + description = "Jinja2 Linter CLI"; + license = licenses.mit; + maintainers = with maintainers; [ polyfloyd ]; + }; +} diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index b1f19401b812..569d6c6902f1 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -134,6 +134,6 @@ buildPythonPackage rec { homepage = "https://github.com/librosa/librosa"; changelog = "https://github.com/librosa/librosa/releases/tag/${version}"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ GuillaumeDesforges ]; + maintainers = with lib.maintainers; [ carlthome ]; }; } diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index a97f71dad212..5d604682a826 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -26,16 +26,15 @@ buildPythonPackage rec { buildInputs = [ lmdb ]; + nativeBuildInputs = [ cffi ]; + env.LMDB_FORCE_SYSTEM = 1; dependencies = [ patch-ng ]; pythonImportsCheck = [ "lmdb" ]; - nativeCheckInputs = [ - cffi - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = { description = "Universal Python binding for the LMDB 'Lightning' Database"; diff --git a/pkgs/development/python-modules/okonomiyaki/default.nix b/pkgs/development/python-modules/okonomiyaki/default.nix index d5365439945c..5ee380a8c820 100644 --- a/pkgs/development/python-modules/okonomiyaki/default.nix +++ b/pkgs/development/python-modules/okonomiyaki/default.nix @@ -64,10 +64,6 @@ buildPythonPackage rec { --replace-fail 'runtime_info = PythonRuntime.from_running_python()' 'raise unittest.SkipTest() #' substituteInPlace okonomiyaki/platforms/_platform.py \ --replace-fail 'name.split()[0]' '(name.split() or [""])[0]' - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace okonomiyaki/platforms/tests/test_pep425.py \ - --replace-fail 'self.assertEqual(platform_tag, self.tag.platform)' 'raise unittest.SkipTest()' ''; pythonImportsCheck = [ "okonomiyaki" ]; diff --git a/pkgs/development/python-modules/reuse/default.nix b/pkgs/development/python-modules/reuse/default.nix index 954fca4a4e2b..8cd13c3e51ab 100644 --- a/pkgs/development/python-modules/reuse/default.nix +++ b/pkgs/development/python-modules/reuse/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "reuse"; - version = "5.0.2"; + version = "5.1.1"; pyproject = true; src = fetchFromGitHub { owner = "fsfe"; repo = "reuse-tool"; tag = "v${version}"; - hash = "sha256-MzI3AY5WLNyCLJZM7Q5wUH3ttx+FHPlSgAfngzOgzec="; + hash = "sha256-xrYr68PpTLglTlLgTHWHJjTd62tzcOvY9h//CxYJOzM="; }; outputs = [ diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 2564a7597fce..d673a96face7 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -78,12 +78,12 @@ }: let - version = "0.21.3"; + version = "0.21.4"; src = fetchFromGitHub { owner = "wandb"; repo = "wandb"; tag = "v${version}"; - hash = "sha256-GJk+Q/PY3/jo/yeetYRgqgMdXdYSlGt7Ny1NqdfHF0Q="; + hash = "sha256-1l68nU/rmYg/Npg1EVraGr2tu/lkNAo9M7Q0IyckEoc="; }; gpu-stats = rustPlatform.buildRustPackage { diff --git a/pkgs/games/openloco/default.nix b/pkgs/games/openloco/default.nix index 5741e8d2c2aa..c8a15981ff85 100644 --- a/pkgs/games/openloco/default.nix +++ b/pkgs/games/openloco/default.nix @@ -17,25 +17,25 @@ let sfl-src = fetchFromGitHub { owner = "slavenf"; repo = "sfl-library"; - tag = "1.9.0"; - hash = "sha256-Udry/Y753l274PU6RvpPgkIr85wSCnz3mLQ0xzerUAc="; + tag = "1.9.2"; + hash = "sha256-/3++CtSuZJ5Sdg8U8mJ/gT+FTatKhBx8QeYjUVQCDWA="; }; openloco-objects = fetchurl { - url = "https://github.com/OpenLoco/OpenGraphics/releases/download/v0.1.1/objects.zip"; - sha256 = "e75ad13a8e8d58458e0c54e5ce62902a073d7bb025ef8fb97cb56108ff7c57c3"; + url = "https://github.com/OpenLoco/OpenGraphics/releases/download/v0.1.3/objects.zip"; + sha256 = "c08937691b9d7a956305864b535c6e4537a84b81a9dc5d4c9016edff83dcceb6"; }; in stdenv.mkDerivation rec { pname = "openloco"; - version = "25.02"; + version = "25.08"; src = fetchFromGitHub { owner = "OpenLoco"; repo = "OpenLoco"; tag = "v${version}"; - hash = "sha256-RsiEYBNx+Lf7OyyyCShQmgtwBuxDrZkRCYCbMmZ8ZMM="; + hash = "sha256-f4GZxLibQM/od0tJoszaG94FkRH5vb9qwQ7OqVdt1cU="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 1771d9880b29..a4090cb4ef20 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -477,6 +477,7 @@ lib.makeOverridable ( # Keep some extra files on some arches (powerpc, aarch64) for f in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do if [ -f "$buildRoot/$f" ]; then + mkdir -p "$(dirname $dev/lib/modules/${modDirVersion}/build/$f)" cp $buildRoot/$f $dev/lib/modules/${modDirVersion}/build/$f fi done diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index c9c027852762..c2d9abd53d29 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -15,14 +15,14 @@ let variants = { # ./update-xanmod.sh lts lts = { - version = "6.12.46"; - hash = "sha256-F3a13wXACJrKHLbEcq+Z+cw08/8Ttqut76osvZ9qdTY="; + version = "6.12.47"; + hash = "sha256-jR1VqFE1jF5mTRAp+Xxswmh9bMIolJtCk4QgMHzIhao="; isLTS = true; }; # ./update-xanmod.sh main main = { - version = "6.16.6"; - hash = "sha256-ayNw64Wkg4HKnxEuvmGmgkJB3wLKqKAkK70mgX3eJJ8="; + version = "6.16.7"; + hash = "sha256-/CFSGaDbK0pZgGGOOxixwOQgeD1OsbUhtRss4VbXHxE="; }; }; diff --git a/pkgs/os-specific/linux/tuxedo-drivers/default.nix b/pkgs/os-specific/linux/tuxedo-drivers/default.nix index 7386e0b8ddf1..a9f579fb6154 100644 --- a/pkgs/os-specific/linux/tuxedo-drivers/default.nix +++ b/pkgs/os-specific/linux/tuxedo-drivers/default.nix @@ -7,22 +7,34 @@ kmod, pahole, gitUpdater, + udevCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "tuxedo-drivers-${kernel.version}"; - version = "4.14.0"; + version = "4.15.4"; src = fetchFromGitLab { group = "tuxedocomputers"; owner = "development/packages"; repo = "tuxedo-drivers"; rev = "v${finalAttrs.version}"; - hash = "sha256-79YZaK8WrHOxSUJWxi4lc+foh4xz3EgRnjw+OrL8yqU="; + hash = "sha256-WJeju+czbCw03ALW7yzGAFENCEAvDdKqHvedchd7NVY="; }; + patches = [ ./no-cp-etc-usr.patch ]; + + postInstall = '' + echo "Running postInstallhook" + install -Dm 0644 -t $out/etc/udev/rules.d usr/lib/udev/rules.d/* + ''; + buildInputs = [ pahole ]; - nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; + nativeBuildInputs = [ + kmod + udevCheckHook + ] + ++ kernel.moduleBuildDependencies; makeFlags = kernelModuleMakeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" @@ -30,6 +42,8 @@ stdenv.mkDerivation (finalAttrs: { "INSTALL_MOD_PATH=${placeholder "out"}" ]; + doInstallCheck = true; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; diff --git a/pkgs/os-specific/linux/tuxedo-drivers/no-cp-etc-usr.patch b/pkgs/os-specific/linux/tuxedo-drivers/no-cp-etc-usr.patch new file mode 100644 index 000000000000..9e94a43d60c5 --- /dev/null +++ b/pkgs/os-specific/linux/tuxedo-drivers/no-cp-etc-usr.patch @@ -0,0 +1,12 @@ +diff --git a/Makefile b/Makefile +index 75a6bc1..6021d42 100644 +--- a/Makefile ++++ b/Makefile +@@ -30,7 +30,6 @@ all: + + install: all + make -C $(KDIR) M=$(PWD) $(MAKEFLAGS) modules_install +- cp -r etc usr / + + clean: + make -C $(KDIR) M=$(PWD) $(MAKEFLAGS) clean diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ffcc8a553d97..78a8c4b385be 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2369,12 +2369,14 @@ mapAliases { tepl = libgedit-tepl; # Added 2024-04-29 termplay = throw "'termplay' has been removed due to lack of maintenance upstream"; # Added 2025-01-25 testVersion = testers.testVersion; # Added 2022-04-20 + textual-paint = throw "'textual-paint' has been removed as it is broken"; # Added 2025-09-10 texinfo4 = throw "'texinfo4' has been removed in favor of the latest version"; # Added 2025-06-08 tezos-rust-libs = ligo; # Added 2025-06-03 tfplugindocs = terraform-plugin-docs; # Added 2023-11-01 thiefmd = throw "'thiefmd' has been removed due to lack of maintenance upstream and incompatible with newer Pandoc. Please use 'apostrophe' or 'folio' instead"; # Added 2025-02-20 thefuck = throw "'thefuck' has been removed due to lack of maintenance upstream and incompatible with python 3.12+. Consider using 'pay-respects' instead"; # Added 2025-05-30 invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05 + ticpp = throw "'ticpp' has been removed due to being unmaintained"; # Added 2025-09-10 tijolo = throw "'tijolo' has been removed due to being unmaintained"; # Added 2024-12-27 timescale-prometheus = throw "'timescale-prometheus' has been renamed to/replaced by 'promscale'"; # Converted to throw 2024-10-17 tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e07466348a9..b4839aa3a1d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14864,6 +14864,8 @@ with pkgs; j2cli = with python311Packages; toPythonApplication j2cli; + j2lint = with python3Packages; toPythonApplication j2lint; + kmonad = haskellPackages.kmonad.bin; # In general we only want keep the last three minor versions around that diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6d8c838dba4f..0fc880511b5d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1911,6 +1911,8 @@ self: super: with self; { binsync = callPackage ../development/python-modules/binsync { }; + biocutils = callPackage ../development/python-modules/biocutils { }; + biom-format = callPackage ../development/python-modules/biom-format { }; biopandas = callPackage ../development/python-modules/biopandas { }; @@ -7321,6 +7323,8 @@ self: super: with self; { j2cli = callPackage ../development/python-modules/j2cli { }; + j2lint = callPackage ../development/python-modules/j2lint { }; + jaconv = callPackage ../development/python-modules/jaconv { }; jalali-core = callPackage ../development/python-modules/jalali-core { };