diff --git a/pkgs/applications/misc/gutenberg/default.nix b/pkgs/applications/misc/zola/default.nix similarity index 54% rename from pkgs/applications/misc/gutenberg/default.nix rename to pkgs/applications/misc/zola/default.nix index c71dcf2e0182..bdf6d0da1457 100644 --- a/pkgs/applications/misc/gutenberg/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -1,33 +1,33 @@ { stdenv, fetchFromGitHub, rustPlatform, cmake, pkgconfig, openssl, CoreServices, cf-private }: rustPlatform.buildRustPackage rec { - name = "gutenberg-${version}"; - version = "0.4.2"; + name = "zola-${version}"; + version = "0.5.0"; src = fetchFromGitHub { - owner = "Keats"; - repo = "gutenberg"; + owner = "getzola"; + repo = "zola"; rev = "v${version}"; - sha256 = "0kzxz26khk5rwb9mz0wi9r8y7r93w4n2dbq6v2qr07cy5h14pa6w"; + sha256 = "0as8nrzw9zz10w4xxiibgz8ylghc879b2pwaxnw8sjbji2d9qv63"; }; - cargoSha256 = "0n4ji06chybmcvg5yz6cnhzqh162zhh5xpbz374a796dwp1132m8"; + cargoSha256 = "0a14hq8d3xjr6yfg5qn5r7npqivm816f1p53bbm826igvpc9hsxa"; nativeBuildInputs = [ cmake pkgconfig openssl ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; postInstall = '' - install -D -m 444 completions/gutenberg.bash \ + install -D -m 444 completions/zola.bash \ -t $out/share/bash-completion/completions - install -D -m 444 completions/_gutenberg \ + install -D -m 444 completions/_zola \ -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 ''; meta = with stdenv.lib; { - description = "An opinionated static site generator with everything built-in"; - homepage = https://www.getgutenberg.io; + description = "A fast static site generator with everything built-in"; + homepage = https://www.getzola.org/; license = licenses.mit; maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index df143b059e7d..02971c5dcff6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -133,6 +133,7 @@ mapAliases ({ gupnp_dlna = gupnp-dlna; # added 2018-02-25 gupnp_igd = gupnp-igd; # added 2018-02-25 gupnptools = gupnp-tools; # added 2015-12-19 + gutenberg = zola; # added 2018-11-17 heimdalFull = heimdal; # added 2018-05-01 hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25 htmlTidy = html-tidy; # added 2014-12-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1dc7490c5eb..b8cf555294ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17230,11 +17230,6 @@ with pkgs; 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 { pulseaudioSupport = config.pulseaudio or true; ffmpeg = ffmpeg_2; @@ -20123,6 +20118,11 @@ with pkgs; 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 { }; zotero = callPackage ../applications/office/zotero { };