cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #50529 from dywedir/zola

Browse source 
gutenberg: 0.4.2 -> zola: 0.5.0
This commit is contained in:
Renaud 2018-11-18 11:58:57 +01:00 committed by GitHub
commit b74b0ad9a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/applications/misc/gutenberg/default.nix → pkgs/applications/misc/zola/default.nix
View file

@ -1,33 +1,33 @@
{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkgconfig, openssl, CoreServices, cf-private }: { stdenv, fetchFromGitHub, rustPlatform, cmake, pkgconfig, openssl, CoreServices, cf-private }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
name = "gutenberg-${version}"; name = "zola-${version}";
version = "0.4.2"; version = "0.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Keats"; owner = "getzola";
repo = "gutenberg"; repo = "zola";
rev = "v${version}"; rev = "v${version}";
sha256 = "0kzxz26khk5rwb9mz0wi9r8y7r93w4n2dbq6v2qr07cy5h14pa6w"; sha256 = "0as8nrzw9zz10w4xxiibgz8ylghc879b2pwaxnw8sjbji2d9qv63";
}; };
cargoSha256 = "0n4ji06chybmcvg5yz6cnhzqh162zhh5xpbz374a796dwp1132m8"; cargoSha256 = "0a14hq8d3xjr6yfg5qn5r7npqivm816f1p53bbm826igvpc9hsxa";
nativeBuildInputs = [ cmake pkgconfig openssl ]; nativeBuildInputs = [ cmake pkgconfig openssl ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ];
postInstall = '' postInstall = ''
install -D -m 444 completions/gutenberg.bash \ install -D -m 444 completions/zola.bash \
-t $out/share/bash-completion/completions -t $out/share/bash-completion/completions
install -D -m 444 completions/_gutenberg \ install -D -m 444 completions/_zola \
-t $out/share/zsh/site-functions -t $out/share/zsh/site-functions
install -D -m 444 completions/gutenberg.fish \ install -D -m 444 completions/zola.fish \
-t $out/share/fish/vendor_completions.d -t $out/share/fish/vendor_completions.d
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An opinionated static site generator with everything built-in"; description = "A fast static site generator with everything built-in";
homepage = https://www.getgutenberg.io; homepage = https://www.getzola.org/;
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ dywedir ]; maintainers = with maintainers; [ dywedir ];
platforms = platforms.all; platforms = platforms.all;

1
pkgs/top-level/aliases.nix
View file

@ -133,6 +133,7 @@ mapAliases ({
gupnp_dlna = gupnp-dlna; # added 2018-02-25 gupnp_dlna = gupnp-dlna; # added 2018-02-25
gupnp_igd = gupnp-igd; # added 2018-02-25 gupnp_igd = gupnp-igd; # added 2018-02-25
gupnptools = gupnp-tools; # added 2015-12-19 gupnptools = gupnp-tools; # added 2015-12-19
gutenberg = zola; # added 2018-11-17
heimdalFull = heimdal; # added 2018-05-01 heimdalFull = heimdal; # added 2018-05-01
hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25 hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25
htmlTidy = html-tidy; # added 2014-12-06 htmlTidy = html-tidy; # added 2014-12-06

10
pkgs/top-level/all-packages.nix
View file

@ -17238,11 +17238,6 @@ with pkgs;
gv = callPackage ../applications/misc/gv { }; gv = callPackage ../applications/misc/gv { };
gutenberg = callPackage ../applications/misc/gutenberg {
inherit (darwin.apple_sdk.frameworks) CoreServices;
inherit (darwin) cf-private;
};
guvcview = callPackage ../os-specific/linux/guvcview { guvcview = callPackage ../os-specific/linux/guvcview {
pulseaudioSupport = config.pulseaudio or true; pulseaudioSupport = config.pulseaudio or true;
ffmpeg = ffmpeg_2; ffmpeg = ffmpeg_2;
@ -20131,6 +20126,11 @@ with pkgs;
zita-njbridge = callPackage ../applications/audio/zita-njbridge { }; zita-njbridge = callPackage ../applications/audio/zita-njbridge { };
zola = callPackage ../applications/misc/zola {
inherit (darwin.apple_sdk.frameworks) CoreServices;
inherit (darwin) cf-private;
};
zoom-us = libsForQt59.callPackage ../applications/networking/instant-messengers/zoom-us { }; zoom-us = libsForQt59.callPackage ../applications/networking/instant-messengers/zoom-us { };
zotero = callPackage ../applications/office/zotero { }; zotero = callPackage ../applications/office/zotero { };