about summary refs log tree commit diff
path: root/pkgs/applications/misc/jekyll/default.nix
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2018-02-28 20:52:49 +0200
committerTuomas Tynkkynen <tuomas@tuxera.com>2018-02-28 20:52:49 +0200
commit34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852 (patch)
treed3e3546a41a812d151d1980cb8ee6808a8b8c7c6 /pkgs/applications/misc/jekyll/default.nix
parentad17db3562766979371f0ae9cc0d2428f44a9d58 (diff)
parentf1dd205c4e5ac28931ae8cdcde9d3c9a8ed2a0f5 (diff)
downloadnixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar
nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.gz
nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.bz2
nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.lz
nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.xz
nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.zst
nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.zip
Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix
Diffstat (limited to 'pkgs/applications/misc/jekyll/default.nix')
-rw-r--r--pkgs/applications/misc/jekyll/default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix
index 418b4ea466ea..ce3c318f6780 100644
--- a/pkgs/applications/misc/jekyll/default.nix
+++ b/pkgs/applications/misc/jekyll/default.nix
@@ -2,6 +2,8 @@
 , withOptionalDependencies ? false
 }:
 
+# Bundix:
+# nix-shell -p bundix zlib
 bundlerEnv rec {
   name = pname + "-" + version;
   pname = "jekyll";