diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bb21521c1970..b0c4e245e52c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2623,6 +2623,12 @@ fingerprint = "F549 3B7F 9372 5578 FDD3 D0B8 A1BC 8428 323E CFE8"; }]; }; + br337 = { + email = "brian.porumb@proton.me"; + github = "br337"; + githubId = 49288125; + name = "Brian Porumb"; + }; bradediger = { email = "brad@bradediger.com"; github = "bradediger"; @@ -11038,9 +11044,6 @@ github = "Ma27"; githubId = 6025220; name = "Maximilian Bosch"; - keys = [{ - fingerprint = "62B9 9C26 F046 721E 26B0 04F6 D006 A998 C6AB FDF1"; - }]; }; ma9e = { email = "sean@lfo.team"; diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index f7dfc0a058cf..63a491e27a69 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -73,7 +73,7 @@ with lib; qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; }; qrencode = super.qrencode.overrideAttrs (_: { doCheck = false; }); qt5 = super.qt5.overrideScope (const (super': { - qtbase = super'.qtbase.override { withGtk3 = false; }; + qtbase = super'.qtbase.override { withGtk3 = false; withQttranslation = false; }; })); stoken = super.stoken.override { withGTK3 = false; }; # translateManpages -> perlPackages.po4a -> texlive-combined-basic -> texlive-core-big -> libX11 diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix index 146e968780c3..b7945282ba09 100644 --- a/nixos/modules/services/video/frigate.nix +++ b/nixos/modules/services/video/frigate.nix @@ -353,6 +353,7 @@ in ]; serviceConfig = { ExecStart = "${cfg.package.python.interpreter} -m frigate"; + Restart = "on-failure"; User = "frigate"; Group = "frigate"; diff --git a/pkgs/applications/audio/airwindows-lv2/default.nix b/pkgs/applications/audio/airwindows-lv2/default.nix index 5e87c50a3147..a5a8965eee40 100644 --- a/pkgs/applications/audio/airwindows-lv2/default.nix +++ b/pkgs/applications/audio/airwindows-lv2/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "airwindows-lv2"; - version = "26.0"; + version = "26.2"; src = fetchFromSourcehut { owner = "~hannes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CmNe70ii3WfQ6GGHVqTEyQ2HVubzoeoeN3JsCZSbsPM="; + sha256 = "sha256-GpfglGC7zD275lm9OsBmqDC90E/vVUqslm7HjPgm74M="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index fc456f65bab1..4c514f3396dc 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "texstudio"; - version = "4.7.1"; + version = "4.7.2"; src = fetchFromGitHub { owner = "texstudio-org"; repo = "texstudio"; rev = finalAttrs.version; - hash = "sha256-Qpt1CiQ+vG7uT8rpuWgYdjug2iigXQDKHIhrquSny6I="; + hash = "sha256-Q4/aoLIxFssti3Dto1JwRRAQ+D3DHlH9JgDrHBVKg4M="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/wallust/default.nix b/pkgs/applications/misc/wallust/default.nix index c88dab646c74..1cd1184a2345 100644 --- a/pkgs/applications/misc/wallust/default.nix +++ b/pkgs/applications/misc/wallust/default.nix @@ -4,7 +4,7 @@ , nix-update-script }: let - version = "2.8.0"; + version = "2.9.0"; in rustPlatform.buildRustPackage { pname = "wallust"; @@ -15,14 +15,10 @@ rustPlatform.buildRustPackage { owner = "explosion-mental"; repo = "wallust"; rev = version; - hash = "sha256-qX+pU/ovRV7dA35qSA724vV9azz7dMbEyMVBzqS47Ps="; + hash = "sha256-AuZRt02bFr7GzI7qe4giGgjlXK/WX+gmF4+QwD0ChXk="; }; - cargoHash = "sha256-PAO7qxaKrRKYoC5RElNCylqRzOgvzPyxb6tTzW4jNi4="; - - # temporarily skip tests for args due to a string formatting conflict - # https://codeberg.org/explosion-mental/wallust/issues/30 - cargoTestFlags = [ "--test config" "--test cache" "--test template" ]; + cargoHash = "sha256-O9w18ae83mgF3zjk0WUMeu16Ap7CF2ubuPnOqeCt4Nw="; passthru.updateScript = nix-update-script { }; @@ -32,7 +28,6 @@ rustPlatform.buildRustPackage { license = lib.licenses.mit; maintainers = with lib.maintainers; [ onemoresuza iynaix ]; downloadPage = "https://codeberg.org/explosion-mental/wallust/releases/tag/${version}"; - platforms = lib.platforms.unix; mainProgram = "wallust"; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index d7cf9a2d2c1e..7ec8d5686c3c 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -80,14 +80,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "4.12.2"; + version = "4.13.1"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-jIOJ7iFF2SMZOBTVzc0ECEZrkXPY060jk3fxt7kIWSg="; + hash = "sha256-WhctvEmOGOxkVQUC84BcC4Td5GUEpY7dOG5La6lTv8E="; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index 1964925924cd..b9059e17bc26 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2023-11-17"; + version = "unstable-2023-12-21"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "76a3513d7f25d6623d92463fbe6470d9001b66a8"; - sha256 = "sha256-nubFELIHxn9yQiFGDqcYtVN9rjXizzkiV07ypWY9v48="; + rev = "afd9d5d31798d3eacf9ed6c30601e91d0f1e4d60"; + sha256 = "sha256-/1cghoxmm+6uFEUgCjh1Xhb0CTnd1XAq1M21FruDRek="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/logic/cvc5/default.nix b/pkgs/applications/science/logic/cvc5/default.nix index 7c483ec185c7..146381961e5c 100644 --- a/pkgs/applications/science/logic/cvc5/default.nix +++ b/pkgs/applications/science/logic/cvc5/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cvc5"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "cvc5"; repo = "cvc5"; rev = "cvc5-${version}"; - hash = "sha256-2sJKHD7Wzznut4hKOyxgc4LR4H+4u3m8Gq02+v+m5lM="; + hash = "sha256-AwUQHFftn51Xt6HtmDsWAdkOS8i64r2FhaHu31KYwZA="; }; nativeBuildInputs = [ pkg-config cmake flex ]; diff --git a/pkgs/applications/science/logic/lean4/default.nix b/pkgs/applications/science/logic/lean4/default.nix index 26f5dd2911eb..092489f84456 100644 --- a/pkgs/applications/science/logic/lean4/default.nix +++ b/pkgs/applications/science/logic/lean4/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_GITHASH=OFF" + "-DINSTALL_LICENSE=OFF" ]; # Work around https://github.com/NixOS/nixpkgs/issues/166205. diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index 0f1ec9fca288..a70c8bd62691 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.14.4"; + version = "0.15.1"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-TEuQ6Ng9DO2ueIvZkXKIE/gQ/v1wSyzQQRFT2Srxuxo="; + hash = "sha256-eoi0kZunU0Jvy5TGK1Whkluk06k6fnsL54dSRXQu1TM="; }; - cargoHash = "sha256-zg2N8yw9qviHd4EVzGakFpBzkKyzVfM/8FRXu24zL64="; + cargoHash = "sha256-xXOO3mOrAFhJuU3Zrpgys36q1sDikigDv4Ch8T8OVxY="; # Work around https://github.com/NixOS/nixpkgs/issues/166205. env = lib.optionalAttrs stdenv.cc.isClang { diff --git a/pkgs/by-name/co/corrupter/package.nix b/pkgs/by-name/co/corrupter/package.nix new file mode 100644 index 000000000000..9e6f33902356 --- /dev/null +++ b/pkgs/by-name/co/corrupter/package.nix @@ -0,0 +1,33 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +}: + +buildGoModule { + pname = "corrupter"; + version = "1.0-unstable-2023-01-11"; + + src = fetchFromGitHub { + owner = "r00tman"; + repo = "corrupter"; + # https://github.com/r00tman/corrupter/issues/15 + rev = "d7aecbb8b622a2c6fafe7baea5f718b46155be15"; + hash = "sha256-GEia3wZqI/j7/dpBbL1SQLkOXZqEwanKGM4wY9nLIqE="; + }; + + vendorHash = null; + + # There are no tests available for this package. + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Simple image glitcher suitable for producing lockscreens"; + homepage = "https://github.com/r00tman/corrupter"; + license = licenses.bsd2; + maintainers = [ maintainers.ivan770 ]; + mainProgram = "corrupter"; + }; +} diff --git a/pkgs/by-name/fl/flarectl/package.nix b/pkgs/by-name/fl/flarectl/package.nix index 8e6dcb2953ef..eaf6e0b6d78b 100644 --- a/pkgs/by-name/fl/flarectl/package.nix +++ b/pkgs/by-name/fl/flarectl/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "flarectl"; - version = "0.83.0"; + version = "0.84.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflare-go"; rev = "v${version}"; - hash = "sha256-TPUHSoot+Hsq71KcNXuJn5sHRuDn3J1FB3r/29Ce9/c="; + hash = "sha256-RHt5Hu3N7gJIg7daylBSr9p7Hb9eQQUK2CfC6q/pblM="; }; vendorHash = "sha256-XziR/ZB0kva/sl2Tj+m0pdK5HxLW6osBXD00+m/y0cQ="; diff --git a/pkgs/by-name/gl/glide-media-player/package.nix b/pkgs/by-name/gl/glide-media-player/package.nix new file mode 100644 index 000000000000..dc2475c768d6 --- /dev/null +++ b/pkgs/by-name/gl/glide-media-player/package.nix @@ -0,0 +1,84 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, meson +, ninja +, rustc +, cargo +, wrapGAppsHook4 +, python3 +, libadwaita +, graphene +, gst_all_1 +, glib-networking +, darwin +, libsoup_3 +}: + +stdenv.mkDerivation rec { + pname = "glide-media-player"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "philn"; + repo = "glide"; + rev = version; + hash = "sha256-dIXuWaoTeyVBhzr6VWxYBsn+CnUYG/KzhzNJtLLdRuI="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-azvxW40fuKuF/N0qwzofFk1bZiNxyTN6YBFU5qHQkCA="; + }; + + postPatch = '' + substituteInPlace scripts/meson_post_install.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" + patchShebangs --build scripts/meson_post_install.py + '' + lib.optionalString stdenv.isDarwin '' + sed -i "/wayland,x11egl,x11glx/d" meson.build + ''; + + nativeBuildInputs = [ + pkg-config + meson + ninja + rustPlatform.cargoSetupHook + rustc + cargo + wrapGAppsHook4 + python3 + ]; + + buildInputs = [ + libadwaita + graphene + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-good + glib-networking + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.IOKit + ]; + + # FIXME: gst-plugins-good missing libsoup breaks streaming + # (https://github.com/nixos/nixpkgs/issues/271960) + preFixup = '' + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsoup_3 ]}") + ''; + + meta = with lib; { + description = "Linux/macOS media player based on GStreamer and GTK"; + homepage = "https://philn.github.io/glide"; + license = licenses.mit; + maintainers = with maintainers; [ aleksana ]; + mainProgram = "glide"; + platforms = platforms.unix; + # error: could not find system library 'gstreamer-gl-1.0' required by the 'gstreamer-gl-sys' crate + broken = stdenv.isDarwin && stdenv.isx86_64; + }; +} diff --git a/pkgs/by-name/kd/kdsingleapplication/package.nix b/pkgs/by-name/kd/kdsingleapplication/package.nix index 22522dd6dc97..7994435b6a60 100644 --- a/pkgs/by-name/kd/kdsingleapplication/package.nix +++ b/pkgs/by-name/kd/kdsingleapplication/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "KDSingleApplication"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "KDAB"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5YprRbfiFI2UGMJqDf+3VDwXV904USEpMEpoNm0g7KY="; + hash = "sha256-Ymm+qOZMWULg7u5xEpGzcAfIrbWBQ3jsndnFSnh6/PA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/mu/multirun/package.nix b/pkgs/by-name/mu/multirun/package.nix new file mode 100644 index 000000000000..4f59a8bd7328 --- /dev/null +++ b/pkgs/by-name/mu/multirun/package.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "multirun"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "nicolas-van"; + repo = "multirun"; + rev = version; + hash = "sha256-I95nxZD65tHiok4MzsGG7gyaxPHbqQLuRWdHUPNhLu8="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + description = "A minimalist init process designed for Docker"; + homepage = "https://github.com/nicolas-van/multirun"; + license = licenses.mit; + maintainers = with maintainers; [ nickcao ]; + mainProgram = "multirun"; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/nl/nlohmann_json_schema_validator/package.nix b/pkgs/by-name/nl/nlohmann_json_schema_validator/package.nix new file mode 100644 index 000000000000..a6317b1f7b28 --- /dev/null +++ b/pkgs/by-name/nl/nlohmann_json_schema_validator/package.nix @@ -0,0 +1,30 @@ +{ stdenv +, lib +, fetchFromGitHub +, nlohmann_json +, cmake +}: +stdenv.mkDerivation (finalAttrs: { + pname = "nlohmann_json_schema_validator"; + version = "2.3.0"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "pboettch"; + repo = "json-schema-validator"; + rev = finalAttrs.version; + hash = "sha256-Ybr5dNmjBBPTYPvgorJ6t2+zvAjxYQISWXJmgUVHBVE="; + }; + + buildInputs = [ nlohmann_json ]; + nativeBuildInputs = [ cmake ]; + + meta = { + description = "JSON schema validator for JSON for Modern C++"; + homepage = "https://github.com/pboettch/json-schema-validator"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ br337 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/qu/quickjs-ng/package.nix b/pkgs/by-name/qu/quickjs-ng/package.nix new file mode 100644 index 000000000000..13e728b4b66b --- /dev/null +++ b/pkgs/by-name/qu/quickjs-ng/package.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, cmake +, fetchFromGitHub +, testers +, texinfo +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "quickjs-ng"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "quickjs-ng"; + repo = "quickjs"; + rev = "v${finalAttrs.version}"; + hash = "sha256-4nFc9xdxrfRWeOY9VNQAI4Ph7G1GMnw06XZiO6xA72o="; + }; + + outputs = [ "bin" "out" "dev" "doc" "info" ]; + + nativeBuildInputs = [ + cmake + texinfo + ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + (lib.cmakeBool "BUILD_STATIC_QJS_EXE" stdenv.hostPlatform.isStatic) + ]; + + postInstall = '' + (cd ../doc + makeinfo --output quickjs.info quickjs.texi + install -Dt $info/share/info/ quickjs.info) + ''; + + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "qjs --help || true"; + }; + }; + + meta = with lib; { + description = "A mighty JavaScript engine"; + homepage = "https://github.com/quickjs-ng/quickjs"; + license = licenses.mit; + maintainers = with maintainers; [ marsam ]; + platforms = platforms.all; + mainProgram = "qjs"; + }; +}) diff --git a/pkgs/by-name/sc/scalingo/package.nix b/pkgs/by-name/sc/scalingo/package.nix index 3b5682846987..91139a255a16 100644 --- a/pkgs/by-name/sc/scalingo/package.nix +++ b/pkgs/by-name/sc/scalingo/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "scalingo"; - version = "1.29.1"; + version = "1.30.0"; src = fetchFromGitHub { owner = pname; repo = "cli"; rev = version; - hash = "sha256-xBf+LIwlpauJd/0xJIQdfEa0rxph3BJPuMY4+0s+Bb4="; + hash = "sha256-vgkVxQK18RBIhhL9gyuH9kmCueJFDZByhy0FE4JuVO8="; }; vendorHash = null; diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix new file mode 100644 index 000000000000..8a3ebbb12bd1 --- /dev/null +++ b/pkgs/by-name/ti/tigerbeetle/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, zig_0_11 +, testers +, tigerbeetle +, nix-update-script +}: +stdenv.mkDerivation (finalAttrs: { + pname = "tigerbeetle"; + version = "0.14.171"; + + src = fetchFromGitHub { + owner = "tigerbeetle"; + repo = "tigerbeetle"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-MjsNQarRXsrWKJZ2aBi/Wc2HAYm3isLBNw81a75+nhc="; + }; + + nativeBuildInputs = [ zig_0_11.hook ]; + + zigBuildFlags = [ + "-Dgit-commit=0000000000000000000000000000000000000000" + "-Dversion=${finalAttrs.version}" + ]; + + passthru = { + tests.version = testers.testVersion { + package = tigerbeetle; + command = "tigerbeetle version"; + }; + updateScript = nix-update-script { }; + }; + + meta = { + homepage = "https://tigerbeetle.com/"; + description = "A financial accounting database designed to be distributed and fast"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ danielsidhion ]; + platforms = lib.platforms.unix; + mainProgram = "tigerbeetle"; + }; +}) diff --git a/pkgs/development/compilers/fbc/default.nix b/pkgs/development/compilers/fbc/default.nix index 8609c841b22a..631bf9c7bfe0 100644 --- a/pkgs/development/compilers/fbc/default.nix +++ b/pkgs/development/compilers/fbc/default.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { pname = "fbc"; - version = "1.10.0"; + version = "1.10.1"; src = fetchzip { # Bootstrap tarball has sources pretranslated from FreeBASIC to C url = "https://github.com/freebasic/fbc/releases/download/${version}/FreeBASIC-${version}-source-bootstrap.tar.xz"; - hash = "sha256-7FmyEfykOAgHaL2AG8zIgftzOszhwVzNKEqskiLGpfk="; + hash = "sha256-LBROv3m1DrEfSStMbNuLC+fldYNfSS+D09bJyNMNPP0="; }; postPatch = '' diff --git a/pkgs/development/libraries/fastcdr/default.nix b/pkgs/development/libraries/fastcdr/default.nix index 19998799a6fb..7d5288753cf0 100644 --- a/pkgs/development/libraries/fastcdr/default.nix +++ b/pkgs/development/libraries/fastcdr/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastcdr"; - version = "1.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "eProsima"; repo = "Fast-CDR"; rev = "v${finalAttrs.version}"; - hash = "sha256-ZJQnm3JN56y2v/XIShfZxkEEu1AKMJxt8wpRqSn9HWk="; + hash = "sha256-rdRn/vRcZuej7buyb1K6f+9A4oLSodNw3pwefjsUXHA="; }; patches = [ diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix index b924dc5e3907..dbee4c9a3582 100644 --- a/pkgs/development/libraries/libkrun/default.nix +++ b/pkgs/development/libraries/libkrun/default.nix @@ -1,62 +1,53 @@ { lib , stdenv , fetchFromGitHub -, fetchurl , rustPlatform , cargo , pkg-config -, dtc , glibc , openssl -, libiconv , libkrunfw , rustc -, Hypervisor , sevVariant ? false }: stdenv.mkDerivation rec { pname = "libkrun"; - version = "1.5.1"; + version = "1.7.2"; - src = if stdenv.isLinux then fetchFromGitHub { + src = fetchFromGitHub { owner = "containers"; - repo = pname; - rev = "v${version}"; - hash = "sha256-N9AkG+zkjQHNaaCVrEpMfWUN9bQNHjMA2xi5NUulF5A="; - } else fetchurl { - url = "https://github.com/containers/libkrun/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz"; - hash = "sha256-8hPbnZtDbiVdwBrtxt4nZ/QA2OFtui2VsQlaoOmWybo="; + repo = "libkrun"; + rev = "refs/tags/v${version}"; + hash = "sha256-cP+Pxl/9QIsoGysXTBZJ86q57cIMA7TJenMWtcOI+Y4="; }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - hash = "sha256-nbtp7FP+ObVGfDOEzTt4Z7TZwcNlREczTKIAXGSflZU="; + inherit pname version src; + hash = "sha256-qVyHC015QJEt6LZ8br3H0nucYKhYGBMtyB2IBaixTqk="; }; nativeBuildInputs = [ rustPlatform.cargoSetupHook cargo rustc - ] ++ lib.optional sevVariant pkg-config; + ] ++ lib.optionals sevVariant [ + pkg-config + ]; buildInputs = [ (libkrunfw.override { inherit sevVariant; }) - ] ++ lib.optionals stdenv.isLinux [ glibc glibc.static - ] ++ lib.optionals stdenv.isDarwin [ - libiconv - Hypervisor - dtc - ] ++ lib.optional sevVariant openssl; + ] ++ lib.optionals sevVariant [ + openssl + ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ] - ++ lib.optional sevVariant "SEV=1"; - - postFixup = lib.optionalString stdenv.isDarwin '' - install_name_tool -id $out/lib/libkrun.dylib $out/lib/libkrun.${version}.dylib - ''; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ] ++ lib.optionals sevVariant [ + "SEV=1" + ]; meta = with lib; { description = "A dynamic library providing Virtualization-based process isolation capabilities"; @@ -64,6 +55,5 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ nickcao ]; platforms = libkrunfw.meta.platforms; - sourceProvenance = with sourceTypes; lib.optionals stdenv.isDarwin [ binaryNativeCode ]; }; } diff --git a/pkgs/development/libraries/libkrunfw/default.nix b/pkgs/development/libraries/libkrunfw/default.nix index 3b4bf0855d0f..f4f67db652ca 100644 --- a/pkgs/development/libraries/libkrunfw/default.nix +++ b/pkgs/development/libraries/libkrunfw/default.nix @@ -10,39 +10,44 @@ , sevVariant ? false }: -assert sevVariant -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "libkrunfw"; - version = "3.11.0"; + version = "4.0.0"; - src = if stdenv.isLinux then fetchFromGitHub { + src = fetchFromGitHub { owner = "containers"; - repo = pname; - rev = "v${version}"; - hash = "sha256-p5z3Dc7o/Ja3K0VlOWIPc0qOIU5p+JSxWe7QiVQNkjs="; - } else fetchurl { - url = "https://github.com/containers/libkrunfw/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz"; - hash = "sha256-XcdsK8L5NwMgelSMhE2YKYxaAin/3p/+GrljGGZpK5Y="; + repo = "libkrunfw"; + rev = "refs/tags/v${version}"; + hash = "sha256-9oVl4mlJE7QHeehG86pbh7KdShZNUGwlnO75k/F/PQ0="; }; kernelSrc = fetchurl { - url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.9.tar.xz"; - hash = "sha256-kDRJwWTAPw50KqzJIOGFY1heB6KMbLeeD9bDZpX9Q/U="; + url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.4.7.tar.xz"; + hash = "sha256-3hQ8th3Kp1bAX1b/NRRDFtgQYVgZUYoz40dU8GTEp9g="; }; - preBuild = '' + postPatch = '' substituteInPlace Makefile \ - --replace 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s $(kernelSrc) $(KERNEL_TARBALL)' \ - --replace 'gcc' '$(CC)' + --replace 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s $(kernelSrc) $(KERNEL_TARBALL)' ''; - nativeBuildInputs = [ flex bison bc python3 python3.pkgs.pyelftools ]; - buildInputs = lib.optionals stdenv.isLinux [ elfutils ]; + nativeBuildInputs = [ + flex + bison + bc + python3 + python3.pkgs.pyelftools + ]; + + buildInputs = [ + elfutils + ]; makeFlags = [ "PREFIX=${placeholder "out"}" - "SONAME_Darwin=-Wl,-install_name,${placeholder "out"}/lib/libkrunfw.dylib" - ] ++ lib.optional sevVariant "SEV=1"; + ] ++ lib.optionals sevVariant [ + "SEV=1" + ]; enableParallelBuilding = true; @@ -51,7 +56,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/containers/libkrunfw"; license = with licenses; [ lgpl2Only lgpl21Only ]; maintainers = with maintainers; [ nickcao ]; - platforms = [ "x86_64-linux" "aarch64-darwin" ]; - sourceProvenance = with sourceTypes; lib.optionals stdenv.isDarwin [ binaryNativeCode ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index b98f5066dae5..8d5a7d9aebd2 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -62,6 +62,8 @@ stdenv.mkDerivation rec { preConfigure = '' # use empty inc file instead of a from linux kernel generated one touch lib/lirc/input_map.inc + + export PKGCONFIG="$PKG_CONFIG" ''; strictDeps = true; diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 5d0ffee503b8..fa5cb97b214f 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -68,7 +68,7 @@ , mysofaSupport ? true , libmysofa , tinycompress -, ffadoSupport ? stdenv.buildPlatform.canExecute stdenv.hostPlatform +, ffadoSupport ? x11Support && stdenv.buildPlatform.canExecute stdenv.hostPlatform , ffado , libselinux }: diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 67e9bd5440d1..594489a0d750 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -15,7 +15,7 @@ # optional dependencies , cups ? null, postgresql ? null , withGtk3 ? false, dconf, gtk3 -, qttranslations ? null +, withQttranslation ? true, qttranslations ? null # options , libGLSupported ? !stdenv.isDarwin @@ -351,7 +351,8 @@ stdenv.mkDerivation (finalAttrs: ({ ] ++ lib.optionals (mysqlSupport) [ "-L" "${libmysqlclient}/lib" "-I" "${libmysqlclient}/include" - ] ++ lib.optional (qttranslations != null) [ + ] ++ lib.optional (withQttranslation && (qttranslations != null)) [ + # depends on x11 "-translationdir" "${qttranslations}/translations" ] ); diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index 2d83211ac0d6..dd35961d085f 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "zchunk"; repo = pname; rev = version; - hash = "sha256-wmbnkxJHFyqntULxzXF16lt+TfwywLdZamQXvcfSFVM="; + hash = "sha256-GiZM8Jh+v0US8xr90rySY0Ud3eAAl8UqLi162zDR3qw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index a068d26695e5..d761a26e7a73 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "irc"; - version = "20.3.0"; + version = "20.3.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-JFteqYqwAlZnYx53alXjGRfmDvcIxgEC8hmLyfURMjY="; + hash = "sha256-gGuDr4lNixIe0eFIZqkGQBKFiN5swElcTsssXsJyKAs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pywerview/default.nix b/pkgs/development/python-modules/pywerview/default.nix index ac637d4501a8..a7e7976a1019 100644 --- a/pkgs/development/python-modules/pywerview/default.nix +++ b/pkgs/development/python-modules/pywerview/default.nix @@ -9,22 +9,27 @@ , pyasn1 , pycryptodome , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pywerview"; - version = "0.5.2"; - format = "setuptools"; + version = "0.6"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "the-useless-one"; - repo = pname; + repo ="pywerview"; rev = "refs/tags/v${version}"; - hash = "sha256-BWH9zYrlbzQC0/cc5k5BlXWyh38gI+hwwTCWhe1xgog="; + hash = "sha256-WZE6qWq9v4A78YELMEcbgyufBRrVFRTqlhGmknpKn1Y="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ beautifulsoup4 gssapi diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 8e13e48219c6..d15384565c85 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "1.5.0"; + version = "2.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-eEK2U1gTw3PP7kt2lNjiEs8yZX9Cmty0LIgZqg7FsJc="; + hash = "sha256-qY8puMt6ogMjx2QmAhPjCkimKp4Zfghur//MXRhsfFg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-ujson/default.nix b/pkgs/development/python-modules/types-ujson/default.nix index 8819dec4220e..eb46df9c9337 100644 --- a/pkgs/development/python-modules/types-ujson/default.nix +++ b/pkgs/development/python-modules/types-ujson/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-ujson"; - version = "5.8.0.1"; + version = "5.9.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-KxQ4gkirTNH176jEZHYREll8zVfA2EI49zYxq+DiDP0="; + hash = "sha256-fnBCRU3HzX8xsJxCDXyvNrk9ML30uNuTeRvQVhcT0Bc="; }; doCheck = false; diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 923b69d31cfa..4d40dcc7686b 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "scummvm"; - version = "2.7.1"; + version = "2.8.0"; src = fetchFromGitHub { owner = "scummvm"; repo = "scummvm"; rev = "v${version}"; - hash = "sha256-GVsvLAjb7pECd7uvPT9ubDFMIkiPWdU5owOafxk5iy0="; + hash = "sha256-W8VZuRVpq0WwaCLH0ODcFmqbE7eKLK6nuyB7qrfqkiY="; }; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix index ef6cd07e9f0e..a365bda5202a 100644 --- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "consul_exporter"; - version = "0.9.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "consul_exporter"; rev = "refs/tags/v${version}"; - hash = "sha256-Y3H4lFRoOLs8BBWUqfQOl9ny7HoRGqKIiq/ONcnzMW0="; + hash = "sha256-3aPLpTV+xuotpBYmRDfU3ewRRlmf7VUdh/u9/SLQDeE="; }; - vendorHash = "sha256-V3IWhVm47Uwgk3Mcu4JcYYGAdCrHDhkXYXCTXQr1BDE="; + vendorHash = "sha256-fsST29HGwJVLVSoAr8tNukW81iJtpb/oypwp5cH7oLQ="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/tmux-sessionizer/default.nix b/pkgs/tools/misc/tmux-sessionizer/default.nix index e0e8dd9efb4b..a9aa41a9d992 100644 --- a/pkgs/tools/misc/tmux-sessionizer/default.nix +++ b/pkgs/tools/misc/tmux-sessionizer/default.nix @@ -5,20 +5,29 @@ , openssl , pkg-config , Security -}: +, testers +, tmux-sessionizer +}: let -rustPlatform.buildRustPackage rec { - pname = "tmux-sessionizer"; - version = "0.2.3"; + name = "tmux-sessionizer"; + version = "0.3.0"; + +in rustPlatform.buildRustPackage { + pname = name; + inherit version; src = fetchFromGitHub { owner = "jrmoulton"; - repo = pname; + repo = name; rev = "v${version}"; - sha256 = "sha256-TTt4pEWlt1cL9SBM6C5dX88MqhBqr4Qt8INnWny8WL4="; + hash = "sha256-ZascTDIV9MqPPtK0CHSXUW5gIk/zjRhUB0xATcu7ICM="; }; - cargoHash = "sha256-Jq4wpSKo5kq6xSr/qRPlMy9QREUHQ33oQgXrvKi25lM="; + cargoHash = "sha256-lZi72OJ+AnnLxf/zxwAERfy1oW8dE8bGF8hFwwrUXqE="; + + passthru.tests.version = testers.testVersion { + package = tmux-sessionizer; + }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; @@ -27,7 +36,7 @@ rustPlatform.buildRustPackage rec { description = "The fastest way to manage projects as tmux sessions"; homepage = "https://github.com/jrmoulton/tmux-sessionizer"; license = licenses.mit; - maintainers = with maintainers; [ vinnymeller ]; + maintainers = with maintainers; [ vinnymeller mrcjkb ]; mainProgram = "tms"; }; } diff --git a/pkgs/tools/misc/twm/default.nix b/pkgs/tools/misc/twm/default.nix index 79c3584ca9ca..8e79293477c9 100644 --- a/pkgs/tools/misc/twm/default.nix +++ b/pkgs/tools/misc/twm/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "twm"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "vinnymeller"; repo = pname; rev = "v${version}"; - sha256 = "sha256-icJQSPt3733H5pIdnpC/Vx+u6LgwokCdbvE3wvDkIlw="; + sha256 = "sha256-4+1+9SdaYxqFmXB3F1vEfVq8bGiR6s8bVLrnjQNf/DY="; }; - cargoHash = "sha256-DxT3Wsiy4zVlTSJwHqV/McSi/pc9pB0wyWY54fj1zVE="; + cargoHash = "sha256-5F3jjNv1oJeYoGEuu2IC/7yiWWigVvxsjmHKcs1mESE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/misc/usbmuxd2/default.nix b/pkgs/tools/misc/usbmuxd2/default.nix index fae54b4ec18c..2eee1bb71324 100644 --- a/pkgs/tools/misc/usbmuxd2/default.nix +++ b/pkgs/tools/misc/usbmuxd2/default.nix @@ -1,30 +1,29 @@ { lib , clangStdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , pkg-config , libimobiledevice , libusb1 , avahi , clang +, git }: let libgeneral = clangStdenv.mkDerivation rec { pname = "libgeneral"; - version = "unstable-2021-12-12"; + version = "74"; src = fetchFromGitHub { owner = "tihmstar"; repo = pname; - rev = "017d71edb0a12ff4fa01a39d12cd297d8b3d8d34"; - hash = "sha256-NrSl/BeKe3wahiYTHGRVSq3PLgQfu76kHCC5ziY7cgQ="; + rev = "refs/tags/${version}"; + hash = "sha256-6aowcIYssc1xqH6kTi/cpH2F7rgc8+lGC8HgZWYH2w0="; + # Leave DotGit so that autoconfigure can read version from git tags + leaveDotGit = true; }; - postPatch = '' - # Set package version so we don't require git - sed -i '/AC_INIT/s/m4_esyscmd.*/${version})/' configure.ac - ''; nativeBuildInputs = [ autoreconfHook + git pkg-config ]; meta = with lib; { @@ -38,33 +37,26 @@ in clangStdenv.mkDerivation rec { pname = "usbmuxd2"; - version = "unstable-2022-02-07"; + version = "unstable-2023-12-12"; src = fetchFromGitHub { owner = "tihmstar"; repo = pname; - rev = "753b79eaf317c56df6c8b1fb6da5847cc54a0bb0"; - hash = "sha256-T9bt3KOJwFpdPeFuXfBhkBZNaNzix3Q3D47vASR+fVg="; + rev = "2ce399ddbacb110bd5a83a6b8232d42c9a9b6e84"; + hash = "sha256-UVLLE73XuWTgGlpTMxUDykFmiBDqz6NCRO2rpRAYfow="; + # Leave DotGit so that autoconfigure can read version from git tags + leaveDotGit = true; }; - patches = [ - (fetchpatch { - name = "libplist-2.3.0-compatibility.patch"; - url = "https://github.com/tihmstar/usbmuxd2/commit/e527bce2360afc22c95542f1252f94c994f45c72.patch"; - hash = "sha256-ig4j4z2HH8gitXxZYW9fm74Ix9XmJeX2Lz9HBCuDsuk="; - }) - ]; - postPatch = '' - # Set package version so we don't require git - sed -i '/AC_INIT/s/m4_esyscmd.*/${version})/' configure.ac - # Do not check libgeneral version - sed -i 's/libgeneral >= 39/libgeneral/' configure.ac + # Checking for libgeneral version still fails + sed -i 's/libgeneral >= $LIBGENERAL_MINVERS_STR/libgeneral/' configure.ac ''; nativeBuildInputs = [ autoreconfHook clang + git pkg-config ]; diff --git a/pkgs/tools/networking/containerlab/default.nix b/pkgs/tools/networking/containerlab/default.nix index 856a21cb9679..43b938ac4a13 100644 --- a/pkgs/tools/networking/containerlab/default.nix +++ b/pkgs/tools/networking/containerlab/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "containerlab"; - version = "0.48.1"; + version = "0.49.0"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-k166J9algbbwGMG65Sr0sshwhLwo5M7JDtGnG4AKZJM="; + hash = "sha256-dSy+4hsuigBSULDfsUW/kArcQByrtUeF3InMRuqFtu4="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-w5lwZTSG6OI85P/swjK3NtovMqfgttr9DC+CPSKlpKQ="; + vendorHash = "sha256-mm3D8WQtgWT9LCWlTZIV5GJ9rIyd3iX8b6zWIpqEwnk="; ldflags = [ "-s" diff --git a/pkgs/tools/security/passage/default.nix b/pkgs/tools/security/passage/default.nix index ba7717771c00..1d6bdfa225aa 100644 --- a/pkgs/tools/security/passage/default.nix +++ b/pkgs/tools/security/passage/default.nix @@ -5,6 +5,12 @@ , substituteAll , age , getopt +, coreutils +, findutils +, gnugrep +, gnused +, qrencode ? null +, wl-clipboard ? null , git ? null , xclip ? null # Used to pretty-print list of all stored passwords, but is not needed to fetch @@ -32,7 +38,18 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeBinaryWrapper ]; - extraPath = lib.makeBinPath [ age git xclip tree ]; + extraPath = lib.makeBinPath [ + age + coreutils + findutils + git + gnugrep + gnused + qrencode + tree + wl-clipboard + xclip + ]; # Using $0 is bad, it causes --help to mention ".passage-wrapped". postInstall = '' @@ -46,7 +63,7 @@ stdenv.mkDerivation { description = "Stores, retrieves, generates, and synchronizes passwords securely"; homepage = "https://github.com/FiloSottile/passage"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ kaction ]; + maintainers = with maintainers; [ kaction ma27 ]; platforms = platforms.unix; mainProgram = "passage"; diff --git a/pkgs/tools/security/ssh-audit/default.nix b/pkgs/tools/security/ssh-audit/default.nix index 668f3c206f61..54ec4e8f4ee1 100644 --- a/pkgs/tools/security/ssh-audit/default.nix +++ b/pkgs/tools/security/ssh-audit/default.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "ssh-audit"; - version = "3.0.0"; + version = "3.1.0"; format = "setuptools"; src = fetchFromGitHub { owner = "jtesta"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-+v+DLZPDC5uffTIJPzMvY/nLoy7BGiAsTddjNZZhTpo="; + sha256 = "sha256-pO6qpY1gqE40bb7q8J/35Dd0XckoFAaIBwWjFsxFO3c="; }; nativeCheckInputs = with python3Packages; [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c52e53caa6dc..8453d6c96335 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28083,9 +28083,7 @@ with pkgs; libdatachannel = callPackage ../development/libraries/libdatachannel { }; - libkrun = callPackage ../development/libraries/libkrun { - inherit (darwin.apple_sdk.frameworks) Hypervisor; - }; + libkrun = callPackage ../development/libraries/libkrun { }; libkrun-sev = libkrun.override { sevVariant = true; };