ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-20 12:08:17 +03:00
Code Issues Projects Releases Wiki Activity

zola: 0.17.2 -> 0.18.0

Browse Source
This commit is contained in:
ivan770 2023-12-26 18:25:19 -05:00
parent 6586ea5fb6
commit e8cfe721c7
2 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/applications/misc/zola/default.nix → pkgs/by-name/zo/zola/package.nix
View File

@ -1,52 +1,38 @@
{ 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;

4
pkgs/top-level/all-packages.nix
View File

@ -36965,10 +36965,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 { };