diff options
Diffstat (limited to 'pkgs')
136 files changed, 1408 insertions, 471 deletions
diff --git a/pkgs/applications/audio/galaxy-buds-client/default.nix b/pkgs/applications/audio/galaxy-buds-client/default.nix index 15125358e4647..6dd2256d7c8a4 100644 --- a/pkgs/applications/audio/galaxy-buds-client/default.nix +++ b/pkgs/applications/audio/galaxy-buds-client/default.nix @@ -2,7 +2,6 @@ , stdenv , buildDotnetModule , fetchFromGitHub -, autoPatchelfHook , fontconfig , xorg , libglvnd @@ -27,7 +26,6 @@ buildDotnetModule rec { dotnetFlags = [ "-p:Runtimeidentifier=linux-x64" ]; nativeBuildInputs = [ - autoPatchelfHook copyDesktopItems graphicsmagick ]; diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index e3bf3acf98d9b..72cbfd443c08b 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.9.3.2"; + version = "0.9.3.4"; src = fetchFromGitHub { owner = "coderholic"; repo = "pyradio"; rev = "refs/tags/${version}"; - hash = "sha256-aIWU68bdPUsIh8QRNnF0NcK7FemmYyUHbJg9KcUALBk="; + hash = "sha256-QifBzQsvYU5kP5mnidOgWGBh3h2MvJm8Wo0i1v6j/cU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/applications/backup/pika-backup/default.nix index 8c225b43ccf58..7adaa00d60781 100644 --- a/pkgs/applications/backup/pika-backup/default.nix +++ b/pkgs/applications/backup/pika-backup/default.nix @@ -21,20 +21,20 @@ stdenv.mkDerivation rec { pname = "pika-backup"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "pika-backup"; rev = "v${version}"; - hash = "sha256-WeFc/4TEIxw6uzLroJX1D/rEA419sghkjBt1nsPv2Ho="; + hash = "sha256-yxr98CJuu15TGiIXCBhU2bOgvct6jQ5xAraD9Z0sL2Q="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-fgPgUZxye9YUyX9/+hTye3cUypgRAegZMUTKfPxVH4s="; + hash = "sha256-ce8SdBvRdFp1BU9OPcByoJjCiSrAkQqtmfCeJ3B+Piw="; }; patches = [ diff --git a/pkgs/applications/blockchains/wasabibackend/default.nix b/pkgs/applications/blockchains/wasabibackend/default.nix index 79355f3979dca..1371be1a97520 100644 --- a/pkgs/applications/blockchains/wasabibackend/default.nix +++ b/pkgs/applications/blockchains/wasabibackend/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, buildDotnetModule, dotnetCorePackages, - autoPatchelfHook, zlib, openssl, }: @@ -25,7 +24,6 @@ buildDotnetModule rec { dotnet-sdk = dotnetCorePackages.sdk_7_0; dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; - nativeBuildInputs = [autoPatchelfHook]; buildInputs = [stdenv.cc.cc.lib zlib]; runtimeDeps = [openssl zlib]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix index 1286c9fc6466d..e714a20cb3794 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix @@ -1,21 +1,26 @@ -{ lib, melpaBuild, fetchurl, writeText }: +{ + lib, + melpaBuild, + fetchzip, + writeText, +}: melpaBuild rec { pname = "ebuild-mode"; - version = "1.67"; + version = "1.70"; - src = fetchurl { - url = "https://dev.gentoo.org/~ulm/emacs/ebuild-mode-${version}.tar.xz"; - hash = "sha256-5qxHpu1BLtI8LFnL/sAoqmo80zeyElxIdFtAsfMefUE="; + src = fetchzip { + url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${version}.tar.bz2"; + hash = "sha256-dOm3xJMFLelwcImIwckeQHx1GqV9PB+I45QA9UT1nCM="; }; # not used but needs to be set; why? - commit = "e7b45096283ac8836f208babddfd1ea1c1d1d1d"; + commit = "a643f177b58aa8869f2f24814e990320aa4f0f96"; recipe = writeText "recipe" '' (ebuild-mode - :url "https://anongit.gentoo.org/git/proj/ebuild-mode.git" - :fetcher git) + :url "https://gitweb.gentoo.org/proj/ebuild-mode.git" + :fetcher git) ''; meta = { diff --git a/pkgs/applications/misc/avalonia-ilspy/default.nix b/pkgs/applications/misc/avalonia-ilspy/default.nix index 797a8ffe5c936..d8ae98e66acd6 100644 --- a/pkgs/applications/misc/avalonia-ilspy/default.nix +++ b/pkgs/applications/misc/avalonia-ilspy/default.nix @@ -15,7 +15,6 @@ , makeDesktopItem , copyDesktopItems , icoutils -, autoPatchelfHook , bintools , fixDarwinDylibNames , autoSignDarwinBinariesHook @@ -40,8 +39,7 @@ buildDotnetModule rec { nativeBuildInputs = [ copyDesktopItems icoutils - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ bintools fixDarwinDylibNames ] + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ bintools fixDarwinDylibNames ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ]; buildInputs = [ diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix index 64fa760ef9d24..43b6cb8769ef7 100644 --- a/pkgs/applications/misc/bambu-studio/default.nix +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -1,49 +1,50 @@ -{ stdenv -, lib -, openexr -, jemalloc -, c-blosc -, binutils -, fetchFromGitHub -, cmake -, pkg-config -, wrapGAppsHook -, boost179 -, cereal -, cgal_5 -, curl -, dbus -, eigen -, expat -, gcc-unwrapped -, glew -, glfw -, glib -, glib-networking -, gmp -, gstreamer -, gst-plugins-base -, gst-plugins-bad -, gst-plugins-good -, gtest -, gtk3 -, hicolor-icon-theme -, ilmbase -, libpng -, mesa -, mpfr -, nlopt -, opencascade-occt -, openvdb -, pcre -, qhull -, systemd -, tbb_2021_11 -, webkitgtk -, wxGTK31 -, xorg -, fetchpatch -, withSystemd ? stdenv.isLinux +{ + stdenv, + lib, + openexr, + jemalloc, + c-blosc, + binutils, + fetchFromGitHub, + cmake, + pkg-config, + wrapGAppsHook, + boost179, + cereal, + cgal_5, + curl, + dbus, + eigen, + expat, + gcc-unwrapped, + glew, + glfw, + glib, + glib-networking, + gmp, + gstreamer, + gst-plugins-base, + gst-plugins-bad, + gst-plugins-good, + gtest, + gtk3, + hicolor-icon-theme, + ilmbase, + libpng, + mesa, + mpfr, + nlopt, + opencascade-occt, + openvdb, + pcre, + qhull, + systemd, + tbb_2021_11, + webkitgtk, + wxGTK31, + xorg, + fetchpatch, + withSystemd ? stdenv.isLinux, }: let wxGTK31' = wxGTK31.overrideAttrs (old: { @@ -53,7 +54,14 @@ let ]; }); openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: rec { - buildInputs = [ openexr boost179 tbb_2021_11 jemalloc c-blosc ilmbase ]; + buildInputs = [ + openexr + boost179 + tbb_2021_11 + jemalloc + c-blosc + ilmbase + ]; }); in stdenv.mkDerivation rec { @@ -106,9 +114,7 @@ stdenv.mkDerivation rec { webkitgtk wxGTK31' xorg.libX11 - ] ++ lib.optionals withSystemd [ - systemd - ] ++ checkInputs; + ] ++ lib.optionals withSystemd [ systemd ] ++ checkInputs; patches = [ # Fix for webkitgtk linking @@ -169,11 +175,8 @@ stdenv.mkDerivation rec { # needed to prevent collisions between the LICENSE.txt files of # bambu-studio and orca-slicer. postInstall = '' - mkdir -p $out/share/doc - mv $out/LICENSE.txt $out/share/doc/LICENSE.txt - if [ -f $out/README.md ]; then - mv $out/README.md $out/share/doc/README.md - fi + mv $out/LICENSE.txt $out/share/BambuStudio/LICENSE.txt + mv $out/README.md $out/share/BambuStudio/README.md ''; meta = with lib; { diff --git a/pkgs/applications/misc/bambu-studio/orca-slicer.nix b/pkgs/applications/misc/bambu-studio/orca-slicer.nix index 5e10050078d6c..af89be65246d3 100644 --- a/pkgs/applications/misc/bambu-studio/orca-slicer.nix +++ b/pkgs/applications/misc/bambu-studio/orca-slicer.nix @@ -1,27 +1,41 @@ -{ lib, fetchFromGitHub, makeDesktopItem, bambu-studio }: +{ + lib, + fetchFromGitHub, + bambu-studio, +}: -bambu-studio.overrideAttrs (finalAttrs: previousAttrs: { - version = "2.0.0"; - pname = "orca-slicer"; +bambu-studio.overrideAttrs ( + finalAttrs: previousAttrs: { + version = "2.0.0"; + pname = "orca-slicer"; - # Don't inherit patches from bambu-studio - patches = [ - ./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch - ]; + # Don't inherit patches from bambu-studio + patches = [ ./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch ]; - src = fetchFromGitHub { - owner = "SoftFever"; - repo = "OrcaSlicer"; - rev = "v${finalAttrs.version}"; - hash = "sha256-YlLDUH3ODIfax5QwnsVJi1JjZ9WtxP3ssqRP1C4d4bw="; - }; + src = fetchFromGitHub { + owner = "SoftFever"; + repo = "OrcaSlicer"; + rev = "v${finalAttrs.version}"; + hash = "sha256-YlLDUH3ODIfax5QwnsVJi1JjZ9WtxP3ssqRP1C4d4bw="; + }; - meta = with lib; { - description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc"; - homepage = "https://github.com/SoftFever/OrcaSlicer"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ zhaofengli ovlach pinpox ]; - mainProgram = "orca-slicer"; - platforms = platforms.linux; - }; -}) + # needed to prevent collisions between the LICENSE.txt files of + # bambu-studio and orca-slicer. + postInstall = '' + mv $out/LICENSE.txt $out/share/OrcaSlicer/LICENSE.txt + ''; + + meta = with lib; { + description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc"; + homepage = "https://github.com/SoftFever/OrcaSlicer"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ + zhaofengli + ovlach + pinpox + ]; + mainProgram = "orca-slicer"; + platforms = platforms.linux; + }; + } +) diff --git a/pkgs/applications/misc/wmenu/default.nix b/pkgs/applications/misc/wmenu/default.nix index 748c2d3b84c92..23d9f2404ea20 100644 --- a/pkgs/applications/misc/wmenu/default.nix +++ b/pkgs/applications/misc/wmenu/default.nix @@ -9,6 +9,7 @@ , pango , wayland , wayland-protocols +, wayland-scanner , libxkbcommon , scdoc }: @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config meson ninja ]; + nativeBuildInputs = [ pkg-config meson ninja wayland-scanner ]; buildInputs = [ cairo pango wayland libxkbcommon wayland-protocols scdoc ]; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/kubecolor/default.nix b/pkgs/applications/networking/cluster/kubecolor/default.nix index 794b184e245f1..1869cc83d9165 100644 --- a/pkgs/applications/networking/cluster/kubecolor/default.nix +++ b/pkgs/applications/networking/cluster/kubecolor/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubecolor"; - version = "0.2.2"; + version = "0.3.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-zXglsfPsJi9DVxlRPniSBsdF1xEMYqqGr46ThpQj3gQ="; + sha256 = "sha256-1gEEmF9RRMwFAvmhLwidkVh+lnibs6x5ZHy/nJRum9E="; }; - vendorHash = "sha256-uf7nBnS1wmbz4xcVA5qF82QMPsLdSucje1NNaPyheCw="; + vendorHash = "sha256-Gzz+mCEMQCcLwTiGMB8/nXk7HDAEGkEapC/VOyXrn/Q="; ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 5e61fc78091e6..0f27e7a770223 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "chatterino2"; - version = "2.4.6"; + version = "2.5.0"; src = fetchFromGitHub { owner = "Chatterino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CQviw5Fw6v5EwjCldAQoJfAIZMWKBfBzUIQZEgW34k0="; + sha256 = "sha256-uR2X0NNSLyOx5n3mZcp6+wW/7L7rHHH2MlOF+c0Uzm0="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config qt6.wrapQtAppsHook ]; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index b29d4d3c9c64e..c1ca934437a7a 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -120,6 +120,8 @@ in stdenv.mkDerivation rec { libappindicator-gtk3 libnotify libdbusmenu + pipewire + stdenv.cc.cc xdg-utils wayland ]; @@ -158,7 +160,6 @@ in stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc pipewire ] }" --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} ) diff --git a/pkgs/applications/office/paperwork/paperwork-backend.nix b/pkgs/applications/office/paperwork/paperwork-backend.nix index 4460e50ab6246..b5620d3f40df0 100644 --- a/pkgs/applications/office/paperwork/paperwork-backend.nix +++ b/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -1,6 +1,7 @@ { buildPythonPackage , lib , fetchFromGitLab +, fetchpatch , pyenchant , scikit-learn , pypillowfight @@ -33,6 +34,13 @@ buildPythonPackage rec { sourceRoot = "${src.name}/paperwork-backend"; patches = [ + # fixes building with recent scipy + # remove on next release + (fetchpatch { + url = "https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/commit/abcebfe9714644d4e259e53b10e0e9417b5b864f.patch"; + hash = "sha256-YjVpphThW5Livs+PZJZDSgJvhLSXhZ1bnlWMwfY4HTg="; + }) + # disables a flaky test https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/issues/1035#note_1493700 ./flaky_test.patch ]; diff --git a/pkgs/by-name/al/alephone-durandal/package.nix b/pkgs/by-name/al/alephone-durandal/package.nix index cd7927d69a141..d8376457f6441 100644 --- a/pkgs/by-name/al/alephone-durandal/package.nix +++ b/pkgs/by-name/al/alephone-durandal/package.nix @@ -3,13 +3,13 @@ alephone.makeWrapper rec { pname = "durandal"; desktopName = "Marathon-Durandal"; - version = "20230119"; + version = "20240119"; icon = alephone.icons + "/marathon2.png"; zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon2-${version}-Data.zip"; - sha256 = "sha256-Vbfk5wLgvNEZW2BohMY5mPXaRbNlHxJdWLYTsE8CSwI="; + sha256 = "sha256-Tp9EWMIY0moK6RLIpxB7rMzLOQ7zPfV58oeAyQsTbnM="; }; meta = { diff --git a/pkgs/by-name/al/alephone-infinity/package.nix b/pkgs/by-name/al/alephone-infinity/package.nix index c49f9a8d2ac72..466f3bb7d4b65 100644 --- a/pkgs/by-name/al/alephone-infinity/package.nix +++ b/pkgs/by-name/al/alephone-infinity/package.nix @@ -3,13 +3,13 @@ alephone.makeWrapper rec { pname = "marathon-infinity"; desktopName = "Marathon-Infinity"; - version = "20230119"; + version = "20240119"; icon = alephone.icons + "/marathon-infinity.png"; zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/MarathonInfinity-${version}-Data.zip"; - sha256 = "sha256-0+xokhzWdXM+L4DBjWnfNVXZve4n1X/Aq6rxNGAFb3Q="; + sha256 = "sha256-KfFu+cboaZMfjnu3W84/Qbcrc9kbkIZ2Y0GM1fXeXh8="; }; meta = { diff --git a/pkgs/by-name/al/alephone-marathon/package.nix b/pkgs/by-name/al/alephone-marathon/package.nix index ea295b7dcdce7..38018ec021b05 100644 --- a/pkgs/by-name/al/alephone-marathon/package.nix +++ b/pkgs/by-name/al/alephone-marathon/package.nix @@ -3,13 +3,13 @@ alephone.makeWrapper rec { pname = "marathon"; desktopName = "Marathon"; - version = "20230119"; + version = "20240119"; icon = alephone.icons + "/marathon.png"; zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip"; - sha256 = "sha256-uz/1ZW9epd1HP/pzTNN3d2EEbOzjj0qpdMkrVoxb8Aw="; + sha256 = "sha256-60+dvXyzHe5PDepyKHcEIdWoRiGMvx5zYehubWKqaB0="; }; meta = { diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix index f236413f33841..e06530202407e 100644 --- a/pkgs/by-name/at/atac/package.nix +++ b/pkgs/by-name/at/atac/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage rec { pname = "atac"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "Julien-cpsn"; repo = "ATAC"; rev = "v${version}"; - hash = "sha256-yR+w6zrX7XHrK6XGWM7J74XPxGEmy8Gf6guOH/Du6rc="; + hash = "sha256-ChX2LMRbqoKzl+QKkeervrCHr3plAQ21RzC4RqEucCA="; }; - cargoHash = "sha256-Ez8d1tb0Xi91e3+U1/LDmj5u/oORQzelEQPFAC96yEI="; + cargoHash = "sha256-nYkXL3SIjG3REE+w2vIlB04FWs7e0d4iu0hRjAPz7aU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/btrfs-assistant/default.nix b/pkgs/by-name/bt/btrfs-assistant/package.nix index d3bdc74980228..d3bdc74980228 100644 --- a/pkgs/tools/misc/btrfs-assistant/default.nix +++ b/pkgs/by-name/bt/btrfs-assistant/package.nix diff --git a/pkgs/data/themes/catppuccin-sddm-corners/default.nix b/pkgs/by-name/ca/catppuccin-sddm-corners/package.nix index 952399f7bf868..952399f7bf868 100644 --- a/pkgs/data/themes/catppuccin-sddm-corners/default.nix +++ b/pkgs/by-name/ca/catppuccin-sddm-corners/package.nix diff --git a/pkgs/data/themes/catppuccin/default.nix b/pkgs/by-name/ca/catppuccin/package.nix index 2463b1fde6db3..2463b1fde6db3 100644 --- a/pkgs/data/themes/catppuccin/default.nix +++ b/pkgs/by-name/ca/catppuccin/package.nix 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/tools/misc/dooit/default.nix b/pkgs/by-name/do/dooit/package.nix index c532b13877d30..c532b13877d30 100644 --- a/pkgs/tools/misc/dooit/default.nix +++ b/pkgs/by-name/do/dooit/package.nix diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/by-name/fa/fastfetch/package.nix index 27da89ceb31ac..3524b3db32313 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -21,6 +21,7 @@ , nix-update-script , ocl-icd , opencl-headers +, overrideSDK , pcre , pcre2 , pkg-config @@ -40,8 +41,10 @@ , waylandSupport ? true , x11Support ? true }: - -stdenv.mkDerivation (finalAttrs: { +let + stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; +in +stdenv'.mkDerivation (finalAttrs: { pname = "fastfetch"; version = "2.9.2"; 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/hy/hyprland-activewindow/package.nix b/pkgs/by-name/hy/hyprland-activewindow/package.nix new file mode 100644 index 0000000000000..bc061447d60f3 --- /dev/null +++ b/pkgs/by-name/hy/hyprland-activewindow/package.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "hyprland-activewindow"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "FieldOfClay"; + repo = "hyprland-activewindow"; + rev = "v${version}"; + hash = "sha256-8pzm8uIyvlz4nHbxtmbMblFIj38M2VsenaKzJ9di1Do="; + }; + + cargoHash = "sha256-wIF0qa1dyZlcsLPL2TflFQFPm4Pe9TWHe1F2L1YccZ8="; + + meta = with lib; { + description = "A multi-monitor-aware Hyprland workspace widget helper"; + homepage = "https://github.com/FieldofClay/hyprland-activewindow"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ kiike donovanglover ]; + mainProgram = "hyprland-activewindow"; + }; +} diff --git a/pkgs/by-name/hy/hyprland-workspaces/package.nix b/pkgs/by-name/hy/hyprland-workspaces/package.nix new file mode 100644 index 0000000000000..4ca89b0da1188 --- /dev/null +++ b/pkgs/by-name/hy/hyprland-workspaces/package.nix @@ -0,0 +1,28 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "hyprland-workspaces"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "FieldofClay"; + repo = "hyprland-workspaces"; + rev = "v${version}"; + hash = "sha256-4QGLTimIpx74gWUyHCheUZZT1WgVzBoJRY8OlUDdOh4="; + }; + + cargoHash = "sha256-9ndP0nyRBCdOGth4UWA263IvjbgnVW2x9PK8oTaMrxg="; + + meta = with lib; { + description = "A multi-monitor aware Hyprland workspace widget"; + homepage = "https://github.com/FieldofClay/hyprland-workspaces"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ kiike donovanglover ]; + mainProgram = "hyprland-workspaces"; + }; +} 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/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/pg/pgmoneta/package.nix b/pkgs/by-name/pg/pgmoneta/package.nix index da725b46e3b43..ccc3c66dad547 100644 --- a/pkgs/by-name/pg/pgmoneta/package.nix +++ b/pkgs/by-name/pg/pgmoneta/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "pgmoneta"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "pgmoneta"; repo = "pgmoneta"; rev = version; - hash = "sha256-gViXbL54YGY2NFg0ScyiarMB4vYjpOrdkyTjWzwP2vo="; + hash = "sha256-sFH8sYTQ10bR+TDNbyIJiAIcp24CA9E5zrRjyV9mGBU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix index f35e6a0ef153e..a6e66fef29545 100644 --- a/pkgs/by-name/qr/qrtool/package.nix +++ b/pkgs/by-name/qr/qrtool/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "qrtool"; - version = "0.10.8"; + version = "0.10.9"; src = fetchFromGitHub { owner = "sorairolake"; repo = "qrtool"; rev = "v${version}"; - sha256 = "sha256-YNA8LdqkgScBAoLyWsr4JIeFcU4KfNAYByXSvaccOoU="; + sha256 = "sha256-wLi2lb48+leH7AfpIj0/vDxPZhBjvuacVit8U8zArjs="; }; - cargoHash = "sha256-6yQVH15oW8dCjNKwL2Gb6IQKilVYokBs2j+M4fWLm+4="; + cargoHash = "sha256-igbRsNWPtE/KcSLqzKIFEm3lmdkIxj/22yo/8Gye96k="; nativeBuildInputs = [ asciidoctor installShellFiles ]; diff --git a/pkgs/by-name/si/simplotask/package.nix b/pkgs/by-name/si/simplotask/package.nix index a3ec04ca5da49..59c8d804f7e26 100644 --- a/pkgs/by-name/si/simplotask/package.nix +++ b/pkgs/by-name/si/simplotask/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "simplotask"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "umputun"; repo = "spot"; rev = "v${version}"; - hash = "sha256-pd6bue/uo6+ZBaN7ZKf/byuPOKOLZdCQau7I7F+iZb0="; + hash = "sha256-XLkq8Oe3EsP0wf0sA7NSZWIsQQnOAGmvlVQad35+5Ws="; }; vendorHash = null; diff --git a/pkgs/data/fonts/sketchybar-app-font/default.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix index ff1a2fe7c742c..ff1a2fe7c742c 100644 --- a/pkgs/data/fonts/sketchybar-app-font/default.nix +++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index 15621682aa649..fee32dc5f88d9 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -20,16 +20,16 @@ assert waylandSupport -> stdenv.isLinux; buildGoModule rec { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "dweymouth"; repo = "supersonic"; rev = "v${version}"; - hash = "sha256-sleXZnJ/JPlyCMf6Js+Yym1RhtfZT7Q+qYAWLCavZFA="; + hash = "sha256-0MbR6ah3UakLn/6Mfd156BlTZe7thNK6mAPLTuz298g="; }; - vendorHash = "sha256-JKihU597ZBq1VygpWB73V2m9NN/GDrquX9hNzBdszSQ="; + vendorHash = "sha256-Ld1j/SFq5W+SKppAzk7UV74RD6/Dw+PWk0BhEGML5+k="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/by-name/wa/waybar/package.nix index f5d93ff4f0273..f5d93ff4f0273 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/by-name/wa/waybar/package.nix 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/wo/workout-tracker/package.nix b/pkgs/by-name/wo/workout-tracker/package.nix index c324829e0a8df..34a031d853e9a 100644 --- a/pkgs/by-name/wo/workout-tracker/package.nix +++ b/pkgs/by-name/wo/workout-tracker/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "workout-tracker"; - version = "0.13.4"; + version = "0.14.1"; src = fetchFromGitHub { owner = "jovandeginste"; repo = "workout-tracker"; rev = "refs/tags/v${version}"; - hash = "sha256-wBDLf4UfE3YXH2naub9Z//z5HWaTBuz6MyCQovZcsFI="; + hash = "sha256-zmDY5KpKkq/9SYAm+v0QSnLLjxYQCzzXWLlCFkE8bA0="; }; vendorHash = null; diff --git a/pkgs/applications/misc/wttrbar/default.nix b/pkgs/by-name/wt/wttrbar/package.nix index 6cba42d0c1582..6cba42d0c1582 100644 --- a/pkgs/applications/misc/wttrbar/default.nix +++ b/pkgs/by-name/wt/wttrbar/package.nix diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix index 9bf70a8645389..12350c6123411 100644 --- a/pkgs/by-name/ya/yazi-unwrapped/package.nix +++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -5,6 +5,7 @@ , installShellFiles , stdenv , Foundation +, rust-jemalloc-sys , nix-update-script }: @@ -25,7 +26,7 @@ rustPlatform.buildRustPackage rec { env.YAZI_GEN_COMPLETIONS = true; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; + buildInputs = [ rust-jemalloc-sys ] ++ lib.optionals stdenv.isDarwin [ Foundation ]; postInstall = '' installShellCompletion --cmd yazi \ 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 ]; diff --git a/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch b/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch index 4d072f88708af..040c403738a37 100644 --- a/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch +++ b/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch @@ -24,3 +24,15 @@ index fbcafbf..ef409ee 100644 if (!resp) { return null; } +diff --git a/src/color_dialog/src/main.ts b/src/color_dialog/src/main.ts +index a9637e5..5cb86ce 100644 +--- a/src/color_dialog/src/main.ts ++++ b/src/color_dialog/src/main.ts +@@ -6,6 +6,7 @@ import Gtk from 'gi://Gtk?version=3.0'; + import Gdk from 'gi://Gdk'; + + const EXT_PATH_DEFAULTS = [ ++ '/run/current-system/sw/share/gnome-shell/extensions/', + GLib.get_home_dir() + '/.local/share/gnome-shell/extensions/', + '/usr/share/gnome-shell/extensions/', + ]; diff --git a/pkgs/development/beam-modules/ex_doc/default.nix b/pkgs/development/beam-modules/ex_doc/default.nix index 7693364c2fc33..d7057a6dd91c2 100644 --- a/pkgs/development/beam-modules/ex_doc/default.nix +++ b/pkgs/development/beam-modules/ex_doc/default.nix @@ -19,7 +19,7 @@ mixRelease { mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version elixir; - hash = "sha256-ZNHhWCZ3n2Y/XCsXVjbu4wbx/J95JdFP/2raACciAUU="; + hash = "sha256-e0lU4TXLY2geO6MI1h0kpdwsGbEyXjIRe0W43337mHk="; }; configurePhase = '' diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index 8ee0bd9e7b3a3..f6802e62c70d1 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -25,6 +25,7 @@ assert if type == "sdk" then packages != null else true; , writeShellScript , mkNugetDeps , callPackage +, dotnetCorePackages }: let @@ -44,6 +45,8 @@ let mkCommon = callPackage ./common.nix {}; + targetRid = dotnetCorePackages.systemToDotnetRid stdenv.targetPlatform.system; + in mkCommon type rec { inherit pname version; @@ -88,21 +91,21 @@ mkCommon type rec { # Tell autoPatchelf about runtime dependencies. # (postFixup phase is run before autoPatchelfHook.) - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.targetPlatform.isLinux '' patchelf \ --add-needed libicui18n.so \ --add-needed libicuuc.so \ $out/shared/Microsoft.NETCore.App/*/libcoreclr.so \ $out/shared/Microsoft.NETCore.App/*/*System.Globalization.Native.so \ - $out/packs/Microsoft.NETCore.App.Host.linux-x64/*/runtimes/linux-x64/native/singlefilehost + $out/packs/Microsoft.NETCore.App.Host.${targetRid}/*/runtimes/${targetRid}/native/*host patchelf \ --add-needed libgssapi_krb5.so \ $out/shared/Microsoft.NETCore.App/*/*System.Net.Security.Native.so \ - $out/packs/Microsoft.NETCore.App.Host.linux-x64/*/runtimes/linux-x64/native/singlefilehost + $out/packs/Microsoft.NETCore.App.Host.${targetRid}/*/runtimes/${targetRid}/native/*host patchelf \ --add-needed libssl.so \ $out/shared/Microsoft.NETCore.App/*/*System.Security.Cryptography.Native.OpenSsl.so \ - $out/packs/Microsoft.NETCore.App.Host.linux-x64/*/runtimes/linux-x64/native/singlefilehost + $out/packs/Microsoft.NETCore.App.Host.${targetRid}/*/runtimes/${targetRid}/native/*host ''; passthru = { diff --git a/pkgs/development/compilers/dotnet/common.nix b/pkgs/development/compilers/dotnet/common.nix index a757dd36d17b2..49f3e3be4d779 100644 --- a/pkgs/development/compilers/dotnet/common.nix +++ b/pkgs/development/compilers/dotnet/common.nix @@ -63,7 +63,7 @@ '' + build); in if run == null - then build + then built else runCommand "${built.name}-run" { src = built; nativeBuildInputs = runInputs; } ( lib.optionalString (runtime != null) '' @@ -71,8 +71,10 @@ export DOTNET_ROOT=${runtime} '' + run); + # Setting LANG to something other than 'C' forces the runtime to search + # for ICU, which will be required in most user environments. checkConsoleOutput = command: '' - output="$(${command})" + output="$(LANG=C.UTF-8 ${command})" # yes, older SDKs omit the comma [[ "$output" =~ Hello,?\ World! ]] && touch "$out" ''; @@ -98,6 +100,15 @@ run = checkConsoleOutput "$src/test"; }; + self-contained = mkDotnetTest { + name = "self-contained"; + template = "console"; + usePackageSource = true; + build = "dotnet publish --use-current-runtime --sc -o $out"; + runtime = null; + run = checkConsoleOutput "$src/test"; + }; + single-file = mkDotnetTest { name = "single-file"; template = "console"; diff --git a/pkgs/development/compilers/inklecate/default.nix b/pkgs/development/compilers/inklecate/default.nix index fa701d8fd269e..52c278a1bd30f 100644 --- a/pkgs/development/compilers/inklecate/default.nix +++ b/pkgs/development/compilers/inklecate/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, autoPatchelfHook , buildDotnetModule , dotnetCorePackages , fetchFromGitHub @@ -17,7 +16,6 @@ buildDotnetModule rec { hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA=="; }; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib ]; projectFile = "inklecate/inklecate.csproj"; diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 6d550538b081a..424c41ce3c783 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, writeText, gradle_7, pkg-config, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python3, ruby, icu68 +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python3, ruby, fetchurl, runCommand , openjdk11-bootstrap , withMedia ? true , withWebKit ? false @@ -14,6 +14,16 @@ let java = openjdk11-bootstrap; }); + icuVersionWithSep = s: "71${s}1"; + icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; + icuData = fetchurl { + url = "https://github.com/unicode-org/icu/releases/${icuPath}"; + hash = "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM="; + }; + icuFakeRepository = runCommand "icu-data-repository" {} '' + install -Dm644 ${icuData} $out/${icuPath} + ''; + makePackage = args: stdenv.mkDerivation ({ version = "${major}${update}-${build}"; @@ -24,7 +34,7 @@ let sha256 = "sha256-46DjIzcBHkmp5vnhYnLu78CG72bIBRM4A6mgk2OLOko="; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu68 ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; @@ -32,6 +42,11 @@ let postPatch = '' substituteInPlace buildSrc/linux.gradle \ --replace ', "-Werror=implicit-function-declaration"' "" + + # Add missing includes for gcc-13 for webkit build: + sed -e '1i #include <cstdio>' \ + -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ + modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h ''; config = writeText "gradle.properties" ('' @@ -46,7 +61,7 @@ let export GRADLE_USER_HOME=$(mktemp -d) ln -s $config gradle.properties export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon $gradleFlags sdk + gradle --no-daemon --console=plain $gradleFlags sdk runHook postBuild ''; @@ -77,6 +92,7 @@ in makePackage { gradleProperties = '' COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} + ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; preBuild = '' diff --git a/pkgs/development/compilers/openjdk/openjfx/17.nix b/pkgs/development/compilers/openjdk/openjfx/17.nix index 58444abd3f17a..c5d6c6aaa597e 100644 --- a/pkgs/development/compilers/openjdk/openjfx/17.nix +++ b/pkgs/development/compilers/openjdk/openjfx/17.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless, gradle_7 , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib -, ffmpeg_4-headless, python3, ruby, icu71, fetchurl, runCommand +, ffmpeg_4-headless, python3, ruby, fetchurl, runCommand , withMedia ? true , withWebKit ? false }: @@ -14,16 +14,14 @@ let java = openjdk17_headless; }); - dashed-icu-version = lib.concatStringsSep "-" (lib.splitVersion (lib.getVersion icu71)); - underscored-icu-version = lib.concatStringsSep "_" (lib.splitVersion (lib.getVersion icu71)); - icu-data = fetchurl { - url = "https://github.com/unicode-org/icu/releases/download/release-${dashed-icu-version}/icu4c-${underscored-icu-version}-data-bin-l.zip"; + icuVersionWithSep = s: "71${s}1"; + icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; + icuData = fetchurl { + url = "https://github.com/unicode-org/icu/releases/${icuPath}"; hash = "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM="; }; - - fakeRepository = runCommand "icu-data-repository" {} '' - mkdir -p $out/download/release-${dashed-icu-version} - cp ${icu-data} $out/download/release-${dashed-icu-version}/icu4c-${underscored-icu-version}-data-bin-l.zip + icuFakeRepository = runCommand "icu-data-repository" {} '' + install -Dm644 ${icuData} $out/${icuPath} ''; makePackage = args: stdenv.mkDerivation ({ @@ -36,7 +34,7 @@ let sha256 = "sha256-9VfXk2EfMebMyVKPohPRP2QXRFf8XemUtfY0JtBCHyw="; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu71 ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; @@ -60,7 +58,7 @@ let export GRADLE_USER_HOME=$(mktemp -d) ln -s $config gradle.properties export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon $gradleFlags sdk + gradle --no-daemon --console=plain $gradleFlags sdk runHook postBuild ''; @@ -91,7 +89,7 @@ in makePackage { gradleProperties = '' COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ${lib.optionalString withWebKit "icuRepositoryURL = file://${fakeRepository}"} + ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; preBuild = '' diff --git a/pkgs/development/compilers/openjdk/openjfx/19.nix b/pkgs/development/compilers/openjdk/openjfx/19.nix index 802a0eb9b457f..6f173db8327c1 100644 --- a/pkgs/development/compilers/openjdk/openjfx/19.nix +++ b/pkgs/development/compilers/openjdk/openjfx/19.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless , openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst -, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, icu68 +, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand , withMedia ? true , withWebKit ? false }: @@ -15,6 +15,16 @@ let java = openjdk17_headless; }); + icuVersionWithSep = s: "68${s}2"; + icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "."}-data-bin-l.zip"; + icuData = fetchurl { + url = "https://github.com/unicode-org/icu/releases/${icuPath}"; + hash = "sha256-ieQCLBTNrskuf8j3IUQS3QLIAQzLom/O58muMP363Lw="; + }; + icuFakeRepository = runCommand "icu-data-repository" {} '' + install -Dm644 ${icuData} $out/${icuPath} + ''; + makePackage = args: stdenv.mkDerivation ({ version = "${major}${update}${build}"; @@ -38,7 +48,14 @@ let }) ]; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ]; + postPatch = '' + # Add missing includes for gcc-13 for webkit build: + sed -e '1i #include <cstdio>' \ + -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ + modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h + ''; + + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; @@ -55,7 +72,7 @@ let export GRADLE_USER_HOME=$(mktemp -d) ln -s $config gradle.properties export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon $gradleFlags sdk + gradle --no-daemon --console=plain $gradleFlags sdk runHook postBuild ''; @@ -89,6 +106,7 @@ in makePackage { gradleProperties = '' COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} + ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; preBuild = '' diff --git a/pkgs/development/compilers/openjdk/openjfx/20.nix b/pkgs/development/compilers/openjdk/openjfx/20.nix index d570db3b9aee1..794590dc7e606 100644 --- a/pkgs/development/compilers/openjdk/openjfx/20.nix +++ b/pkgs/development/compilers/openjdk/openjfx/20.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless , openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst -, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, icu68 +, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand , withMedia ? true , withWebKit ? false }: @@ -15,6 +15,16 @@ let java = openjdk17_headless; }); + icuVersionWithSep = s: "71${s}1"; + icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; + icuData = fetchurl { + url = "https://github.com/unicode-org/icu/releases/${icuPath}"; + hash = "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM="; + }; + icuFakeRepository = runCommand "icu-data-repository" {} '' + install -Dm644 ${icuData} $out/${icuPath} + ''; + makePackage = args: stdenv.mkDerivation ({ version = "${major}${update}${build}"; @@ -25,11 +35,18 @@ let hash = "sha256-QPPJyl6+XU+m5xqYOFtQKJNNrovqy7ngNE/e7kiEJVU="; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; + postPatch = '' + # Add missing includes for gcc-13 for webkit build: + sed -e '1i #include <cstdio>' \ + -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ + modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h + ''; + config = writeText "gradle.properties" ('' CONF = Release JDK_HOME = ${openjdk19_headless.home} @@ -42,7 +59,7 @@ let export GRADLE_USER_HOME=$(mktemp -d) ln -s $config gradle.properties export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon $gradleFlags sdk + gradle --no-daemon --console=plain $gradleFlags sdk runHook postBuild ''; @@ -76,6 +93,7 @@ in makePackage { gradleProperties = '' COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} + ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; preBuild = '' diff --git a/pkgs/development/compilers/openjdk/openjfx/21.nix b/pkgs/development/compilers/openjdk/openjfx/21.nix index 2f0d83f9f251a..f49dbe3b0e985 100644 --- a/pkgs/development/compilers/openjdk/openjfx/21.nix +++ b/pkgs/development/compilers/openjdk/openjfx/21.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless , openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst -, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, icu68 +, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand , withMedia ? true , withWebKit ? false }: @@ -15,6 +15,16 @@ let java = openjdk17_headless; }); + icuVersionWithSep = s: "73${s}1"; + icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; + icuData = fetchurl { + url = "https://github.com/unicode-org/icu/releases/${icuPath}"; + hash = "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA="; + }; + icuFakeRepository = runCommand "icu-data-repository" {} '' + install -Dm644 ${icuData} $out/${icuPath} + ''; + makePackage = args: stdenv.mkDerivation ({ version = "${major}${update}${build}"; @@ -25,11 +35,18 @@ let hash = "sha256-deNAGfnA6gwcAa64l0AWdkX+vJd3ZOfIgAifSl+/m+s="; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; + postPatch = '' + # Add missing includes for gcc-13 for webkit build: + sed -e '1i #include <cstdio>' \ + -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ + modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h + ''; + config = writeText "gradle.properties" ('' CONF = Release JDK_HOME = ${openjdk19_headless.home} @@ -42,7 +59,7 @@ let export GRADLE_USER_HOME=$(mktemp -d) ln -s $config gradle.properties export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon $gradleFlags sdk + gradle --no-daemon --console=plain $gradleFlags sdk runHook postBuild ''; @@ -76,6 +93,7 @@ in makePackage { gradleProperties = '' COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} + ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; preBuild = '' diff --git a/pkgs/development/compilers/openjdk/openjfx/22.nix b/pkgs/development/compilers/openjdk/openjfx/22.nix index 89908779c9094..d585dbdf01413 100644 --- a/pkgs/development/compilers/openjdk/openjfx/22.nix +++ b/pkgs/development/compilers/openjdk/openjfx/22.nix @@ -2,6 +2,8 @@ , lib , fetchFromGitHub , fetchpatch +, fetchurl +, runCommand , writeText , openjdk21_headless , gradle @@ -18,7 +20,6 @@ , ffmpeg_4 , python3 , ruby -, icu68 , withMedia ? true , withWebKit ? false }: @@ -29,6 +30,16 @@ let build = "+30"; repover = "${major}${update}${build}"; + icuVersionWithSep = s: "73${s}1"; + icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; + icuData = fetchurl { + url = "https://github.com/unicode-org/icu/releases/${icuPath}"; + hash = "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA="; + }; + icuFakeRepository = runCommand "icu-data-repository" {} '' + install -Dm644 ${icuData} $out/${icuPath} + ''; + makePackage = args: stdenv.mkDerivation ({ version = "${major}${update}${build}"; @@ -39,7 +50,7 @@ let hash = "sha256-sZF7ZPC0kgTTxWgtkxmGtOlfroGPGVZcMw0/wSTJUxQ="; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; @@ -56,7 +67,7 @@ let export GRADLE_USER_HOME=$(mktemp -d) ln -s $config gradle.properties export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon $gradleFlags sdk + gradle --no-daemon --console=plain $gradleFlags sdk runHook postBuild ''; @@ -88,6 +99,7 @@ makePackage { gradleProperties = '' COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} + ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; preBuild = '' diff --git a/pkgs/development/interpreters/erlang/27-rc2.nix b/pkgs/development/interpreters/erlang/27-rc2.nix deleted file mode 100644 index a9b6fa05e5186..0000000000000 --- a/pkgs/development/interpreters/erlang/27-rc2.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ mkDerivation }: - -mkDerivation { - version = "27.0-rc2"; - sha256 = "sha256-o+uqQMlrh7wJQbiecMnn3/tv6nqSJh7unOj0A95mMb0="; -} diff --git a/pkgs/development/interpreters/erlang/27-rc3.nix b/pkgs/development/interpreters/erlang/27-rc3.nix new file mode 100644 index 0000000000000..77e59672c1563 --- /dev/null +++ b/pkgs/development/interpreters/erlang/27-rc3.nix @@ -0,0 +1,6 @@ +{ mkDerivation }: + +mkDerivation { + version = "27.0-rc3"; + sha256 = "sha256-c2DTIqBd7UxpSv84F1cCB9K+MkJb5OwnWSghtewnw/4="; +} diff --git a/pkgs/development/interpreters/wamr/default.nix b/pkgs/development/interpreters/wamr/default.nix index 34a60c320bcb4..58d9fb2ef592f 100644 --- a/pkgs/development/interpreters/wamr/default.nix +++ b/pkgs/development/interpreters/wamr/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wamr"; - version = "1.3.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasm-micro-runtime"; rev = "WAMR-${finalAttrs.version}"; - hash = "sha256-4iH1PC0fEPehlez8YWgqPBxWnePFcMBzbGfd2CQjvd4="; + hash = "sha256-7k7FRe1mBH/+r9M19pYGAHX5rt54AomeWDBW4lwCfu4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 0f56582c05c3a..545c176ab4722 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "19.0.2"; + version = "20.0.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-t+2bkJ1SFN7Bi1Mj74CKGhnL2vWpruQKf8lYJWLOqB8="; + hash = "sha256-Q2CsIwYQsLnAlGyMRxNTxjZsezxhjSptBF540NtgkCc="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-Jr02AQWz4ILYZWlGtcVYWTcBojHWZk871bWuEyG5QxE="; + cargoHash = "sha256-d956DuVtLbZ/u3sAA4cQlw55CuYC7XyzeQarwyQ/hpY="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; @@ -36,7 +36,6 @@ rustPlatform.buildRustPackage rec { install -d -m0755 $dev/include/wasmtime install -m0644 $src/crates/c-api/include/*.h $dev/include install -m0644 $src/crates/c-api/include/wasmtime/*.h $dev/include/wasmtime - install -m0644 $src/crates/c-api/wasm-c-api/include/* $dev/include '' + lib.optionalString stdenv.isDarwin '' install_name_tool -id \ $dev/lib/libwasmtime.dylib \ diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 515eeb7de975a..27f9174c444d9 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -23,7 +23,7 @@ let in stdenv.mkDerivation rec { pname = "gusb"; - version = "0.4.8"; + version = "0.4.9"; outputs = [ "bin" "out" "dev" "devdoc" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libgusb"; rev = "refs/tags/${version}"; - hash = "sha256-xhWx45uOh8Yokd3/32CQ6tsdkgGaYUOvaylrq/jmoP0="; + hash = "sha256-piIPNLc3deToyQaajXFvM+CKh9ni8mb0P3kb+2RoJOs="; }; patches = [ diff --git a/pkgs/development/libraries/nng/default.nix b/pkgs/development/libraries/nng/default.nix index c66199a31e911..612f8e3845708 100644 --- a/pkgs/development/libraries/nng/default.nix +++ b/pkgs/development/libraries/nng/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nng"; - version = "1.7.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nng"; rev = "v${version}"; - hash = "sha256-oP7hO3wCXNPW7877wK+HpGsw7j+U0q4i8aTRVi1v0r0="; + hash = "sha256-E2uosZrmxO3fqwlLuu5e36P70iGj5xUlvhEb+1aSvOA="; }; nativeBuildInputs = [ cmake ninja ] diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index 35574d7c788aa..71a1b2a2001f4 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "ucx"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "openucx"; repo = "ucx"; rev = "v${version}"; - sha256 = "sha256-VxIxrk9qKM6Ncfczl4p2EhXiLNgPaYTmjhqi6/w2ZNY="; + sha256 = "sha256-dihWwGlQclfa2ke+1V5c6coqfFjjuMyI8QRzNdx33zQ="; }; outputs = [ "out" "doc" "dev" ]; diff --git a/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix b/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix index ed9b299320d89..067b61212acec 100644 --- a/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix @@ -49,9 +49,5 @@ buildDunePackage rec { and de-serialization function from a .proto file. ''; maintainers = [ lib.maintainers.GirardR1006 ]; - # Broken with Dune 3.15.1: - # Error: Dependency cycle between: - # %{read:config/support_proto3_optional.conf} at test/dune:16 - broken = true; }; } diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 41043eef5deea..d347b623d4077 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -75,6 +75,9 @@ buildPythonPackage rec { # The following tests have been disabled because they need to be run on a GPU platform. disabledTestPaths = [ "tests-cuda" + # Disable tests dependending on jax on darwin + ] ++ lib.optionals stdenv.isDarwin [ + "tests/test_2603_custom_behaviors_with_jax.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 7d2776ffe76a1..c11a021b4abc2 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.88"; + version = "1.34.89"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-I8qeDNDT53AtZjGh6UpCCKJrOfprEsc0Qn5op/pklHc="; + hash = "sha256-LGZI40McFYE28MHyHkQtPt4/taUkpacOo4AffpUUoQc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 3b536f15577c5..e4ada4a18276b 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.88"; + version = "1.34.89"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-ZW6WbqFSpPKCiJKqepZzvJF5mZj1qO/Y6P45D2HC9PE="; + hash = "sha256-stdBa1JLznMlql/gm7XgtryVMdQTb0QH+jm2vFhQfzQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index 3f5de521b0a87..86090e3b25562 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "coffea"; - version = "2024.2.2"; + version = "2024.4.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "CoffeaTeam"; repo = "coffea"; rev = "refs/tags/v${version}"; - hash = "sha256-GdoVb9YtlUlrSx7TWWrdHOqOJJ4M+kJspOllv6HgFXk="; + hash = "sha256-Iu1GHnLUqdhYO7hoHaf+O/S6KO0P+dvl0wgfRA5vtGI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix new file mode 100644 index 0000000000000..68dca5fe42fe0 --- /dev/null +++ b/pkgs/development/python-modules/dask-expr/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + setuptools, + versioneer, + wheel, + dask, + pandas, + pyarrow, + distributed, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "dask-expr"; + version = "1.0.12"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "dask"; + repo = "dask-expr"; + rev = "refs/tags/v${version}"; + hash = "sha256-B/BkLOZhvUyjinaFKp0ecUfzvLb5S90q+YHmJwS6WSQ="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "versioneer[toml]==0.28" "versioneer[toml]" + ''; + + nativeBuildInputs = [ + setuptools + versioneer + wheel + ]; + + propagatedBuildInputs = [ + dask + pandas + pyarrow + ]; + + pythonImportsCheck = [ "dask_expr" ]; + + nativeCheckInputs = [ + distributed + pytestCheckHook + ]; + + meta = with lib; { + description = ""; + homepage = "https://github.com/dask/dask-expr"; + license = licenses.bsd3; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index ee12386ae3d8b..df9179539fe38 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch # build-system , setuptools @@ -29,6 +28,7 @@ # tests , arrow-cpp +, dask-expr , hypothesis , pytest-asyncio , pytest-rerunfailures @@ -37,9 +37,9 @@ , pythonOlder }: -buildPythonPackage rec { +let self = buildPythonPackage rec { pname = "dask"; - version = "2024.2.1"; + version = "2024.4.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -48,22 +48,9 @@ buildPythonPackage rec { owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-8VFtKPaF0PqCjqFB+plFe1GjUno5j7j86+wxKhzByyw="; + hash = "sha256-iD+diwctXaQlOpL0fjOiFoWVONtlMq7AonbC0vCmXc0="; }; - patches = [ - # A pair of fixes with python 3.11.9, merged upstream; - # see https://github.com/dask/dask/issues/11038 - (fetchpatch { - url = "https://github.com/dask/dask/pull/11035.diff"; - hash = "sha256-aQTzas8gn7pCyp7L6VV3NpSYgqC1Ov7YN7YGnX0Vwmo="; - }) - (fetchpatch { - url = "https://github.com/dask/dask/pull/11039.diff"; - hash = "sha256-gvEEvnyhFlhiFvVaB6jwMy4auUOvECf49FbFJyjqQm4="; - }) - ]; - nativeBuildInputs = [ setuptools wheel @@ -93,6 +80,7 @@ buildPythonPackage rec { ++ self.distributed ++ self.diagnostics; dataframe = [ + # dask-expr -> circular dependency with dask-expr numpy pandas ]; @@ -106,6 +94,7 @@ buildPythonPackage rec { }); nativeCheckInputs = [ + dask-expr pytestCheckHook pytest-rerunfailures pytest-xdist @@ -113,6 +102,7 @@ buildPythonPackage rec { hypothesis pytest-asyncio ] + ++ passthru.optional-dependencies.array ++ passthru.optional-dependencies.dataframe ++ lib.optionals (!arrow-cpp.meta.broken) [ # support is sparse on aarch64 pyarrow @@ -172,15 +162,29 @@ buildPythonPackage rec { pythonImportsCheck = [ "dask" - "dask.array" "dask.bag" "dask.bytes" - "dask.dataframe" - "dask.dataframe.io" - "dask.dataframe.tseries" "dask.diagnostics" ]; + doCheck = false; + + # Enable tests via passthru to avoid cyclic dependency with dask-expr. + passthru.tests = { + check = self.overridePythonAttrs (old: { + doCheck = true; + pythonImportsCheck = [ + # Requires the `dask.optional-dependencies.array` that are only in `nativeCheckInputs` + "dask.array" + # Requires the `dask.optional-dependencies.dataframe` that are only in `nativeCheckInputs` + "dask.dataframe" + "dask.dataframe.io" + "dask.dataframe.tseries" + ] ++ old.pythonImportsCheck; + }); + }; + + meta = with lib; { description = "Minimal task scheduling abstraction"; mainProgram = "dask"; @@ -189,4 +193,4 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ fridh ]; }; -} +}; in self diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index c5be90d0af98a..890f579207cac 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "distributed"; - version = "2023.12.0"; + version = "2024.4.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "dask"; repo = "distributed"; rev = "refs/tags/${version}"; - hash = "sha256-Zv31BTzY31eXkU7wqa+h33qGrH+OTzKEj6L7Ei/aizk="; + hash = "sha256-xoQ+b7qzstZl9gRNs4jssNOsGQHDdvTXU7pTjBSuyWs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index 513e7c8584942..b31a0b6a93540 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , substituteAll , graphviz-nox , xdg-utils @@ -18,17 +17,17 @@ buildPythonPackage rec { pname = "graphviz"; - version = "0.20.1"; + version = "0.20.2"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; # patch does not apply to PyPI tarball due to different line endings src = fetchFromGitHub { owner = "xflr6"; repo = "graphviz"; rev = version; - hash = "sha256-plhWG9mE9DoTMg7mWCvFLAgtBx01LAgJ0gQ/mqBU3yc="; + hash = "sha256-q5y4QPBCtA1kMhxbOECodSeubj2bULnnNDrZZfxiry4="; }; patches = [ @@ -37,12 +36,6 @@ buildPythonPackage rec { graphviz = graphviz-nox; xdgutils = xdg-utils; }) - # https://github.com/xflr6/graphviz/issues/209 - (fetchpatch { - name = "fix-tests-with-python312.patch"; - url = "https://github.com/xflr6/graphviz/commit/5ce9fc5de4f2284baa27d7a8d68ab0885d032868.patch"; - hash = "sha256-jREPACSc4aoHY3G+39e8Axqajw4eeKkAeVu2s40v1nI="; - }) ]; postPatch = '' diff --git a/pkgs/development/python-modules/graphviz/paths.patch b/pkgs/development/python-modules/graphviz/paths.patch index f53852544a2dd..2323cd66e0203 100644 --- a/pkgs/development/python-modules/graphviz/paths.patch +++ b/pkgs/development/python-modules/graphviz/paths.patch @@ -1,5 +1,5 @@ diff --git a/graphviz/backend/dot_command.py b/graphviz/backend/dot_command.py -index 60654bd..2c62b47 100644 +index 3a62a85..a38bb9b 100644 --- a/graphviz/backend/dot_command.py +++ b/graphviz/backend/dot_command.py @@ -9,7 +9,7 @@ from .. import parameters @@ -38,20 +38,20 @@ index fde74a6..6f29b68 100644 kwargs = {'stderr': subprocess.DEVNULL} if quiet else {} subprocess.Popen(cmd, **kwargs) diff --git a/tests/_common.py b/tests/_common.py -index 87b4cbd..4188beb 100644 +index edc1309..42d730c 100644 --- a/tests/_common.py +++ b/tests/_common.py -@@ -14,9 +14,9 @@ __all__ = ['EXPECTED_DOT_BINARY', 'EXPECTED_UNFLATTEN_BINARY', +@@ -14,9 +14,9 @@ __all__ = ['EXPECTED_DOT_BINARY', 'as_cwd', 'check_startupinfo', 'StartupinfoMatcher'] --EXPECTED_DOT_BINARY = _compat.make_subprocess_arg(pathlib.Path('dot')) -+EXPECTED_DOT_BINARY = _compat.make_subprocess_arg(pathlib.Path('@graphviz@/bin/dot')) +-EXPECTED_DOT_BINARY = pathlib.Path('dot') ++EXPECTED_DOT_BINARY = pathlib.Path('@graphviz@/bin/dot') --EXPECTED_UNFLATTEN_BINARY = _compat.make_subprocess_arg(pathlib.Path('unflatten')) -+EXPECTED_UNFLATTEN_BINARY = _compat.make_subprocess_arg(pathlib.Path('@graphviz@/bin/unflatten')) +-EXPECTED_UNFLATTEN_BINARY = pathlib.Path('unflatten') ++EXPECTED_UNFLATTEN_BINARY = pathlib.Path('@graphviz@/bin/unflatten') - EXPECTED_DEFAULT_ENCODING = 'utf-8' + EXPECTED_DEFAULT_ENGINE = 'dot' diff --git a/tests/backend/test_execute.py b/tests/backend/test_execute.py index 2cb853a..8093dfe 100644 diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index fa904248f3e6b..7807d5d7b2798 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ical"; - version = "7.0.3"; + version = "8.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,14 +25,14 @@ buildPythonPackage rec { owner = "allenporter"; repo = "ical"; rev = "refs/tags/${version}"; - hash = "sha256-RiwWnRSe0HdeGVo592A+Rk+IvA1Lfp6mY+/ZEyqJBDU="; + hash = "sha256-nwF6iInQzHdOtmcC1fi6CS2LnYRCxc/DS9bg8IxTlFg="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ python-dateutil tzdata pydantic diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index 00bb481c169bd..1f038308a76b9 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "6.0.3"; + version = "6.0.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QRysmtKo5KXXAVcyQx2WwuwySUP8vAN/gqXWmgoOPmo="; + hash = "sha256-XtZOk3KgIzu9vwI0HnoklGQVZ42KVOPQBXxJ1fpfJjA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/model-bakery/default.nix b/pkgs/development/python-modules/model-bakery/default.nix index a5b38b525f7d2..82b91dd10da51 100644 --- a/pkgs/development/python-modules/model-bakery/default.nix +++ b/pkgs/development/python-modules/model-bakery/default.nix @@ -1,17 +1,18 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, hatchling -, django -, pytestCheckHook -, pythonOlder -, pytest-django +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + django, + pytestCheckHook, + pythonOlder, + pytest-django, }: buildPythonPackage rec { pname = "model-bakery"; - version = "1.17.0"; - format = "pyproject"; + version = "1.18.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -19,25 +20,19 @@ buildPythonPackage rec { owner = "model-bakers"; repo = "model_bakery"; rev = "refs/tags/${version}"; - hash = "sha256-o3BI2lMwctR9tiGmY07dAOQUfv9K4rWkc/xI6uHnVfs="; + hash = "sha256-mf6NV7r/9kDCRlszx/QGtfEsC1O/SATd6+EX+w7ptEQ="; }; - nativeBuildInputs = [ - hatchling - ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ - django - ]; + dependencies = [ django ]; nativeCheckInputs = [ pytest-django pytestCheckHook ]; - pythonImportsCheck = [ - "model_bakery" - ]; + pythonImportsCheck = [ "model_bakery" ]; meta = with lib; { description = "Object factory for Django"; diff --git a/pkgs/development/python-modules/nanobind/default.nix b/pkgs/development/python-modules/nanobind/default.nix new file mode 100644 index 0000000000000..27460b65a8dba --- /dev/null +++ b/pkgs/development/python-modules/nanobind/default.nix @@ -0,0 +1,72 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + cmake, + eigen, + ninja, + scikit-build, + pytestCheckHook, + numpy, + scipy, + torch, + jax, + jaxlib, + tensorflow, + setuptools, +}: +buildPythonPackage rec { + pname = "nanobind"; + version = "1.9.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "wjakob"; + repo = pname; + rev = "v${version}"; + hash = "sha256-6swDqw7sEYOawQbNWD8VfSQoi+9wjhOhOOwPPkahDas="; + fetchSubmodules = true; + }; + + disabled = pythonOlder "3.8"; + + nativeBuildInputs = [ + cmake + ninja + scikit-build + setuptools + ]; + buildInputs = [ eigen ]; + dontUseCmakeBuildDir = true; + + preCheck = '' + # build tests + make -j $NIX_BUILD_CORES + ''; + + nativeCheckInputs = [ + pytestCheckHook + numpy + scipy + torch + tensorflow + jax + jaxlib + ]; + + meta = with lib; { + homepage = "https://github.com/wjakob/nanobind"; + changelog = "https://github.com/wjakob/nanobind/blob/${src.rev}/docs/changelog.rst"; + description = "Tiny and efficient C++/Python bindings"; + longDescription = '' + nanobind is a small binding library that exposes C++ types in Python and + vice versa. It is reminiscent of Boost.Python and pybind11 and uses + near-identical syntax. In contrast to these existing tools, nanobind is + more efficient: bindings compile in a shorter amount of time, produce + smaller binaries, and have better runtime performance. + ''; + license = licenses.bsd3; + maintainers = with maintainers; [ parras ]; + }; +} diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 3f880f9d5f903..eb5cf1ecfed2c 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -9,6 +9,7 @@ , jbig2enc , packaging , pdfminer-six +, pillow-heif , pikepdf , pillow , pluggy @@ -18,19 +19,17 @@ , pythonOlder , rich , reportlab -, setuptools , setuptools-scm , substituteAll , tesseract , tqdm -, typing-extensions , unpaper , installShellFiles }: buildPythonPackage rec { pname = "ocrmypdf"; - version = "16.1.2"; + version = "16.2.0"; disabled = pythonOlder "3.10"; @@ -46,10 +45,11 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-nZvfkfO5u3iuN0g/KITWbhYCRAJngEOKCW48z6IEPMI="; + hash = "sha256-sqhuQ+no6UymxbVtDtWiYQK8kKpO1y37NxLDmRT1LEQ="; }; patches = [ + ./use-pillow-heif.patch (substituteAll { src = ./paths.patch; gs = lib.getExe ghostscript; @@ -60,30 +60,31 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ - setuptools + build-system = [ setuptools-scm + ]; + + nativeBuildInputs = [ installShellFiles ]; - propagatedBuildInputs = [ + dependencies = [ deprecation img2pdf packaging pdfminer-six + pillow-heif pikepdf pillow pluggy - reportlab rich - ] ++ lib.optionals (pythonOlder "3.10") [ - typing-extensions ]; nativeCheckInputs = [ hypothesis pytest-xdist pytestCheckHook + reportlab ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/ocrmypdf/use-pillow-heif.patch b/pkgs/development/python-modules/ocrmypdf/use-pillow-heif.patch new file mode 100644 index 0000000000000..fc464cf71b665 --- /dev/null +++ b/pkgs/development/python-modules/ocrmypdf/use-pillow-heif.patch @@ -0,0 +1,26 @@ +diff --git a/pyproject.toml b/pyproject.toml +index d045458f..efa9161d 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -16,7 +16,7 @@ dependencies = [ + "img2pdf>=0.5", + "packaging>=20", + "pdfminer.six>=20220319", +- "pi-heif", # Heif image format - maintainers: if this is removed, it will NOT break ++ "pillow-heif", # Heif image format - maintainers: if this is removed, it will NOT break + "pikepdf>=8.10.1", + "Pillow>=10.0.1", + "pluggy>=1", +diff --git a/src/ocrmypdf/_pipeline.py b/src/ocrmypdf/_pipeline.py +index 043a78a0..522197b1 100644 +--- a/src/ocrmypdf/_pipeline.py ++++ b/src/ocrmypdf/_pipeline.py +@@ -42,7 +42,7 @@ from ocrmypdf.pdfinfo import Colorspace, Encoding, PageInfo, PdfInfo + from ocrmypdf.pluginspec import OrientationConfidence + + try: +- from pi_heif import register_heif_opener ++ from pillow_heif import register_heif_opener + except ImportError: + + def register_heif_opener(): diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index 6560c63ac2832..d91408fc864d2 100644 --- a/pkgs/development/python-modules/pillow-heif/default.nix +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -57,8 +57,12 @@ buildPythonPackage rec { x265 ]; - # clang-16: error: argument unused during compilation: '-fno-strict-overflow' [-Werror,-Wunused-command-line-argument] - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; + env = { + # clang-16: error: argument unused during compilation: '-fno-strict-overflow' + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; + + RELEASE_FULL_FLAG = 1; + }; propagatedBuildInputs = [ pillow diff --git a/pkgs/development/python-modules/psrpcore/default.nix b/pkgs/development/python-modules/psrpcore/default.nix index 8608c19c8dcdb..102d9ce9b7c0c 100644 --- a/pkgs/development/python-modules/psrpcore/default.nix +++ b/pkgs/development/python-modules/psrpcore/default.nix @@ -1,38 +1,40 @@ -{ lib -, buildPythonPackage -, cryptography -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, xmldiff +{ + lib, + buildPythonPackage, + cryptography, + fetchFromGitHub, + powershell, + pytestCheckHook, + pythonOlder, + setuptools, + xmldiff, }: buildPythonPackage rec { pname = "psrpcore"; - version = "0.2.2"; - format = "pyproject"; + version = "0.3.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jborean93"; - repo = pname; + repo = "psrpcore"; rev = "refs/tags/v${version}"; - hash = "sha256-6d5HQJEH/x+V0rpmQkprMlH1n151KyUF6d4tM9W5TFs="; + hash = "sha256-YThumRHMOTyhP6/EmNEew47v/X4Y1aYg1nvgZJz2XUg="; }; - propagatedBuildInputs = [ - cryptography - ]; + build-system = [ setuptools ]; + + dependencies = [ cryptography ]; nativeCheckInputs = [ + powershell pytestCheckHook xmldiff ]; - pythonImportsCheck = [ - "psrpcore" - ]; + pythonImportsCheck = [ "psrpcore" ]; meta = with lib; { description = "Library for the PowerShell Remoting Protocol (PSRP)"; diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index 7a52c601ef35f..f9b70e83157e6 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pyaml"; - version = "23.12.0"; + version = "24.4.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-zm9kjv37GzpVefjO2wT6zw+h6PZIRrY5MJtYW7MitOU="; + hash = "sha256-Dkg9kokBDnR6Ml3EMXG8w51lYt0d1HGejMfnyWyZ/OY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pydantic-yaml-0/default.nix b/pkgs/development/python-modules/pydantic-yaml-0/default.nix index bc842e5dc5326..74c44b255283a 100644 --- a/pkgs/development/python-modules/pydantic-yaml-0/default.nix +++ b/pkgs/development/python-modules/pydantic-yaml-0/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "pydantic_yaml-0"; + # nixpkgs-update: no auto update version = "0.11.2"; pyproject = true; diff --git a/pkgs/development/python-modules/python-novaclient/default.nix b/pkgs/development/python-modules/python-novaclient/default.nix index 8ce053cab37cc..d3451236d0914 100644 --- a/pkgs/development/python-modules/python-novaclient/default.nix +++ b/pkgs/development/python-modules/python-novaclient/default.nix @@ -46,6 +46,8 @@ buildPythonPackage rec { checkPhase = '' stestr run -e <(echo " + novaclient.tests.unit.test_shell.ParserTest.test_ambiguous_option + novaclient.tests.unit.test_shell.ParserTest.test_not_really_ambiguous_option novaclient.tests.unit.test_shell.ShellTest.test_osprofiler novaclient.tests.unit.test_shell.ShellTestKeystoneV3.test_osprofiler ") diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 771971445156f..701400f3168fb 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1133"; + version = "3.0.1135"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-RQudhUn4BfsdwQOCt9CUuKVVlXbHLMEohg6C2srZ9pk="; + hash = "sha256-qrD33e9mOmgi/y9YArxjuV+wbkx9+/Jy0mJBYdVG4Ws="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index d261337be26d0..5bcbeb035f673 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.40.0"; + version = "4.40.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -63,7 +63,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-k0AloOG7fRQhTW8IF6uQSfav8p1KC5633SaLNYZrZ2M="; + hash = "sha256-w9BVJwYS2QV58UTOpcoQwdC+dxZuhLS2h8PqN5W2Yjc="; }; build-system = [ diff --git a/pkgs/development/python-modules/units/default.nix b/pkgs/development/python-modules/units/default.nix deleted file mode 100644 index 90e7c73b56a51..0000000000000 --- a/pkgs/development/python-modules/units/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "units"; - version = "0.07"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "43eb3e073e1b11289df7b1c3f184b5b917ccad178b717b03933298716f200e14"; - }; - - meta = with lib; { - description = "Python support for quantities with units"; - homepage = "https://bitbucket.org/adonohue/units/"; - license = licenses.psfl; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/vacuum-map-parser-base/default.nix b/pkgs/development/python-modules/vacuum-map-parser-base/default.nix index c6656eb97971b..e27ea9d8b6f07 100644 --- a/pkgs/development/python-modules/vacuum-map-parser-base/default.nix +++ b/pkgs/development/python-modules/vacuum-map-parser-base/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "vacuum-map-parser-base"; - version = "0.1.2"; + version = "0.1.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "PiotrMachowski"; repo = "Python-package-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-moCWUPzn9stxehVEnjqpx8ILYhxzuy8QG+uxR53rCew="; + hash = "sha256-wX7RsJKSNZmi6uIDqsKxWe8VaYJPg4I3pwHHckMUOw4="; }; postPatch = '' diff --git a/pkgs/development/tools/algolia-cli/default.nix b/pkgs/development/tools/algolia-cli/default.nix index 7ef189b67fe3a..b3ff05249ae09 100644 --- a/pkgs/development/tools/algolia-cli/default.nix +++ b/pkgs/development/tools/algolia-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "algolia-cli"; - version = "1.6.6"; + version = "1.6.7"; src = fetchFromGitHub { owner = "algolia"; repo = "cli"; rev = "v${version}"; - hash = "sha256-yLsyby3u1oz5fnQ/zQ0sjy2w+Pv0KHySojsDc4vnFF0="; + hash = "sha256-g6UNFE1EEo40pqdTAmidG4/A+cQ89UZNp++B+q6AzeA="; }; vendorHash = "sha256-cNuBTH7L2K4TgD0H9FZ9CjhE5AGXADaniGLD9Lhrtrk="; diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index e9aace248d865..34aaf68bb0ff3 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -1,5 +1,4 @@ -{ autoPatchelfHook -, autoSignDarwinBinariesHook +{ autoSignDarwinBinariesHook , buildDotnetModule , dotnetCorePackages , fetchFromGitHub @@ -114,8 +113,6 @@ buildDotnetModule rec { nativeBuildInputs = [ which git - ] ++ lib.optionals stdenv.isLinux [ - autoPatchelfHook ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]; diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index efe9917a0d8a3..9c9c53c390737 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -4,6 +4,12 @@ buildGoModule rec { pname = "gauge"; version = "1.6.6"; + patches = [ + # adds a check which adds an error message when trying to + # install plugins imperatively when using the wrapper + ./nix-check.patch + ]; + src = fetchFromGitHub { owner = "getgauge"; repo = "gauge"; @@ -20,6 +26,6 @@ buildGoModule rec { mainProgram = "gauge"; homepage = "https://gauge.org"; license = licenses.asl20; - maintainers = [ maintainers.vdemeester ]; + maintainers = with maintainers; [ vdemeester marie ]; }; } diff --git a/pkgs/development/tools/gauge/nix-check.patch b/pkgs/development/tools/gauge/nix-check.patch new file mode 100644 index 0000000000000..37aec8a51b62a --- /dev/null +++ b/pkgs/development/tools/gauge/nix-check.patch @@ -0,0 +1,50 @@ +diff --git a/plugin/install/install.go b/plugin/install/install.go +index 60c61550..d7573c2d 100644 +--- a/plugin/install/install.go ++++ b/plugin/install/install.go +@@ -151,6 +151,7 @@ func isOSCompatible(zipfile string) bool { + + // InstallPluginFromZipFile installs plugin from given zip file + func InstallPluginFromZipFile(zipFile string, pluginName string) InstallResult { ++ CheckForNixStore(fmt.Sprintf("Tried to install the plugin `%s`.", pluginName)) + if !isPlatformIndependent(zipFile) && !isOSCompatible(zipFile) { + err := fmt.Errorf("provided plugin is not compatible with OS %s %s", runtime.GOOS, runtime.GOARCH) + return installError(err) +@@ -314,6 +315,7 @@ func runPlatformCommands(commands platformSpecificCommand, workingDir string) er + // UninstallPlugin uninstall the given plugin of the given uninstallVersion + // If uninstallVersion is not specified, it uninstalls all the versions of given plugin + func UninstallPlugin(pluginName string, uninstallVersion string) { ++ CheckForNixStore(fmt.Sprintf("Tried to uninstall the plugin `%s`.", pluginName)) + pluginsHome, err := common.GetPrimaryPluginsInstallDir() + if err != nil { + logger.Fatalf(true, "Failed to uninstall plugin %s. %s", pluginName, err.Error()) +@@ -518,6 +520,7 @@ func AllPlugins(silent, languageOnly bool) { + + // UpdatePlugins updates all the currently installed plugins to its latest version + func UpdatePlugins(silent bool) { ++ CheckForNixStore("Tried to update plugins") + var failedPlugin []string + pluginInfos, err := pluginInfo.GetPluginsInfo() + if err != nil { +@@ -673,3 +676,21 @@ func AddPluginToProject(pluginName string) error { + logger.Infof(true, "Plugin %s was successfully added to the project\n", pluginName) + return nil + } ++ ++func CheckForNixStore(message string) error { ++ installDir, err := common.GetPrimaryPluginsInstallDir() ++ if err != nil { ++ return err ++ } ++ if strings.HasPrefix(installDir, "/nix/store") { ++ ++ // check if we're installing in the sandbox ++ if os.Getenv("NIX_GAUGE_IN_SANDBOX") == "true" { ++ return nil ++ } ++ logger.Errorf(true, "%s\ngauge is installed with nix.\nPlease install plugins using nix or use the `gauge-unwrapped` package.", message) ++ os.Exit(1) ++ ++ } ++ return nil ++} diff --git a/pkgs/development/tools/gauge/plugins/default.nix b/pkgs/development/tools/gauge/plugins/default.nix new file mode 100644 index 0000000000000..92ee2fca77d0b --- /dev/null +++ b/pkgs/development/tools/gauge/plugins/default.nix @@ -0,0 +1,14 @@ +{ lib, pkgs }: +lib.makeScope pkgs.newScope (final: let + inherit (final) callPackage; +in { + makeGaugePlugin = callPackage ./make-gauge-plugin.nix { }; + dotnet = callPackage ./dotnet { }; + html-report = callPackage ./html-report { }; + java = callPackage ./java { }; + js = callPackage ./js { }; + ruby = callPackage ./ruby { }; + go = callPackage ./go { }; + screenshot = callPackage ./screenshot { }; + xml-report = callPackage ./xml-report { }; +}) diff --git a/pkgs/development/tools/gauge/plugins/dotnet/data.json b/pkgs/development/tools/gauge/plugins/dotnet/data.json new file mode 100644 index 0000000000000..fd2d19ec864e4 --- /dev/null +++ b/pkgs/development/tools/gauge/plugins/dotnet/data.json @@ -0,0 +1,5 @@ +{ + "version": "0.5.7", + "url": "https://github.com/getgauge/gauge-dotnet/releases/download/v0.5.7/gauge-dotnet-0.5.7.zip", + "hash": "sha256-VKs25WzS0UZAeCg91f/f6ZOGH28PulUvyDSc/dbJeoE=" +} diff --git a/pkgs/development/tools/gauge/plugins/dotnet/default.nix b/pkgs/development/tools/gauge/plugins/dotnet/default.nix new file mode 100644 index 0000000000000..7cf99f2e7b4f0 --- /dev/null +++ b/pkgs/development/tools/gauge/plugins/dotnet/default.nix @@ -0,0 +1,22 @@ +{ lib +, makeGaugePlugin +, gauge-unwrapped +}: + +makeGaugePlugin { + pname = "dotnet"; + data = lib.importJSON ./data.json; + + repo = "getgauge/gauge-dotnet"; + releasePrefix = "gauge-dotnet-"; + isCrossArch = true; + + meta = { + description = "Gauge plugin that lets you write tests in C#"; + homepage = "https://github.com/getgauge/gauge-dotnet/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ marie ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + inherit (gauge-unwrapped.meta) platforms; + }; +} diff --git a/pkgs/development/tools/gauge/plugins/go/data.json b/pkgs/development/tools/gauge/plugins/go/data.json new file mode 100644 index 0000000000000..b4c9904bbea46 --- /dev/null +++ b/pkgs/development/tools/gauge/plugins/go/data.json @@ -0,0 +1,15 @@ +{ + "version": "0.4.0", + "aarch64-darwin": { + "url": "https://github.com/getgauge-contrib/gauge-go/releases/download/v0.4.0/gauge-go-0.4.0-darwin.arm64.zip", + "hash": "sha256-tMo3+gQPnldCARm0WB7UYSMwaVpz90N2BiTzmvIFTg0=" + }, + "x86_64-darwin": { + "url": "https://github.com/getgauge-contrib/gauge-go/releases/download/v0.4.0/gauge-go-0.4.0-darwin.x86_64.zip", + "hash": "sha256-zfrEDRyflvvp4Hf2+42RL+5ooY0iBU0bkO2caOAGp74=" + }, + "x86_64-linux": { + "url": "https://github.com/getgauge-contrib/gauge-go/releases/download/v0.4.0/gauge-go-0.4.0-linux.x86_64.zip", + "hash": "sha256-JEHjk51vYCFAcj9xant2vBU3BZI0krYbfZk9ALjdIs0=" + } +} diff --git a/pkgs/development/tools/gauge/plugins/go/default.nix b/pkgs/development/tools/gauge/plugins/go/default.nix new file mode 100644 index 0000000000000..c21c517fb7d10 --- /dev/null +++ b/pkgs/development/tools/gauge/plugins/go/default.nix @@ -0,0 +1,19 @@ +{ lib +, makeGaugePlugin +}: +makeGaugePlugin { + pname = "go"; + data = lib.importJSON ./data.json; + + repo = "getgauge-contrib/gauge-go"; + releasePrefix = "gauge-go-"; + + meta = { + description = "Gauge plugin that lets you write tests in Go"; + homepage = "https://github.com/getgauge-contrib/gauge-go"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ marie ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/gauge/plugins/html-report/data.json b/pkgs/development/tools/gauge/plugins/html-report/data.json new file mode 100644 index 0000000000000..e72be41f921e8 --- /dev/null +++ b/pkgs/development/tools/gauge/plugins/html-report/data.json @@ -0,0 +1,19 @@ +{ + "version": "4.3.1", + "aarch64-darwin": { + "url": "https://github.com/getgauge/html-report/releases/download/v4.3.1/html-report-4.3.1-darwin.arm64.zip", + "hash": "sha256-OovQxwi4NGrdbKYGfMLgqQ9BuT1gvl7NFu5aTrA2HWw=" + }, + "x86_64-darwin": { + "url": "https://github.com/getgauge/html-report/releases/download/v4.3.1/html-report-4.3.1-darwin.x86_64.zip", + "hash": "sha256-oOJE3VJH8Cwbvdc2kTs0dHjNb2r35tXTP18EAts6XYs=" + }, + "aarch64-linux": { + "url": "https://github.com/getgauge/html-report/releases/download/v4.3.1/html-report-4.3.1-linux.arm64.zip", + "hash": "sha256-ZhNPGKuB08V/fxJCOya/uHUNlVT223WEPX6BrOhxPc8=" + }, + "x86_64-linux": { + "url": "https://github.com/getgauge/html-report/releases/download/v4.3.1/html-report-4.3.1-linux.x86_64.zip", + "hash": "sha256-insNiAbJM5Xc/GY6UTgMJgYU6vnBzKC13aBlgq3GBpo=" + } +} diff --git a/pkgs/development/tools/gauge/plugins/html-report/default.nix b/pkgs/development/tools/gauge/plugins/html-report/default.nix new file mode 100644 index 0000000000000..33e0eb272275a --- /dev/null +++ b/pkgs/development/tools/gauge/plugins/html-report/default.nix @@ -0,0 +1,19 @@ +{ lib +, makeGaugePlugin +}: +makeGaugePlugin { + pname = "html-report"; + data = lib.importJSON ./data.json; + + repo = "getgauge/html-report"; + releasePrefix = "html-report-"; + + meta = { + description = "HTML report generation plugin for Gauge"; + homepage = "https://github.com/getgauge/html-report/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ marie ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + platforms = [ "aarch64-darwin" "x86_64-darwin" "aarch64-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/gauge/plugins/java/data.json b/pkgs/development/tools/gauge/plugins/java/data.json new file mode 100644 index 0000000000000..96c993e6f3061 --- /dev/null +++ b/pkgs/development/tools/gauge/plugins/java/data.json @@ -0,0 +1,19 @@ +{ + "version": "0.10.3", + "aarch64-darwin": { + "url": "https://github.com/getgauge/gauge-java/releases/download/v0.10.3/gauge-java-0.10.3-darwin.arm64.zip", + "hash": "sha256-Hs9ZNupj0s7YRjRZibphr7m5YjOj3MTgx/hqAbWyY6I=" + }, + "x86_64-darwin": { + "url": "https://github.com/getgauge/gauge-java/releases/download/v0.10.3/gauge-java-0.10.3-darwin.x86_64.zip", + "hash": "sha256-Hj/Lkwsx/RvyMiJO8dI6vFpIvvyhOA2Un5deC1syYY4=" + }, + "aarch64-linux": { + "url": "https://github.com/getgauge/gauge-java/releases/download/v0.10.3/gauge-java-0.10.3-linux.arm64.zip", + "hash": "sha256-XJqP2eew+aI1jFaDzsJhfML8Ft+adFJrHURF8F391Pc=" + }, + "x86_64-linux": { + "url": "https://github.com/getgauge/gauge-java/releases/download/v0.10.3/gauge-java-0.10.3-linux.x86_64.zip", + "hash": "sha256-sMyWhAGo6oa7MsqK8xApdrwhZo8NkSTIRbsCu5LW3ls=" + } +} diff --git a/pkgs/development/tools/gauge/plugins/java/default.nix b/pkgs/development/tools/gauge/plugins/java/default.nix new file mode 100644 index 0000000000000..1dafc4a04065e --- /dev/null +++ b/pkgs/development/tools/gauge/plugins/java/default.nix @@ -0,0 +1,24 @@ +{ lib +, makeGaugePlugin +}: +makeGaugePlugin { + pname = "java"; + data = lib.importJSON ./data.json; + + repo = "getgauge/gauge-java"; + releasePrefix = "gauge-java-"; + + meta = { + description = "Gauge plugin that lets you write tests in Java"; + homepage = "https://github.com/getgauge/gauge-java/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ marie ]; + sourceProvenance = with lib.sourceTypes; [ + # Native binary written in go + binaryNativeCode + # Jar files + binaryBytecode + ]; + platforms = [ "aarch64-darwin" "x86_64-darwin" "aarch64-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/gauge/plugins/js/default.nix b/pkgs/development/tools/gauge/plugins/js/default.nix new file mode 100644 index 0000000000000..621cbbbc1938e --- /dev/null +++ b/pkgs/development/tools/gauge/plugins/js/default.nix @@ -0,0 +1,42 @@ +{ lib +, nodejs +, buildNpmPackage +, fetchFromGitHub +, unzip +, gauge-unwrapped +}: +buildNpmPackage rec { + pname = "gauge-plugin-js"; + version = "4.0.1"; + + src = fetchFromGitHub { + owner = "getgauge"; + repo = "gauge-js"; + rev = "v${version}"; + hash = "sha256-qCn4EKndd0eM3X0+aLrCwvmEG5fgUfpVm76cg/n7B84="; + fetchSubmodules = true; + }; + + npmDepsHash = "sha256-5XkFwCFqNMe5xc/Tx69uUV7KMtgY7Z3zE7hbtxYqRf0="; + npmBuildScript = "package"; + + buildInputs = [ nodejs ]; + nativeBuildInputs = [ unzip ]; + + postPatch = '' + patchShebangs index.js + ''; + + installPhase = '' + mkdir -p $out/share/gauge-plugins/js/${version} + unzip deploy/gauge-js-${version}.zip -d $out/share/gauge-plugins/js/${version} + ''; + + meta = { + description = "Gauge plugin that lets you write tests in JavaScript"; + homepage = "https://github.com/getgauge/gauge-js/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ marie ]; + inherit (gauge-unwrapped.meta) platforms; + }; +} diff --git a/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix b/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix new file mode 100644 index 0000000000000..116effa45b14f --- /dev/null +++ b/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix @@ -0,0 +1,94 @@ +{ stdenvNoCC +, fetchzip +, lib +, writeScript +}: + +{ pname +, data +, repo +, releasePrefix +, isCrossArch ? false +, meta +, ... +} @ args: +let + otherArgs = lib.attrsets.removeAttrs args [ "pname" "data" "repo" "releasePrefix" "isMultiArch" ]; + inherit (stdenvNoCC.hostPlatform) system; + inherit (if isCrossArch then data else data.${system}) url hash; + # Upstream uses a different naming scheme for platforms + systemMap = { + "x86_64-darwin" = "darwin.x86_64"; + "aarch64-darwin" = "darwin.arm64"; + "aarch64-linux" = "linux.arm64"; + "x86_64-linux" = "linux.x86_64"; + }; +in +stdenvNoCC.mkDerivation (finalAttrs: (lib.recursiveUpdate { + pname = "gauge-plugin-${pname}"; + inherit (data) version; + + src = fetchzip { + inherit url hash; + stripRoot = false; + }; + + installPhase = '' + mkdir -p "$out/share/gauge-plugins/${pname}/${finalAttrs.version}" + cp -r . "$out/share/gauge-plugins/${pname}/${finalAttrs.version}" + ''; + + passthru.updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl nix-prefetch yq-go + + set -e + + dirname="pkgs/development/tools/gauge/plugins/${pname}" + + currentVersion=$(nix eval --raw -f default.nix gaugePlugins.${pname}.version) + + latestTag=$(curl -s ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} https://api.github.com/repos/${repo}/releases/latest | yq ".tag_name") + latestVersion="$(expr $latestTag : 'v\(.*\)')" + + tempfile=$(mktemp) + + if [[ "$FORCE_UPDATE" != "true" && "$currentVersion" == "$latestVersion" ]]; then + echo "gauge-${pname} is up-to-date: ''${currentVersion}" + exit 0 + fi + + yq -iPoj "{ \"version\": \"$latestVersion\" }" "$tempfile" + + updateSystem() { + system=$1 + url=$2 + + echo "Fetching hash for $system" + hash=$(nix-prefetch-url --type sha256 $url --unpack) + sriHash="$(nix hash to-sri --type sha256 $hash)" + + yq -iPoj '. + { "$system": { "url": "$url", "hash": "$sriHash" } }' "$tempfile" + } + + updateSingle() { + url=$1 + + echo "Fetching hash" + hash=$(nix-prefetch-url --type sha256 $url --unpack) + sriHash="$(nix hash to-sri --type sha256 $hash)" + + yq -iPoj '. + { "url": "$url", "hash": "$sriHash" }' "$tempfile" + } + + baseUrl="https://github.com/${repo}/releases/download/$latestTag/${releasePrefix}$latestVersion" + + ${if isCrossArch then + "updateSingle \${baseUrl}.zip" + else + lib.concatStringsSep "\n" (map (platform: ''updateSystem "${platform}" "''${baseUrl}-${systemMap.${platform}}.zip"'') meta.platforms) + } + + mv "$tempfile" "$dirname/data.json" + ''; +} otherArgs)) diff --git a/pkgs/development/tools/gauge/plugins/ruby/data.json b/pkgs/development/tools/gauge/plugins/ruby/data.json new file mode 100644 index 0000000000000..b7f827cfc5698 --- /dev/null +++ b/pkgs/development/tools/gauge/plugins/ruby/data.json @@ -0,0 +1,19 @@ +{ + "version": "0.8.0", + "aarch64-darwin": { + "url": "https://github.com/getgauge/gauge-ruby/releases/download/v0.8.0/gauge-ruby-0.8.0-darwin.arm64.zip", + "hash": "sha256-HQ7reuC7dQUMbhEzUBiEelPmFBsFJBHe42lmFufkZJY=" + }, + "x86_64-darwin": { + "url": "https://github.com/getgauge/gauge-ruby/releases/download/v0.8.0/gauge-ruby-0.8.0-darwin.x86_64.zip", + "hash": "sha256-poxT9wYgs21GRx/eVvD7jA1T0VBDEHgH0Zv941pZcKA=" + }, + "aarch64-linux": { + "url": "https://github.com/getgauge/gauge-ruby/releases/download/v0.8.0/gauge-ruby-0.8.0-linux.arm64.zip", + "hash": "sha256-SAEHPaWScux6C05jQBfDuLBN2J22Df9eKVM46kWawiU=" + }, + "x86_64-linux": { + "url": "https://github.com/getgauge/gauge-ruby/releases/download/v0.8.0/gauge-ruby-0.8.0-linux.x86_64.zip", + "hash": "sha256-aXLDK/7phdsX0CmIuxfK39mdrjGo2IpwYBL7uolP5Mk=" + } +} diff --git a/pkgs/development/tools/gauge/plugins/ruby/default.nix b/pkgs/development/tools/gauge/plugins/ruby/default.nix new file mode 100644 index 0000000000000..9a5283b649a14 --- /dev/null +++ b/pkgs/development/tools/gauge/plugins/ruby/default.nix @@ -0,0 +1,19 @@ +{ lib +, makeGaugePlugin +}: +makeGaugePlugin { + pname = "ruby"; + data = lib.importJSON ./data.json; + + repo = "getgauge/gauge-ruby"; + releasePrefix = "gauge-ruby-"; + + meta = { + description = "Gauge plugin that lets you write tests in Ruby"; + homepage = "https://github.com/getgauge/gauge-ruby/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ marie ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = [ "aarch64-darwin" "x86_64-darwin" "aarch64-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/gauge/plugins/screenshot/data.json b/pkgs/development/tools/gauge/plugins/screenshot/data.json new file mode 100644 index 0000000000000..c836d5a84a954 --- /dev/null +++ b/pkgs/development/tools/gauge/plugins/screenshot/data.json @@ -0,0 +1,19 @@ +{ + "version": "0.2.0", + "x86_64-darwin": { + "url": "https://github.com/getgauge/gauge_screenshot/releases/download/v0.2.0/screenshot-0.2.0-darwin.x86_64.zip", + "hash": "sha256-7bFuInEYAQ+fN12HTazQNfqpz5DAkYNCjUJbaj0DYb4=" + }, + "aarch64-darwin": { + "url": "https://github.com/getgauge/gauge_screenshot/releases/download/v0.2.0/screenshot-0.2.0-darwin.arm64.zip", + "hash": "sha256-Ly6iHBc2PfeFkKkZIkyD2JD5+EpFNL4SDjzG1oMpKfA=" + }, + "aarch64-linux": { + "url": "https://github.com/getgauge/gauge_screenshot/releases/download/v0.2.0/screenshot-0.2.0-linux.arm64.zip", + "hash": "sha256-Pzfnhs4H0MmeBIhrZElFmvC+PuabLNU/pftVdIu4+LI=" + }, + "x86_64-linux": { + "url": "https://github.com/getgauge/gauge_screenshot/releases/download/v0.2.0/screenshot-0.2.0-linux.x86_64.zip", + "hash": "sha256-Wpuq3aSgbIhd4WuJx4SMv+NbEZMVIpAOUMdKV2xxd7c=" + } +} diff --git a/pkgs/development/tools/gauge/plugins/screenshot/default.nix b/pkgs/development/tools/gauge/plugins/screenshot/default.nix new file mode 100644 index 0000000000000..a394338d7a641 --- /dev/null +++ b/pkgs/development/tools/gauge/plugins/screenshot/default.nix @@ -0,0 +1,19 @@ +{ lib +, makeGaugePlugin +}: +makeGaugePlugin { + pname = "screenshot"; + data = lib.importJSON ./data.json; + + repo = "getgauge/gauge_screenshot"; + releasePrefix = "screenshot-"; + + meta = { + description = "Gauge plugin to take screenshots"; + homepage = "https://github.com/getgauge/gauge_screenshot/"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ marie ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = [ "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/gauge/plugins/xml-report/data.json b/pkgs/development/tools/gauge/plugins/xml-report/data.json new file mode 100644 index 0000000000000..7b1fbf21b648a --- /dev/null +++ b/pkgs/development/tools/gauge/plugins/xml-report/data.json @@ -0,0 +1,19 @@ +{ + "version": "0.5.1", + "x86_64-darwin": { + "url": "https://github.com/getgauge/xml-report/releases/download/v0.5.1/xml-report-0.5.1-darwin.x86_64.zip", + "hash": "sha256-xLz9GFeXeZcLXa5P7DeiBljK3n7HKvsm/eJFEw5w+hU=" + }, + "aarch64-darwin": { + "url": "https://github.com/getgauge/xml-report/releases/download/v0.5.1/xml-report-0.5.1-darwin.arm64.zip", + "hash": "sha256-P8nqS22OibtAOpbn8G8WwfJ0vvAM/3IC6F0Nd/HfO5s=" + }, + "aarch64-linux": { + "url": "https://github.com/getgauge/xml-report/releases/download/v0.5.1/xml-report-0.5.1-linux.arm64.zip", + "hash": "sha256-ORMWXiahT8TAusqIPQSZm5t5r3p5jqLAKNghYw+tOYI=" + }, + "x86_64-linux": { + "url": "https://github.com/getgauge/xml-report/releases/download/v0.5.1/xml-report-0.5.1-linux.x86_64.zip", + "hash": "sha256-y0vpS09GlRKKPr7UwY+YAR8xwjQYnYf6TFkeT3SXwco=" + } +} diff --git a/pkgs/development/tools/gauge/plugins/xml-report/default.nix b/pkgs/development/tools/gauge/plugins/xml-report/default.nix new file mode 100644 index 0000000000000..0337ceca0605a --- /dev/null +++ b/pkgs/development/tools/gauge/plugins/xml-report/default.nix @@ -0,0 +1,19 @@ +{ lib +, makeGaugePlugin +}: +makeGaugePlugin { + pname = "xml-report"; + data = lib.importJSON ./data.json; + + repo = "getgauge/xml-report"; + releasePrefix = "xml-report-"; + + meta = { + description = "XML report generation plugin for Gauge"; + homepage = "https://github.com/getgauge/xml-report/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ marie ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + platforms = [ "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/gauge/wrapper.nix b/pkgs/development/tools/gauge/wrapper.nix new file mode 100644 index 0000000000000..67b1a8ddc52b1 --- /dev/null +++ b/pkgs/development/tools/gauge/wrapper.nix @@ -0,0 +1,59 @@ +{ gauge-unwrapped +, gauge +, makeWrapper +, stdenvNoCC +, lib +, xorg +, gaugePlugins +, plugins ? [] +}: + +stdenvNoCC.mkDerivation { + pname = "gauge-wrapped"; + inherit (gauge-unwrapped) version; + + dontUnpack = true; + + installPhase = '' + mkdir -p $out{bin,/share/gauge/{plugins,config}} + export NIX_GAUGE_IN_SANDBOX=true + export GAUGE_HOME=$(mktemp -d) + + # run gauge to create config files + cd $(mktemp -d) + gauge init js || true + + mkdir -p "$out/share/gauge/config" + mv "$GAUGE_HOME"/config/{gauge,template}.properties "$out/share/gauge/config" + + export GAUGE_HOME="$out/share/gauge" + + ${lib.concatMapStringsSep "\n" (plugin: '' + for plugin in "$(ls ${plugin}/share/gauge-plugins)"; do + echo Installing gauge plugin $plugin + mkdir -p "$GAUGE_HOME/plugins/$plugin" + # Use lndir here + # gauge checks for a directory, which fails if it's a symlink + # It's easier to link this with lndir, than patching an upstream dependency + lndir "${plugin}/share/gauge-plugins/$plugin" "$GAUGE_HOME/plugins/$plugin" + done + '') plugins} + + makeWrapper ${gauge-unwrapped}/bin/gauge $out/bin/gauge \ + --set GAUGE_HOME "$GAUGE_HOME" + ''; + + nativeBuildInputs = [ gauge-unwrapped makeWrapper xorg.lndir ]; + + passthru = { + withPlugins = f: gauge.override { plugins = f gaugePlugins; }; + fromManifest = path: + let + manifest = lib.importJSON path; + requiredPlugins = with manifest; [ Language ] ++ Plugins; + manifestPlugins = plugins: map (name: plugins.${name} or (throw "Gauge plugin ${name} is not available!")) requiredPlugins; + in gauge.withPlugins manifestPlugins; + }; + + inherit (gauge-unwrapped) meta; +} diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 6c3b1707a4056..0f15b8627ba5c 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -15,16 +15,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.14.1"; + version = "5.15.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-OqnV0ZpriiH69cTlmqPxorCgeO3x5h15e5Crn7DPwBM="; + hash = "sha256-V2+2fiQsU55Ig6GoxDJB0RCTh8nhuiGIYM3NeR4pU+k="; }; - cargoHash = "sha256-V5FP24Cz1umffFD1Am4/IG3c7zKpT7MdghLpKvDxZwA="; + cargoHash = "sha256-MPhG+YZ52fvv3+cKNebIkWwvruUsaRnOqPI1fs3osNI="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { # generate the man page postInstall = lib.optionalString (!isCross) '' # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v5.14.1/.github/workflows/publish.yml#L117-L121 + # https://github.com/latex-lsp/texlab/blob/v5.15.0/.github/workflows/publish.yml#L117-L121 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index 7e1d1d6305991..6d8c862ac6fac 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.15.1"; + version = "3.15.2"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - hash = "sha256-tbeKSgLU3QiUI02/cYv/R3/Nheff3/6OzgC5oM89VHs="; + hash = "sha256-+VmYBULKhZCbPz+Om+ZcK4o3XzpOO9g8etegfy4HeTM="; }; nativeBuildInputs = [ ocaml findlib ]; diff --git a/pkgs/games/shipwright/default.nix b/pkgs/games/shipwright/default.nix index e8b91a8141ace..397226fc4ba5c 100644 --- a/pkgs/games/shipwright/default.nix +++ b/pkgs/games/shipwright/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "shipwright"; - version = "8.0.4"; + version = "8.0.5"; src = fetchFromGitHub { owner = "harbourmasters"; repo = "shipwright"; rev = finalAttrs.version; - hash = "sha256-OoDToHCVNzccbKdsmek1kqCsW2HmVzA2vy3BtVW1DuM="; + hash = "sha256-o2VwOF46Iq4pwpumOau3bDXJ/CArx6NWBi00s3E4PnE="; fetchSubmodules = true; }; @@ -42,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/HarbourMasters/Shipwright/blob/e46c60a7a1396374e23f7a1f7122ddf9efcadff7/soh/CMakeLists.txt#L736 gamecontrollerdb = fetchurl { name = "gamecontrollerdb.txt"; - url = "https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/81d89fd1e2bd5878e57dfa629abeed3a8feea438/gamecontrollerdb.txt"; - hash = "sha256-m1XzDc2dS0hkBTEGABgW4J/jjIw1TXtvHHtsvui6Bcc="; + url = "https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/b7933e43ca2f8d26d8b668ea8ea52b736221af1e/gamecontrollerdb.txt"; + hash = "sha256-XIuS9BkWkM9d+SgT1OYTfWtcmzqSUDbMrMLoVnPgidE="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/rtl8852bu/default.nix b/pkgs/os-specific/linux/rtl8852bu/default.nix new file mode 100644 index 0000000000000..cc0f495b8122f --- /dev/null +++ b/pkgs/os-specific/linux/rtl8852bu/default.nix @@ -0,0 +1,51 @@ +{ lib, stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: + +stdenv.mkDerivation { + pname = "rtl8852bu"; + version = "${kernel.version}-unstable-2024-03-28"; + + src = fetchFromGitHub { + owner = "morrownr"; + repo = "rtl8852bu"; + rev = "f6aaa3c0094c541d9b0347926c76c1e9cc4a49d1"; + hash = "sha256-Jbd6nixo873LU74klhhQU1qD3ahxEnywdqcF89LTRxc="; + }; + + nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; + hardeningDisable = [ "pic" "format" ]; + + postPatch = '' + substituteInPlace ./Makefile \ + --replace-fail /sbin/depmod \# \ + --replace-fail '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + substituteInPlace ./platform/i386_pc.mk \ + --replace-fail /lib/modules "${kernel.dev}/lib/modules" + ''; + + makeFlags = [ + "ARCH=${stdenv.hostPlatform.linuxArch}" + ("CONFIG_PLATFORM_I386_PC=" + (if stdenv.hostPlatform.isx86 then "y" else "n")) + ("CONFIG_PLATFORM_ARM_RPI=" + (if stdenv.hostPlatform.isAarch then "y" else "n")) + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + ]; + + preInstall = '' + mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + mkdir -p "$out/usr/lib/systemd/system-sleep" + ''; + + postInstall = '' + nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko + ''; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Driver for Realtek rtl8852au and rtl8832bu chipsets, provides the 8852au mod"; + homepage = "https://github.com/morrownr/rtl8852bu"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ lonyelon ]; + }; +} diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 4981f5938de21..8beaffa75e384 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "bind"; - version = "9.18.25"; + version = "9.18.26"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-WkpwQyoz0Anw5unbsyiq56XidQfpjii/PAxrJQzLKrM="; + hash = "sha256-df/uUnMelgTISbZY3ynpJ/HE8B1aceo+vL62NwLLZlE="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d8da6b345eb46..186956baa9ff9 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1,8 +1,8 @@ -# Generated by parse-requirements.py +# Generated by update-component-packages.py # Do not edit! { - version = "2024.4.3"; + version = "2024.4.4"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -5945,6 +5945,7 @@ "airthings" "airthings_ble" "airtouch4" + "airtouch5" "airvisual" "airvisual_pro" "airzone" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e3bec47d25a80..3bd9616da23e8 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -525,8 +525,8 @@ let # Ensure that we are using a consistent package set extraBuildInputs = extraPackages python.pkgs; - # Don't forget to run parse-requirements.py after updating - hassVersion = "2024.4.3"; + # Don't forget to run update-component-packages.py after updating + hassVersion = "2024.4.4"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -544,13 +544,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-jHt4cWi1JxUs2XKf0N9gqsYj5XZK7TXwgj7WPZ7dmEA="; + hash = "sha256-bZcrFtaO0S22M6Wt2otK8rCg+NhpXr+/yRFxi02QJJI="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-sj3usdXUl/wNElO3OgGx6dsBqn9+h9zq/AC3Zdn379M="; + hash = "sha256-NyIBFpDstX1MEoLS9p7GXl/+V6xB2hklNf2LmNLUMQk="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index b7b1578033e25..744adc8b49739 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -1,33 +1,67 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder # build-system , setuptools + +# codegen +, hassil +, python +, pyyaml +, voluptuous +, regex +, jinja2 + +# tests +, pytest-xdist +, pytestCheckHook }: buildPythonPackage rec { pname = "home-assistant-intents"; version = "2024.4.3"; - format = "wheel"; + pyproject = true; disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit version format; - pname = "home_assistant_intents"; - dist = "py3"; - python = "py3"; - hash = "sha256-GraYVtioKIoKlPRBhhhzlbBfI6heXAaA1MQpUqAgEDQ="; + src = fetchFromGitHub { + owner = "home-assistant"; + repo = "intents-package"; + rev = "refs/tags/${version}"; + hash = "sha256-hcstD1qkngZAl/jKLez+4qDs/ZIandkVkY2jrvZqph8="; + fetchSubmodules = true; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools~=62.3" "setuptools" \ + --replace-fail "wheel~=0.37.1" "wheel" + ''; + build-system = [ setuptools + + # build-time codegen; https://github.com/home-assistant/intents/blob/main/requirements.txt#L1-L5 + hassil + pyyaml + voluptuous + regex + jinja2 ]; - # sdist/wheel do not ship tests - doCheck = false; + postInstall = '' + # https://github.com/home-assistant/intents-package/blob/main/script/package#L23-L24 + PACKAGE_DIR=$out/${python.sitePackages}/home_assistant_intents + ${python.pythonOnBuildForHost.interpreter} script/merged_output.py $PACKAGE_DIR/data + ${python.pythonOnBuildForHost.interpreter} script/write_languages.py $PACKAGE_DIR/data > $PACKAGE_DIR/languages.py + ''; + + nativeCheckInputs = [ + pytest-xdist + pytestCheckHook + ]; pytestFlagsArray = [ "intents/tests" diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index f8e4e49b13ff0..d31cf8104dbed 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.4.3"; + version = "2024.4.4"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-uFQQNcRfo4m3GnfCbAe4yjdphkpqnhpqVr1EZP3bqVM="; + hash = "sha256-BPmHorcyO6a7Ag7FQogkZYh2x3GoMRKiFh+9aSkjE7M="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/update-component-packages.py index 404120d062acb..10288f5e6d64f 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/update-component-packages.py @@ -268,7 +268,7 @@ def main() -> None: build_inputs[component] = (attr_paths, extra_attrs, missing_reqs) with open(os.path.dirname(sys.argv[0]) + "/component-packages.nix", "w") as f: - f.write("# Generated by parse-requirements.py\n") + f.write("# Generated by update-component-packages.py\n") f.write("# Do not edit!\n\n") f.write("{\n") f.write(f' version = "{version}";\n') diff --git a/pkgs/servers/home-assistant/update.py b/pkgs/servers/home-assistant/update.py index c9b9eb183890e..70eb77ce9a1cd 100755 --- a/pkgs/servers/home-assistant/update.py +++ b/pkgs/servers/home-assistant/update.py @@ -222,7 +222,7 @@ class HomeAssistant: async def update_components(self): await run_async([ - f"{ROOT}/pkgs/servers/home-assistant/parse-requirements.py" + f"{ROOT}/pkgs/servers/home-assistant/update-component-packages.py" ]) diff --git a/pkgs/servers/jellyseerr/package.json b/pkgs/servers/jellyseerr/package.json index 6892a3bd80858..39613efb5fad5 100644 --- a/pkgs/servers/jellyseerr/package.json +++ b/pkgs/servers/jellyseerr/package.json @@ -1,6 +1,6 @@ { "name": "jellyseerr", - "version": "1.7.0", + "version": "1.8.1", "private": true, "scripts": { "dev": "nodemon -e ts --watch server --watch overseerr-api.yml -e .json,.ts,.yml -x ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/index.ts", diff --git a/pkgs/servers/jellyseerr/pin.json b/pkgs/servers/jellyseerr/pin.json index 7905d006ee849..715f91a73b31c 100644 --- a/pkgs/servers/jellyseerr/pin.json +++ b/pkgs/servers/jellyseerr/pin.json @@ -1,5 +1,5 @@ { - "version": "1.7.0", - "srcHash": "sha256-9ILP2HH7p8ELwrQOBnqPbvHdUnNrqEkA4OmxOuhNbEc=", - "yarnSha256": "1ygb8pmwra570wmdkn7mxv9j90cgjh063b9cl0wl9hsmg687sk9h" + "version": "1.8.1", + "srcHash": "sha256-B8Hnpi4XwK0WrHRgj7OSVUh49oRH9SVEHdzGbnDa8p8=", + "yarnSha256": "ME19kHlVw0Q5oCytYQCUj4Ek0+712NkqB6eozOtF6/k=" } diff --git a/pkgs/tools/games/opentracker/default.nix b/pkgs/tools/games/opentracker/default.nix index 6bb5fc8ff207d..5bab19fa2ad97 100644 --- a/pkgs/tools/games/opentracker/default.nix +++ b/pkgs/tools/games/opentracker/default.nix @@ -3,7 +3,6 @@ stdenv, buildDotnetModule, fetchFromGitHub, - autoPatchelfHook, wrapGAppsHook, dotnetCorePackages, fontconfig, @@ -40,7 +39,6 @@ buildDotnetModule rec { ]; nativeBuildInputs = [ - autoPatchelfHook wrapGAppsHook ]; @@ -64,12 +62,6 @@ buildDotnetModule rec { libXi ]); - # Attempts to patchelf unneeded SOs - autoPatchelfIgnoreMissingDeps = [ - "libc.musl-x86_64.so.1" - "libintl.so.8" - ]; - meta = with lib; { description = "A tracking application for A Link to the Past Randomizer"; homepage = "https://github.com/trippsc2/OpenTracker"; diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index a966b11382aa8..efb77b89a64bf 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "argyllcms"; - version = "3.1.0"; + version = "3.2.0"; src = fetchzip { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a # while on me. It might be good to find a mirror url = "https://www.argyllcms.com/Argyll_V${version}_src.zip"; - hash = "sha256-IZScf+xpvvMt5YFlYQprg51cw2ztMdOrqcLm7l5uBhU="; + hash = "sha256-t2dvbYFHEz9IUYpcM5HqDju4ugHrD7seG3QxumspxDg="; }; nativeBuildInputs = [ jam unzip ]; diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 23f9692597a3a..4650db3e506d6 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchCrate, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "9.0.0"; + version = "9.1.1"; pname = "oxipng"; src = fetchCrate { inherit version pname; - hash = "sha256-1OpSweosYiqtLqCcAw1EsAtBAYVc/VH8kRtVSpmTytM="; + hash = "sha256-I+1yQQEzhGApvHxPM8W1wySQtDglGp3V4vkwoTd92EU="; }; - cargoHash = "sha256-kPdAfqMNOoQPSdv+VLRDUr6AXGPy47UnldXwvpwKp6s="; + cargoHash = "sha256-miXrQVFahz9WYRCduSF5+RSY4j/XNEt8lnSuOohBUFU="; doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index d0199bdbed4a0..95155aa6469a9 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -12,19 +12,19 @@ let zip-codes = fetchFromGitHub { owner = "musjj"; repo = "jp-zip-codes"; - rev = "a1eed9bae0ba909c8c8f5387008b08ff490f5e57"; - hash = "sha256-VfI8qAMPPCC2H4vjm4a6sAmSwc1YkXlMyLm1cnufvrU="; + rev = "119c888a38032a92e139c52cd26f45bb495c4d54"; + hash = "sha256-uyAL2TcFJsYZACFDAxIQ4LE40Hi4PVrQRnJl5O5+RmU="; }; in buildBazelPackage rec { pname = "ibus-mozc"; - version = "2.29.5268.102"; + version = "2.29.5374.102"; src = fetchFromGitHub { owner = "google"; repo = "mozc"; rev = version; - hash = "sha256-B7hG8OUaQ1jmmcOPApJlPVcB8h1Rw06W5LAzlTzI9rU="; + hash = "sha256-AcIN5sWPBe4JotAUYv1fytgQw+mJzdFhKuVPLR48soA="; fetchSubmodules = true; }; @@ -38,11 +38,11 @@ buildBazelPackage rec { inherit bazel; fetchAttrs = { - sha256 = "sha256-17QHh1MJUu8OK/T+WSpLXEx83DmRORLN7yLzILqP7vw="; + sha256 = "sha256-TJ5ksmGCZ8Vy3WmwqQQqQh+kYZvrBeGXc4zcOt1ZYI4="; - # remove references of buildInputs + # remove references of buildInputs and zip code files preInstall = '' - rm -rv $bazelOut/external/{ibus,qt_linux} + rm -rv $bazelOut/external/{ibus,qt_linux,zip_code_*} ''; }; diff --git a/pkgs/tools/misc/poweralertd/default.nix b/pkgs/tools/misc/poweralertd/default.nix index 677d85e18f090..c61f5af1b41d1 100644 --- a/pkgs/tools/misc/poweralertd/default.nix +++ b/pkgs/tools/misc/poweralertd/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "poweralertd"; - version = "0.2.0"; + version = "0.3.0"; outputs = [ "out" "man" ]; @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { owner = "~kennylevinsen"; repo = "poweralertd"; rev = version; - sha256 = "19rw9q4pcqw56nmzjfglfikzx5wwjl4n08awwdhg0jy1k0bm3dvp"; + hash = "sha256-WzqThv3Vu8R+g6Bn8EfesRk18rchCvw/UMPwbn9YC80="; }; postPatch = '' - substituteInPlace meson.build --replace "systemd.get_pkgconfig_variable('systemduserunitdir')" "'${placeholder "out"}/lib/systemd/user'" + substituteInPlace meson.build --replace-fail "systemd.get_pkgconfig_variable('systemduserunitdir')" "'${placeholder "out"}/lib/systemd/user'" ''; buildInputs = [ diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index 2c8f0d5521ba3..740bea469a393 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -3,21 +3,21 @@ , fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pv"; - version = "1.8.5"; + version = "1.8.9"; src = fetchurl { - url = "https://www.ivarch.com/programs/sources/pv-${version}.tar.gz"; - sha256 = "sha256-0ilI0GvgalvjczYxjeVAoiFb4QqwFj+M0jogFJZHt4A="; + url = "https://www.ivarch.com/programs/sources/pv-${finalAttrs.version}.tar.gz"; + sha256 = "sha256-oHidj4xaCPrzcLWgfR2Tau/5UEpPSdp21BZHl6xGBuY="; }; meta = { homepage = "https://www.ivarch.com/programs/pv.shtml"; description = "Tool for monitoring the progress of data through a pipeline"; - license = lib.licenses.artistic2; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ matthiasbeyer ]; platforms = lib.platforms.all; mainProgram = "pv"; }; -} +}) diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 60a086bbbedc0..8cf801da5712e 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2024.4"; + version = "2024.5"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-7gEHr0niDCjYaZAEB2tUuFVy5wIROCanHyL/HkbZkbw="; + hash = "sha256-lwgEOnV82/EHRem3owngq4ALcjIWj7V1J552JsNCrBw="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 98335cc895cf3..f718a59350a91 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -17,9 +17,7 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ - click colorama - kaptan libtmux ]; diff --git a/pkgs/tools/networking/mqttmultimeter/default.nix b/pkgs/tools/networking/mqttmultimeter/default.nix index e2d6f4e6fbd37..1c2c290bef787 100644 --- a/pkgs/tools/networking/mqttmultimeter/default.nix +++ b/pkgs/tools/networking/mqttmultimeter/default.nix @@ -4,7 +4,6 @@ , dotnet-runtime_8 , buildDotnetModule , fetchFromGitHub -, autoPatchelfHook , fontconfig , xorg , libglvnd @@ -12,9 +11,6 @@ , copyDesktopItems }: -# NOTES: -# 1. we need autoPatchelfHook for quite a number of things in $out/lib - buildDotnetModule rec { pname = "mqttmultimeter"; version = "1.8.2.272"; @@ -35,13 +31,11 @@ buildDotnetModule rec { executables = [ "mqttMultimeter" ]; nativeBuildInputs = [ - autoPatchelfHook copyDesktopItems ]; buildInputs = [ stdenv.cc.cc.lib fontconfig ]; - # don't care about musl and windows versions, as they fail autoPatchelfHook postInstall = '' rm -rf $out/lib/${lib.toLower pname}/runtimes/{*musl*,win*} ''; diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 50b1860535eb3..022ea754c7a49 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.0.2"; + version = "11.1.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-TSTOhfFNFwuF9kNf1q2HVcoxhKS1pKW4kSorSPyyeQU="; + hash = "sha256-fmvjjakKvsXBhXAfHp9+3X4vbgOPkBD9P9o6/UEdlGo="; }; proxyVendor = true; - vendorHash = "sha256-Uuz/ghtd/1ol1ugDI7pz5Fyv6U5PpOdcoerU/qx4MPA="; + vendorHash = "sha256-q31SCURhtAWqD8IsQXYHek6l7DbbTNKS6J//z3ckD3M="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index 2766a4e88ac27..8fb34dbbbcc23 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/pkgs/tools/security/cryptomator/default.nix @@ -33,6 +33,8 @@ mavenJdk.buildMavenPackage rec { # This is based on the instructins in https://github.com/cryptomator/cryptomator/blob/develop/dist/linux/appimage/build.sh installPhase = '' + runHook preInstall + mkdir -p $out/bin/ $out/share/cryptomator/libs/ $out/share/cryptomator/mods/ cp target/libs/* $out/share/cryptomator/libs/ @@ -70,9 +72,15 @@ mavenJdk.buildMavenPackage rec { cp ${src}/dist/linux/common/org.cryptomator.Cryptomator256.png $out/share/icons/hicolor/256x256/apps/org.cryptomator.Cryptomator.png cp ${src}/dist/linux/common/org.cryptomator.Cryptomator512.png $out/share/icons/hicolor/512x512/apps/org.cryptomator.Cryptomator.png cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.svg $out/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg + cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.tray-unlocked.svg $out/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.tray-unlocked.svg + cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.tray.svg $out/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.tray.svg + cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.tray-unlocked.svg $out/share/icons/hicolor/symbolic/apps/org.cryptomator.Cryptomator.tray-unlocked-symbolic.svg + cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.tray.svg $out/share/icons/hicolor/symbolic/apps/org.cryptomator.Cryptomator.tray-symbolic.svg cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.desktop $out/share/applications/org.cryptomator.Cryptomator.desktop cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml $out/share/metainfo/org.cryptomator.Cryptomator.metainfo.xml cp ${src}/dist/linux/common/application-vnd.cryptomator.vault.xml $out/share/mime/packages/application-vnd.cryptomator.vault.xml + + runHook postInstall ''; nativeBuildInputs = [ diff --git a/pkgs/tools/security/prs/default.nix b/pkgs/tools/security/prs/default.nix index cfab2229efeeb..39a629cb707c8 100644 --- a/pkgs/tools/security/prs/default.nix +++ b/pkgs/tools/security/prs/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "prs"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitLab { owner = "timvisee"; repo = "prs"; rev = "refs/tags/v${version}"; - hash = "sha256-9/XKz+yOCFEB1VI2EK0xF5ecyBPeGztpGPo/aXQ6v5E="; + hash = "sha256-MvQ0B35NF/AuGHBMa201FkFlU/UX0WXMcBRxTJwpUFw="; }; - cargoHash = "sha256-kxIgToqhJhUgJcxnGRGG6I+YqM2diFgQDyn1jBxWAw8="; + cargoHash = "sha256-YDcAjBIdUboOKvGSnGW6b1JVbhQaB3ccXcSmK78M7DI="; postPatch = '' # The GPGME backend is recommended diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 7771760dee6ed..4c5a536c882f4 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.73.0"; + version = "3.74.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-5tyjSwuhrtiAzvS5F8TyPCZhjSasTWQE9wcNGDevucE="; + hash = "sha256-smG27WHWGe15Q0XIjeK4C45mEvJuYqsUf0SsaMyYGzs="; }; - vendorHash = "sha256-eK4YwNkBvC7VW5Cn6/M4clN83LGRNuw5jpjtnM0B9g8="; + vendorHash = "sha256-FOFrFmILeONJyKGZ7I+sWd8Di0Ni6P5/buA5QbR41A4="; proxyVendor = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5fd7bf1f4587..d86301632c8b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -428,8 +428,6 @@ with pkgs; catatonit = callPackage ../applications/virtualization/catatonit { }; - catppuccin = callPackage ../data/themes/catppuccin { }; - catppuccin-catwalk = callPackage ../development/tools/misc/catppuccin-catwalk { }; catppuccin-gtk = callPackage ../data/themes/catppuccin-gtk { }; @@ -442,8 +440,6 @@ with pkgs; catppuccin-plymouth = callPackage ../data/themes/catppuccin-plymouth { }; - catppuccin-sddm-corners = callPackage ../data/themes/catppuccin-sddm-corners { }; - btdu = callPackage ../tools/misc/btdu { }; ccal = callPackage ../tools/misc/ccal { }; @@ -1777,10 +1773,6 @@ with pkgs; dysk = callPackage ../tools/filesystems/dysk { }; - fastfetch = callPackage ../tools/misc/fastfetch { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; - }; - fscan = callPackage ../tools/security/fscan { }; copier = callPackage ../tools/misc/copier { }; @@ -3555,8 +3547,6 @@ with pkgs; boulder = callPackage ../tools/admin/boulder { }; - btrfs-assistant = qt6.callPackage ../tools/misc/btrfs-assistant { }; - btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { }; bucklespring = bucklespring-x11; @@ -3723,8 +3713,6 @@ with pkgs; dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { }; - dooit = callPackage ../tools/misc/dooit { }; - doona = callPackage ../tools/security/doona { }; dotter = callPackage ../tools/misc/dotter { @@ -8338,7 +8326,9 @@ with pkgs; gau = callPackage ../tools/security/gau { }; - gauge = callPackage ../development/tools/gauge { }; + gauge-unwrapped = callPackage ../development/tools/gauge { }; + gauge = callPackage ../development/tools/gauge/wrapper.nix { }; + gaugePlugins = recurseIntoAttrs (callPackage ../development/tools/gauge/plugins {}); gawd = python3Packages.toPythonApplication python3Packages.gawd; @@ -13093,8 +13083,6 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AppKit Carbon CoreAudio CoreWLAN CoreVideo DisplayServices IOKit MediaRemote SkyLight; }; - sketchybar-app-font = callPackage ../data/fonts/sketchybar-app-font { }; - skippy-xd = callPackage ../tools/X11/skippy-xd { }; sks = callPackage ../servers/sks { @@ -17338,7 +17326,7 @@ with pkgs; }; inherit (beam.interpreters) - erlang erlang_27-rc2 erlang_26 erlang_25 erlang_24 + erlang erlang_27-rc3 erlang_26 erlang_25 erlang_24 erlang_odbc erlang_javac erlang_odbc_javac elixir elixir_1_16 elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir-ls; @@ -31962,8 +31950,6 @@ with pkgs; rootbar = callPackage ../applications/misc/rootbar { }; - waybar = callPackage ../applications/misc/waybar { }; - waycorner = callPackage ../applications/misc/waycorner { }; waylock = callPackage ../applications/misc/waylock { }; @@ -41300,8 +41286,6 @@ with pkgs; sirikali = libsForQt5.callPackage ../tools/security/sirikali { }; - wttrbar = callPackage ../applications/misc/wttrbar { }; - wpm = callPackage ../applications/misc/wpm { }; weggli = callPackage ../tools/security/weggli { }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 8dbc9e1c07087..24b162ec577ff 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -41,7 +41,7 @@ in # Standard Erlang versions, using the generic builder. - erlang_27-rc2 = self.beamLib.callErlang ../development/interpreters/erlang/27-rc2.nix { + erlang_27-rc3 = self.beamLib.callErlang ../development/interpreters/erlang/27-rc3.nix { wxGTK = wxGTK32; parallelBuild = true; autoconf = buildPackages.autoconf269; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 33ef16e22c8f9..91a8c2f539267 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -443,6 +443,8 @@ in { rtl8852au = callPackage ../os-specific/linux/rtl8852au { }; + rtl8852bu = callPackage ../os-specific/linux/rtl8852bu { }; + rtl88xxau-aircrack = callPackage ../os-specific/linux/rtl88xxau-aircrack {}; rtl8821au = callPackage ../os-specific/linux/rtl8821au { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b4753e4d1853..b5d0287f4d5f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2700,6 +2700,8 @@ self: super: with self; { dask-awkward = callPackage ../development/python-modules/dask-awkward { }; + dask-expr = callPackage ../development/python-modules/dask-expr { }; + dask-gateway = callPackage ../development/python-modules/dask-gateway { }; dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { }; @@ -8532,6 +8534,8 @@ self: super: with self; { nampa = callPackage ../development/python-modules/nampa { }; + nanobind = callPackage ../development/python-modules/nanobind { }; + nanoid = callPackage ../development/python-modules/nanoid { }; nanoleaf = callPackage ../development/python-modules/nanoleaf { }; @@ -16350,8 +16354,6 @@ self: super: with self; { unique-log-filter = callPackage ../development/python-modules/unique-log-filter { }; - units = callPackage ../development/python-modules/units { }; - unittest-data-provider = callPackage ../development/python-modules/unittest-data-provider { }; unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { }; |