Unverified Commit 98830685 authored by 0x4A6F's avatar 0x4A6F Committed by GitHub
Browse files

Merge pull request #276411 from ivan770/update-zola

zola: 0.17.2 -> 0.18.0
parents 15373e4b e8cfe721
Loading
Loading
Loading
Loading
+8 −22
Original line number Diff line number Diff line
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, rustPlatform
, cmake
, pkg-config
, openssl
, oniguruma
, CoreServices
, darwin
, installShellFiles
, libsass
, zola
, testers
}:

rustPlatform.buildRustPackage rec {
  pname = "zola";
  version = "0.17.2";
  version = "0.18.0";

  src = fetchFromGitHub {
    owner = "getzola";
    repo = "zola";
    rev = "v${version}";
    hash = "sha256-br7VpxkVMZ/TgwMaFbnVMOw9RemNjur/UYnloMoDzHs=";
    hash = "sha256-kNlFmCqWEfU2ktAMxXNKe6dmAV25voHjHYaovBYsOu8=";
  };

  cargoHash = "sha256-AAub8UwAvX3zNX+SM/T9biyNxFTgfqUQG/MUGfwWuno=";

  patches = [
    (fetchpatch {
      name = "CVE-2023-40274.patch";
      url = "https://github.com/getzola/zola/commit/fe1967fb0fe063b1cee1ad48820870ab2ecc0e5b.patch";
      hash = "sha256-B/SVGhVX5hAbvMhBYO+mU5+xdZXU2JyS4uKmOj+aZuI=";
    })
  ];
  cargoHash = "sha256-JWYuolHh/qdWF+i6WTgz/uDrkQ6V+SDFhEzGGkUA0E4=";

  nativeBuildInputs = [
    cmake
    pkg-config
    installShellFiles
  ];

  buildInputs = [
    openssl
    oniguruma
    libsass
  ] ++ lib.optionals stdenv.isDarwin [
    CoreServices
  ];
  ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
    CoreServices SystemConfiguration
  ]);

  RUSTONIG_SYSTEM_LIBONIG = true;

+0 −4
Original line number Diff line number Diff line
@@ -36915,10 +36915,6 @@ with pkgs;
  zita-njbridge = callPackage ../applications/audio/zita-njbridge { };
  zola = callPackage ../applications/misc/zola {
    inherit (darwin.apple_sdk.frameworks) CoreServices;
  };
  zoom-us = callPackage ../applications/networking/instant-messengers/zoom-us { };
  zotero = callPackage ../applications/office/zotero { };