diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3ad79be89fb8..6cb738e8b39e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19376,6 +19376,12 @@ githubId = 137805; name = "Alexander Tsvyashchenko"; }; + ndom91 = { + email = "nix@ndo.dev"; + github = "ndom91"; + githubId = 7415984; + name = "Nico Domino"; + }; nealfennimore = { email = "hi@neal.codes"; github = "nealfennimore"; diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix deleted file mode 100644 index 997423e45257..000000000000 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, ... }: -{ - imports = [ - ../sd-card/sd-image-aarch64-new-kernel-installer.nix - ]; - config = { - warnings = [ - '' - .../cd-dvd/sd-image-aarch64-new-kernel.nix is deprecated and will eventually be removed. - Please switch to .../sd-card/sd-image-aarch64-new-kernel-installer.nix, instead. - '' - ]; - }; -} diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix deleted file mode 100644 index e7afffb81a5a..000000000000 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, ... }: -{ - imports = [ - ../sd-card/sd-image-aarch64-installer.nix - ]; - config = { - warnings = [ - '' - .../cd-dvd/sd-image-aarch64.nix is deprecated and will eventually be removed. - Please switch to .../sd-card/sd-image-aarch64-installer.nix, instead. - '' - ]; - }; -} diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix deleted file mode 100644 index c16b82256b4f..000000000000 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, ... }: -{ - imports = [ - ../sd-card/sd-image-armv7l-multiplatform-installer.nix - ]; - config = { - warnings = [ - '' - .../cd-dvd/sd-image-armv7l-multiplatform.nix is deprecated and will eventually be removed. - Please switch to .../sd-card/sd-image-armv7l-multiplatform-installer.nix, instead. - '' - ]; - }; -} diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix deleted file mode 100644 index b870d3a8b24e..000000000000 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, ... }: -{ - imports = [ - ../sd-card/sd-image-raspberrypi-installer.nix - ]; - config = { - warnings = [ - '' - .../cd-dvd/sd-image-raspberrypi.nix is deprecated and will eventually be removed. - Please switch to .../sd-card/sd-image-raspberrypi-installer.nix, instead. - '' - ]; - }; -} diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix deleted file mode 100644 index 8f8efff4d41d..000000000000 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, ... }: -{ - imports = [ - ../sd-card/sd-image.nix - ]; - config = { - warnings = [ - '' - .../cd-dvd/sd-image.nix is deprecated and will eventually be removed. - Please switch to .../sd-card/sd-image.nix, instead. - '' - ]; - }; -} diff --git a/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix index 028aae4c8913..c8e323df7c50 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix @@ -11,13 +11,13 @@ }: vimUtils.buildVimPlugin rec { pname = "codediff.nvim"; - version = "2.45.1"; + version = "2.49.2"; src = fetchFromGitHub { owner = "esmuellert"; repo = "codediff.nvim"; tag = "v${version}"; - hash = "sha256-1F6z/rhZxiuI6W1ReyHP6EQFxys4qm3fbINxoy1hQZA="; + hash = "sha256-kT5plTJP4VfN6mFkq6voDTmr9LaZ37W80UU3QUGlKkY="; }; dependencies = [ vimPlugins.nui-nvim ]; diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix index 0002e31fe4af..4b8dead1bf79 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-2026-06-04"; + version = "0-unstable-2026-06-12"; src = fetchFromGitHub { owner = "libretro"; repo = "fbneo"; - rev = "298f913aeb781908c7f6a568a2ede3940a98738d"; - hash = "sha256-UP0jNsqXMzrO+EQY8Gbkl2lIizfsAKoKiGaXGp7Nok8="; + rev = "9723c47c2d782ccb8cf48f96568a89a44631e6ba"; + hash = "sha256-zYIC0up0tkvq0TLjSiypxwSTYAF1XnmHXsUTKsUQejA="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/hatari.nix b/pkgs/applications/emulators/libretro/cores/hatari.nix index 88480119bb42..1214fe8b1ece 100644 --- a/pkgs/applications/emulators/libretro/cores/hatari.nix +++ b/pkgs/applications/emulators/libretro/cores/hatari.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "hatari"; - version = "0-unstable-2026-04-20"; + version = "0-unstable-2026-06-10"; src = fetchFromGitHub { owner = "libretro"; repo = "hatari"; - rev = "6aa7c7079b3186025ebc6bad4b4251aa359a3947"; - hash = "sha256-17L2EpLGwkWA/9XTgtIq+PNABGvgdBQDsAfAZFRKLOE="; + rev = "c605d3aa342f2ad8f915f94bf03bae018e1be7b7"; + hash = "sha256-UJyfIt5+anXaqqMmL9JNTBvXu5bmyMYloYc8fWxx2m0="; }; extraNativeBuildInputs = [ which ]; diff --git a/pkgs/applications/emulators/libretro/cores/mame.nix b/pkgs/applications/emulators/libretro/cores/mame.nix index 7d30ae2ed015..21e6cfd861f6 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-2026-05-31"; + version = "0-unstable-2026-06-10"; src = fetchFromGitHub { owner = "libretro"; repo = "mame"; - rev = "2ffec28bcf65eceb395722c9d721e7d4523fbb56"; - hash = "sha256-37SD78rFYgIoI7FDsgHhupYse8QbzwVRrJCXSVjpLCc="; + rev = "e126237dcf44622deaf18e7668f07ba96c363673"; + hash = "sha256-6M4revCs32ffmUjhl10nL/MsVl8QRn6JQmC7NzDW1Mo="; fetchSubmodules = true; }; diff --git a/pkgs/build-support/fetchcodeberg/default.nix b/pkgs/build-support/fetchcodeberg/default.nix index 4277e5a5613c..aac1f97a7fdb 100644 --- a/pkgs/build-support/fetchcodeberg/default.nix +++ b/pkgs/build-support/fetchcodeberg/default.nix @@ -1,2 +1,11 @@ { lib, fetchFromGitea }: -lib.makeOverridable (args: fetchFromGitea ({ domain = "codeberg.org"; } // args)) +lib.makeOverridable ( + args: + fetchFromGitea ( + { + domain = "codeberg.org"; + functionName = "fetchFromCodeberg"; + } + // args + ) +) diff --git a/pkgs/build-support/fetchgitea/default.nix b/pkgs/build-support/fetchgitea/default.nix index a7910b671e9b..cfa7c592db1f 100644 --- a/pkgs/build-support/fetchgitea/default.nix +++ b/pkgs/build-support/fetchgitea/default.nix @@ -3,7 +3,20 @@ { lib, fetchFromGitHub }: lib.makeOverridable ( - { domain, ... }@args: + { + domain, + functionName ? "fetchFromGitea", + ... + }@args: - fetchFromGitHub ((removeAttrs args [ "domain" ]) // { githubBase = domain; }) + fetchFromGitHub ( + (removeAttrs args [ + "domain" + "functionName" + ]) + // { + inherit functionName; + githubBase = domain; + } + ) ) diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix index f21256f5d57b..27a19b53b18d 100644 --- a/pkgs/build-support/fetchgithub/default.nix +++ b/pkgs/build-support/fetchgithub/default.nix @@ -48,6 +48,7 @@ decorate ( repo, tag ? null, rev ? null, + functionName ? "fetchFromGitHub", # TODO(@ShamrockLee): Add back after reconstruction with lib.extendMkDerivation # name ? repoRevToNameMaybe finalAttrs.repo (lib.revOrTag finalAttrs.revCustom finalAttrs.tag) "github", private ? false, @@ -60,7 +61,7 @@ decorate ( assert ( lib.xor (tag == null) (rev == null) - || throw "fetchFromGitHub requires one of either `rev` or `tag` to be provided (not both)." + || throw "${functionName} requires one of either `rev` or `tag` to be provided (not both)." ); let @@ -115,6 +116,7 @@ decorate ( "repo" "tag" "rev" + "functionName" "private" "githubBase" "varPrefix" @@ -135,7 +137,7 @@ decorate ( in '' if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then - echo "Error: Private fetchFromGitHub requires the nix building process (nix-daemon in multi user mode) to have the ${varBase}USERNAME and ${varBase}PASSWORD env vars set." >&2 + echo "Error: Private ${functionName} requires the nix building process (nix-daemon in multi user mode) to have the ${varBase}USERNAME and ${varBase}PASSWORD env vars set." >&2 exit 1 fi cat > netrc < rawMag {}; ++ // Sized to cover wide / HiDPI windows; paint() additionally clamps the ++ // working width to this capacity so the buffer can never be overrun. ++ std::array rawMag {}; + + // Background color randomization + juce::Colour bgColour = juce::Colour(0xff2a2a2a); // Default dark color diff --git a/pkgs/by-name/qu/quad-morph-filter/package.nix b/pkgs/by-name/qu/quad-morph-filter/package.nix new file mode 100644 index 000000000000..f3949e170a63 --- /dev/null +++ b/pkgs/by-name/qu/quad-morph-filter/package.nix @@ -0,0 +1,126 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + cmake, + pkg-config, + + alsa-lib, + freetype, + juce, + xsimd, + + libx11, + libxcursor, + libxext, + libxinerama, + libxrandr, + + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "quad-morph-filter"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "OTODESK4193"; + repo = "QuadMorphFilter"; + tag = "V${finalAttrs.version}"; + hash = "sha256-xz97h8j411r7g6fSVDo8E4ARLyIP++qK26aTvDqP+Yo="; + }; + + __structuredAttrs = true; + strictDeps = true; + + # FilterVisualizer writes a per-pixel response curve into a fixed + # std::array, assuming the editor is <=1024px wide. The standalone + # window is resizable (HiDPI/large/tiled displays make it far wider), so the + # write overruns the array and smashes adjacent editor members -> SIGSEGV on the + # first paint. Clamp the width to the buffer and size the buffer for wide windows. + # see https://github.com/OTODESK4193/QuadMorphFilter/issues/2 + patches = [ ./filtervisualizer-clamp-width.patch ]; + + postPatch = '' + # Use JUCE from nixpkgs instead of a hardcoded Windows path, and drop + # -mavx2/-mfma: baseline x86_64-linux has no AVX2 and other platforms + # reject the flags. The code contains no AVX intrinsics; it compiles + # and runs fine without them. + substituteInPlace CMakeLists.txt \ + --replace-fail 'set(JUCE_DIR "C:/JUCE")' 'find_package(JUCE CONFIG REQUIRED)' \ + --replace-fail 'add_subdirectory(''${JUCE_DIR} build_juce)' "" \ + --replace-fail ' -mavx2 -mfma' "" \ + --replace-fail ' -ffast-math' "" + + # The Linux WebBrowserComponent (gtk3/webkit) and curl are unused by the + # plugin; disable them instead of pulling the dependencies in. + printf '\ntarget_compile_definitions(QuadMorphFilter PUBLIC JUCE_WEB_BROWSER=0 JUCE_USE_CURL=0)\n' >> CMakeLists.txt + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ + alsa-lib + freetype + juce # propagates fontconfig + libx11 + libxcursor + libxext + libxinerama + libxrandr + xsimd + ]; + + cmakeFlags = [ + # Upstream pulls xsimd via FetchContent; resolve it through + # find_package against the xsimd in buildInputs instead of the network. + (lib.cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS") + ]; + + cmakeBuildType = "RelWithDebInfo"; + + # JUCE dlopens these at runtime, standalone executable crashes without them. + # Must go through `env`: with __structuredAttrs only `env` entries are + # exported, so a top-level NIX_LDFLAGS never reaches the ld wrapper. + env.NIX_LDFLAGS = toString [ + "-lX11" + "-lXext" + "-lXcursor" + "-lXinerama" + "-lXrandr" + ]; + + # Upstream has no install rules. + installPhase = '' + runHook preInstall + + install -Dm755 "QuadMorphFilter_artefacts/$cmakeBuildType/Standalone/Quad-Morph Filter" \ + "$out/bin/quad-morph-filter" + mkdir -p "$out/lib/vst3" + cp -r "QuadMorphFilter_artefacts/$cmakeBuildType/VST3/Quad-Morph Filter.vst3" "$out/lib/vst3/" + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "V(.*)" + ]; + }; + + meta = { + description = "Morphing multi-filter audio plugin with 28 filter models controlled from an XY pad"; + homepage = "https://github.com/OTODESK4193/QuadMorphFilter"; + changelog = "https://github.com/OTODESK4193/QuadMorphFilter/releases/tag/V${finalAttrs.version}"; + # Stated in README.md ("GPLv3, inherited via the JUCE framework"); + # the repository ships no LICENSE file. + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ magnetophon ]; + platforms = lib.platforms.linux; + mainProgram = "quad-morph-filter"; + }; +}) diff --git a/pkgs/by-name/re/redo-apenwarr/package.nix b/pkgs/by-name/re/redo-apenwarr/package.nix index 38aae496b40d..71b0967cd2df 100644 --- a/pkgs/by-name/re/redo-apenwarr/package.nix +++ b/pkgs/by-name/re/redo-apenwarr/package.nix @@ -48,6 +48,11 @@ stdenv.mkDerivation (finalAttrs: { # See https://github.com/apenwarr/redo/pull/47 substituteInPlace minimal/do \ --replace-fail 'cd "$dodir"' 'cd "''${dodir:-.}"' + + # the tests refer to /etc/passwd (as an arbitrarily-chosen absolute-path file that won't change), + # but that fails under sandboxing. Replace it with another arbrarily-chosen file that won't change: + substituteInPlace t/105-sympath/all.do \ + --replace-fail "/etc/passwd" "${coreutils}/bin/pwd" ''; inherit doCheck; diff --git a/pkgs/by-name/rs/rs-reticulum/package.nix b/pkgs/by-name/rs/rs-reticulum/package.nix index 61e756b442c1..4b2b4f81fc4e 100644 --- a/pkgs/by-name/rs/rs-reticulum/package.nix +++ b/pkgs/by-name/rs/rs-reticulum/package.nix @@ -1,27 +1,29 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, pkg-config, bzip2, dbus, python3, + versionCheckHook, nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rs-reticulum"; - version = "1.0.0"; + version = "1.0.1"; __structuredAttrs = true; src = fetchFromGitHub { owner = "ratspeak"; repo = "rsReticulum"; tag = "v${finalAttrs.version}"; - hash = "sha256-CoA+HOcMkwmo7WUhXCLIwx4hMqLHFQqu6d1NOz1N2PY="; + hash = "sha256-MSvIgB/E1Ce8M8vOaXlHQGYnxFf0lT2hg8g0tx6QY/w="; }; - cargoHash = "sha256-h8P2PuW3hiyQuvAHhat831dxBGSmV0rxDWB8lffZpac="; + cargoHash = "sha256-Kv3aVET69yI28muyaJop4YQEqOxNeyajK7j5J+jDhe0="; nativeBuildInputs = [ pkg-config @@ -38,6 +40,15 @@ rustPlatform.buildRustPackage (finalAttrs: { __darwinAllowLocalNetworking = true; + checkFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + # Broken since 0.9.4 + "--skip=actor::tests::test_rate_tracking" + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/rnid-rs"; + passthru.updateScript = nix-update-script { }; meta = { @@ -46,6 +57,5 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/ratspeak/rsReticulum"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ drupol ]; - mainProgram = "rs-reticulum"; }; }) diff --git a/pkgs/by-name/sa/sandhole/package.nix b/pkgs/by-name/sa/sandhole/package.nix index 33dda20b501c..e2f4c6381068 100644 --- a/pkgs/by-name/sa/sandhole/package.nix +++ b/pkgs/by-name/sa/sandhole/package.nix @@ -11,16 +11,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "sandhole"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "EpicEric"; repo = "sandhole"; tag = "v${finalAttrs.version}"; - hash = "sha256-nOh9JRb1T85gEsQzd0BJqvR941QMoqeIjRFg4d8eASc="; + hash = "sha256-ZK8yXitfHT2al2xmYM8uk7is5zelLr3JYS7WcaUR834="; }; - cargoHash = "sha256-EZxRKq5r5Cgp/WqcL1dY4ypf2K73YjaadqI5Tl+6Kec="; + cargoHash = "sha256-ujEIuUNEcHftpeHD6UX8CzoQ1tEcfL0sT3H0z81UBfc="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/sb/sbb-tui/package.nix b/pkgs/by-name/sb/sbb-tui/package.nix index e95e5b5cd23f..c4ffab9730ba 100644 --- a/pkgs/by-name/sb/sbb-tui/package.nix +++ b/pkgs/by-name/sb/sbb-tui/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "sbb-tui"; - version = "1.14.2"; + version = "1.15.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "Necrom4"; repo = "sbb-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-kmT8wVkmAmVQLtSkRRIGInCjXiLfsYd9OrixYcDofS4="; + hash = "sha256-bYIIMFUogowywYmXNWRobmo7etbHqwOV8eHmaxz1AUg="; }; vendorHash = "sha256-K4DOu3rfSlKAa5JNKCzWWpnWZlXXxtN5Po7p1Spqe1w="; diff --git a/pkgs/by-name/un/unigine-superposition/package.nix b/pkgs/by-name/un/unigine-superposition/package.nix index 1d07d10fbd26..3744963f12aa 100644 --- a/pkgs/by-name/un/unigine-superposition/package.nix +++ b/pkgs/by-name/un/unigine-superposition/package.nix @@ -14,7 +14,7 @@ libglvnd, libxext, libxrandr, - mailspring, + openssl, libx11, libice, libxrender, @@ -59,16 +59,17 @@ let libglvnd libxext libxrandr - mailspring libx11 libice libxrender + openssl ]; installPhase = '' bash $src --target $name --noexec mkdir -p $out/bin $out/lib/unigine/superposition/ cp -r $name/* $out/lib/unigine/superposition/ + ln -s ${lib.getLib openssl}/lib/libcrypto.so $out/lib/libcrypto.so.1.0.0 echo "exec $out/lib/unigine/superposition/Superposition" >> $out/bin/superposition chmod +x $out/bin/superposition wrapProgram $out/lib/unigine/superposition/Superposition \ @@ -116,11 +117,11 @@ buildFHSEnv { libglvnd libxext libxrandr - mailspring libx11 libice libxrender openal + openssl ]; runScript = "superposition"; diff --git a/pkgs/by-name/ya/yazi/plugins/allmytoes/default.nix b/pkgs/by-name/ya/yazi/plugins/allmytoes/default.nix new file mode 100644 index 000000000000..94d83a97f6d6 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/allmytoes/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "allmytoes.yazi"; + version = "0-unstable-2025-11-22"; + + src = fetchFromGitHub { + owner = "Sonico98"; + repo = "allmytoes.yazi"; + rev = "acdc53be76434a82218eed8e1fda5512971bf3cc"; + hash = "sha256-zZ9L0FrcxFvSuDJwi6VHQXDT7b/sM4DhZ3LPi/i9tig="; + }; + + meta = { + description = "Generate freedesktop-compatible thumbnails while using yazi"; + homepage = "https://github.com/Sonico98/allmytoes.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ luminarleaf ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/omni-trash/default.nix b/pkgs/by-name/ya/yazi/plugins/omni-trash/default.nix new file mode 100644 index 000000000000..8857307ff8bd --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/omni-trash/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "omni-trash.yazi"; + version = "0-unstable-2026-06-10"; + + src = fetchFromGitHub { + owner = "goon"; + repo = "omni-trash.yazi"; + rev = "3c2a9923673e0552a093afc4122473df1d427a93"; + hash = "sha256-heqqEWzJCoNt3CIJAEaWfqUX4J9BfVEw3OsU7Xjc17M="; + }; + + meta = { + description = "Yazi plugin to manage your trash across all drives from a single, unified interface, powered by trash-cli"; + homepage = "https://github.com/goon/omni-trash.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ anninzy ]; + }; +} diff --git a/pkgs/by-name/yq/yq-go/package.nix b/pkgs/by-name/yq/yq-go/package.nix index 2d79bfe85617..358a57af01d3 100644 --- a/pkgs/by-name/yq/yq-go/package.nix +++ b/pkgs/by-name/yq/yq-go/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "yq-go"; - version = "4.53.2"; + version = "4.53.3"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; tag = "v${finalAttrs.version}"; - hash = "sha256-So0yUblAxLgbw1/BrOp6zj9wGMTtsspjk2UQaBIBIYE="; + hash = "sha256-e4/Tu40Fe2DKzP7+ZLqkWty+VJ5eWGyKAwH0U07gQeg="; }; - vendorHash = "sha256-t+u3rJNbe8JcfWBb+jMaZuTcSWYmhMiCeKbI2noVaCo="; + vendorHash = "sha256-B+FGknoNYfWXT8nx0teSCdT9i18VJMv8L1dv1w8gcF8="; nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ installShellFiles diff --git a/pkgs/by-name/zo/zotero/package.nix b/pkgs/by-name/zo/zotero/package.nix index 438a9eee0f86..326e3129cd7f 100644 --- a/pkgs/by-name/zo/zotero/package.nix +++ b/pkgs/by-name/zo/zotero/package.nix @@ -22,6 +22,7 @@ xvfb-run, makeBinaryWrapper, doCheck ? false, + zotero, }: let # note-editor needs nodejs 22. Any newer version fails to build zotero's fork of @benrbray/prosemirror-math during npm install. @@ -345,7 +346,12 @@ buildNpmPackage (finalAttrs: { makeWrapper $out/Applications/Zotero.app/Contents/MacOS/zotero $out/bin/zotero ''; - passthru.updateScript = nix-update-script { }; + passthru = { + tests.build-with-checks = zotero.override { + doCheck = true; + }; + updateScript = nix-update-script { }; + }; meta = { homepage = "https://www.zotero.org"; diff --git a/pkgs/development/python-modules/bleak-esphome/default.nix b/pkgs/development/python-modules/bleak-esphome/default.nix index 1e88ad92ffb5..9215ad8723ce 100644 --- a/pkgs/development/python-modules/bleak-esphome/default.nix +++ b/pkgs/development/python-modules/bleak-esphome/default.nix @@ -19,14 +19,14 @@ buildPythonPackage (finalAttrs: { pname = "bleak-esphome"; - version = "3.9.1"; + version = "3.9.4"; pyproject = true; src = fetchFromGitHub { owner = "bluetooth-devices"; repo = "bleak-esphome"; tag = "v${finalAttrs.version}"; - hash = "sha256-6qwg6jI9zFf3x0Yfp03C62f+LMO/RIDju+/ykoiOCI4="; + hash = "sha256-kH+UiXpu0HNdz55Qz8y/NJ/XzOkTk7fkah7CZE2Zets="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cf-xarray/default.nix b/pkgs/development/python-modules/cf-xarray/default.nix index 9d5334502e07..1c77d916cb88 100644 --- a/pkgs/development/python-modules/cf-xarray/default.nix +++ b/pkgs/development/python-modules/cf-xarray/default.nix @@ -18,14 +18,14 @@ buildPythonPackage (finalAttrs: { pname = "cf-xarray"; - version = "0.11.1"; + version = "0.11.3"; pyproject = true; src = fetchFromGitHub { owner = "xarray-contrib"; repo = "cf-xarray"; tag = "v${finalAttrs.version}"; - hash = "sha256-UB/aMXnfX2dOprjQp51QHYOGq9Acn030oLqjLt/avS4="; + hash = "sha256-njwK8wJH0YKzA7Lq8J0gBvAzNJa24XncF7IB9Dy6Lys="; }; build-system = [ diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index e2317d08a38c..2b3beaaf0149 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "fastcore"; - version = "1.12.39"; + version = "1.13.3"; pyproject = true; src = fetchFromGitHub { owner = "fastai"; repo = "fastcore"; tag = finalAttrs.version; - hash = "sha256-4pa0h+8V7E3CJtJguM/OhEK61OeK/+JKEL7fNsWIKek="; + hash = "sha256-ZwiqTGgvu/OdnaJHq+oWZat33BvhF52X48d6ipcexRU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index da57c08873cb..fe7dbded4bd7 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.8.0"; + version = "1.10.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_appengine_logging"; inherit version; - hash = "sha256-hLcFpp5BCfwvaN/jbOPfajTVw9mJ7ubQrBsCTdoLpvU="; + hash = "sha256-tVY+dgEKNuat8cxIliDCnuT7O5hrAG0jfpoGHrDwq7c="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/growattserver/default.nix b/pkgs/development/python-modules/growattserver/default.nix index 6cd940f85681..30edba45b29b 100644 --- a/pkgs/development/python-modules/growattserver/default.nix +++ b/pkgs/development/python-modules/growattserver/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "growattserver"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "indykoning"; repo = "PyPi_GrowattServer"; tag = finalAttrs.version; - hash = "sha256-MRxNPyvIlMafJYhjMNirb0cqppJYr9MUR7FxjhqQsyY="; + hash = "sha256-zVcKuwTxuCCIZzVKgEdjULSyKgKcb/Fb93rk3J8ztCg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 4b49c19db0cc..d1dbede3737d 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202606121"; + version = "0.1.202606131"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-d7joiPl5EQaGH0co6SC1ifnjRV7FowFswGFF6mSmIcM="; + hash = "sha256-QPaaJ+yeRC2CYsUNTwBrqZStJ/+BxfYG0xteo+iYV/Y="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix index f03fb728feae..61011013734f 100644 --- a/pkgs/development/python-modules/libknot/default.nix +++ b/pkgs/development/python-modules/libknot/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "libknot"; - version = "3.5.4"; + version = "3.5.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-pwXOlz5oxtDOkUXWcqTSwPc9BeYaikG4E7qJ4rbVsAk="; + hash = "sha256-zv8N2Nmk+9BK2U6kfqV+tVoJDQXXZ9vgV+jEYDAYN3g="; }; postPatch = '' diff --git a/pkgs/development/python-modules/raylib-python-cffi/default.nix b/pkgs/development/python-modules/raylib-python-cffi/default.nix index 3f4160960c29..659109475bec 100644 --- a/pkgs/development/python-modules/raylib-python-cffi/default.nix +++ b/pkgs/development/python-modules/raylib-python-cffi/default.nix @@ -16,14 +16,14 @@ buildPythonPackage (finalAttrs: { pname = "raylib-python-cffi"; - version = "5.5.0.4"; + version = "6.0.1.0"; pyproject = true; src = fetchFromGitHub { owner = "electronstudio"; repo = "raylib-python-cffi"; tag = "v${finalAttrs.version}"; - hash = "sha256-MKyTpGnup4QmRui2OVBpnyn9KENATWcwYcikOmYX4c8="; + hash = "sha256-9eN3H62gYDloMHbJbTFiO3acif3GJuTkk4CWltzBOXg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index 19f9a8376396..7de0016c5fa1 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -2,12 +2,15 @@ lib, stdenv, altair, + anyio, blinker, buildPythonPackage, cachetools, click, fetchPypi, gitpython, + httptools, + itsdangerous, numpy, packaging, pandas, @@ -15,24 +18,28 @@ protobuf, pyarrow, pydeck, - setuptools, + python-multipart, requests, rich, + setuptools, + starlette, tenacity, toml, tornado, typing-extensions, + uvicorn, watchdog, + websockets, }: buildPythonPackage (finalAttrs: { pname = "streamlit"; - version = "1.55.0"; + version = "1.58.0"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-AV5RK70C0AD0BH5REY3AhrcOfZxGtKEaM8JQlzE3liY="; + hash = "sha256-eKIucIWwU6985UREK/S2cHceaMUJuhvaoFa6Bwj0nD0="; }; build-system = [ setuptools ]; @@ -44,23 +51,30 @@ buildPythonPackage (finalAttrs: { dependencies = [ altair + anyio blinker cachetools click + gitpython + httptools + itsdangerous numpy packaging pandas pillow protobuf pyarrow + pydeck + python-multipart requests rich + starlette tenacity toml - typing-extensions - gitpython - pydeck tornado + typing-extensions + uvicorn + websockets ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ watchdog ]; diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix index 4455be29ee79..98d0f136a4f8 100644 --- a/pkgs/development/python-modules/types-urllib3/default.nix +++ b/pkgs/development/python-modules/types-urllib3/default.nix @@ -2,18 +2,23 @@ lib, buildPythonPackage, fetchPypi, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-urllib3"; version = "1.26.25.14"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Ipt/V3yVG4wbksG8Ky/bC0mEe9KvbRzCouPdNA872o8="; }; + build-system = [ setuptools ]; + # Module doesn't have tests doCheck = false; @@ -25,4 +30,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/kde/third-party/karousel/default.nix b/pkgs/kde/third-party/karousel/default.nix index 512c0bc4b900..f338a5be0d0d 100644 --- a/pkgs/kde/third-party/karousel/default.nix +++ b/pkgs/kde/third-party/karousel/default.nix @@ -10,19 +10,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "karousel"; - version = "0.15"; + version = "0.17"; src = fetchFromGitHub { owner = "peterfajdiga"; repo = "karousel"; rev = "v${finalAttrs.version}"; - hash = "sha256-pxcKfhQmudxCJ7fwteT+QZrRib03tYZEWiRjmZtVKgQ="; + hash = "sha256-qrsdVyeDD4VuGQKzUqxxGt+a4zA6jOI0cSxTSnBkkgQ="; }; postPatch = '' patchShebangs run-ts.sh substituteInPlace Makefile \ - --replace-fail "build: lint tests" "build: tests" + --replace-fail "build: lint test" "build: test" ''; nativeBuildInputs = [ diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 6b61a16d94ab..a597cea10f5d 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -1359,6 +1359,49 @@ in maintainers = with lib.maintainers; [ szaffarano ]; }; }; + + tmux-window-name = mkTmuxPlugin { + pluginName = "tmux-window-name"; + version = "2024-03-08"; + src = fetchFromGitHub { + owner = "ofirgall"; + repo = "tmux-window-name"; + rev = "34026b6f442ceb07628bf25ae1b04a0cd475e9ae"; + sha256 = "sha256-BNgxLk/BkaQkGlB4g2WKVs39y4VHL1Y2TdTEoBy7yo0="; + }; + nativeBuildInputs = [ pkgs.makeWrapper ]; + rtpFilePath = "tmux_window_name.tmux"; + postInstall = '' + script=$target/scripts/rename_session_windows.py + + sed -i \ + -e 's|^USR_BIN_REMOVER.*|USR_BIN_REMOVER = (r"^" + os.path.expanduser("~") + r"/.nix-profile/bin/(.+)( --.*)?", r"\\g<1>")|' \ + -e 's|^\(\s*\)substitute_sets: List.*|\1substitute_sets: List[Tuple] = field(default_factory=lambda: [(os.path.expanduser("~") + r"/.nix-profile/bin/(.+) --.*", r"\\g<1>"), (r".+ipython([32])", r"ipython\\g<1>"), USR_BIN_REMOVER, (r"(bash) (.+)/(.+[ $])(.+)", r"\\g<3>\\g<4>")])|' \ + -e 's|^\(\s*\)dir_programs: List.*|\1dir_programs: List[str] = field(default_factory=lambda: [os.path.expanduser("~") + "/.nix-profile/bin/" + p for p in ["vim", "vi", "git", "nvim"]])|' \ + $script + + for f in tmux_window_name.tmux scripts/rename_session_windows.py; do + wrapProgram $target/$f \ + --prefix PATH : ${ + lib.makeBinPath [ + (pkgs.python3.withPackages ( + p: with p; [ + libtmux + pip + ] + )) + ] + } + done + ''; + meta = with lib; { + homepage = "https://github.com/ofirgall/tmux-window-name"; + description = "Tmux plugin to name your windows smartly, like IDE's"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ ndom91 ]; + }; + }; } // lib.optionalAttrs config.allowAliases { mkDerivation = throw "tmuxPlugins.mkDerivation is deprecated, use tmuxPlugins.mkTmuxPlugin instead"; # added 2021-03-14 diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json index faa9a5e851fb..d419fa5b0c1e 100644 --- a/pkgs/servers/web-apps/lemmy/pin.json +++ b/pkgs/servers/web-apps/lemmy/pin.json @@ -1,8 +1,8 @@ { - "serverVersion": "0.19.18", - "uiVersion": "0.19.18", - "serverHash": "sha256-NUr96dsH3Gd+1ouOAgPheU0hnDI37a87EN642u482Sg=", - "serverCargoHash": "sha256-oI8o+29kqjkAP2DIoSopPMQb5YlZNja1hV1bVmfMIvU=", - "uiHash": "sha256-7WcPujev7VrkoX5vvGUvS0hUVJnCZjsceO5zK36jPbw=", - "uiPNPMDepsHash": "sha256-dRUD/R7Qtlfy2saX7grfdi5qBDP8gc3L3+C2m7ro1CU=" + "serverVersion": "0.19.19", + "uiVersion": "0.19.19", + "serverHash": "sha256-JcJV1dEWlFsbv9eH2yQMGYEZEFB/Pe1xtL1UNtKI6c4=", + "serverCargoHash": "sha256-cwmz8Gf7T1IsCRyxo3ap+byX+Aj7+iCTHmZ/IeMN2no=", + "uiHash": "sha256-67OMwzOGl+dMX5YNPPBG/QwKOVerkSa7ICbrQl4YBp4=", + "uiPNPMDepsHash": "sha256-T7vHfeewwT8fCH6AM6u2GFRkd+KWsp4lKj5I7I+yJAo=" } diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index 9c573d048104..c3cb5c6444e1 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -66,7 +66,7 @@ rustPlatform.buildRustPackage rec { # This gets installed automatically by cargoInstallHook, # but we don't actually need it, and it leaks a reference to rustc. - postInstall = '' + postInstall = lib.optionals (!stdenv.hostPlatform.isDarwin) '' rm $out/lib/libhtml2md.so '';