diff options
| author | Renaud <c0bw3b@users.noreply.github.com> | 2018-11-18 11:58:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-18 11:58:57 +0100 |
| commit | b74b0ad9a06f66f053f9fd3bb374f9af34e6ea40 (patch) | |
| tree | 34f7dba900b12cabf58f35e85ff1a65bb4f42286 /pkgs/top-level | |
| parent | 1ac58ddec6f211e206cad2d44f5f40e6e38a6748 (diff) | |
| parent | a470750ab42b253301a118b1384ba1a0e1015ea0 (diff) | |
| download | nixlib-b74b0ad9a06f66f053f9fd3bb374f9af34e6ea40.tar nixlib-b74b0ad9a06f66f053f9fd3bb374f9af34e6ea40.tar.gz nixlib-b74b0ad9a06f66f053f9fd3bb374f9af34e6ea40.tar.bz2 nixlib-b74b0ad9a06f66f053f9fd3bb374f9af34e6ea40.tar.lz nixlib-b74b0ad9a06f66f053f9fd3bb374f9af34e6ea40.tar.xz nixlib-b74b0ad9a06f66f053f9fd3bb374f9af34e6ea40.tar.zst nixlib-b74b0ad9a06f66f053f9fd3bb374f9af34e6ea40.zip | |
Merge pull request #50529 from dywedir/zola
gutenberg: 0.4.2 -> zola: 0.5.0
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
2 files changed, 6 insertions, 5 deletions
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 aef230a68548..54f154208abf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17238,11 +17238,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; @@ -20131,6 +20126,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 { }; |