diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/science/logic/lean4/default.nix | 1 | ||||
-rw-r--r-- | pkgs/by-name/nl/nlohmann_json_schema_validator/package.nix | 30 | ||||
-rw-r--r-- | pkgs/development/libraries/libkrun/default.nix | 46 | ||||
-rw-r--r-- | pkgs/development/libraries/libkrunfw/default.nix | 44 | ||||
-rw-r--r-- | pkgs/tools/security/passage/default.nix | 21 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
6 files changed, 93 insertions, 53 deletions
diff --git a/pkgs/applications/science/logic/lean4/default.nix b/pkgs/applications/science/logic/lean4/default.nix index 26f5dd2911ebb..092489f844568 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/nl/nlohmann_json_schema_validator/package.nix b/pkgs/by-name/nl/nlohmann_json_schema_validator/package.nix new file mode 100644 index 0000000000000..a6317b1f7b288 --- /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/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix index b924dc5e3907c..dbee4c9a35820 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 3b4bf0855d0fa..f4f67db652cac 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/tools/security/passage/default.nix b/pkgs/tools/security/passage/default.nix index ba7717771c004..1d6bdfa225aab 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4453341022b8..5ba31c6d6db24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28059,9 +28059,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; }; |