diff options
| author | 0x4A6F <0x4A6F@users.noreply.github.com> | 2024-01-03 23:29:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-03 23:29:45 +0100 |
| commit | 98830685686ac4f7efbfb969299c3c1968b7dfb3 (patch) | |
| tree | 9a39274617687e99c69b1a53ed6dbccca8677617 /pkgs | |
| parent | 15373e4b9d0e77424e611b81318a2475dfe62c13 (diff) | |
| parent | e8cfe721c7c872b73bb20e944744d20b49be4f38 (diff) | |
Merge pull request #276411 from ivan770/update-zola
zola: 0.17.2 -> 0.18.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/by-name/zo/zola/package.nix (renamed from pkgs/applications/misc/zola/default.nix) | 30 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 26 deletions
diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/by-name/zo/zola/package.nix index 9a76eed6dff6d..df32093d3ef33 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/by-name/zo/zola/package.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ea6b10849f3a..15e957391f068 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |