diff --git a/nixos/modules/services/hardware/auto-cpufreq.nix b/nixos/modules/services/hardware/auto-cpufreq.nix index e79d1542f252..7c88b63f604e 100644 --- a/nixos/modules/services/hardware/auto-cpufreq.nix +++ b/nixos/modules/services/hardware/auto-cpufreq.nix @@ -40,6 +40,8 @@ in path = with pkgs; [ bash coreutils + # Battery thresholds control executes lsmod + kmod ]; serviceConfig.WorkingDirectory = ""; diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix index 5d7c6373ae21..a0eb9af8c041 100644 --- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix +++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix @@ -13,13 +13,13 @@ }: mkLibretroCore { core = "ppsspp"; - version = "0-unstable-2026-01-04"; + version = "0-unstable-2026-01-10"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; - rev = "6c0aff3a28b8c1ee97e1346d0b2404179ce5e5c0"; - hash = "sha256-X/d3qGpdTJx7r6qtW2P/l7COMsv4oJ1nqjZC0QRLYiQ="; + rev = "3f3b353350aae4f9584070c793bf19983886d910"; + hash = "sha256-VFAs6bmMWRn737nfRd98vcFJkVQ6Z580COUmgl2aOY0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/vba-m.nix b/pkgs/applications/emulators/libretro/cores/vba-m.nix index 0e0d9cd98671..7beabad5155d 100644 --- a/pkgs/applications/emulators/libretro/cores/vba-m.nix +++ b/pkgs/applications/emulators/libretro/cores/vba-m.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "vbam"; - version = "0-unstable-2026-01-04"; + version = "0-unstable-2024-10-21"; src = fetchFromGitHub { owner = "libretro"; repo = "vbam-libretro"; - rev = "894948f85303253d4e70ae03c9eff8865d95f427"; - hash = "sha256-0KgCJSYn0PUL/5cGLzFEfRCAMtsdY4N6wY5hbNteRFI="; + rev = "60b48a3a4a46562f29120c1868a54778b40b60a2"; + hash = "sha256-UbXSHdKfa91MpcYityo+aILbI0DfkLqZh8YfGcRx/BI="; }; makefile = "Makefile"; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix index ac2e32d5a09d..d1749a14986c 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix @@ -7,13 +7,13 @@ mkHyprlandPlugin (finalAttrs: { pluginName = "hypr-darkwindow"; - version = "0.52.2"; + version = "0.53.1"; src = fetchFromGitHub { owner = "micha4w"; repo = "Hypr-DarkWindow"; tag = "v${finalAttrs.version}"; - hash = "sha256-0jqliHlmW/lEDC3X8tYrqdY6d15h1hF40p32r4Nsa4w="; + hash = "sha256-gfRfNeqaXc1yQh41tv9WtNLZydxwFoLYBP+inndexvA="; }; installPhase = '' diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix index 81252598f64a..180a4c132050 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix @@ -8,13 +8,13 @@ }: mkHyprlandPlugin (finalAttrs: { pluginName = "hyprsplit"; - version = "0.52.2"; + version = "0.53.1"; src = fetchFromGitHub { owner = "shezdy"; repo = "hyprsplit"; tag = "v${finalAttrs.version}"; - hash = "sha256-6s8nuPwLP5NKUevLeYYgHirk9RkZhaXtDRXBfrIAibs="; + hash = "sha256-seA9mz0Yej4yYZVgzd7yKoHwuueKhfQPu0CyB7EL8No="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/br/brotli/package.nix b/pkgs/by-name/br/brotli/package.nix index ee1c8535c0af..a28ac9846ec1 100644 --- a/pkgs/by-name/br/brotli/package.nix +++ b/pkgs/by-name/br/brotli/package.nix @@ -6,6 +6,7 @@ python3Packages, staticOnly ? stdenv.hostPlatform.isStatic, testers, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -41,9 +42,12 @@ stdenv.mkDerivation (finalAttrs: { cp ../docs/*.3 $out/share/man/man3/ ''; - passthru.tests = { - pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - python = python3Packages.brotli; + passthru = { + tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + python = python3Packages.brotli; + }; + updateScript = nix-update-script { }; }; meta = { @@ -63,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { https://datatracker.ietf.org/doc/html/rfc7932 ''; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ mdaniels5757 ]; pkgConfigModules = [ "libbrotlidec" "libbrotlienc" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 79bf6ba1cac6..f932cd7f1816 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -22,6 +22,11 @@ buildNpmPackage (finalAttrs: { postPatch = '' cp ${./package-lock.json} package-lock.json + + # Replace hardcoded `/bin/bash` with `/usr/bin/env bash` for Nix compatibility + # https://github.com/anthropics/claude-code/issues/15195 + substituteInPlace cli.js \ + --replace-warn '#!/bin/bash' '#!/usr/bin/env bash' ''; dontNpmBuild = true; diff --git a/pkgs/by-name/cm/cmake-format/package.nix b/pkgs/by-name/cm/cmake-format/package.nix index 3070e55bc021..62fca21a1617 100644 --- a/pkgs/by-name/cm/cmake-format/package.nix +++ b/pkgs/by-name/cm/cmake-format/package.nix @@ -11,7 +11,8 @@ python3Packages.buildPythonApplication rec { format = "wheel"; src = fetchPypi { - inherit version format; + inherit version; + format = "wheel"; pname = "cmakelang"; sha256 = "0kmggnfbv6bba75l3zfzqwk0swi90brjka307m2kcz2w35kr8jvn"; }; diff --git a/pkgs/by-name/co/constrict/package.nix b/pkgs/by-name/co/constrict/package.nix new file mode 100644 index 000000000000..8df59d9f2d9c --- /dev/null +++ b/pkgs/by-name/co/constrict/package.nix @@ -0,0 +1,77 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + meson, + ninja, + pkg-config, + blueprint-compiler, + gobject-introspection, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, + libglycin, + libva-utils, + ffmpeg, + gst-thumbnailers, + glycin-loaders, +}: + +python3Packages.buildPythonApplication (finalAttrs: { + pname = "constrict"; + version = "25.12.1"; + pyproject = false; # Built with meson + + src = fetchFromGitHub { + owner = "Wartybix"; + repo = "Constrict"; + tag = finalAttrs.version; + hash = "sha256-ZSiBlejNFakz+/3qj3n+ekB5l9JOk3MiQ8PRZOdxtLQ="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + blueprint-compiler + gobject-introspection + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + libglycin + ]; + + dependencies = [ + python3Packages.pygobject3 + ]; + + # Search for use of subprocess + runtimeDeps = [ + libva-utils + ffmpeg + gst-thumbnailers + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + ''${gappsWrapperArgs[@]} + --prefix XDG_DATA_DIRS : "${glycin-loaders}/share" + --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps} + ) + ''; + + meta = { + description = "Compresses your videos to your chosen file size"; + homepage = "https://github.com/Wartybix/Constrict"; + changelog = "https://github.com/Wartybix/Constrict/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.gpl3Plus; + mainProgram = "constrict"; + teams = [ lib.teams.gnome-circle ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ed/ed/package.nix b/pkgs/by-name/ed/ed/package.nix index 46e352ef2c68..25db42bca9c7 100644 --- a/pkgs/by-name/ed/ed/package.nix +++ b/pkgs/by-name/ed/ed/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl3Plus; mainProgram = "ed"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ mdaniels5757 ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix index b0a0fa1519ef..8d084497a755 100644 --- a/pkgs/by-name/fr/freetube/package.nix +++ b/pkgs/by-name/fr/freetube/package.nix @@ -70,7 +70,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { makeWrapper ${lib.getExe electron} $out/bin/freetube \ --add-flags "$out/share/freetube/resources/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" install -D _icons/icon.svg $out/share/icons/hicolor/scalable/apps/freetube.svg '' diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix index 4dfd94c39534..f2e519bf5364 100644 --- a/pkgs/by-name/gl/glaze/package.nix +++ b/pkgs/by-name/gl/glaze/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (final: { pname = "glaze"; - version = "6.2.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "stephenberry"; repo = "glaze"; tag = "v${final.version}"; - hash = "sha256-gxSmCKzehnDfoexEm1V2cs91qDUzRJrtFjCsM1NHI9Y="; + hash = "sha256-bYXXQmrVnrBTW/r+fgRBPYfKGPtHvEDw0Sk6BYTMm/4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/gn/gnulib/memcpy-fix-backport-250512.patch b/pkgs/by-name/gn/gnulib/memcpy-fix-backport-250512.patch new file mode 100644 index 000000000000..1900b618bc27 --- /dev/null +++ b/pkgs/by-name/gn/gnulib/memcpy-fix-backport-250512.patch @@ -0,0 +1,67 @@ +Based on https://gitweb.git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff_plain;h=c44fe03b72687c9e913727724c29bdb49c1f86e3 + +Backported to 5c5298c4f47bf1912f6317a938df501e680f2bcb for use in packages with older gnulibs + +diff --git a/lib/string.in.h b/lib/string.in.h +index e764221168..db574ca576 100644 +--- a/lib/string.in.h ++++ b/lib/string.in.h +@@ -214,38 +214,58 @@ _GL_EXTERN_C void free (void *); + + /* Declarations for ISO C N3322. */ + #if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__ ++# ifndef memcpy + _GL_EXTERN_C void *memcpy (void *__dest, const void *__src, size_t __n) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); ++# endif ++# ifndef memccpy + _GL_EXTERN_C void *memccpy (void *__dest, const void *__src, int __c, size_t __n) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 4) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 4); ++# endif ++# ifndef memmove + _GL_EXTERN_C void *memmove (void *__dest, const void *__src, size_t __n) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); ++# endif ++# ifndef strncpy + _GL_EXTERN_C char *strncpy (char *__dest, const char *__src, size_t __n) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); ++# endif ++# ifndef strndup + _GL_EXTERN_C char *strndup (const char *__s, size_t __n) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 2); ++# endif ++# ifndef strncat + _GL_EXTERN_C char *strncat (char *__dest, const char *__src, size_t __n) + _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); ++# endif ++# ifndef memcmp + _GL_EXTERN_C int memcmp (const void *__s1, const void *__s2, size_t __n) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); ++# endif ++# ifndef strncmp + _GL_EXTERN_C int strncmp (const char *__s1, const char *__s2, size_t __n) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); +-# ifndef __cplusplus ++# endif ++# if !defined memchr && !defined __cplusplus + _GL_EXTERN_C void *memchr (const void *__s, int __c, size_t __n) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3); + _GL_EXTERN_C void *memrchr (const void *__s, int __c, size_t __n) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3); + # endif ++# ifndef memset + _GL_EXTERN_C void *memset (void *__s, int __c, size_t __n) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3); ++# endif ++# ifndef memset_explicit + _GL_EXTERN_C void *memset_explicit (void *__s, int __c, size_t __n) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3); ++# endif + #endif + \ No newline at end of file diff --git a/pkgs/by-name/gn/gnulib/memcpy-fix.patch b/pkgs/by-name/gn/gnulib/memcpy-fix.patch new file mode 100644 index 000000000000..8584a773982a --- /dev/null +++ b/pkgs/by-name/gn/gnulib/memcpy-fix.patch @@ -0,0 +1,107 @@ +Based on https://gitweb.git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff_plain;h=c44fe03b72687c9e913727724c29bdb49c1f86e3 + +--- a/lib/string.in.h ++++ b/lib/string.in.h +@@ -214,63 +214,83 @@ + + /* Declarations for ISO C N3322. */ + #if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__ ++# ifndef memcpy + _GL_EXTERN_C void *memcpy (void *__dest, const void *__src, size_t __n) +-# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 ++# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 + _GL_ATTRIBUTE_NOTHROW +-# endif ++# endif + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); ++# endif ++# ifndef memccpy + _GL_EXTERN_C void *memccpy (void *__dest, const void *__src, int __c, size_t __n) +-# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 ++# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 + _GL_ATTRIBUTE_NOTHROW +-# endif ++# endif + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 4) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 4); ++# endif ++# ifndef memmove + _GL_EXTERN_C void *memmove (void *__dest, const void *__src, size_t __n) +-# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 ++# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 + _GL_ATTRIBUTE_NOTHROW +-# endif ++# endif + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); ++# endif ++# ifndef strncpy + _GL_EXTERN_C char *strncpy (char *__dest, const char *__src, size_t __n) +-# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 ++# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 + _GL_ATTRIBUTE_NOTHROW +-# endif ++# endif + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); ++# endif ++# ifndef strndup + _GL_EXTERN_C char *strndup (const char *__s, size_t __n) +-# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 ++# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 + _GL_ATTRIBUTE_NOTHROW +-# endif ++# endif + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 2); ++# endif ++# ifndef strncat + _GL_EXTERN_C char *strncat (char *__dest, const char *__src, size_t __n) +-# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 ++# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 + _GL_ATTRIBUTE_NOTHROW +-# endif ++# endif + _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); ++# endif ++# ifndef memcmp + _GL_EXTERN_C int memcmp (const void *__s1, const void *__s2, size_t __n) +-# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 ++# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 + _GL_ATTRIBUTE_NOTHROW +-# endif ++# endif + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); ++# endif ++# ifndef strncmp + _GL_EXTERN_C int strncmp (const char *__s1, const char *__s2, size_t __n) +-# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 ++# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 + _GL_ATTRIBUTE_NOTHROW +-# endif ++# endif + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); +-# ifndef __cplusplus ++# endif ++# if !defined memchr && !defined __cplusplus + _GL_EXTERN_C void *memchr (const void *__s, int __c, size_t __n) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3); + _GL_EXTERN_C void *memrchr (const void *__s, int __c, size_t __n) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3); + # endif ++# ifndef memset + _GL_EXTERN_C void *memset (void *__s, int __c, size_t __n) +-# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 ++# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 + _GL_ATTRIBUTE_NOTHROW +-# endif ++# endif + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3); ++# endif ++# ifndef memset_explicit + _GL_EXTERN_C void *memset_explicit (void *__s, int __c, size_t __n) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3); ++# endif + #endif diff --git a/pkgs/by-name/gn/gnulib/package.nix b/pkgs/by-name/gn/gnulib/package.nix index c8d47e6666fc..afa89c12dd4d 100644 --- a/pkgs/by-name/gn/gnulib/package.nix +++ b/pkgs/by-name/gn/gnulib/package.nix @@ -34,6 +34,11 @@ stdenv.mkDerivation { # do not change headers to not update all vendored build files dontFixup = true; + passthru.patches = { + memcpy-fix = ./memcpy-fix.patch; + memcpy-fix-backport-250512 = ./memcpy-fix-backport-250512.patch; + }; + meta = { description = "Central location for code to be shared among GNU packages"; homepage = "https://www.gnu.org/software/gnulib/"; diff --git a/pkgs/by-name/gs/gst-thumbnailers/package.nix b/pkgs/by-name/gs/gst-thumbnailers/package.nix new file mode 100644 index 000000000000..3b84499f8a7c --- /dev/null +++ b/pkgs/by-name/gs/gst-thumbnailers/package.nix @@ -0,0 +1,67 @@ +{ + lib, + stdenv, + fetchFromGitLab, + rustPlatform, + meson, + ninja, + pkg-config, + cargo, + rustc, + wrapGAppsNoGuiHook, + gst_all_1, + fontconfig, + libglycin, + glycin-loaders, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gst-thumbnailers"; + version = "1.0.alpha.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "gst-thumbnailers"; + tag = finalAttrs.version; + hash = "sha256-LOdD8ECSK+QuXkE8jjIg5IfZSQ5FcIi3hmZ2vAaaBKI="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-PIqEEijKe+wsX6idqoIB591h1Yj4mixwXDKDN4caO9I="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + cargo + rustc + wrapGAppsNoGuiHook + ]; + + buildInputs = [ + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + fontconfig + libglycin + ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${glycin-loaders}/share" + ) + ''; + + meta = { + description = "Generate thumbnailer for video and audio files"; + homepage = "https://gitlab.gnome.org/GNOME/gst-thumbnailers"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.aleksana ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/hp/hpp2plantuml/package.nix b/pkgs/by-name/hp/hpp2plantuml/package.nix index 853d938ac68c..cfa75e3ee4e7 100644 --- a/pkgs/by-name/hp/hpp2plantuml/package.nix +++ b/pkgs/by-name/hp/hpp2plantuml/package.nix @@ -10,7 +10,8 @@ python3Packages.buildPythonApplication rec { format = "wheel"; src = fetchPypi { - inherit pname version format; + inherit pname version; + format = "wheel"; hash = "sha256-9FggDDOxWr4z1DBbvYLyvgs3CCguFjq3I4E9ULwL0+Q="; }; diff --git a/pkgs/by-name/is/isocodes/package.nix b/pkgs/by-name/is/isocodes/package.nix index c3c0e79ef08c..49cc31de2aca 100644 --- a/pkgs/by-name/is/isocodes/package.nix +++ b/pkgs/by-name/is/isocodes/package.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://salsa.debian.org/iso-codes-team/iso-codes"; description = "Various ISO codes packaged as XML files"; license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ mdaniels5757 ]; platforms = lib.platforms.all; pkgConfigModules = [ "iso-codes" ]; }; diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix index 23cbef0de559..ad6ceada1b8a 100644 --- a/pkgs/by-name/jj/jjui/package.nix +++ b/pkgs/by-name/jj/jjui/package.nix @@ -7,16 +7,16 @@ }: buildGoModule (finalAttrs: { pname = "jjui"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "idursun"; repo = "jjui"; tag = "v${finalAttrs.version}"; - hash = "sha256-YEEcSaIm21IUp7EFdYvDG2h55YIqzghYdGxdXmZnp9I="; + hash = "sha256-kBhEX6k/1vVhSqKeUcIQp6sOpKDnJfgUNKOTzbjG/VI="; }; - vendorHash = "sha256-2TlJJY/eM6yYFOdq8CcH9l2lFHJmFrihuGwLS7jMwJ0="; + vendorHash = "sha256-jte0g+aUiGNARLi8DyfsX6wYYJnodHnILzmid6KvMiA="; ldflags = [ "-X main.Version=${finalAttrs.version}" ]; diff --git a/pkgs/by-name/ma/man-pages/package.nix b/pkgs/by-name/ma/man-pages/package.nix index df1bca2e0fdc..6aa04f9e6baa 100644 --- a/pkgs/by-name/ma/man-pages/package.nix +++ b/pkgs/by-name/ma/man-pages/package.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Linux development manual pages"; homepage = "https://www.kernel.org/doc/man-pages/"; license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ mdaniels5757 ]; platforms = lib.platforms.unix; priority = 30; # if a package comes with its own man page, prefer it }; diff --git a/pkgs/by-name/mp/mpv/scripts/cut.nix b/pkgs/by-name/mp/mpv/scripts/cut.nix new file mode 100644 index 000000000000..592afadcb1e5 --- /dev/null +++ b/pkgs/by-name/mp/mpv/scripts/cut.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: + +stdenvNoCC.mkDerivation { + pname = "mpv-cut"; + version = "2.2.0-unstable-2023-11-21"; + + src = fetchFromGitHub { + owner = "familyfriendlymikey"; + repo = "mpv-cut"; + rev = "3b18f1161ffb2ff822c88cb97e099772d4b3c26d"; + hash = "sha256-c4NHJM1qeXXBz8oyGUzS9QiAzRYiNKjmArM1K0Q2Xo0="; + }; + + dontBuild = true; + dontCheck = true; + + installPhase = '' + runHook preInstall + + install -Dm644 main.lua $out/share/mpv/scripts/cut.lua + install -Dm644 utils $out/share/mpv/scripts/cut/utils + + runHook postInstall + ''; + + passthru.scriptName = "cut.lua"; + + meta = with lib; { + description = "An mpv plugin for cutting videos incredibly quickly"; + homepage = "https://github.com/familyfriendlymikey/mpv-cut"; + license = licenses.unfree; # the repository doesn't have a license + maintainers = with maintainers; [ ncfavier ]; + }; +} diff --git a/pkgs/by-name/oc/oculante/libaom-sys-0.17.2+libaom.3.11.0-cmake-nasm-fix.patch b/pkgs/by-name/oc/oculante/libaom-sys-0.17.2+libaom.3.11.0-cmake-nasm-fix.patch new file mode 100644 index 000000000000..744d0a05da55 --- /dev/null +++ b/pkgs/by-name/oc/oculante/libaom-sys-0.17.2+libaom.3.11.0-cmake-nasm-fix.patch @@ -0,0 +1,21 @@ +--- a/libaom-sys-0.17.2+libaom.3.11.0/vendor/build/cmake/aom_optimization.cmake ++++ b/libaom-sys-0.17.2+libaom.3.11.0/vendor/build/cmake/aom_optimization.cmake +@@ -212,7 +212,7 @@ endfunction() + # Currently checks only for presence of required object formats and support for + # the -Ox argument (multipass optimization). + function(test_nasm) +- execute_process(COMMAND ${CMAKE_ASM_NASM_COMPILER} -hf ++ execute_process(COMMAND ${CMAKE_ASM_NASM_COMPILER} -hO + OUTPUT_VARIABLE nasm_helptext) + + if(NOT "${nasm_helptext}" MATCHES "-Ox") +@@ -220,6 +220,9 @@ function(test_nasm) + FATAL_ERROR "Unsupported nasm: multipass optimization not supported.") + endif() + ++ execute_process(COMMAND ${CMAKE_ASM_NASM_COMPILER} -hf ++ OUTPUT_VARIABLE nasm_helptext) ++ + if("${AOM_TARGET_CPU}" STREQUAL "x86") + if("${AOM_TARGET_SYSTEM}" STREQUAL "Darwin") + if(NOT "${nasm_helptext}" MATCHES "macho32") diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix index 72976e469153..747f389c98f7 100644 --- a/pkgs/by-name/oc/oculante/package.nix +++ b/pkgs/by-name/oc/oculante/package.nix @@ -67,6 +67,18 @@ rustPlatform.buildRustPackage rec { "--skip=thumbnails::test_thumbs" # broken as of v0.9.2 ]; + patches = [ + # The below patch is needed to fix this build, until the upstream dependency (libavif-rs) fixes the problem. + # The explicit `patchFlags` can also be removed when this patch becomes obsolete. + # + ./libaom-sys-0.17.2+libaom.3.11.0-cmake-nasm-fix.patch + ]; + + patchFlags = [ + "-p1" + "--directory=../${pname}-${version}-vendor" + ]; + postInstall = '' install -Dm444 $src/res/icons/icon.png $out/share/icons/hicolor/128x128/apps/oculante.png install -Dm444 $src/res/oculante.desktop -t $out/share/applications diff --git a/pkgs/by-name/ok/oku/package.nix b/pkgs/by-name/ok/oku/package.nix index 8b2a87d90e2f..37a80f0c7efe 100644 --- a/pkgs/by-name/ok/oku/package.nix +++ b/pkgs/by-name/ok/oku/package.nix @@ -9,6 +9,7 @@ gtk4, hicolor-icon-theme, libadwaita, + oniguruma, pango, webkitgtk_6_0, nix-update-script, @@ -45,10 +46,14 @@ rustPlatform.buildRustPackage (finalAttrs: { gtk4 hicolor-icon-theme libadwaita + oniguruma pango webkitgtk_6_0 ]; + # use system oniguruma since the bundled one fails to build with gcc15 + env.RUSTONIG_SYSTEM_LIBONIG = 1; + # the program expects icons to be installed but the # program does not install them itself postInstall = '' diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 3305fa23d373..9860c99c89a3 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -9,13 +9,13 @@ }: let pname = "open-webui"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; tag = "v${version}"; - hash = "sha256-pjrzZhY886LjkUnbG58r9j/ynq1fjTNCCqLmCPKoeek="; + hash = "sha256-BS/EB64y/ytHqfKdAmTV0ahT6HQPo96cs+O1CYwd8Rs="; }; frontend = buildNpmPackage rec { @@ -32,7 +32,7 @@ let url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2"; }; - npmDepsHash = "sha256-useP5o3Hx9I7WY0j+idKaa4KHx2w69/Us5ezN/v2+Ns="; + npmDepsHash = "sha256-OH0TuHN324Ef7ZX2JpWVi5q0ycgf1E+UXJj2b3ubMd4="; # See https://github.com/open-webui/open-webui/issues/15880 npmFlags = [ diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix index c904337dc53d..24a2f1fc11e5 100644 --- a/pkgs/by-name/sh/shadow/package.nix +++ b/pkgs/by-name/sh/shadow/package.nix @@ -31,14 +31,14 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "shadow"; version = "4.18.0"; src = fetchFromGitHub { owner = "shadow-maint"; repo = "shadow"; - rev = version; + tag = finalAttrs.version; hash = "sha256-M7We3JboNpr9H0ELbKcFtMvfmmVYaX9dYcsQ3sVX0lM="; }; @@ -133,6 +133,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/shadow-maint/shadow"; description = "Suite containing authentication-related tools such as passwd and su"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mdaniels5757 ]; platforms = lib.platforms.linux; }; @@ -141,4 +142,4 @@ stdenv.mkDerivation rec { # TODO: Run system tests: https://github.com/shadow-maint/shadow/blob/master/doc/contributions/tests.md#system-tests tests = { inherit (nixosTests) shadow; }; }; -} +}) diff --git a/pkgs/by-name/so/sourcery/package.nix b/pkgs/by-name/so/sourcery/package.nix index 5594087a5c2c..45348e09a4af 100644 --- a/pkgs/by-name/so/sourcery/package.nix +++ b/pkgs/by-name/so/sourcery/package.nix @@ -28,7 +28,8 @@ python3Packages.buildPythonApplication rec { format = "wheel"; src = fetchPypi { - inherit pname version format; + inherit pname version; + format = "wheel"; inherit (platformInfo) platform hash; }; diff --git a/pkgs/by-name/ti/tidal-hifi/package.nix b/pkgs/by-name/ti/tidal-hifi/package.nix index 7997195c60d1..b736f01cf8c3 100644 --- a/pkgs/by-name/ti/tidal-hifi/package.nix +++ b/pkgs/by-name/ti/tidal-hifi/package.nix @@ -47,7 +47,7 @@ }: let - version = "6.0.0"; + version = "6.0.1"; electronLibPath = lib.makeLibraryPath [ alsa-lib @@ -95,7 +95,7 @@ buildNpmPackage (self: { owner = "Mastermindzh"; repo = "tidal-hifi"; tag = version; - hash = "sha256-t9sNOLIhxA2/5tpILgGkNkkg1wmX2smcEeWWh424GPA="; + hash = "sha256-wc8KsZGNjaIG9sijVGEzoJ7ZTmu4xX8b/ETjlMkNyDs="; }; nativeBuildInputs = [ @@ -104,7 +104,7 @@ buildNpmPackage (self: { copyDesktopItems ]; - npmDepsHash = "sha256-CvqKElGYJ/sXxIz/vEWi21tyyPbRoZgQG8We1g2XNHM="; + npmDepsHash = "sha256-lec3XcdZc+lcp/b175m/4dgBPLJCvlUPN8Ttqdehgw4="; forceGitDeps = true; makeCacheWritable = true; diff --git a/pkgs/by-name/ti/time/package.nix b/pkgs/by-name/ti/time/package.nix index cd49f0f89850..6f444565df0b 100644 --- a/pkgs/by-name/ti/time/package.nix +++ b/pkgs/by-name/ti/time/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - fetchpatch, fetchurl, }: @@ -41,5 +40,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.gnu.org/software/time/"; platforms = lib.platforms.unix; mainProgram = "time"; + maintainers = with lib.maintainers; [ mdaniels5757 ]; }; }) diff --git a/pkgs/by-name/ti/tintin/package.nix b/pkgs/by-name/ti/tintin/package.nix index e2fcb3546cdd..a7203c96449d 100644 --- a/pkgs/by-name/ti/tintin/package.nix +++ b/pkgs/by-name/ti/tintin/package.nix @@ -3,24 +3,24 @@ fetchFromGitHub, lib, zlib, - pcre, + pcre2, gnutls, }: stdenv.mkDerivation rec { pname = "tintin"; - version = "2.02.51"; + version = "2.02.60"; src = fetchFromGitHub { owner = "scandum"; repo = "tintin"; rev = version; - hash = "sha256-QU9Q2VbJ44NHm//LTwDoHQIUV/LnLM94I7GtoCxL3js="; + hash = "sha256-2pkQv3Tf0cT0P7x1eiQYYlDYr9kA5F4DQxb8muJFX6Y="; }; buildInputs = [ zlib - pcre + pcre2 gnutls ]; diff --git a/pkgs/by-name/xe/xeyes/package.nix b/pkgs/by-name/xe/xeyes/package.nix index b23c50e764ae..021f1043e942 100644 --- a/pkgs/by-name/xe/xeyes/package.nix +++ b/pkgs/by-name/xe/xeyes/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.freedesktop.org/xorg/app/xeyes"; license = lib.licenses.x11; mainProgram = "xeyes"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ mdaniels5757 ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/package.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/package.nix new file mode 100644 index 000000000000..174831cb5ff9 --- /dev/null +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/package.nix @@ -0,0 +1,193 @@ +{ + _cuda, + backendStdenv, + cmake, + cuda_cudart, + cuda_nvcc, + cuda_profiler_api, + cudaNamePrefix, + fetchFromGitHub, + fetchzip, + flags, + lib, + runCommand, + stdenvNoCC, + tensorrt, + writeShellApplication, +}: +let + inherit (_cuda.lib) majorMinorPatch; + inherit (lib) + cmakeBool + cmakeFeature + getAttr + getInclude + licenses + maintainers + optionalString + replaceStrings + teams + ; +in +backendStdenv.mkDerivation (finalAttrs: { + __structuredAttrs = true; + strictDeps = true; + + name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}"; + + pname = "tensorrt-samples"; + + version = majorMinorPatch tensorrt.version; + + src = fetchFromGitHub ( + { + owner = "NVIDIA"; + repo = "TensorRT"; + } + // getAttr finalAttrs.version { + "10.0.0" = { + tag = "v10.0.0"; + hash = "sha256-k0FqEURPCtcPgowORHme/lhQ5SN63d0lYQvTvFXS6vw="; + }; + "10.0.1" = { + tag = "v10.0.1"; + hash = "sha256-lSEw0GM0eW2BHNBq/wTQA8v3aNueE3FT+k9F5nH1OgA="; + }; + "10.1.0" = { + tag = "v10.1.0"; + hash = "sha256-A3QwrQaI0EgRspgXEKcna/z6p7abOq3M7KDQMPQftvE="; + }; + "10.2.0" = { + tag = "v10.2.0"; + hash = "sha256-Euo9VD4VTpx8XJV97IMETTAx/YkPGXiNdA39Wjp3UMU="; + }; + "10.3.0" = { + tag = "v10.3.0"; + hash = "sha256-odSrsfOa8PlbJiPrkvWFm2hHc+ud0qSpLQanx9/M/90="; + }; + "10.4.0" = { + tag = "v10.4.0"; + hash = "sha256-GAu/VdHrC3UQw9okPexVItLPrRb1m3ZMpCkHNcfzRkE="; + }; + "10.5.0" = { + tag = "v10.5.0"; + hash = "sha256-No0JKfvi6ETXrnebMX+tAVhz7fuuCwYAp/WNUN73XzY="; + }; + "10.6.0" = { + tag = "v10.6.0"; + hash = "sha256-nnzicyCjVqpAonIhx3u9yNnoJkZ0XXjJ8oxQH+wfrtE="; + }; + "10.7.0" = { + tag = "v10.7.0"; + hash = "sha256-sbp61GverIWrHKvJV+oO9TctFTO4WUmH0oInZIwqF/s="; + }; + "10.8.0" = { + tag = "v10.8.0"; + hash = "sha256-SDlTZf8EQBq8vDCH3YFJCROHbf47RB5WUu4esLNpYuA="; + }; + "10.9.0" = { + tag = "v10.9.0"; + hash = "sha256-J8K9RjeGIem5ZxXyU+Rne8uBbul54ie6P/Y1In2mQ0g="; + }; + "10.10.0" = { + tag = "v10.10.0"; + hash = "sha256-/vkGmH+WKXMXsUizGfjBKRHOp5IpS236eUdCQ8tr1u8="; + }; + "10.11.0" = { + tag = "v10.11"; + hash = "sha256-OXI6mR2X+kF/0EO5RSBnnaGjMKD6AkuQMfl0OMzayxc="; + }; + "10.12.0" = { + tag = "v10.12.0"; + hash = "sha256-3pFiqDzWcMAk3GfnSOzzInddEfoGX0Fwqb+vEYr9eBw="; + }; + "10.13.0" = { + tag = "v10.13.0"; + hash = "sha256-hjl9fKFIE8p05/lmius2vuil6evPbNEjTT9yJyC44FI="; + }; + "10.13.2" = { + tag = "v10.13.2"; + hash = "sha256-1t4TyQKGTVPyPPNA3dlVDoBSHXKGcTms8AUejbvtVfw="; + }; + "10.13.3" = { + tag = "v10.13.3"; + hash = "sha256-d14R0UmSLT63wlmpCMi9ZvHZjottr8LJfig7EcqxLEY="; + }; + "10.14.1" = { + tag = "v10.14"; + hash = "sha256-pWvXpXiUriLDYHqro3HWAmO/9wbGznyUrc9qxq/t0/U="; + }; + } + ); + + nativeBuildInputs = [ + cmake + cuda_nvcc + ]; + + postPatch = '' + nixLog "patching $PWD/CMakeLists.txt to avoid manually setting CMAKE_CXX_COMPILER" + substituteInPlace "$PWD"/CMakeLists.txt \ + --replace-fail \ + 'find_program(CMAKE_CXX_COMPILER NAMES $ENV{CXX} g++)' \ + '# find_program(CMAKE_CXX_COMPILER NAMES $ENV{CXX} g++)' + + nixLog "patching $PWD/CMakeLists.txt to use find_package(CUDAToolkit) instead of find_package(CUDA)" + substituteInPlace "$PWD"/CMakeLists.txt \ + --replace-fail \ + 'find_package(CUDA ''${CUDA_VERSION} REQUIRED)' \ + 'find_package(CUDAToolkit REQUIRED)' + '' + # CMakeLists.txt only started using CMAKE_CUDA_ARCHITECTURES in 10.9, and this bug was fixed by 10.12. + + + optionalString + (lib.versionAtLeast finalAttrs.version "10.9" && lib.versionOlder finalAttrs.version "10.12") + '' + nixLog "patching $PWD/CMakeLists.txt to fix CMake logic error" + substituteInPlace "$PWD"/CMakeLists.txt \ + --replace-fail \ + 'list(APPEND CMAKE_CUDA_ARCHITECTURES SM)' \ + 'list(APPEND CMAKE_CUDA_ARCHITECTURES "''${SM}")' + ''; + + cmakeFlags = [ + # Use tensorrt for these components; we only really want the samples. + (cmakeBool "BUILD_PARSERS" false) + (cmakeBool "BUILD_PLUGINS" false) + (cmakeBool "BUILD_SAMPLES" true) + + # Build configuration + (cmakeFeature "GPU_ARCHS" (replaceStrings [ ";" ] [ " " ] flags.cmakeCudaArchitecturesString)) + ]; + + buildInputs = [ + (getInclude cuda_nvcc) + cuda_cudart + cuda_profiler_api + tensorrt + ]; + + passthru = import ./passthru.nix { + inherit + backendStdenv + fetchzip + finalAttrs + lib + runCommand + stdenvNoCC + writeShellApplication + ; + }; + + meta = { + description = "Open Source Software (OSS) components of NVIDIA TensorRT"; + homepage = "https://github.com/NVIDIA/TensorRT"; + license = licenses.asl20; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; + teams = [ teams.cuda ]; + maintainers = with maintainers; [ connorbaker ]; + }; +}) diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/passthru.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/passthru.nix new file mode 100644 index 000000000000..6b3481ff6278 --- /dev/null +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/passthru.nix @@ -0,0 +1,85 @@ +{ + backendStdenv, + fetchzip, + finalAttrs, + lib, + runCommand, + stdenvNoCC, + writeShellApplication, +}: +let + older = lib.versionOlder finalAttrs.version; + atLeast = lib.versionAtLeast finalAttrs.version; +in +{ + sample-data = + let + # Releases prior to 10.14.1 don't have any sample data available to them, so just use the 10.14.1 release's + # sample data. + sample-data_10_14_1 = { + url = "https://github.com/NVIDIA/TensorRT/releases/download/v10.14/tensorrt_sample_data_20251106.zip"; + hash = "sha256-IA1pH8idtk/7FD1Tf0hKtyP7A5SW/2ugezyBRluG8yk="; + }; + in + fetchzip ( + if older "10.14.1" then + sample-data_10_14_1 + else + lib.getAttr finalAttrs.version { + "10.14.1" = sample-data_10_14_1; + } + ); + + # TODO(@connorbaker): A number of the tests fail with 10.2: + # API Usage Error (Unable to load library: libnvinfer_builder_resource_win.so.10.2.0: + # libnvinfer_builder_resource_win.so.10.2.0: cannot open shared object file: No such file or directory) + # TODO(@connorbaker): Add tests for trtexec. + testers = + let + mkTester = + name: cmdArgs: + writeShellApplication { + name = finalAttrs.name + "-tester-" + name; + runtimeInputs = [ finalAttrs.finalPackage ]; + text = '' + ${lib.toShellVar "cmdArgs" cmdArgs} + echo "running ''${cmdArgs[*]@Q}" + "''${cmdArgs[@]}" + ''; + }; + in + lib.packagesFromDirectoryRecursive { + callPackage = + path: _: + import path { + inherit (finalAttrs.passthru) sample-data; + inherit + atLeast + backendStdenv + finalAttrs + lib + mkTester + older + ; + }; + directory = ./testers; + }; + + # Wrap each of the derivations in testers in a runCommand. + tests = lib.mapAttrsRecursiveCond (as: !(lib.isDerivation as)) ( + path: drv: + runCommand (lib.replaceString "-tester-" "-test-" drv.name) + { + nativeBuildInputs = [ drv ]; + requiredSystemFeatures = [ "cuda" ]; + } + '' + set -euo pipefail + mkdir -p "$out" + "${lib.getExe drv}" | tee -a "$out/test.log" || { + nixErrorLog "command failed with exit code $?" + exit 1 + } + '' + ) finalAttrs.passthru.testers; +} diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_algorithm_selector.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_algorithm_selector.nix new file mode 100644 index 000000000000..047b0e6a5121 --- /dev/null +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_algorithm_selector.nix @@ -0,0 +1,44 @@ +{ + backendStdenv, + lib, + mkTester, + older, + sample-data, + ... +}: +# While available on both 10.8 and 10.9, NVIDIA removed this sample from their CMakeLists.txt, so +# we cannot build it. +lib.optionalAttrs (older "10.8") ( + { + default = mkTester "sample_algorithm_selector" [ + "sample_algorithm_selector" + "--datadir=${sample-data.outPath + "/mnist"}" + ]; + + int8 = mkTester "sample_algorithm_selector-int8" [ + "sample_algorithm_selector" + "--datadir=${sample-data.outPath + "/mnist"}" + "--int8" + ]; + + fp16 = mkTester "sample_algorithm_selector-fp16" [ + "sample_algorithm_selector" + "--datadir=${sample-data.outPath + "/mnist"}" + "--fp16" + ]; + + bf16 = mkTester "sample_algorithm_selector-bf16" [ + "sample_algorithm_selector" + "--datadir=${sample-data.outPath + "/mnist"}" + "--bf16" + ]; + } + # Only Orin has a DLA + // lib.optionalAttrs (lib.elem "8.7" backendStdenv.cudaCapabilities) { + dla = mkTester "sample_algorithm_selector-dla" [ + "sample_algorithm_selector" + "--datadir=${sample-data.outPath + "/mnist"}" + "--useDLACore=0" + ]; + } +) diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_char_rnn.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_char_rnn.nix new file mode 100644 index 000000000000..eec554ddd8de --- /dev/null +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_char_rnn.nix @@ -0,0 +1,11 @@ +{ + mkTester, + sample-data, + ... +}: +{ + default = mkTester "sample_char_rnn" [ + "sample_char_rnn" + "--datadir=${sample-data.outPath + "/char-rnn"}" + ]; +} diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_dynamic_reshape.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_dynamic_reshape.nix new file mode 100644 index 000000000000..e68c51ccb3df --- /dev/null +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_dynamic_reshape.nix @@ -0,0 +1,30 @@ +{ + mkTester, + sample-data, + ... +}: +{ + default = mkTester "sample_dynamic_reshape" [ + "sample_dynamic_reshape" + "--datadir=${sample-data.outPath + "/mnist"}" + ]; + + # TODO(@connorbaker): Neither the sample data nor the sample sources provide train-images-idx3-ubyte, so we can't run the int8 test. + # int8 = mkTester "sample_dynamic_reshape-int8" [ + # "sample_dynamic_reshape" + # "--datadir=${sample-data.outPath + "/mnist"}" + # "--int8" + # ]; + + fp16 = mkTester "sample_dynamic_reshape-fp16" [ + "sample_dynamic_reshape" + "--datadir=${sample-data.outPath + "/mnist"}" + "--fp16" + ]; + + bf16 = mkTester "sample_dynamic_reshape-bf16" [ + "sample_dynamic_reshape" + "--datadir=${sample-data.outPath + "/mnist"}" + "--bf16" + ]; +} diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_editable_timing_cache.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_editable_timing_cache.nix new file mode 100644 index 000000000000..e852ef3f3664 --- /dev/null +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_editable_timing_cache.nix @@ -0,0 +1,11 @@ +{ + atLeast, + lib, + mkTester, + ... +}: +lib.optionalAttrs (atLeast "10.8") { + default = mkTester "sample_editable_timing_cache" [ + "sample_editable_timing_cache" + ]; +} diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_int8_api.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_int8_api.nix new file mode 100644 index 000000000000..58faf35a48fc --- /dev/null +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_int8_api.nix @@ -0,0 +1,23 @@ +{ + backendStdenv, + lib, + mkTester, + sample-data, + ... +}: +{ + default = mkTester "sample_int8_api" [ + "sample_int8_api" + "--model=${sample-data.outPath + "/resnet50/ResNet50.onnx"}" + "--data=${sample-data.outPath + "/int8_api"}" + ]; +} +# Only Orin has a DLA +// lib.optionalAttrs (lib.elem "8.7" backendStdenv.cudaCapabilities) { + dla = mkTester "sample_int8_api-dla" [ + "sample_int8_api" + "--model=${sample-data.outPath + "/resnet50/ResNet50.onnx"}" + "--data=${sample-data.outPath + "/int8_api"}" + "--useDLACore=0" + ]; +} diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_io_formats.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_io_formats.nix new file mode 100644 index 000000000000..208966cd2640 --- /dev/null +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_io_formats.nix @@ -0,0 +1,21 @@ +{ + backendStdenv, + lib, + mkTester, + sample-data, + ... +}: +{ + default = mkTester "sample_io_formats" [ + "sample_io_formats" + "--datadir=${sample-data.outPath + "/mnist"}" + ]; +} +# Only Orin has a DLA +// lib.optionalAttrs (lib.elem "8.7" backendStdenv.cudaCapabilities) { + dla = mkTester "sample_io_formats-dla" [ + "sample_io_formats" + "--datadir=${sample-data.outPath + "/mnist"}" + "--useDLACore=0" + ]; +} diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_named_dimensions.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_named_dimensions.nix new file mode 100644 index 000000000000..6be6ac22ad6e --- /dev/null +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_named_dimensions.nix @@ -0,0 +1,11 @@ +{ + finalAttrs, + mkTester, + ... +}: +{ + default = mkTester "sample_named_dimensions" [ + "sample_named_dimensions" + "--datadir=${finalAttrs.src.outPath + "/samples/sampleNamedDimensions"}" + ]; +} diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_non_zero_plugin.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_non_zero_plugin.nix new file mode 100644 index 000000000000..8e97fdf3c99c --- /dev/null +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_non_zero_plugin.nix @@ -0,0 +1,27 @@ +{ + atLeast, + finalAttrs, + lib, + mkTester, + sample-data, + ... +}: +{ + default = mkTester "sample_non_zero_plugin" [ + "sample_non_zero_plugin" + "--datadir=${sample-data.outPath + "/mnist"}" + ]; + + fp16 = mkTester "sample_non_zero_plugin-fp16" [ + "sample_non_zero_plugin" + "--datadir=${sample-data.outPath + "/mnist"}" + "--fp16" + ]; +} +// lib.optionalAttrs (atLeast "10.0.1") { + columnOrder = mkTester "sample_non_zero_plugin-columnOrder" [ + "sample_non_zero_plugin" + "--datadir=${sample-data.outPath + "/mnist"}" + "--columnOrder" + ]; +} diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_onnx_mnist.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_onnx_mnist.nix new file mode 100644 index 000000000000..1895b87d47e5 --- /dev/null +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_onnx_mnist.nix @@ -0,0 +1,39 @@ +{ + backendStdenv, + lib, + mkTester, + sample-data, + ... +}: +{ + default = mkTester "sample_onnx_mnist" [ + "sample_onnx_mnist" + "--datadir=${sample-data.outPath + "/mnist"}" + ]; + + int8 = mkTester "sample_onnx_mnist-int8" [ + "sample_onnx_mnist" + "--datadir=${sample-data.outPath + "/mnist"}" + "--int8" + ]; + + fp16 = mkTester "sample_onnx_mnist-fp16" [ + "sample_onnx_mnist" + "--datadir=${sample-data.outPath + "/mnist"}" + "--fp16" + ]; + + bf16 = mkTester "sample_onnx_mnist-bf16" [ + "sample_onnx_mnist" + "--datadir=${sample-data.outPath + "/mnist"}" + "--bf16" + ]; +} +# Only Orin has a DLA +// lib.optionalAttrs (lib.elem "8.7" backendStdenv.cudaCapabilities) { + dla = mkTester "sample_onnx_mnist-dla" [ + "sample_onnx_mnist" + "--datadir=${sample-data.outPath + "/mnist"}" + "--useDLACore=0" + ]; +} diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_onnx_mnist_coord_conv_ac.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_onnx_mnist_coord_conv_ac.nix new file mode 100644 index 000000000000..ef4b4bedfbc0 --- /dev/null +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_onnx_mnist_coord_conv_ac.nix @@ -0,0 +1,36 @@ +{ + backendStdenv, + lib, + mkTester, + sample-data, + ... +}: +# TODO(@connorbaker): Neither the sample data nor the sample sources provide mnist_with_coordconv.onnx, so we can't run these tests. +lib.optionalAttrs false ( + { + default = mkTester "sample_onnx_mnist_coord_conv_ac" [ + "sample_onnx_mnist_coord_conv_ac" + "--datadir=${sample-data.outPath + "/mnist"}" + ]; + + int8 = mkTester "sample_onnx_mnist_coord_conv_ac-int8" [ + "sample_onnx_mnist_coord_conv_ac" + "--datadir=${sample-data.outPath + "/mnist"}" + "--int8" + ]; + + fp16 = mkTester "sample_onnx_mnist_coord_conv_ac-fp16" [ + "sample_onnx_mnist_coord_conv_ac" + "--datadir=${sample-data.outPath + "/mnist"}" + "--fp16" + ]; + } + # Only Orin has a DLA + // lib.optionalAttrs (lib.elem "8.7" backendStdenv.cudaCapabilities) { + dla = mkTester "sample_onnx_mnist_coord_conv_ac-dla" [ + "sample_onnx_mnist_coord_conv_ac" + "--datadir=${sample-data.outPath + "/mnist"}" + "--useDLACore=0" + ]; + } +) diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_progress_monitor.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_progress_monitor.nix new file mode 100644 index 000000000000..86254b3039d4 --- /dev/null +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_progress_monitor.nix @@ -0,0 +1,36 @@ +{ + backendStdenv, + lib, + mkTester, + sample-data, + ... +}: +# NOTE: Disabled because it generates way too much output. +lib.optionalAttrs false ( + { + default = mkTester "sample_progress_monitor" [ + "sample_progress_monitor" + "--datadir=${sample-data.outPath + "/mnist"}" + ]; + + int8 = mkTester "sample_progress_monitor-int8" [ + "sample_progress_monitor" + "--datadir=${sample-data.outPath + "/mnist"}" + "--int8" + ]; + + fp16 = mkTester "sample_progress_monitor-fp16" [ + "sample_progress_monitor" + "--datadir=${sample-data.outPath + "/mnist"}" + "--fp16" + ]; + } + # Only Orin has a DLA + // lib.optionalAttrs (lib.elem "8.7" backendStdenv.cudaCapabilities) { + dla = mkTester "sample_progress_monitor-dla" [ + "sample_progress_monitor" + "--datadir=${sample-data.outPath + "/mnist"}" + "--useDLACore=0" + ]; + } +) diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/trtexec.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/trtexec.nix new file mode 100644 index 000000000000..facb35d6f550 --- /dev/null +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/trtexec.nix @@ -0,0 +1,4 @@ +{ ... }: +{ + +} diff --git a/pkgs/development/cuda-modules/packages/tensorrt.nix b/pkgs/development/cuda-modules/packages/tensorrt.nix index 745d590c03a5..4bb18b625afc 100644 --- a/pkgs/development/cuda-modules/packages/tensorrt.nix +++ b/pkgs/development/cuda-modules/packages/tensorrt.nix @@ -12,7 +12,7 @@ let inherit (backendStdenv) cudaCapabilities hostRedistSystem; inherit (lib.lists) optionals; - inherit (lib.strings) concatStringsSep; + inherit (lib.strings) concatStringsSep optionalString; in buildRedist ( finalAttrs: @@ -133,7 +133,8 @@ buildRedist ( moveToOutput data "''${!outputSamples:?}" '' # Remove the Windows library used for cross-compilation if it exists. - + '' + # NOTE: These are not removed for TensorRT 10.2 since the samples (and presumably others) try to load them. + + optionalString (lib.versions.majorMinor finalAttrs.version != "10.2") '' nixLog "removing any Windows libraries" for winLib in "''${!outputLib:?}/lib/"*_win*; do rm --verbose "$winLib" diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 20edb670b8a0..8d1c548944fc 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -5,6 +5,7 @@ libiconv, bashNonInteractive, updateAutotoolsGnuConfigScriptsHook, + gnulib, }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -69,12 +70,22 @@ stdenv.mkDerivation rec { substituteInPlace gettext-tools/projects/GNOME/trigger --replace "/bin/pwd" pwd substituteInPlace gettext-tools/src/project-id --replace "/bin/pwd" pwd '' - + lib.optionalString stdenv.hostPlatform.isCygwin '' - sed -i -e "s/\(cldr_plurals_LDADD = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in - sed -i -e "s/\(libgettextsrc_la_LDFLAGS = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in - '' + lib.optionalString stdenv.hostPlatform.isMinGW '' sed -i "s/@GNULIB_CLOSE@/1/" */*/unistd.in.h + '' + + lib.optionalString stdenv.hostPlatform.isCygwin '' + for gnulib in \ + ./libtextstyle/lib \ + ./gettext-tools/libgettextpo \ + ./gettext-tools/gnulib-lib \ + ./gettext-runtime/libasprintf/gnulib-lib \ + ./gettext-runtime/intl/gnulib-lib \ + ./gettext-runtime/gnulib-lib + do + cd "$gnulib" + patch -p2 < ${gnulib.patches.memcpy-fix} + cd - + done ''; strictDeps = true; @@ -85,7 +96,7 @@ stdenv.mkDerivation rec { lib.optionals (!stdenv.hostPlatform.isMinGW) [ bashNonInteractive ] - ++ lib.optionals (!stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isCygwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ # HACK, see #10874 (and 14664) libiconv ]; diff --git a/pkgs/development/python-modules/array-record/default.nix b/pkgs/development/python-modules/array-record/default.nix index f4d804ab8731..ff4d552842b2 100644 --- a/pkgs/development/python-modules/array-record/default.nix +++ b/pkgs/development/python-modules/array-record/default.nix @@ -21,7 +21,8 @@ buildPythonPackage rec { pyShortVersion = "cp${builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion}"; in fetchPypi { - inherit version format; + inherit version; + format = "wheel"; pname = "array_record"; dist = pyShortVersion; python = pyShortVersion; diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index e1bcff2cccf0..4d1d47815545 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { homepage = "https://github.com/python-attrs/attrs"; changelog = "https://github.com/python-attrs/attrs/releases/tag/${version}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ mdaniels5757 ]; }; } diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index 6746fb5707fa..1f2ed960bf20 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -2,7 +2,6 @@ lib, brotli, buildPythonPackage, - fetchFromGitHub, pkgconfig, pytestCheckHook, setuptools, @@ -36,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/google/brotli"; description = "Generic-purpose lossless compression algorithm"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ mdaniels5757 ]; }; } diff --git a/pkgs/development/python-modules/fontawesomefree/default.nix b/pkgs/development/python-modules/fontawesomefree/default.nix index 5faebbf181a3..97b26b9244c3 100644 --- a/pkgs/development/python-modules/fontawesomefree/default.nix +++ b/pkgs/development/python-modules/fontawesomefree/default.nix @@ -11,7 +11,8 @@ buildPythonPackage rec { # they only provide a wheel src = fetchPypi { - inherit pname version format; + inherit pname version; + format = "wheel"; dist = "py3"; python = "py3"; hash = "sha256-WZtXRDHJvZLtX8BU0QRaB8QjNdo2wXiE8rk0dV7vkIk="; diff --git a/pkgs/development/python-modules/gviz-api/default.nix b/pkgs/development/python-modules/gviz-api/default.nix index 47fdc10c23a8..6b14a04aa65b 100644 --- a/pkgs/development/python-modules/gviz-api/default.nix +++ b/pkgs/development/python-modules/gviz-api/default.nix @@ -11,7 +11,8 @@ buildPythonPackage rec { format = "wheel"; src = fetchPypi { - inherit pname version format; + inherit pname version; + format = "wheel"; sha256 = "a05055fed8c279f34f4b496eace7648c7fe9c1b06851e8a36e748541f1adbb05"; }; diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix index cfdc875abd4c..485628c0b747 100644 --- a/pkgs/development/python-modules/ipympl/default.nix +++ b/pkgs/development/python-modules/ipympl/default.nix @@ -17,7 +17,8 @@ buildPythonPackage rec { format = "wheel"; src = fetchPypi { - inherit pname version format; + inherit pname version; + format = "wheel"; hash = "sha256-NpjufqoLBHp2A1F9eqG3GzIRil9RdUyrRexdmU9nII8="; dist = "py3"; python = "py3"; diff --git a/pkgs/development/python-modules/paddle2onnx/default.nix b/pkgs/development/python-modules/paddle2onnx/default.nix index bf6dae50e388..7dd80a466912 100644 --- a/pkgs/development/python-modules/paddle2onnx/default.nix +++ b/pkgs/development/python-modules/paddle2onnx/default.nix @@ -14,7 +14,8 @@ let format = "wheel"; pyShortVersion = "cp${builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion}"; src = fetchPypi { - inherit pname version format; + inherit pname version; + format = "wheel"; dist = pyShortVersion; python = pyShortVersion; abi = pyShortVersion; diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 51480f98b010..755ae203d8f2 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -24,7 +24,8 @@ buildPythonPackage rec { # artifacts using npm, the bundling invoked in setup.py # tries to fetch even more artifacts src = fetchPypi { - inherit pname version format; + inherit pname version; + format = "wheel"; hash = "sha256-HDtKM11W1aoM9dbhw2hKKX4kpiz5k0XF6euFUoN7l8M="; dist = "py3"; python = "py3"; diff --git a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix index b0e61e198bbe..7a274dd04e70 100644 --- a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix +++ b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix @@ -17,7 +17,8 @@ buildPythonPackage rec { format = "wheel"; src = fetchPypi { - inherit version format; + inherit version; + format = "wheel"; dist = "py3"; python = "py3"; pname = "pydata_sphinx_theme"; diff --git a/pkgs/development/python-modules/pyttsx3/default.nix b/pkgs/development/python-modules/pyttsx3/default.nix index 7c0d205b7f1c..eb58ac98e57a 100644 --- a/pkgs/development/python-modules/pyttsx3/default.nix +++ b/pkgs/development/python-modules/pyttsx3/default.nix @@ -10,7 +10,8 @@ buildPythonPackage rec { format = "wheel"; src = fetchPypi { - inherit pname version format; + inherit pname version; + format = "wheel"; sha256 = "sha256-/z5P91bCTXK58/LzBODtqv0PWK2w5vS5DZMEQM2osgc="; dist = "py3"; python = "py3"; diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index a99b72d0b395..247015bd3269 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -114,7 +114,8 @@ buildPythonPackage rec { }; in fetchPypi { - inherit pname version format; + inherit pname version; + format = "wheel"; dist = pyShortVersion; python = pyShortVersion; abi = pyShortVersion; diff --git a/pkgs/development/python-modules/requests-download/default.nix b/pkgs/development/python-modules/requests-download/default.nix index 63390f71e1fd..e6f52acfd6ab 100644 --- a/pkgs/development/python-modules/requests-download/default.nix +++ b/pkgs/development/python-modules/requests-download/default.nix @@ -18,7 +18,8 @@ buildPythonPackage rec { src = fetchPypi { pname = "requests_download"; - inherit version format; + inherit version; + format = "wheel"; sha256 = "1ballx1hljpdpyvqzqn79m0dc21z2smrnxk2ylb6dbpg5crrskcr"; }; diff --git a/pkgs/development/python-modules/sphinx-book-theme/default.nix b/pkgs/development/python-modules/sphinx-book-theme/default.nix index 8306fd5861b2..2bac99cef6c1 100644 --- a/pkgs/development/python-modules/sphinx-book-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-book-theme/default.nix @@ -14,7 +14,8 @@ buildPythonPackage rec { format = "wheel"; src = fetchPypi { - inherit version format; + inherit version; + format = "wheel"; dist = "py3"; python = "py3"; pname = "sphinx_book_theme"; diff --git a/pkgs/development/python-modules/tensorboard-data-server/default.nix b/pkgs/development/python-modules/tensorboard-data-server/default.nix index 4c7ab2bbef50..8148d9df8413 100644 --- a/pkgs/development/python-modules/tensorboard-data-server/default.nix +++ b/pkgs/development/python-modules/tensorboard-data-server/default.nix @@ -11,7 +11,8 @@ buildPythonPackage rec { src = fetchPypi { pname = "tensorboard_data_server"; - inherit version format; + inherit version; + format = "wheel"; dist = "py3"; python = "py3"; hash = "sha256-fgYQ0gWIlYiYODbsBdwJjoD5e357v/fplOu3j1eNDds="; diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix index 3c4d65d2bf83..106a5753fc98 100644 --- a/pkgs/development/python-modules/tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -27,7 +27,8 @@ buildPythonPackage rec { # tensorflow/tensorboard is built from a downloaded wheel, because # https://github.com/tensorflow/tensorboard/issues/719 blocks buildBazelPackage. src = fetchPypi { - inherit pname version format; + inherit pname version; + format = "wheel"; dist = "py3"; python = "py3"; hash = "sha256-ncn5eMuEwHI6z5o0XZbBhPApPRjxZruNWe4Jjmz6q6Y="; diff --git a/pkgs/development/python-modules/tensorflow-estimator/bin.nix b/pkgs/development/python-modules/tensorflow-estimator/bin.nix index b9ee6496a692..68b760131346 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/bin.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/bin.nix @@ -14,7 +14,8 @@ buildPythonPackage rec { src = fetchPypi { pname = "tensorflow_estimator"; - inherit version format; + inherit version; + format = "wheel"; hash = "sha256-rt8h7sf7LckRUPyRoc4SvETbtyJ4oItY55/4fJ4o8VM="; }; diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix index 889178fea5bb..0c90372bbdc6 100644 --- a/pkgs/development/python-modules/tzdata/default.nix +++ b/pkgs/development/python-modules/tzdata/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Provider of IANA time zone data"; homepage = "https://github.com/python/tzdata"; license = lib.licenses.asl20; - maintainers = [ ]; + maintainers = with lib.maintainers; [ mdaniels5757 ]; }; } diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index ae246f9c7b23..93718dfd95e7 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -12,16 +12,17 @@ libidn2, iproute2, apparmorRulesFromClosure, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "iputils"; version = "20250605"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = version; + owner = "iputils"; + repo = "iputils"; + tag = finalAttrs.version; hash = "sha256-AJgNPIE90kALu4ihANELr9Dh28LhJ4camLksOIRV8Xo="; }; @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { "-DNO_SETCAP_OR_SUID=true" "-Dsystemdunitdir=etc/systemd/system" "-DINSTALL_SYSTEMD_UNITS=true" - "-DSKIP_TESTS=${lib.boolToString (!doCheck)}" + "-DSKIP_TESTS=${lib.boolToString (!finalAttrs.doCheck)}" ] # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): ++ lib.optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; @@ -78,9 +79,11 @@ stdenv.mkDerivation rec { EOF ''; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/iputils/iputils"; - changelog = "https://github.com/iputils/iputils/releases/tag/${version}"; + changelog = "https://github.com/iputils/iputils/releases/tag/${finalAttrs.version}"; description = "Set of small useful utilities for Linux networking"; longDescription = '' A set of small useful utilities for Linux networking including: @@ -95,6 +98,6 @@ stdenv.mkDerivation rec { bsd3 ]; platforms = lib.platforms.linux; - maintainers = [ ]; + maintainers = with lib.maintainers; [ mdaniels5757 ]; }; -} +}) diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 33030883efda..71038f75ca94 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -74,6 +74,6 @@ stdenv.mkDerivation (finalAttrs: { priority = 11; # less than coreutils, which also provides "kill" and "uptime" license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; - maintainers = [ ]; + maintainers = with lib.maintainers; [ mdaniels5757 ]; }; }) diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index d8b539acdcf4..c1eb8bdc2e03 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -12,7 +12,8 @@ buildPythonPackage rec { format = "wheel"; src = fetchPypi { - inherit version format; + inherit version; + format = "wheel"; pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix deleted file mode 100644 index a75381c1fb9f..000000000000 --- a/pkgs/tools/networking/gandi-cli/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - buildPythonApplication, - click, - fetchFromGitHub, - ipy, - pyyaml, - requests, -}: - -buildPythonApplication rec { - pname = "gandi-cli"; - version = "1.6"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "Gandi"; - repo = "gandi.cli"; - rev = version; - sha256 = "sha256-KLeEbbzgqpmBjeTc5RYsFScym8xtMqVjU+H0lyDM0+o="; - }; - - propagatedBuildInputs = [ - click - ipy - pyyaml - requests - ]; - - # Tests try to contact the actual remote API - doCheck = false; - pythonImportsCheck = [ "gandi" ]; - - meta = { - description = "Command-line interface to the public Gandi.net API"; - mainProgram = "gandi"; - homepage = "https://cli.gandi.net/"; - license = lib.licenses.gpl3Plus; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 859341ffcb82..c9074c59caf8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -651,6 +651,7 @@ mapAliases { fx_cast_bridge = throw "'fx_cast_bridge' has been renamed to/replaced by 'fx-cast-bridge'"; # Converted to throw 2025-10-27 g4music = throw "'g4music' has been renamed to/replaced by 'gapless'"; # Converted to throw 2025-10-27 gamecube-tools = throw "gamecube-tools was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 + gandi-cli = throw "'gandi-cli' has been removed as it is unmaintained upstream"; # Added 2026-01-11 garage_0_8 = throw "'garage_0_8' has been removed as it is unmaintained upstream"; # Added 2025-06-23 garage_0_8_7 = throw "'garage_0_8_7' has been removed as it is unmaintained upstream"; # Added 2025-06-23 garage_0_9 = throw "'garage_0_9' has been removed as it is unmaintained upstream"; # Added 2025-09-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d34adeb5e130..f94bfe8a0a49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2584,8 +2584,6 @@ with pkgs; uniscribe = callPackage ../tools/text/uniscribe { }; - gandi-cli = python3Packages.callPackage ../tools/networking/gandi-cli { }; - inherit (callPackages ../tools/filesystems/garage { }) garage garage_1