diff --git a/pkgs/applications/audio/spotify-qt/default.nix b/pkgs/applications/audio/spotify-qt/default.nix index abb40e9ed468..6e86ec681591 100644 --- a/pkgs/applications/audio/spotify-qt/default.nix +++ b/pkgs/applications/audio/spotify-qt/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spotify-qt"; - version = "3.12"; + version = "4.0.0"; src = fetchFromGitHub { owner = "kraxarn"; repo = "spotify-qt"; rev = "v${finalAttrs.version}"; - hash = "sha256-j9g2fq12gsue0pc/fLoCAtDlwwlbCVJ65kxPiTJTqvk="; + hash = "sha256-4Qcmb8SYh4wQIosMU9bk22Y7FF3gfYgM3zODMBsD8Iw="; }; postPatch = '' diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 14b687ee3ee6..a6a9cd67e980 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -82,14 +82,14 @@ let ]; in mkDerivation rec { - version = "3.40.5"; + version = "3.40.6"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-YVHNB4vdLw8RZir4UydTijztzx58aXBLJk+lA0K9y+4="; + hash = "sha256-pw5XxaGDsyQfeJL582Iic2sg5j8AUPvM+I53YLB4aG4="; }; passthru = { diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index bdd7fec08765..31c9302518a2 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -82,14 +82,14 @@ let ]; in mkDerivation rec { - version = "3.42.1"; + version = "3.42.2"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-0VW/5X8C35uwIZu018Vtp7qosS0v1b+1SFUE8NSTQYE="; + hash = "sha256-kWy+FBiqPMt8GLGWSJBQp0uD5l1IE/2KmDGdxKapg78="; }; passthru = { diff --git a/pkgs/by-name/ac/act/package.nix b/pkgs/by-name/ac/act/package.nix index ed31c174d388..121ad3a60415 100644 --- a/pkgs/by-name/ac/act/package.nix +++ b/pkgs/by-name/ac/act/package.nix @@ -8,7 +8,7 @@ }: let - version = "0.2.76"; + version = "0.2.77"; in buildGoModule { pname = "act"; @@ -18,10 +18,10 @@ buildGoModule { owner = "nektos"; repo = "act"; tag = "v${version}"; - hash = "sha256-9Pn4Yzc0ZjOJy0ktJl/C1OXHkJ4vZrA0d4FJTooLvWU="; + hash = "sha256-bcqHj40lySE2xXGuUbXbH5cjQ5NoJCvjE/uX8HaKVho="; }; - vendorHash = "sha256-ak7JFh739SoHeiEWLjthqAn1KHamGujYJNa3ZIdhLLQ="; + vendorHash = "sha256-YH5SIZ73VYqg7+sSJpvqkIlBUy1rs3uNEWiEBDRdkQw="; doCheck = false; diff --git a/pkgs/by-name/ba/bamf/package.nix b/pkgs/by-name/ba/bamf/package.nix index f19d19ce426c..94276bfa2565 100644 --- a/pkgs/by-name/ba/bamf/package.nix +++ b/pkgs/by-name/ba/bamf/package.nix @@ -19,17 +19,21 @@ dbus, python3, wrapGAppsHook3, + withDocs ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, }: stdenv.mkDerivation rec { pname = "bamf"; version = "0.5.6"; - outputs = [ - "out" - "dev" - "devdoc" - ]; + outputs = + [ + "out" + "dev" + ] + ++ lib.optionals withDocs [ + "devdoc" + ]; src = fetchgit { url = "https://git.launchpad.net/~unity-team/bamf"; @@ -37,14 +41,18 @@ stdenv.mkDerivation rec { sha256 = "7U+2GcuDjPU8quZjkd8bLADGlG++tl6wSo0mUQkjAXQ="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ - (python3.withPackages (ps: with ps; [ lxml ])) # Tests + (python3.pythonOnBuildForHost.withPackages (ps: with ps; [ lxml ])) # Tests autoreconfHook dbus docbook_xsl gnome-common gobject-introspection - gtk-doc + gtk-doc # required for autoreconfHook, even when `withDocs = false` pkg-config vala which @@ -66,10 +74,13 @@ stdenv.mkDerivation rec { --replace '/usr/lib/systemd/user' '@prefix@/lib/systemd/user' ''; - configureFlags = [ - "--enable-gtk-doc" - "--enable-headless-tests" - ]; + configureFlags = + [ + "--enable-headless-tests" + ] + ++ lib.optionals withDocs [ + "--enable-gtk-doc" + ]; # Fix paths makeFlags = [ @@ -79,6 +90,7 @@ stdenv.mkDerivation rec { # TODO: Requires /etc/machine-id doCheck = false; + strictDeps = true; # Ignore deprecation errors env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index 23798b2dd395..d962a6228f4f 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -9,10 +9,10 @@ }: let pname = "beeper"; - version = "4.0.640"; + version = "4.0.661"; src = fetchurl { url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage"; - hash = "sha256-hYbTYvfrTpRPRwXXgNCqKeEtiRpuLj6sYIYnfJ3aMv4="; + hash = "sha256-cKeHttoaV+UN5LXUArUxEcMjj3a4kjcj0EuiDriTtyE="; }; appimageContents = appimageTools.extract { inherit pname version src; diff --git a/pkgs/by-name/ci/cider-2/package.nix b/pkgs/by-name/ci/cider-2/package.nix index 0bd0e4c2e23e..3a66cd3c6a3d 100644 --- a/pkgs/by-name/ci/cider-2/package.nix +++ b/pkgs/by-name/ci/cider-2/package.nix @@ -33,7 +33,8 @@ appimageTools.wrapType2 rec { install -m 444 -D ${contents}/Cider.desktop $out/share/applications/${pname}.desktop substituteInPlace $out/share/applications/${pname}.desktop \ --replace-warn 'Exec=Cider' 'Exec=${pname}' - cp -r ${contents}/usr/share/icons $out/share + install -Dm444 ${contents}/usr/share/icons/hicolor/256x256/cider.png \ + $out/share/icons/hicolor/256x256/apps/cider.png ''; meta = { diff --git a/pkgs/by-name/co/cobang/package.nix b/pkgs/by-name/co/cobang/package.nix index c14daf4907ae..826bbe609b7b 100644 --- a/pkgs/by-name/co/cobang/package.nix +++ b/pkgs/by-name/co/cobang/package.nix @@ -18,14 +18,14 @@ python3Packages.buildPythonApplication rec { pname = "cobang"; - version = "1.6.1"; + version = "1.6.2"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "hongquan"; repo = "CoBang"; tag = "v${version}"; - hash = "sha256-/0EfE4ZVfDFEbPel/g69sFqsBPMJ4pE9Fqz4t3o7jtY="; + hash = "sha256-M32bGVPOkbx93gDPQcin+Dv9P8zfx1Ory+DTJY+bypI="; }; # https://github.com/hongquan/CoBang/issues/117 diff --git a/pkgs/by-name/dv/dvd-vr/package.nix b/pkgs/by-name/dv/dvd-vr/package.nix index 3a807f009d2d..cea6368174dc 100644 --- a/pkgs/by-name/dv/dvd-vr/package.nix +++ b/pkgs/by-name/dv/dvd-vr/package.nix @@ -11,7 +11,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://www.pixelbeat.org/programs/dvd-vr/dvd-vr-${finalAttrs.version}.tar.gz"; sha256 = "13wkdia3c0ryda40b2nzpb9vddimasgc4w95hvl0k555k9k8bl0r"; }; - makeFlags = [ "PREFIX=$(out)" ]; + + makeFlags = [ + "PREFIX=$(out)" + # Fix build with GCC 14 + "CFLAGS=-Wno-error=incompatible-pointer-types" + ]; meta = with lib; { homepage = "https://www.pixelbeat.org/programs/dvd-vr/"; diff --git a/pkgs/by-name/em/emulationstation-de/package.nix b/pkgs/by-name/em/emulationstation-de/package.nix index 999909d689ad..7646b0754512 100644 --- a/pkgs/by-name/em/emulationstation-de/package.nix +++ b/pkgs/by-name/em/emulationstation-de/package.nix @@ -17,6 +17,7 @@ poppler, pugixml, SDL2, + libGL, }: stdenv.mkDerivation (finalAttrs: { @@ -57,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { poppler pugixml SDL2 + libGL ]; cmakeFlags = [ (lib.cmakeBool "APPLICATION_UPDATER" false) ]; diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index c9ba8fdeb022..8c05f19873da 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -13,6 +13,7 @@ imagemagick, libXrandr, libdrm, + libelf, libglvnd, libpulseaudio, libselinux, @@ -24,7 +25,6 @@ nix-update-script, ocl-icd, opencl-headers, - pcre, pcre2, pkg-config, python3, @@ -40,15 +40,20 @@ zlib, # Feature flags audioSupport ? true, + brightnessSupport ? true, + dbusSupport ? true, flashfetchSupport ? false, + terminalSupport ? true, gnomeSupport ? true, imageSupport ? true, openclSupport ? true, + openglSupport ? true, rpmSupport ? false, sqliteSupport ? true, vulkanSupport ? true, waylandSupport ? true, x11Support ? true, + xfceSupport ? true, }: stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; @@ -76,132 +81,157 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = let commonDeps = [ - pcre - pcre2 yyjson ]; # Cross-platform optional dependencies imageDeps = lib.optionals imageSupport [ + # Image output as ascii art. chafa + # Images in terminal using sixel or kitty graphics protocol imagemagick ]; sqliteDeps = lib.optionals sqliteSupport [ + # linux - Needed for pkg & rpm package count. + # darwin - Used for fast wallpaper detection before macOS Sonoma sqlite ]; - linuxCoreDeps = lib.optionals stdenv.hostPlatform.isLinux [ - hwdata - libselinux - libsepol - util-linux - zlib - ]; + linuxCoreDeps = lib.optionals stdenv.hostPlatform.isLinux ( + [ + hwdata + ] + # Fallback if both `wayland` and `x11` are not available. AMD GPU properties detection + ++ lib.optional (!x11Support && !waylandSupport) libdrm + ); linuxFeatureDeps = lib.optionals stdenv.hostPlatform.isLinux ( - lib.optionals gnomeSupport [ - dbus - dconf - glib - libsysprof-capture - ] - ++ lib.optionals audioSupport [ + lib.optionals audioSupport [ + # Sound device detection libpulseaudio ] + ++ lib.optionals brightnessSupport [ + # Brightness detection of external displays + ddcutil + ] + ++ lib.optionals dbusSupport [ + # Bluetooth, wifi, player & media detection + dbus + ] + ++ lib.optionals gnomeSupport [ + # Needed for values that are only stored in DConf + Fallback for GSettings. + dconf + glib + # Required by glib messages + libsysprof-capture + pcre2 + # Required by gio messages + libselinux + util-linux + # Required by selinux + libsepol + ] + ++ lib.optionals imageSupport [ + # Faster image output when using kitty graphics protocol. + zlib + ] ++ lib.optionals openclSupport [ + # OpenCL module ocl-icd opencl-headers ] - ++ lib.optionals vulkanSupport [ - libdrm - ddcutil + ++ lib.optionals openglSupport [ + # OpenGL module + libglvnd ] ++ lib.optionals rpmSupport [ + # Slower fallback for rpm package count. Needed on openSUSE. rpm ] + ++ lib.optionals terminalSupport [ + # Needed for st terminal font detection. + libelf + ] + ++ lib.optionals vulkanSupport [ + # Vulkan module & fallback for GPU output + vulkan-loader + ] + ++ lib.optionals waylandSupport [ + # Better display performance and output in wayland sessions. Supports different refresh rates per monitor. + wayland + ] + ++ lib.optionals x11Support [ + # At least one of them sould be present in X11 sessions for better display detection and faster WM detection. + # The *randr ones provide multi monitor support The libxcb* ones usually have better performance. + libXrandr + libxcb + # Required by libxcb messages + xorg.libXau + xorg.libXdmcp + xorg.libXext + ] + ++ lib.optionals xfceSupport [ + # Needed for XFWM theme and XFCE Terminal font. + xfce.xfconf + ] ); - waylandDeps = lib.optionals waylandSupport [ - wayland - ]; - - vulkanDeps = lib.optionals vulkanSupport [ - vulkan-loader - ]; - - x11Deps = lib.optionals x11Support [ - libXrandr - libglvnd - libxcb - xorg.libXau - xorg.libXdmcp - xorg.libXext - ]; - - x11XfceDeps = lib.optionals (x11Support && (!stdenv.hostPlatform.isDarwin)) [ - xfce.xfconf - ]; - macosDeps = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 moltenvk ]; in - commonDeps - ++ imageDeps - ++ sqliteDeps - ++ linuxCoreDeps - ++ linuxFeatureDeps - ++ waylandDeps - ++ vulkanDeps - ++ x11Deps - ++ x11XfceDeps - ++ macosDeps; + commonDeps ++ imageDeps ++ sqliteDeps ++ linuxCoreDeps ++ linuxFeatureDeps ++ macosDeps; cmakeFlags = [ (lib.cmakeOptionType "filepath" "CMAKE_INSTALL_SYSCONFDIR" "${placeholder "out"}/etc") (lib.cmakeBool "ENABLE_DIRECTX_HEADERS" false) - (lib.cmakeBool "ENABLE_OSMESA" false) (lib.cmakeBool "ENABLE_SYSTEM_YYJSON" true) # Feature flags + (lib.cmakeBool "BUILD_FLASHFETCH" flashfetchSupport) + (lib.cmakeBool "ENABLE_IMAGEMAGICK6" false) (lib.cmakeBool "ENABLE_IMAGEMAGICK7" imageSupport) (lib.cmakeBool "ENABLE_CHAFA" imageSupport) - (lib.cmakeBool "ENABLE_ZLIB" imageSupport) (lib.cmakeBool "ENABLE_SQLITE3" sqliteSupport) - + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.cmakeBool "ENABLE_PULSE" audioSupport) + (lib.cmakeBool "ENABLE_DDCUTIL" brightnessSupport) + + (lib.cmakeBool "ENABLE_DBUS" dbusSupport) + + (lib.cmakeBool "ENABLE_ELF" terminalSupport) + (lib.cmakeBool "ENABLE_GIO" gnomeSupport) (lib.cmakeBool "ENABLE_DCONF" gnomeSupport) - (lib.cmakeBool "ENABLE_DBUS" gnomeSupport) + + (lib.cmakeBool "ENABLE_ZLIB" imageSupport) (lib.cmakeBool "ENABLE_OPENCL" openclSupport) - (lib.cmakeBool "ENABLE_DRM" vulkanSupport) - (lib.cmakeBool "ENABLE_DRM_AMDGPU" vulkanSupport) - (lib.cmakeBool "ENABLE_VULKAN" vulkanSupport) - (lib.cmakeBool "ENABLE_DDCUTIL" vulkanSupport) - (lib.cmakeBool "ENABLE_EGL" vulkanSupport) - - (lib.cmakeBool "ENABLE_WAYLAND" waylandSupport) - - (lib.cmakeBool "ENABLE_GLX" x11Support) - (lib.cmakeBool "ENABLE_X11" x11Support) - (lib.cmakeBool "ENABLE_XCB" x11Support) - (lib.cmakeBool "ENABLE_XCB_RANDR" x11Support) - (lib.cmakeBool "ENABLE_XFCONF" (x11Support && (!stdenv.hostPlatform.isDarwin))) - (lib.cmakeBool "ENABLE_XRANDR" x11Support) + (lib.cmakeBool "ENABLE_EGL" openglSupport) + (lib.cmakeBool "ENABLE_GLX" openglSupport) (lib.cmakeBool "ENABLE_RPM" rpmSupport) - (lib.cmakeBool "BUILD_FLASHFETCH" flashfetchSupport) - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ + (lib.cmakeBool "ENABLE_DRM" (!x11Support && !waylandSupport)) + (lib.cmakeBool "ENABLE_DRM_AMDGPU" (!x11Support && !waylandSupport)) + + (lib.cmakeBool "ENABLE_VULKAN" vulkanSupport) + + (lib.cmakeBool "ENABLE_WAYLAND" waylandSupport) + + (lib.cmakeBool "ENABLE_XCB_RANDR" x11Support) + (lib.cmakeBool "ENABLE_XRANDR" x11Support) + + (lib.cmakeBool "ENABLE_XFCONF" xfceSupport) + (lib.cmakeOptionType "filepath" "CUSTOM_PCI_IDS_PATH" "${hwdata}/share/hwdata/pci.ids") (lib.cmakeOptionType "filepath" "CUSTOM_AMDGPU_IDS_PATH" "${libdrm}/share/libdrm/amdgpu.ids") ]; @@ -241,16 +271,21 @@ stdenv.mkDerivation (finalAttrs: { Fast and highly customizable system info script. Feature flags (all default to 'true' except rpmSupport and flashfetchSupport): + * audioSupport: PulseAudio functionality + * brightnessSupport: External display brightness detection via DDCUtil + * dbusSupport: DBus functionality for Bluetooth, WiFi, player & media detection + * flashfetchSupport: Build the flashfetch utility (default: false) + * gnomeSupport: GNOME integration (dconf, dbus, gio) + * imageSupport: Image rendering (chafa and imagemagick) + * openclSupport: OpenCL features + * openglSupport: OpenGL features * rpmSupport: RPM package detection (default: false) + * sqliteSupport: Package counting via SQLite + * terminalSupport: Terminal font detection * vulkanSupport: Vulkan GPU information and DRM features * waylandSupport: Wayland display detection * x11Support: X11 display information - * flashfetchSupport: Build the flashfetch utility (default: false) - * imageSupport: Image rendering (chafa and imagemagick) - * sqliteSupport: Package counting via SQLite - * audioSupport: PulseAudio functionality - * gnomeSupport: GNOME integration (dconf, dbus, gio) - * openclSupport: OpenCL features + * xfceSupport: XFCE integration for theme and terminal font detection ''; }; }) diff --git a/pkgs/by-name/fa/fastfetchMinimal/package.nix b/pkgs/by-name/fa/fastfetchMinimal/package.nix index a8cce7333af7..f3d97cd886fd 100644 --- a/pkgs/by-name/fa/fastfetchMinimal/package.nix +++ b/pkgs/by-name/fa/fastfetchMinimal/package.nix @@ -1,13 +1,18 @@ { fastfetch }: fastfetch.override { audioSupport = false; + brightnessSupport = false; + dbusSupport = false; flashfetchSupport = false; gnomeSupport = false; imageSupport = false; openclSupport = false; + openglSupport = false; rpmSupport = false; sqliteSupport = false; + terminalSupport = false; vulkanSupport = false; waylandSupport = false; x11Support = false; + xfceSupport = false; } diff --git a/pkgs/by-name/ge/gersemi/package.nix b/pkgs/by-name/ge/gersemi/package.nix index a29d98aeefd1..305d430a323c 100644 --- a/pkgs/by-name/ge/gersemi/package.nix +++ b/pkgs/by-name/ge/gersemi/package.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "gersemi"; - version = "0.19.2"; + version = "0.19.3"; src = fetchFromGitHub { owner = "BlankSpruce"; repo = "gersemi"; tag = version; - hash = "sha256-lQafcZLTF/6SHC/NL1UnuilascjwqH4sX+kmCYHFDrw="; + hash = "sha256-CVb6ibO5+Tp0o+nB+bo9G9OKyB4L05wN1QiB9J4bOqY="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/kr/krun/package.nix b/pkgs/by-name/kr/krun/package.nix deleted file mode 100644 index fa17064e39e4..000000000000 --- a/pkgs/by-name/kr/krun/package.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - rustPlatform, - libkrun, - makeWrapper, - passt, - sommelier, - mesa, - withSommelier ? false, -}: - -rustPlatform.buildRustPackage { - pname = "krun"; - version = "0-unstable-2024-06-18"; - - src = fetchFromGitHub { - owner = "slp"; - repo = "krun"; - rev = "912afa5c6525b7c8f83dffd65ec4b1425b3f7521"; - hash = "sha256-rDuxv3UakAemDnj4Nsbpqsykts2IcseuQmDwO24L+u8="; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/slp/krun/pull/39.diff"; - hash = "sha256-CV69L+VDDLRcWgpgDCAYKLlTU9ytFcHhzNgOibWD8KY="; - }) - (fetchpatch { - url = "https://github.com/slp/krun/pull/38.diff"; - hash = "sha256-cK3iDhh+33H16V65lWUXahjmpSxI1HhiLUmkjfkRB7A="; - }) - ]; - - useFetchCargoVendor = true; - cargoHash = "sha256-5zrwxyzt9ZEdUNUMnCaFUVpaO53RAabVdtib9LG6Q1s="; - - nativeBuildInputs = [ - rustPlatform.bindgenHook - makeWrapper - ]; - - buildInputs = [ - (libkrun.override { - withGpu = true; - withNet = true; - }) - ]; - - # Allow for sommelier to be disabled as it can cause problems. - wrapArgs = [ - "--prefix PATH : ${lib.makeBinPath (lib.optional withSommelier [ sommelier ] ++ [ passt ])}" - ]; - - postFixup = '' - wrapProgram $out/bin/krun $wrapArgs \ - --set-default OPENGL_DRIVER ${mesa.driverLink} - ''; - - meta = { - description = "Run programs from your system in a microVM"; - homepage = "https://github.com/slp/krun"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ RossComputerGuy ]; - platforms = libkrun.meta.platforms; - mainProgram = "krun"; - }; -} diff --git a/pkgs/by-name/kr/kryptor/package.nix b/pkgs/by-name/kr/kryptor/package.nix index f1b548ca0fb4..bab6ed45f9ae 100644 --- a/pkgs/by-name/kr/kryptor/package.nix +++ b/pkgs/by-name/kr/kryptor/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildDotnetModule, fetchFromGitHub, dotnetCorePackages, @@ -42,5 +43,9 @@ buildDotnetModule rec { gepbird ]; platforms = lib.platforms.all; + # https://hydra.nixos.org/build/286325419 + # a libsodium.dylib file should be kept as per https://github.com/samuel-lucas6/Kryptor/releases/tag/v4.1.1 + # upstream issue: https://github.com/dotnet/sdk/issues/45903 + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/li/libkrun/package.nix b/pkgs/by-name/li/libkrun/package.nix index 71ff653b002e..3f8f2c4e3895 100644 --- a/pkgs/by-name/li/libkrun/package.nix +++ b/pkgs/by-name/li/libkrun/package.nix @@ -13,6 +13,7 @@ virglrenderer, libkrunfw, rustc, + withBlk ? false, withGpu ? false, withSound ? false, withNet ? false, @@ -21,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libkrun"; - version = "1.9.8"; + version = "1.11.2"; src = fetchFromGitHub { owner = "containers"; repo = "libkrun"; tag = "v${finalAttrs.version}"; - hash = "sha256-a5ot5ad8boANK3achn6PJ52k/xmxawbTM0/hEEC/fss="; + hash = "sha256-B11f7uG/oODwkME2rauCFbVysxUtUrUmd6RKeuBdnUU="; }; outputs = [ @@ -37,9 +38,19 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-X1NPZQaXFBw9IKD2DbBCPug0WDjv8XnpefbA2RNJgFU="; + hash = "sha256-bcHy8AfO9nzSZKoFlEpPKvwupt3eMb+A2rHDaUzO3/U="; }; + # Make sure libkrunfw can be found by dlopen() + # FIXME: This wasn't needed previously. What changed? + env.RUSTFLAGS = toString ( + map (flag: "-C link-arg=" + flag) [ + "-Wl,--push-state,--no-as-needed" + "-lkrunfw" + "-Wl,--pop-state" + ] + ); + nativeBuildInputs = [ rustPlatform.cargoSetupHook rustPlatform.bindgenHook @@ -65,6 +76,7 @@ stdenv.mkDerivation (finalAttrs: { [ "PREFIX=${placeholder "out"}" ] + ++ lib.optional withBlk "BLK=1" ++ lib.optional withGpu "GPU=1" ++ lib.optional withSound "SND=1" ++ lib.optional withNet "NET=1" @@ -72,8 +84,8 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' mkdir -p $dev/lib/pkgconfig - mv $out/lib64/pkgconfig $dev/lib/pkgconfig - mv $out/include $dev/include + mv $out/lib64/pkgconfig $dev/lib/ + mv $out/include $dev/ ''; meta = with lib; { @@ -83,6 +95,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ nickcao RossComputerGuy + nrabulinski ]; platforms = libkrunfw.meta.platforms; }; diff --git a/pkgs/by-name/li/libkrunfw/package.nix b/pkgs/by-name/li/libkrunfw/package.nix index 5a70ea441b91..9496c7cfdc7e 100644 --- a/pkgs/by-name/li/libkrunfw/package.nix +++ b/pkgs/by-name/li/libkrunfw/package.nix @@ -15,18 +15,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "libkrunfw"; - version = "4.5.1"; + version = "4.9.0"; src = fetchFromGitHub { owner = "containers"; repo = "libkrunfw"; tag = "v${finalAttrs.version}"; - hash = "sha256-GFfBiGMOyBwMKjpD1kj3vRpvjR0ydji3QNDyoOQoQsw="; + hash = "sha256-wmvjex68Mh7qehA33WNBYHhV9Q/XWLixokuGWnqJ3n0="; }; kernelSrc = fetchurl { - url = "mirror://kernel/linux/kernel/v6.x/linux-6.6.59.tar.xz"; - hash = "sha256-I2FoCNjAjxKBX/iY9O20wROXorKEPQKe5iRS0hgzp20="; + url = "mirror://kernel/linux/kernel/v6.x/linux-6.12.20.tar.xz"; + hash = "sha256-Iw6JsHsKuC508H7MG+4xBdyoHQ70qX+QCSnEBySbasc="; }; postPatch = '' @@ -71,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ nickcao RossComputerGuy + nrabulinski ]; platforms = [ "x86_64-linux" ] ++ lib.optionals (!sevVariant) [ "aarch64-linux" ]; }; diff --git a/pkgs/by-name/lx/lx-music-desktop/package.nix b/pkgs/by-name/lx/lx-music-desktop/package.nix index 8979de91851d..6be8e51cc2d2 100644 --- a/pkgs/by-name/lx/lx-music-desktop/package.nix +++ b/pkgs/by-name/lx/lx-music-desktop/package.nix @@ -18,13 +18,13 @@ let in buildNpmPackage rec { pname = "lx-music-desktop"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "lyswhut"; repo = "lx-music-desktop"; tag = "v${version}"; - hash = "sha256-8IzQEGdaeoBbCsZSPhVowipeBr4YHGm/G28qGHtCY/s="; + hash = "sha256-NMj8rb5PAejT1HCE5nxi2+SS9lFUVdLEqN0id23QjVc="; }; patches = [ @@ -39,7 +39,7 @@ buildNpmPackage rec { makeWrapper ]; - npmDepsHash = "sha256-awD8gu1AnhUn5uT/dITXjMVWNAwABAmcEVZOKukbWrI="; + npmDepsHash = "sha256-cA9NdHe3lEg8twMLWoeomWgobidZ34TKwdC5rDezZ5g="; makeCacheWritable = true; diff --git a/pkgs/by-name/mu/muvm/package.nix b/pkgs/by-name/mu/muvm/package.nix new file mode 100644 index 000000000000..64ad1e8c4ca4 --- /dev/null +++ b/pkgs/by-name/mu/muvm/package.nix @@ -0,0 +1,110 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + libkrun, + passt, + dhcpcd, + systemd, + udev, + pkg-config, + procps, + fex, + writeShellApplication, + coreutils, + makeBinaryWrapper, +# TODO: Enable again when sommelier is not broken. +# For now, don't give false impression of sommelier being supported. +# sommelier, +# withSommelier ? false, +}: +let + # TODO: Setup setuid wrappers. + # E.g. FEX needs fusermount for rootfs functionality + initScript = writeShellApplication { + name = "muvm-init"; + runtimeInputs = [ + coreutils + ]; + text = '' + if [[ ! -f /etc/NIXOS ]]; then exit; fi + + ln -s /run/muvm-host/run/current-system /run/current-system + # Only create the symlink if that path exists on the host and is a directory. + if [[ -d /run/muvm-host/run/opengl-driver ]]; then ln -s /run/muvm-host/run/opengl-driver /run/opengl-driver; fi + ''; + }; + binPath = [ + dhcpcd + passt + (placeholder "out") + ] ++ lib.optionals stdenv.isAarch64 [ fex ]; + wrapArgs = lib.escapeShellArgs [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath binPath) + "--add-flags" + "--execute-pre=${lib.getExe initScript}" + ]; +in +rustPlatform.buildRustPackage rec { + pname = "muvm"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "AsahiLinux"; + repo = pname; + rev = "muvm-${version}"; + hash = "sha256-1XPhVEj7iqTxdWyYwNk6cbb9VRGuhpvvowYDPJb1cWU="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-fkvdS0c1Ib8Kto44ou06leXy731cpMHXevyFR5RROt4="; + + postPatch = + '' + substituteInPlace crates/muvm/src/guest/bin/muvm-guest.rs \ + --replace-fail "/usr/lib/systemd/systemd-udevd" "${systemd}/lib/systemd/systemd-udevd" + + substituteInPlace crates/muvm/src/monitor.rs \ + --replace-fail "/sbin/sysctl" "${lib.getExe' procps "sysctl"}" + '' + # Only patch FEX path if we're aarch64, otherwise we don't want the derivation to pull in FEX in any way + + lib.optionalString stdenv.isAarch64 '' + substituteInPlace crates/muvm/src/guest/mount.rs \ + --replace-fail "/usr/share/fex-emu" "${fex}/share/fex-emu" + ''; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + makeBinaryWrapper + pkg-config + ]; + + buildInputs = [ + (libkrun.override { + withBlk = true; + withGpu = true; + withNet = true; + }) + udev + ]; + + postFixup = '' + wrapProgram $out/bin/muvm ${wrapArgs} + ''; + + meta = { + description = "Run programs from your system in a microVM"; + homepage = "https://github.com/AsahiLinux/muvm"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + RossComputerGuy + nrabulinski + ]; + inherit (libkrun.meta) platforms; + mainProgram = "muvm"; + }; +} diff --git a/pkgs/by-name/po/popa3d/package.nix b/pkgs/by-name/po/popa3d/package.nix index b4ced4eb19e2..637a34ef94e1 100644 --- a/pkgs/by-name/po/popa3d/package.nix +++ b/pkgs/by-name/po/popa3d/package.nix @@ -4,22 +4,18 @@ fetchurl, openssl, libxcrypt, + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "popa3d"; version = "1.0.3"; src = fetchurl { - url = "http://www.openwall.com/popa3d/${pname}-${version}.tar.gz"; - sha256 = "1g48cd74sqhl496wmljhq44iyfpghaz363a1ip8nyhpjz7d57f03"; + url = "http://www.openwall.com/popa3d/popa3d-${finalAttrs.version}.tar.gz"; + hash = "sha256-A7hT2vnyQm/RjUENM76C7zofCcFQ0spNIhRiTU5jiLw="; }; - buildInputs = [ - openssl - libxcrypt - ]; - patches = [ ./fix-mail-spool-path.patch ./use-openssl.patch @@ -27,7 +23,23 @@ stdenv.mkDerivation rec { ./enable-standalone-mode.patch ]; - configurePhase = ''makeFlags="PREFIX=$out MANDIR=$out/share/man"''; + enableParallelBuilding = true; + + makeFlags = [ + "PREFIX=$(out)" + "MANDIR=$(out)/share/man" + ]; + + buildInputs = [ + openssl + libxcrypt + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgramArg = "-V"; meta = { homepage = "http://www.openwall.com/popa3d/"; @@ -35,4 +47,4 @@ stdenv.mkDerivation rec { mainProgram = "popa3d"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/po/popa3d/use-glibc-crypt.patch b/pkgs/by-name/po/popa3d/use-glibc-crypt.patch index 35843a38bb31..66e973283eca 100644 --- a/pkgs/by-name/po/popa3d/use-glibc-crypt.patch +++ b/pkgs/by-name/po/popa3d/use-glibc-crypt.patch @@ -10,3 +10,16 @@ diff -ubr popa3d-1.0.2-orig/Makefile popa3d-1.0.2/Makefile # HP-UX trusted system #LIBS += -lsec # Solaris (POP_STANDALONE, POP_VIRTUAL) +diff -ubr popa3d-1.0.2-orig/auth_shadow.c popa3d-1.0.2/auth_shadow.c +--- a/auth_shadow.c ++++ b/auth_shadow.c +@@ -14,8 +14,9 @@ + #define _XOPEN_SOURCE 4 + #define _XOPEN_SOURCE_EXTENDED + #define _XOPEN_VERSION 4 + #define _XPG4_2 ++#define _DEFAULT_SOURCE + #include + #include + #include + #include diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index 3e35a63a40c3..72c832fb4338 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.77.22"; + version = "0.78.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; tag = "v${version}"; - hash = "sha256-Mj7lTyrEo3hOTzSUfKShK/Rzx/gOwdJYFofde+2uJHs="; + hash = "sha256-ldGv4hD+WR4c3Ajozu+u4qy/DOCKQIk9tECOfPpNbjU="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ buildGoModule rec { make generate-mocks ''; - vendorHash = "sha256-qAuC1qDUBrnf/Fq2fV4DfA5oKOMQ1AdC6XFUxXi3nuA="; + vendorHash = "sha256-56/XSeNjqUF3uQsadHWpefeXK2zIjRWXkkmQeZbmHZg="; doCheck = false; diff --git a/pkgs/by-name/va/vault/package.nix b/pkgs/by-name/va/vault/package.nix index 1e6a7a4e7c56..6b946cdde4bf 100644 --- a/pkgs/by-name/va/vault/package.nix +++ b/pkgs/by-name/va/vault/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "vault"; - version = "1.19.2"; + version = "1.19.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - hash = "sha256-8i00QdBcqpLy6qgInIWZ91Fqs4dWmamA8lmlqVR5TeI="; + hash = "sha256-Mh9cRSLvx//ePSI1RMcSA7s56MAw+XuAJvbP7BFNZZw="; }; - vendorHash = "sha256-oZhYIsDGxTGQwJGkq1tFUSMBB6240XLG2pm8/2PMA3s="; + vendorHash = "sha256-F86lDf9AYvVL/sNNstRINe5+O/kGA0SuRjkXM4C99TU="; proxyVendor = true; diff --git a/pkgs/development/python-modules/langchain-core/update.sh b/pkgs/development/python-modules/langchain-core/update.sh index 5568df95e43b..9d5348c1bffc 100755 --- a/pkgs/development/python-modules/langchain-core/update.sh +++ b/pkgs/development/python-modules/langchain-core/update.sh @@ -11,6 +11,7 @@ declare -ar packages=( langchain-core langchain-groq langchain-huggingface + langchain-mistralai langchain-mongodb langchain-ollama langchain-openai diff --git a/pkgs/development/python-modules/langchain-mistralai/default.nix b/pkgs/development/python-modules/langchain-mistralai/default.nix new file mode 100644 index 000000000000..55df9f444be7 --- /dev/null +++ b/pkgs/development/python-modules/langchain-mistralai/default.nix @@ -0,0 +1,79 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + nix-update-script, + + # build-system + pdm-backend, + + # dependencies + langchain-core, + tokenizers, + httpx, + httpx-sse, + pydantic, + + # tests + langchain-tests, + pytest-asyncio, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "langchain-mistralai"; + version = "0.2.10"; + pyproject = true; + + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langchain"; + tag = "langchain-mistralai==${version}"; + hash = "sha256-1oH9GRvjYv/YzedKXeWgw5nwNgMQ9mSNkmZ2xwPekXc="; + }; + + sourceRoot = "${src.name}/libs/partners/mistralai"; + + build-system = [ pdm-backend ]; + + dependencies = [ + langchain-core + tokenizers + httpx + httpx-sse + pydantic + ]; + + pythonRelaxDeps = [ + # Each component release requests the exact latest core. + # That prevents us from updating individual components. + "langchain-core" + ]; + + nativeCheckInputs = [ + langchain-tests + pytest-asyncio + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests/unit_tests" ]; + + pythonImportsCheck = [ "langchain_mistralai" ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "langchain-mistralai==([0-9.]+)" + ]; + }; + + meta = { + changelog = "https://github.com/langchain-ai/langchain-mistralai/releases/tag/langchain-mistralai==${version}"; + description = "Build LangChain applications with mistralai"; + homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/mistralai"; + license = lib.licenses.mit; + maintainers = [ + lib.maintainers.sarahec + ]; + }; +} diff --git a/pkgs/development/python-modules/py-stringmatching/default.nix b/pkgs/development/python-modules/py-stringmatching/default.nix index fd6a265b87e5..4ec1fe9cfad0 100644 --- a/pkgs/development/python-modules/py-stringmatching/default.nix +++ b/pkgs/development/python-modules/py-stringmatching/default.nix @@ -1,30 +1,40 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + + # build-system + cython, setuptools, - pytestCheckHook, - numpy, - pythonOlder, + + # dependencies + numpy_1, six, + + # tests + pytestCheckHook, }: buildPythonPackage rec { pname = "py-stringmatching"; version = "0.4.6"; - pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-XdHLHwT/sgHM+uQ4lxw9c+AcAdJjL6OVgfwtJkYLoBs="; + src = fetchFromGitHub { + owner = "anhaidgroup"; + repo = "py_stringmatching"; + tag = "v${version}"; + hash = "sha256-gQiIIN0PeeM81ZHsognPFierf9ZXasq/JqxsYZmLAnU="; }; - nativeBuildInputs = [ setuptools ]; + pyproject = true; - propagatedBuildInputs = [ - numpy + build-system = [ + setuptools + cython + ]; + + dependencies = [ + numpy_1 six ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index aa90a7c7f886..51bf85042ff6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -919,6 +919,7 @@ mapAliases { kramdown-rfc2629 = throw "'kramdown-rfc2629' has been renamed to/replaced by 'rubyPackages.kramdown-rfc2629'"; # Converted to throw 2024-10-17 krb5Full = krb5; krita-beta = throw "'krita-beta' has been renamed to/replaced by 'krita'"; # Converted to throw 2024-10-17 + krun = throw "'krun' has been renamed to/replaced by 'muvm'"; # Added 2025-05-01 kubei = kubeclarity; # Added 2023-05-20 kubo-migrator-all-fs-repo-migrations = kubo-fs-repo-migrations; # Added 2024-09-24 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 786f78d21c4d..10a5fe61db5e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7526,6 +7526,8 @@ self: super: with self; { langchain-huggingface = callPackage ../development/python-modules/langchain-huggingface { }; + langchain-mistralai = callPackage ../development/python-modules/langchain-mistralai { }; + langchain-mongodb = callPackage ../development/python-modules/langchain-mongodb { }; langchain-ollama = callPackage ../development/python-modules/langchain-ollama { };