diff options
Diffstat (limited to 'pkgs/by-name')
32 files changed, 894 insertions, 149 deletions
diff --git a/pkgs/by-name/ad/adbtuifm/package.nix b/pkgs/by-name/ad/adbtuifm/package.nix new file mode 100644 index 0000000000000..8f8c15c283be5 --- /dev/null +++ b/pkgs/by-name/ad/adbtuifm/package.nix @@ -0,0 +1,25 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, +}: +buildGoModule rec { + pname = "adbtuifm"; + version = "0.5.8"; + src = fetchFromGitHub { + owner = "darkhz"; + repo = "adbtuifm"; + rev = "v${version}"; + hash = "sha256-TK93O9XwMrsrQT3EG0969HYMtYkK0a4PzG9FSTqHxAY="; + }; + vendorHash = "sha256-voVoowjM90OGWXF4REEevO8XEzT7azRYiDay4bnGBks="; + meta = with lib; { + description = "A TUI-based file manager for the Android Debug Bridge"; + homepage = "https://github.com/darkhz/adbtuifm"; + changelog = "https:/github.com/darkhz/adbtuifm/releases/tag/v${version}"; + license = with licenses; [mit]; + maintainers = with maintainers; [daru-san]; + mainProgram = "adbtuifm"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json index 115584aa553f3..d3e8daf45c829 100644 --- a/pkgs/by-name/au/audiobookshelf/source.json +++ b/pkgs/by-name/au/audiobookshelf/source.json @@ -1,9 +1,9 @@ { "owner": "advplyr", "repo": "audiobookshelf", - "rev": "166454ef43e3cdb42c644cdccdacddd3a880cd89", - "hash": "sha256-QrGzlSGK7WDlRemS13CmHdg563HFv9QhOpCF+XRxXsg=", - "version": "2.8.1", - "depsHash": "sha256-CzlwpgSgsQZGuRWTA/IkCyaryCSurH74WR5Rhm5faEk=", - "clientDepsHash": "sha256-s7/Rlj3DrYjUkxAN82bTpWe+D4HdVOc1mrqKgqcJuI4=" + "rev": "8b27c726d51cd9706cd564ef72377b89db3194b3", + "hash": "sha256-9WqMcehlGhSMI08u6/LSNOrLhCCl8coEHAUUM5KLnx8=", + "version": "2.9.0", + "depsHash": "sha256-ll96aPw6lO7B1c5s7uIpn3poPu/JRa/weins5SNMQw4=", + "clientDepsHash": "sha256-uqHfU38BLqigGzKJC/i/bftLJbCmHaOcj04d1bu4K1I=" } diff --git a/pkgs/by-name/au/autopsy/package.nix b/pkgs/by-name/au/autopsy/package.nix new file mode 100644 index 0000000000000..359a7affa3a00 --- /dev/null +++ b/pkgs/by-name/au/autopsy/package.nix @@ -0,0 +1,49 @@ +{ stdenv, lib, makeWrapper, fetchzip, testdisk, imagemagick, jdk, findutils, sleuthkit, ... }: +let + jdkWithJfx = jdk.override (lib.optionalAttrs stdenv.isLinux { + enableJavaFX = true; + }); +in +stdenv.mkDerivation rec { + pname = "autopsy"; + version = "4.21.0"; + + src = fetchzip { + url = "https://github.com/sleuthkit/autopsy/releases/download/autopsy-${version}/autopsy-${version}.zip"; + sha256 = "32iOQA3+ykltCYW/MpqCVxyhh3mm6eYzY+t0smAsWRw="; + }; + + nativeBuildInputs = [ makeWrapper findutils ]; + buildInputs = [ testdisk imagemagick jdkWithJfx ]; + + installPhase = '' + runHook preInstall + + cp -r . $out + + # Run the provided setup script to make files executable and copy sleuthkit + TSK_JAVA_LIB_PATH="${sleuthkit}/share/java" bash $out/unix_setup.sh -j '${jdkWithJfx}' -n autopsy + + substituteInPlace $out/bin/autopsy \ + --replace-warn 'APPNAME=`basename "$PRG"`' 'APPNAME=autopsy' + wrapProgram $out/bin/autopsy \ + --run 'export SOLR_LOGS_DIR="$HOME/.autopsy/dev/var/log"' \ + --run 'export SOLR_PID_DIR="$HOME/.autopsy/dev"' \ + --prefix PATH : "${lib.makeBinPath [ testdisk imagemagick jdkWithJfx ]}" + + runHook postInstall + ''; + + meta = { + description = "Graphical interface to The Sleuth Kit and other open source digital forensics tools"; + homepage = "https://www.sleuthkit.org/autopsy"; + changelog = "https://github.com/sleuthkit/autopsy/releases/tag/autopsy-${version}"; + # Autopsy brings a lot of vendored dependencies + license = with lib.licenses; [ asl20 ipl10 lgpl3Only lgpl21Only zlib wtfpl bsd3 cc-by-30 mit gpl2Only ]; + maintainers = with lib.maintainers; [ zebreus ]; + mainProgram = "autopsy"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + # Autopsy theoretically also supports darwin + platforms = lib.platforms.x86_64; + }; +} diff --git a/pkgs/by-name/bt/btrfs-assistant/package.nix b/pkgs/by-name/bt/btrfs-assistant/package.nix new file mode 100644 index 0000000000000..d3bdc74980228 --- /dev/null +++ b/pkgs/by-name/bt/btrfs-assistant/package.nix @@ -0,0 +1,90 @@ +{ lib +, stdenv +, fetchFromGitLab +, bash +, btrfs-progs +, cmake +, coreutils +, git +, pkg-config +, qt6 +, snapper +, util-linux +, enableSnapper ? true +, nix-update-script +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "btrfs-assistant"; + version = "2.0"; + + src = fetchFromGitLab { + owner = "btrfs-assistant"; + repo = "btrfs-assistant"; + rev = finalAttrs.version; + hash = "sha256-nE8Vsc0leXWhbrjMgJDef6jl9MqdojRniGcvUmrQNUQ="; + }; + + nativeBuildInputs = [ + cmake + git + pkg-config + ]; + + buildInputs = [ + btrfs-progs + qt6.qtbase + qt6.qtsvg + qt6.qttools + qt6.qtwayland + ]; + + propagatedBuildInputs = [ qt6.wrapQtAppsHook ]; + + prePatch = '' + substituteInPlace src/util/System.cpp \ + --replace '/bin/bash' "${lib.getExe bash}" + '' + + lib.optionalString enableSnapper '' + substituteInPlace src/main.cpp \ + --replace '/usr/bin/snapper' "${lib.getExe snapper}" + ''; + + postPatch = '' + substituteInPlace src/org.btrfs-assistant.pkexec.policy \ + --replace '/usr/bin' "$out/bin" + + substituteInPlace src/btrfs-assistant \ + --replace 'btrfs-assistant-bin' "$out/bin/btrfs-assistant-bin" + + substituteInPlace src/btrfs-assistant-launcher \ + --replace 'btrfs-assistant' "$out/bin/btrfs-assistant" + '' + + lib.optionalString enableSnapper '' + substituteInPlace src/btrfs-assistant.conf \ + --replace '/usr/bin/snapper' "${lib.getExe snapper}" + ''; + + qtWrapperArgs = + let + runtimeDeps = lib.makeBinPath ([ + coreutils + util-linux + ] + ++ lib.optionals enableSnapper [ snapper ]); + in + [ + "--prefix PATH : ${runtimeDeps}" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A GUI management tool to make managing a Btrfs filesystem easier"; + homepage = "https://gitlab.com/btrfs-assistant/btrfs-assistant"; + license = lib.licenses.gpl3Only; + mainProgram = "btrfs-assistant-bin"; + maintainers = with lib.maintainers; [ khaneliman ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index 2c0dd84cbbcda..cc87e9b5a0d53 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -13,10 +13,10 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-6sIYDI6+1/p54Af+E/GmRAFlfDYJVwxhn0qF47ZH+Zg="; - aarch64-linux = "sha256-1ImcjAqCZm5KZZYHWhG1eO7ipAdrP4Qjj2eBxTst++s="; - x86_64-darwin = "sha256-yHthItxZYFejJlwJJ7BrM2csnLsZXjy/IbzF1iaCCyI="; - aarch64-darwin = "sha256-GIx0yABISj/rH/yVkkx6NBs5qF0P8nhpMyvnzXJ92mA="; + x86_64-linux = "sha256-cDMdhfN7PxT687DG1djDNzZXb6E3OrWHXbl1XS6pxi4="; + aarch64-linux = "sha256-0wc7fuvyDcbx2HXVq5IMe59r3iNbnXe+gDjCXtU3KjQ="; + x86_64-darwin = "sha256-ZWsBfA1AsBFWA3f40coqhaAmnQc1U50VJ1RHWiybq+o="; + aarch64-darwin = "sha256-EaoEsBBlpewevk9HstJLZGgQGdPuPb5cqXYkcbGX9WU="; }.${system} or throwSystem; bin = "$out/bin/codeium_language_server"; @@ -24,7 +24,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; - version = "1.8.25"; + version = "1.8.27"; src = fetchurl { name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix index 01659a65173e2..8100b835e44ac 100644 --- a/pkgs/by-name/di/digikam/package.nix +++ b/pkgs/by-name/di/digikam/package.nix @@ -26,6 +26,7 @@ , x265 , jasper +, bash # For panorama and focus stacking , enblend-enfuse , hugin @@ -110,6 +111,13 @@ stdenv.mkDerivation rec { cuda_cudart ]); + postPatch = '' + substituteInPlace \ + core/dplugins/bqm/custom/userscript/userscript.cpp \ + core/utilities/import/backend/cameracontroller.cpp \ + --replace-fail \"/bin/bash\" \"${lib.getExe bash}\" + ''; + cmakeFlags = [ "-DENABLE_MYSQLSUPPORT=1" "-DENABLE_INTERNALMYSQL=1" diff --git a/pkgs/by-name/do/dooit/package.nix b/pkgs/by-name/do/dooit/package.nix new file mode 100644 index 0000000000000..c532b13877d30 --- /dev/null +++ b/pkgs/by-name/do/dooit/package.nix @@ -0,0 +1,60 @@ +{ lib +, fetchFromGitHub +, dooit +, python3 +, testers +, nix-update-script +}: + +python3.pkgs.buildPythonApplication rec { + pname = "dooit"; + version = "2.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "kraanzu"; + repo = "dooit"; + rev = "v${version}"; + hash = "sha256-GtXRzj+o+FClleh73kqelk0JrSyafZhf847lX1BiS9k="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "textual" + "tzlocal" + ]; + + propagatedBuildInputs = with python3.pkgs; [ + appdirs + pyperclip + python-dateutil + pyyaml + textual + tzlocal + ]; + + # No tests available + doCheck = false; + + passthru = { + tests.version = testers.testVersion { + package = dooit; + command = "HOME=$(mktemp -d) dooit --version"; + }; + + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "A TUI todo manager"; + homepage = "https://github.com/kraanzu/dooit"; + changelog = "https://github.com/kraanzu/dooit/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ khaneliman wesleyjrz ]; + mainProgram = "dooit"; + }; +} diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix new file mode 100644 index 0000000000000..3524b3db32313 --- /dev/null +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -0,0 +1,161 @@ +{ lib +, stdenv +, fetchFromGitHub +, chafa +, cmake +, darwin +, dbus +, dconf +, ddcutil +, glib +, hwdata +, imagemagick_light +, libXrandr +, libglvnd +, libpulseaudio +, libselinux +, libsepol +, libxcb +, makeBinaryWrapper +, networkmanager +, nix-update-script +, ocl-icd +, opencl-headers +, overrideSDK +, pcre +, pcre2 +, pkg-config +, python3 +, rpm +, sqlite +, testers +, util-linux +, vulkan-loader +, wayland +, xfce +, xorg +, yyjson +, zlib +, rpmSupport ? false +, vulkanSupport ? true +, waylandSupport ? true +, x11Support ? true +}: +let + stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; +in +stdenv'.mkDerivation (finalAttrs: { + pname = "fastfetch"; + version = "2.9.2"; + + src = fetchFromGitHub { + owner = "fastfetch-cli"; + repo = "fastfetch"; + rev = finalAttrs.version; + hash = "sha256-SEt/qw8ixlgRY2+fqyCmhqzLVoAw/BMl//JqQxbuB0s="; + }; + + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ + cmake + makeBinaryWrapper + pkg-config + python3 + ]; + + buildInputs = [ + chafa + imagemagick_light + pcre + pcre2 + sqlite + yyjson + ] ++ lib.optionals stdenv.isLinux [ + dbus + dconf + ddcutil + glib + hwdata + libpulseaudio + libselinux + libsepol + networkmanager + ocl-icd + opencl-headers + util-linux + zlib + ] ++ lib.optionals rpmSupport [ + rpm + ] ++ lib.optionals vulkanSupport [ + vulkan-loader + ] ++ lib.optionals waylandSupport [ + wayland + ] ++ lib.optionals x11Support [ + libXrandr + libglvnd + libxcb + xorg.libXau + xorg.libXdmcp + xorg.libXext + ] ++ lib.optionals (x11Support && (!stdenv.isDarwin)) [ + xfce.xfconf + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ + Apple80211 + AppKit + AVFoundation + Cocoa + CoreDisplay + CoreVideo + CoreWLAN + DisplayServices + IOBluetooth + MediaRemote + OpenCL + SystemConfiguration + darwin.moltenvk + ]); + + cmakeFlags = [ + (lib.cmakeOptionType "filepath" "CMAKE_INSTALL_SYSCONFDIR" "${placeholder "out"}/etc") + (lib.cmakeBool "ENABLE_DIRECTX_HEADERS" false) + (lib.cmakeBool "ENABLE_DRM" false) + (lib.cmakeBool "ENABLE_IMAGEMAGICK6" false) + (lib.cmakeBool "ENABLE_OSMESA" false) + (lib.cmakeBool "ENABLE_SYSTEM_YYJSON" true) + (lib.cmakeBool "ENABLE_GLX" x11Support) + (lib.cmakeBool "ENABLE_RPM" rpmSupport) + (lib.cmakeBool "ENABLE_VULKAN" x11Support) + (lib.cmakeBool "ENABLE_WAYLAND" waylandSupport) + (lib.cmakeBool "ENABLE_X11" x11Support) + (lib.cmakeBool "ENABLE_XCB" x11Support) + (lib.cmakeBool "ENABLE_XCB_RANDR" x11Support) + (lib.cmakeBool "ENABLE_XFCONF" (x11Support && (!stdenv.isDarwin))) + (lib.cmakeBool "ENABLE_XRANDR" x11Support) + ]; + + postInstall = '' + wrapProgram $out/bin/fastfetch \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" + wrapProgram $out/bin/flashfetch \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" + ''; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "fastfetch -v | cut -d '(' -f 1"; + version = "fastfetch ${finalAttrs.version}"; + }; + }; + + meta = { + description = "Like neofetch, but much faster because written in C"; + homepage = "https://github.com/fastfetch-cli/fastfetch"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gerg-l khaneliman federicoschonborn ]; + platforms = lib.platforms.all; + mainProgram = "fastfetch"; + }; +}) diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix index 850bb85755d65..ad1782de129bc 100644 --- a/pkgs/by-name/fi/firefly-iii/package.nix +++ b/pkgs/by-name/fi/firefly-iii/package.nix @@ -8,24 +8,25 @@ let pname = "firefly-iii"; - version = "6.1.13"; + version = "6.1.15"; phpPackage = php83; src = fetchFromGitHub { owner = "firefly-iii"; repo = "firefly-iii"; rev = "v${version}"; - hash = "sha256-85zI8uCyyoCflzxDkvba6FWa9B3kh179DJfQ2Um6MGM="; + hash = "sha256-9Od8tR8X2OZ2hu81tHWDpBX8snWCRvTnlY1AwjIcMug="; }; assets = buildNpmPackage { pname = "${pname}-assets"; inherit version src; - npmDepsHash = "sha256-wuPUE6XuzzgKjpxZVgwh2wGut15M61WSBFG+YIZwOFM="; + npmDepsHash = "sha256-UVySgcj1tQLQIxlsZuig4ixkfxfsYWYPKWLz5zHA+Dg="; dontNpmBuild = true; installPhase = '' runHook preInstall - npm run build + npm run prod --workspace=v1 + npm run build --workspace=v2 cp -r ./public $out/ runHook postInstall ''; @@ -35,7 +36,7 @@ in phpPackage.buildComposerProject (finalAttrs: { inherit pname src version; - vendorHash = "sha256-CVGKyyLp5hjjpEulDNEYfljU4OgPBaFcYQQAUf6GeGs="; + vendorHash = "sha256-RDkAbTKj7M7lE8bVRxb+RR5CA6hJIMp61U0+aRtFE50="; passthru = { inherit phpPackage; diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index e8726689e859c..b4683af8912eb 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/pkgs/by-name/fw/fwupd/package.nix @@ -120,7 +120,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "1.9.16"; + version = "1.9.18"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; rev = finalAttrs.version; - hash = "sha256-mM8HSSQD5znjpl9q/f+u0RzZEkFA1tnh+BPB2qdcWvI="; + hash = "sha256-w2jqIPNV6OkPaHfy7bEFgr5IgzJYtMTrO5UWmnZ+2JI="; }; patches = [ diff --git a/pkgs/by-name/gl/glasskube/package.nix b/pkgs/by-name/gl/glasskube/package.nix index 91d2dcceef7cf..b3e6e34939f33 100644 --- a/pkgs/by-name/gl/glasskube/package.nix +++ b/pkgs/by-name/gl/glasskube/package.nix @@ -7,12 +7,12 @@ }: let - version = "0.1.0"; + version = "0.2.0"; gitSrc = fetchFromGitHub { owner = "glasskube"; repo = "glasskube"; rev = "refs/tags/v${version}"; - hash = "sha256-iJjO4V2sK3e/SpDZ5Lfw7gILgZrI4CGg0wLLVKthGUE="; + hash = "sha256-r14gYgrenUk3OFUEab4QlwmwUeEwqocJJ3Vje9wRdBA="; }; web-bundle = buildNpmPackage rec { inherit version; @@ -20,7 +20,7 @@ let src = gitSrc; - npmDepsHash = "sha256-nv2ng8gUOi9K46bDuWt/Y3S6AJovUWaqM+8uGiu/QSs="; + npmDepsHash = "sha256-WKwEAVMG6r/ZFmxgLR+zJCW8F2DOHxpWDYqhX/vcdrs="; dontNpmInstall = true; @@ -40,7 +40,7 @@ in buildGoModule rec { src = gitSrc; - vendorHash = "sha256-iFWcTzZP0DKJ9hrmfUWR4U/VX2zsR+3uojI+GRI2R3I="; + vendorHash = "sha256-sj9TEAWhExwaaKlMJ10U7m3/xbUNl0dVZwrCb2TTu4o="; CGO_ENABLED = 0; diff --git a/pkgs/by-name/go/godot_4-export-templates/package.nix b/pkgs/by-name/go/godot_4-export-templates/package.nix new file mode 100644 index 0000000000000..be1240737649a --- /dev/null +++ b/pkgs/by-name/go/godot_4-export-templates/package.nix @@ -0,0 +1,13 @@ +# Export templates is necessary for setting up Godot engine, it's used when exporting projects. +# Godot applications/games packages needs to reference export templates. +# Export templates version should be kept in sync with Godot version. +# https://docs.godotengine.org/en/stable/tutorials/export/exporting_projects.html#export-templates + +{ fetchzip, godot_4, ... }: + +fetchzip { + pname = "export_templates"; + extension = "zip"; + url = "https://github.com/godotengine/godot/releases/download/${godot_4.version}/Godot_v${godot_4.version}_export_templates.tpz"; + hash = "sha256-eomGLH9lbZhl7VtHTWjJ5mxVt0Yg8LfnAnpqoCksPgs="; +} diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 49ebe5433c0c4..1fa25ad356eb9 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "hugo"; - version = "0.125.0"; + version = "0.125.3"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; rev = "refs/tags/v${version}"; - hash = "sha256-aPBS/8m57Dn8Uvem58KzaCZJ1Hn8doL1BsDdF7w5nJc="; + hash = "sha256-PZTV/VM0KS/vM4lLrJ/XPvNi33lM+L0gITQHGpjdN+4="; }; vendorHash = "sha256-jGCHlAE5mSDKpZVWgjCEN51sL+3GR/C5ROI9065OhRU="; diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index 5051944cab1ec..746aa71125319 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -1,15 +1,16 @@ -{ lib -, darwin -, fetchurl -, fetchpatch -, openssl -, stdenv -, vlc +{ + lib, + darwin, + fetchpatch, + fetchurl, + openssl, + stdenv, + vlc, }: stdenv.mkDerivation (finalAttrs: { pname = "live555"; - version = "2024.03.08"; + version = "2024.04.14"; src = fetchurl { urls = [ @@ -18,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { "https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz" ]; - hash = "sha256-wWUC4EbxxfK+OxXiyNbNMGObVMZOqb+8jTG078pnDeU="; + hash = "sha256-mR5rKGKtTwMq3p+xAAGdo0DNNnIe4KHladLPlnhVhNY="; }; patches = [ @@ -60,11 +61,13 @@ stdenv.mkDerivation (finalAttrs: { ''; configurePhase = let - platform = if stdenv.isLinux - then "linux" - else if stdenv.isDarwin - then "macosx-catalina" - else throw "Unsupported platform: ${stdenv.hostPlatform.system}"; + platform = + if stdenv.isLinux then + "linux" + else if stdenv.isDarwin then + "macosx-catalina" + else + throw "Unsupported platform: ${stdenv.hostPlatform.system}"; in '' runHook preConfigure diff --git a/pkgs/by-name/li/livekit-cli/package.nix b/pkgs/by-name/li/livekit-cli/package.nix index 75682ea71b4bd..686f58800345c 100644 --- a/pkgs/by-name/li/livekit-cli/package.nix +++ b/pkgs/by-name/li/livekit-cli/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "livekit-cli"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "livekit"; repo = "livekit-cli"; rev = "v${version}"; - hash = "sha256-/H7Xn/nUumKf62qV6kt2PBbvIt67IwA1dt+hj8mbE30="; + hash = "sha256-6UIMyroZpylUMG7TIBOqDIDsuJLtpe2BQxfjEhbZBGc="; }; - vendorHash = "sha256-yO2Qr6H5sZGLMHiue5IVHkF1IDsZZh48s6KNpXR+nzA="; + vendorHash = "sha256-e84jusaQx6B5cbJoIOSVyxgAQx9VIxFODH1Io1Z/yj0="; subPackages = [ "cmd/livekit-cli" ]; diff --git a/pkgs/by-name/ma/maa-cli/package.nix b/pkgs/by-name/ma/maa-cli/package.nix index c083f6451ee8c..3f8fadb0ee953 100644 --- a/pkgs/by-name/ma/maa-cli/package.nix +++ b/pkgs/by-name/ma/maa-cli/package.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "maa-cli"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "MaaAssistantArknights"; repo = "maa-cli"; rev = "v${version}"; - hash = "sha256-LeEIbfDQ+GO3gNmdpWGTNkpbhSqLz4fYQ+MdcrcbDk0="; + hash = "sha256-fvMSYcYWYEVvDuAEjSmQJltl90EoLKkjYD2P3OsHS3c="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { buildNoDefaultFeatures = true; buildFeatures = [ "git2" "core_installer" ]; - cargoHash = "sha256-tkUJH7oFY5eZ5A7J+qzeyHlqOUnTipf6o+leZz7KOiQ="; + cargoHash = "sha256-LQWjgMRxtSs2MX1R6YsxDAWUvoUJfOWmp/zj/hlTxyw="; # maa-cli would only seach libMaaCore.so and resources in itself's path # https://github.com/MaaAssistantArknights/maa-cli/issues/67 diff --git a/pkgs/by-name/na/nawk/package.nix b/pkgs/by-name/na/nawk/package.nix index 2ad1e2c9c3cdb..bb93e778922e9 100644 --- a/pkgs/by-name/na/nawk/package.nix +++ b/pkgs/by-name/na/nawk/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nawk"; - version = "20240311"; + version = "20240422"; src = fetchFromGitHub { owner = "onetrueawk"; repo = "awk"; rev = finalAttrs.version; - hash = "sha256-4iAQR8djhhp5Yn4H1IdzotQLY0d/Gz/vNQPfAUNQV0A="; + hash = "sha256-wsRkSXCLtK2jk4gW/Lpg/14NiOUANfmCrYqeKZW6CLY="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/by-name/ne/netscanner/package.nix b/pkgs/by-name/ne/netscanner/package.nix index 7aa745856d34c..16c1f2d847ff4 100644 --- a/pkgs/by-name/ne/netscanner/package.nix +++ b/pkgs/by-name/ne/netscanner/package.nix @@ -6,7 +6,7 @@ }: let pname = "netscanner"; - version = "0.4.2"; + version = "0.4.4"; in rustPlatform.buildRustPackage { inherit pname version; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "Chleba"; repo = "netscanner"; rev = "refs/tags/v${version}"; - hash = "sha256-xdY3moWRmSMZ3PVyuHBnp8c9k5KxH+MoE5+s0QWSUM4="; + hash = "sha256-RO0+Zz1sivIjD8OM4TBHR5geJw540MAJfXEl2yriH6o="; }; - cargoHash = "sha256-15BNkrr79KMyFcn7NJrGCj25RjH/a4WUOQAoMPzJieQ="; + cargoHash = "sha256-GJLrUF2YAMtCtXTPJvlUURfiTYBFUE6Gmeux+5RXqAM="; postFixup = '' wrapProgram $out/bin/netscanner \ diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index 989a97f0c5f89..09142e93ca102 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nuclei-templates"; - version = "9.8.1"; + version = "9.8.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; rev = "refs/tags/v${version}"; - hash = "sha256-g1MwzJK9a8bpbbP9EoUi0UBR54nfnyg3RDi9qwIKlH0="; + hash = "sha256-j1W/Gq002Y+/Lrq51Od8iZoxbMJji20kpbUaCC7ieqE="; }; installPhase = '' diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix index 4f803fe35626d..ff2fb3a1b7807 100644 --- a/pkgs/by-name/om/omnictl/package.nix +++ b/pkgs/by-name/om/omnictl/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "omnictl"; - version = "0.32.2"; + version = "0.33.2"; src = fetchFromGitHub { owner = "siderolabs"; repo = "omni"; rev = "v${version}"; - hash = "sha256-db/bYwMPrOZvD/YPtFaRK80yaYdsE70YPh0xQe0uVi4="; + hash = "sha256-sszIUHEXtnla1fxlUbHXjQzaJoafse1YOSVikd7LMHk="; }; - vendorHash = "sha256-uwzVUdA51eT9fi2Wr0ilNPMpXx430UIYYWXQa1hpzRM="; + vendorHash = "sha256-fU2bmVL42tEoWvrCAg2iSV7bErZhwor6tnjGRrtwMA4="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix index baa05e840c66a..11a9f99af9c81 100644 --- a/pkgs/by-name/py/pyprland/package.nix +++ b/pkgs/by-name/py/pyprland/package.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "pyprland"; - version = "2.2.5"; + version = "2.2.10"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.10"; @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { owner = "hyprland-community"; repo = "pyprland"; rev = "refs/tags/${version}"; - hash = "sha256-ech+KqB0SyFYDWNP+luv+K2aDjJHZDWp72V6wkGBJJw="; + hash = "sha256-SOrkOLSjXq8PlZ894EKjfN+Dfnwa8dRgh5eOJVeD2Mk="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; diff --git a/pkgs/by-name/rk/rkbin/package.nix b/pkgs/by-name/rk/rkbin/package.nix index 9ccff94a4e4b1..5579703daca09 100644 --- a/pkgs/by-name/rk/rkbin/package.nix +++ b/pkgs/by-name/rk/rkbin/package.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation { homepage = "https://github.com/rockchip-linux/rkbin"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ thefossguy ]; - platforms = [ "aarch64-linux" ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/rk/rkboot/package.nix b/pkgs/by-name/rk/rkboot/package.nix new file mode 100644 index 0000000000000..5e71406967a62 --- /dev/null +++ b/pkgs/by-name/rk/rkboot/package.nix @@ -0,0 +1,43 @@ +{ stdenv +, lib +, rkbin +, box64 +}: + +stdenv.mkDerivation { + name = "rkboot"; + + src = rkbin.src; + + postPatch = '' + substituteInPlace RKBOOT/*.ini --replace 'PATH=' 'PATH=rkboot/' + ''; + + buildPhase = '' + mkdir rkboot + for i in $(ls ./RKBOOT/*.ini) + do + # The proprietary, statically linked binaries to perform boot_merge are + # x86_64 only. Though we use box64 to emulate if building on aarch64-linux + ${lib.optionalString stdenv.isAarch64 "${lib.getExe box64}"} ./tools/boot_merger "$i" || true + done + ''; + + installPhase = '' + mkdir -p $out + if [ -z "$(ls -A rkboot)" ]; then + echo "Error: The 'rkboot' directory is empty." + exit 1 + else + mv rkboot $out/bin + fi + ''; + + meta = with lib; { + description = "Rockchip proprietary SPL bootloader blobs"; + homepage = "https://github.com/rockchip-linux/rkbin"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ matthewcroughan ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + }; +} diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index e52e1d0ca2287..ed71e50f2bae4 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.10.7"; + version = "2.10.10"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-B44KFrKy76IZB7QeivE4a/e8JARp4VwJs0mTffa622w="; + hash = "sha256-CdTY5Qv/xF9ItNgHQFqec5nKObnImx/+MuFShTfdrAo="; }; sourceRoot = "."; diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock index 2044212a42c25..99c96ee226159 100644 --- a/pkgs/by-name/uv/uv/Cargo.lock +++ b/pkgs/by-name/uv/uv/Cargo.lock @@ -308,9 +308,9 @@ dependencies = [ [[package]] name = "axoupdater" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04daf26062f90764242d0e144ad52d1952cb0d02ef7ce3ffbb9127b4f1340f36" +checksum = "639ef3c97d1bebfb42f94739036fbe3e10ef0056d2f8d5ea288bf4ad5f73a5e6" dependencies = [ "axoasset", "axoprocess", @@ -628,7 +628,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -1049,6 +1049,7 @@ dependencies = [ "cache-key", "distribution-filename", "fs-err", + "git2", "itertools 0.12.1", "once_cell", "pep440_rs", @@ -1618,9 +1619,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f24ce812868d86d19daa79bf3bf9175bc44ea323391147a5e3abde2a283871b" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", @@ -2724,15 +2725,15 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" +checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" dependencies = [ "cfg-if", "indoc", "libc", "memoffset 0.9.1", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "portable-atomic", "pyo3-build-config", "pyo3-ffi", @@ -2742,9 +2743,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" +checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50" dependencies = [ "once_cell", "target-lexicon", @@ -2752,9 +2753,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" +checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403" dependencies = [ "libc", "pyo3-build-config", @@ -2762,9 +2763,9 @@ dependencies = [ [[package]] name = "pyo3-log" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c10808ee7250403bedb24bc30c32493e93875fef7ba3e4292226fe924f398bd" +checksum = "2af49834b8d2ecd555177e63b273b708dea75150abc6f5341d0a6e1a9623976c" dependencies = [ "arc-swap", "log", @@ -2773,9 +2774,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" +checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -2785,9 +2786,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" +checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -2933,13 +2934,13 @@ dependencies = [ [[package]] name = "reflink-copy" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52b1349400e2ffd64a9fb5ed9008e33c0b8ef86bd5bae8f73080839c7082f1d5" +checksum = "7c3138c30c59ed9b8572f82bed97ea591ecd7e45012566046cc39e72679cff22" dependencies = [ "cfg-if", "rustix", - "windows 0.54.0", + "windows 0.56.0", ] [[package]] @@ -3191,9 +3192,9 @@ dependencies = [ [[package]] name = "rmp" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", "num-traits", @@ -3202,9 +3203,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "1.1.2" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +checksum = "938a142ab806f18b88a97b0dea523d39e0fd730a064b035726adcfc58a8a5188" dependencies = [ "byteorder", "rmp", @@ -3434,18 +3435,18 @@ checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" dependencies = [ "proc-macro2", "quote", @@ -3465,9 +3466,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -3855,18 +3856,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", @@ -4397,7 +4398,7 @@ checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" [[package]] name = "uv" -version = "0.1.35" +version = "0.1.36" dependencies = [ "anstream", "anyhow", @@ -4465,6 +4466,7 @@ dependencies = [ name = "uv-auth" version = "0.0.1" dependencies = [ + "anyhow", "async-trait", "base64 0.22.0", "http", @@ -4978,6 +4980,7 @@ dependencies = [ "pep440_rs", "pep508_rs", "pypi-types", + "requirements-txt", "rustc-hash", "serde", "serde_json", @@ -4991,7 +4994,7 @@ dependencies = [ [[package]] name = "uv-version" -version = "0.1.35" +version = "0.1.36" [[package]] name = "uv-virtualenv" @@ -5306,19 +5309,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core 0.52.0", - "windows-implement", - "windows-interface", - "windows-targets 0.52.4", + "windows-implement 0.52.0", + "windows-interface 0.52.0", + "windows-targets 0.52.5", ] [[package]] name = "windows" -version = "0.54.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" dependencies = [ - "windows-core 0.54.0", - "windows-targets 0.52.4", + "windows-core 0.56.0", + "windows-targets 0.52.5", ] [[package]] @@ -5327,17 +5330,19 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] name = "windows-core" -version = "0.54.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" dependencies = [ + "windows-implement 0.56.0", + "windows-interface 0.56.0", "windows-result", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -5352,6 +5357,17 @@ dependencies = [ ] [[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] name = "windows-interface" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5363,12 +5379,23 @@ dependencies = [ ] [[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] name = "windows-result" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64" +checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -5386,7 +5413,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -5406,17 +5433,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -5427,9 +5455,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -5439,9 +5467,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -5451,9 +5479,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -5463,9 +5497,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -5475,9 +5509,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -5487,9 +5521,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -5499,9 +5533,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index f4aab33401c08..09b05725caa97 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "uv"; - version = "0.1.35"; + version = "0.1.36"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = version; - hash = "sha256-GcAvpX7oanJ8G1dgTyTa8jk9xhTroF2G+ir8j7Yua1M="; + hash = "sha256-ngKVc3RJzkkjIfeyRbPe2kzBSJH7T8wdyZo3DP9FwpU="; }; cargoLock = { diff --git a/pkgs/by-name/wa/warp-terminal/package.nix b/pkgs/by-name/wa/warp-terminal/package.nix index 972afafda5676..cd69dc6e37cf7 100644 --- a/pkgs/by-name/wa/warp-terminal/package.nix +++ b/pkgs/by-name/wa/warp-terminal/package.nix @@ -10,9 +10,12 @@ , libglvnd , libxkbcommon , vulkan-loader +, wayland , xdg-utils , xorg , zlib +, makeWrapper +, waylandSupport ? false }: let @@ -35,7 +38,7 @@ linux = stdenv.mkDerivation (finalAttrs: { --replace-fail /opt/ $out/opt/ ''; - nativeBuildInputs = [ autoPatchelfHook zstd ]; + nativeBuildInputs = [ autoPatchelfHook zstd makeWrapper ]; buildInputs = [ curl @@ -54,7 +57,7 @@ linux = stdenv.mkDerivation (finalAttrs: { xorg.libxcb xorg.libXcursor xorg.libXi - ]; + ] ++ lib.optionals waylandSupport [wayland]; installPhase = '' runHook preInstall @@ -62,6 +65,9 @@ linux = stdenv.mkDerivation (finalAttrs: { mkdir $out cp -r opt usr/* $out + '' + lib.optionalString waylandSupport '' + wrapProgram $out/bin/warp-terminal --set WARP_ENABLE_WAYLAND 1 + '' + '' runHook postInstall ''; }); diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix new file mode 100644 index 0000000000000..f5d93ff4f0273 --- /dev/null +++ b/pkgs/by-name/wa/waybar/package.nix @@ -0,0 +1,200 @@ +{ lib +, stdenv +, bash +, fetchFromGitHub +, fetchFromGitLab +, SDL2 +, alsa-lib +, catch2_3 +, fftw +, glib +, gobject-introspection +, gtk-layer-shell +, gtkmm3 +, howard-hinnant-date +, hyprland +, iniparser +, jsoncpp +, libdbusmenu-gtk3 +, libevdev +, libinotify-kqueue +, libinput +, libjack2 +, libmpdclient +, libnl +, libpulseaudio +, libsigcxx +, libxkbcommon +, meson +, ncurses +, ninja +, pipewire +, pkg-config +, playerctl +, portaudio +, python3 +, scdoc +, sndio +, spdlog +, sway +, udev +, upower +, wayland +, wireplumber +, wrapGAppsHook + +, cavaSupport ? true +, evdevSupport ? true +, experimentalPatches ? true +, hyprlandSupport ? true +, inputSupport ? true +, jackSupport ? true +, mpdSupport ? true +, mprisSupport ? stdenv.isLinux +, nlSupport ? true +, pipewireSupport ? true +, pulseSupport ? true +, rfkillSupport ? true +, runTests ? true +, sndioSupport ? true +, swaySupport ? true +, traySupport ? true +, udevSupport ? true +, upowerSupport ? true +, wireplumberSupport ? true +, withMediaPlayer ? mprisSupport && false +, nix-update-script +}: + +let + # Derived from subprojects/cava.wrap + libcava.src = fetchFromGitHub { + owner = "LukashonakV"; + repo = "cava"; + rev = "0.10.1"; + hash = "sha256-iIYKvpOWafPJB5XhDOSIW9Mb4I3A4pcgIIPQdQYEqUw="; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "waybar"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "Alexays"; + repo = "Waybar"; + rev = finalAttrs.version; + hash = "sha256-xDeY0Bnwr+jCS0IpseWNgryQ3yV7RJ1VNNbOkT/xl5c="; + }; + + postUnpack = lib.optional cavaSupport '' + pushd "$sourceRoot" + cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.10.1 + patchShebangs . + popd + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + wrapGAppsHook + ] ++ lib.optional withMediaPlayer gobject-introspection; + + propagatedBuildInputs = lib.optionals withMediaPlayer [ + glib + playerctl + python3.pkgs.pygobject3 + ]; + + strictDeps = false; + + buildInputs = [ + gtk-layer-shell + gtkmm3 + howard-hinnant-date + jsoncpp + libsigcxx + libxkbcommon + spdlog + wayland + ] + ++ lib.optionals cavaSupport [ + SDL2 + alsa-lib + fftw + iniparser + ncurses + portaudio + ] + ++ lib.optional evdevSupport libevdev + ++ lib.optional hyprlandSupport hyprland + ++ lib.optional inputSupport libinput + ++ lib.optional jackSupport libjack2 + ++ lib.optional mpdSupport libmpdclient + ++ lib.optional mprisSupport playerctl + ++ lib.optional nlSupport libnl + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional sndioSupport sndio + ++ lib.optional swaySupport sway + ++ lib.optional traySupport libdbusmenu-gtk3 + ++ lib.optional udevSupport udev + ++ lib.optional upowerSupport upower + ++ lib.optional wireplumberSupport wireplumber + ++ lib.optional (cavaSupport || pipewireSupport) pipewire + ++ lib.optional (!stdenv.isLinux) libinotify-kqueue; + + nativeCheckInputs = [ catch2_3 ]; + doCheck = runTests; + + mesonFlags = (lib.mapAttrsToList lib.mesonEnable { + "cava" = cavaSupport; + "dbusmenu-gtk" = traySupport; + "jack" = jackSupport; + "libinput" = inputSupport; + "libnl" = nlSupport; + "libudev" = udevSupport; + "man-pages" = true; + "mpd" = mpdSupport; + "mpris" = mprisSupport; + "pipewire" = pipewireSupport; + "pulseaudio" = pulseSupport; + "rfkill" = rfkillSupport; + "sndio" = sndioSupport; + "systemd" = false; + "tests" = runTests; + "upower_glib" = upowerSupport; + "wireplumber" = wireplumberSupport; + }) ++ lib.optional experimentalPatches (lib.mesonBool "experimental" true); + + postPatch = '' + substituteInPlace include/util/command.hpp \ + --replace-fail /bin/sh ${lib.getExe' bash "sh"} + ''; + + preFixup = lib.optionalString withMediaPlayer '' + cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py + + wrapProgram $out/bin/waybar-mediaplayer.py \ + --prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}" + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/alexays/waybar"; + description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; + changelog = "https://github.com/alexays/waybar/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + mainProgram = "waybar"; + maintainers = with lib.maintainers; [ + FlorianFranzen + lovesegfault + minijackson + rodrgz + synthetica + khaneliman + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/we/wechat-uos/package.nix b/pkgs/by-name/we/wechat-uos/package.nix index 7a8f806426ce0..0fd6dbd8ea0ba 100644 --- a/pkgs/by-name/we/wechat-uos/package.nix +++ b/pkgs/by-name/we/wechat-uos/package.nix @@ -60,11 +60,7 @@ └── uos └── .license.key */ - uosLicense ? requireFile { - name = "license.tar.gz"; - url = "https://www.uniontech.com"; - sha256 = "53760079c1a5b58f2fa3d5effe1ed35239590b288841d812229ef4e55b2dbd69"; - } + uosLicense ? null }: let wechat-uos-env = stdenvNoCC.mkDerivation { @@ -87,6 +83,30 @@ let preferLocalBuild = true; }; + uosLicenseUnzipped = stdenvNoCC.mkDerivation { + name = "uos-license-unzipped"; + src = + if uosLicense == null then + requireFile + { + name = "license.tar.gz"; + url = "https://www.uniontech.com"; + sha256 = "53760079c1a5b58f2fa3d5effe1ed35239590b288841d812229ef4e55b2dbd69"; + } else uosLicense; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r * $out/ + + runHook postInstall + ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "sha256-pNftwtUZqBsKBSPQsEWlYLlb6h2Xd9j56ZRMi8I82ME="; + }; + wechat-uos-runtime = with xorg; [ stdenv.cc.cc stdenv.cc.libc @@ -195,11 +215,10 @@ let dpkg -x $src ./wechat-uos dpkg -x $uosSrc ./wechat-uos-old-source - tar -xvf $uosLicense - runHook postUnpack ''; + # Use ln for license to prevent being garbage collection installPhase = '' runHook preInstall mkdir -p $out @@ -207,7 +226,7 @@ let cp -r wechat-uos/* $out mkdir -pv $out/usr/lib/wechat-uos/license - cp -r license/* $out/usr/lib/wechat-uos/license + ln -s ${uosLicenseUnzipped}/* $out/usr/lib/wechat-uos/license/ cp -r wechat-uos-old-source/usr/lib/license/libuosdevicea.so $out/usr/lib/wechat-uos/license/ runHook postInstall diff --git a/pkgs/by-name/wt/wttrbar/package.nix b/pkgs/by-name/wt/wttrbar/package.nix new file mode 100644 index 0000000000000..6cba42d0c1582 --- /dev/null +++ b/pkgs/by-name/wt/wttrbar/package.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, darwin +, nix-update-script +}: + +rustPlatform.buildRustPackage rec { + pname = "wttrbar"; + version = "0.9.4"; + + src = fetchFromGitHub { + owner = "bjesus"; + repo = "wttrbar"; + rev = version; + hash = "sha256-kRrVqUfkrSK/9z3Hj4J+mKcdV7JdTzjhxlVRa/kf8sw="; + }; + + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]); + + cargoHash = "sha256-HxSyGME95FWR5VwodmrMUX0jPlfE9SJV0WBbICuuTok="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A simple but detailed weather indicator for Waybar using wttr.in"; + homepage = "https://github.com/bjesus/wttrbar"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + mainProgram = "wttrbar"; + }; +} diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix index 5d53e08badfc5..9ca8b2c719eea 100644 --- a/pkgs/by-name/ya/yamlscript/package.nix +++ b/pkgs/by-name/ya/yamlscript/package.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "yamlscript"; - version = "0.1.56"; + version = "0.1.57"; src = fetchurl { url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar"; - hash = "sha256-4ZjQYl4NdqbzyeEWDthBA8fWJFlIuMRtvHLtdlVYQmw="; + hash = "sha256-nuYfYz1Q7PtVb9A2KEN2XGeINifEjsM4IqGiUBbTGFM="; }; executable = "ys"; diff --git a/pkgs/by-name/yo/youtrack/package.nix b/pkgs/by-name/yo/youtrack/package.nix index 564c86e2842cd..61788d193b564 100644 --- a/pkgs/by-name/yo/youtrack/package.nix +++ b/pkgs/by-name/yo/youtrack/package.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "youtrack"; - version = "2024.1.27971"; + version = "2024.1.28928"; src = fetchzip { url = "https://download.jetbrains.com/charisma/youtrack-${finalAttrs.version}.zip"; - hash = "sha256-DropdHT3ZA4kuxyE8xyHB079OMzYH4zKPt38oW7XoFY="; + hash = "sha256-8+dZ1YTpvOX0IEEbFzv4t8T/U/BZMeDCZL7Ju25WBpE="; }; nativeBuildInputs = [ makeBinaryWrapper ]; |