Skip to content

Commit

Permalink
jekyll: Update the dependencies
Browse files Browse the repository at this point in the history 
The dependencies could be more minimal but this way it should hopefully
work for most use-cases.
  • Loading branch information
@primeos
primeos committed Feb 19, 2018
1 parent b5aabb6 commit f14b6ea
Show file tree
Hide file tree
Showing 8 changed files with 877 additions and 49 deletions.
7 changes: 0 additions & 7 deletions pkgs/applications/misc/jekyll/Gemfile
View file

This file was deleted.

10 changes: 10 additions & 0 deletions pkgs/applications/misc/jekyll/basic/Gemfile
View file
@@ -0,0 +1,10 @@
source "https://rubygems.org"
gem "jekyll"
# jekyll alone might be enough for most use-cases
gem "rouge"
gem "activesupport", "~> 4.2"
gem "jekyll-avatar"
gem "jekyll-mentions"
gem "jekyll-seo-tag"
gem "jekyll-sitemap"
gem "jemoji"
50 changes: 36 additions & 14 deletions pkgs/applications/misc/jekyll/Gemfile.lock → ...plications/misc/jekyll/basic/Gemfile.lock
View file
@@ -1,7 +1,11 @@
GEM
remote: https://rubygems.org/
specs:
RedCloth (4.3.2)
activesupport (4.2.10)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
colorator (1.1.0)
Expand All @@ -12,6 +16,10 @@ GEM
eventmachine (1.2.5)
ffi (1.9.21)
forwardable-extended (2.6.0)
gemoji (3.0.0)
html-pipeline (2.7.1)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
Expand All @@ -28,33 +36,42 @@ GEM
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
safe_yaml (~> 1.0)
jekyll-feed (0.9.3)
jekyll (~> 3.3)
jekyll-paginate (1.1.0)
jekyll-avatar (0.5.0)
jekyll (~> 3.0)
jekyll-mentions (1.2.0)
activesupport (~> 4.0)
html-pipeline (~> 2.3)
jekyll (~> 3.0)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-seo-tag (2.4.0)
jekyll (~> 3.3)
jekyll-sitemap (1.2.0)
jekyll (~> 3.3)
jekyll-watch (2.0.0)
listen (~> 3.0)
jemoji (0.9.0)
activesupport (~> 4.0, >= 4.2.9)
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (~> 3.0)
kramdown (1.16.2)
liquid (4.0.0)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
mercenary (0.3.6)
minima (2.3.0)
jekyll (~> 3.5)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
mini_portile2 (2.3.0)
minitest (5.11.3)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
pathutil (0.16.1)
forwardable-extended (~> 2.6)
public_suffix (3.0.2)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rdiscount (2.2.0.1)
rouge (3.1.1)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
Expand All @@ -63,17 +80,22 @@ GEM
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)

PLATFORMS
ruby

DEPENDENCIES
RedCloth
activesupport (~> 4.2)
jekyll
jekyll-feed
jekyll-paginate
minima
rdiscount
jekyll-avatar
jekyll-mentions
jekyll-seo-tag
jekyll-sitemap
jemoji
rouge

BUNDLED WITH
1.14.6
112 changes: 87 additions & 25 deletions pkgs/applications/misc/jekyll/gemset.nix → ...applications/misc/jekyll/basic/gemset.nix
View file
@@ -1,4 +1,13 @@
{
activesupport = {
dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7";
type = "gem";
};
version = "4.2.10";
};
addressable = {
dependencies = ["public_suffix"];
source = {
Expand Down Expand Up @@ -57,6 +66,23 @@
};
version = "2.6.0";
};
gemoji = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1h85qpn2xbmsn8ssf2fqzlqg181j000m5z4l3g26r7vblncg162d";
type = "gem";
};
version = "3.0.0";
};
html-pipeline = {
dependencies = ["activesupport" "nokogiri"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hkx70z9ijgnncmrna9qdh9ajn9m7v146k91j257lrzyq2f6jdjd";
type = "gem";
};
version = "2.7.1";
};
"http_parser.rb" = {
source = {
remotes = ["https://rubygems.org"];
Expand All @@ -83,22 +109,23 @@
};
version = "3.7.2";
};
jekyll-feed = {
jekyll-avatar = {
dependencies = ["jekyll"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kr3kyaq4z3jixn6ay8h16bxxlv6slvvp7nqnl05jdymhkl0bmm9";
sha256 = "0y2w7pnahkm3ddxrq589wv1w53ay7p1pvfs6khcmh6wq85r6wpsf";
type = "gem";
};
version = "0.9.3";
version = "0.5.0";
};
jekyll-paginate = {
jekyll-mentions = {
dependencies = ["activesupport" "html-pipeline" "jekyll"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0r7bcs8fq98zldih4787zk5i9w24nz5wa26m84ssja95n3sas2l8";
sha256 = "00nqm1ng4iiibmv4vx0ayzq7fqm2sm1af98r4ykvld6asqj5qkyd";
type = "gem";
};
version = "1.1.0";
version = "1.2.0";
};
jekyll-sass-converter = {
dependencies = ["sass"];
Expand All @@ -118,6 +145,15 @@
};
version = "2.4.0";
};
jekyll-sitemap = {
dependencies = ["jekyll"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xy93ysl1q8r4xhbnffycvsslja0dskh2z2pl1jnykwsy27dc89n";
type = "gem";
};
version = "1.2.0";
};
jekyll-watch = {
dependencies = ["listen"];
source = {
Expand All @@ -127,6 +163,15 @@
};
version = "2.0.0";
};
jemoji = {
dependencies = ["activesupport" "gemoji" "html-pipeline" "jekyll"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0acmi7mgr844dmzgfi9flcqkkb0jh5l21h579cidxwf1409w588b";
type = "gem";
};
version = "0.9.0";
};
kramdown = {
source = {
remotes = ["https://rubygems.org"];
Expand Down Expand Up @@ -160,15 +205,31 @@
};
version = "0.3.6";
};
minima = {
dependencies = ["jekyll" "jekyll-feed" "jekyll-seo-tag"];
mini_portile2 = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pasyjszlj4ir1zlbrq8ggydgdaib5zbbs5vjbvyla66ip9jrdji";
sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
type = "gem";
};
version = "2.3.0";
};
minitest = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
type = "gem";
};
version = "5.11.3";
};
nokogiri = {
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq";
type = "gem";
};
version = "1.8.2";
};
pathutil = {
dependencies = ["forwardable-extended"];
source = {
Expand Down Expand Up @@ -203,22 +264,6 @@
};
version = "0.9.10";
};
rdiscount = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1arvk3k06prxasq1djbj065ixar4zl171340g7wr1ww4gj9makx3";
type = "gem";
};
version = "2.2.0.1";
};
RedCloth = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0m9dv7ya9q93r8x1pg2gi15rxlbck8m178j1fz7r5v6wr1avrrqy";
type = "gem";
};
version = "4.3.2";
};
rouge = {
source = {
remotes = ["https://rubygems.org"];
Expand Down Expand Up @@ -261,4 +306,21 @@
};
version = "4.0.0";
};
thread_safe = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
type = "gem";
};
version = "0.3.6";
};
tzinfo = {
dependencies = ["thread_safe"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
type = "gem";
};
version = "1.2.5";
};
}
10 changes: 7 additions & 3 deletions pkgs/applications/misc/jekyll/default.nix
View file
@@ -1,12 +1,16 @@
{ stdenv, lib, bundlerEnv, ruby }:
{ stdenv, lib, bundlerEnv, ruby
, withOptionalDependencies ? false
}:

bundlerEnv rec {
name = pname + "-" + version;
pname = "jekyll";
version = (import ./gemset.nix).jekyll.version;
version = (import "${gemdir}/gemset.nix").jekyll.version;

inherit ruby;
gemdir = ./.;
gemdir = if withOptionalDependencies
then ./full
else ./basic;

meta = with lib; {
description = "Simple, blog aware, static site generator";
Expand Down
30 changes: 30 additions & 0 deletions pkgs/applications/misc/jekyll/full/Gemfile
View file
@@ -0,0 +1,30 @@
source "https://rubygems.org"
gem "jekyll"
gem "rouge"
gem "activesupport", "~> 4.2"
gem "jekyll-avatar"
gem "jekyll-mentions"
gem "jekyll-seo-tag"
gem "jekyll-sitemap"
gem "jemoji"
# Optional dependencies:
gem "coderay", "~> 1.1.0"
gem "jekyll-coffeescript"
gem "jekyll-docs"
gem "jekyll-feed", "~> 0.9"
gem "jekyll-gist"
gem "jekyll-paginate"
gem "jekyll-redirect-from"
gem "kramdown", "~> 1.14"
gem "mime-types", "~> 3.0"
gem "rdoc", RUBY_VERSION >= "2.2.2" ? "~> 6.0" : "~> 5.1"
gem "tomlrb", "~> 1.2"

platform :ruby, :mswin, :mingw, :x64_mingw do
gem "classifier-reborn", "~> 2.2.0"
gem "liquid-c", "~> 3.0"
gem "pygments.rb", "~> 1.0"
gem "rdiscount", "~> 2.0"
gem "redcarpet", "~> 3.2", ">= 3.2.3"
gem "yajl-ruby", "~> 1.3.1"
end

4 comments on commit f14b6ea

@joachifm
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a heads up, this looks to have broken eval

@grahamc
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted in 4419a31

@grahamc
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here is a log from the evaluation failure: https://gist.github.com/GrahamcOfBorg/2fe33e4d5697d133f684e31adafb4811 You should be able to replicate the failure with

HOME=/homeless-shelter NIX_PATH=nixpkgs=$(pwd) nix-instantiate ./pkgs/top-level/release.nix -A manual --option restrict-eval true --option build-timeout 1800 --argstr system thesystem --show-trace

@primeos
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, didn't saw that coming...

For some reason I can't reproduce it locally. I'll have a closer look.

$ git rev-parse HEAD
f14b6ea81f1739a90c208fbbdd1ed6f948434693
$ HOME=/homeless-shelter NIX_PATH=nixpkgs=$(pwd) nix-instantiate ./pkgs/top-level/release.nix -A manual --option restrict-eval true --option build-timeout 1800 --argstr system thesystem --show-trace
warning: you did not specify '--add-root'; the result might be removed by the garbage collector
/nix/store/r2plm1pzq6hxwy7d339a7c0bqwllw4rr-nixpkgs-manual.drv
$ echo $?
0

Please sign in to comment.