Unverified Commit f0d1b9e3 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

jekyll: 4.3.3 -> 4.3.4 (#351729)

parents 1a1b7c2a b79631f9

pkgs/applications/misc/jekyll/basic/Gemfile.lock

+22 −22
Original line number Diff line number Diff line 
GEM

  remote: https://rubygems.org/

  specs:

    activesupport (7.1.3.4)

    activesupport (7.2.1.2)

      base64

      bigdecimal

      concurrent-ruby (~> 1.0, >= 1.0.2)

      concurrent-ruby (~> 1.0, >= 1.3.1)

      connection_pool (>= 2.2.5)

      drb

      i18n (>= 1.6, < 2)

      logger (>= 1.4.2)

      minitest (>= 5.1)

      mutex_m

      tzinfo (~> 2.0)

      securerandom (>= 0.3)

      tzinfo (~> 2.0, >= 2.0.5)

    addressable (2.8.7)

      public_suffix (>= 2.0.2, < 7.0)

    base64 (0.2.0)

    bigdecimal (3.1.8)

    colorator (1.1.0)

    concurrent-ruby (1.3.3)

    concurrent-ruby (1.3.4)

    connection_pool (2.4.1)

    drb (2.2.1)

    em-websocket (0.5.3)
@@ -26,16 +27,16 @@ GEM 
    ffi (1.17.0)

    forwardable-extended (2.6.0)

    gemoji (4.1.0)

    google-protobuf (4.27.2)

    google-protobuf (4.28.3)

      bigdecimal

      rake (>= 13)

    html-pipeline (2.14.3)

      activesupport (>= 2)

      nokogiri (>= 1.4)

    http_parser.rb (0.8.0)

    i18n (1.14.5)

    i18n (1.14.6)

      concurrent-ruby (~> 1.0)

    jekyll (4.3.3)

    jekyll (4.3.4)

      addressable (~> 2.4)

      colorator (~> 1.0)

      em-websocket (~> 0.5)
@@ -76,35 +77,34 @@ GEM 
    listen (3.9.0)

      rb-fsevent (~> 0.10, >= 0.10.3)

      rb-inotify (~> 0.9, >= 0.9.10)

    logger (1.6.1)

    mercenary (0.4.0)

    mini_portile2 (2.8.7)

    minitest (5.24.0)

    mutex_m (0.2.0)

    nokogiri (1.16.6)

    minitest (5.25.1)

    nokogiri (1.16.7)

      mini_portile2 (~> 2.8.2)

      racc (~> 1.4)

    pathutil (0.16.2)

      forwardable-extended (~> 2.6)

    public_suffix (6.0.0)

    racc (1.8.0)

    public_suffix (6.0.1)

    racc (1.8.1)

    rake (13.2.1)

    rb-fsevent (0.11.2)

    rb-inotify (0.11.1)

      ffi (~> 1.0)

    rexml (3.3.1)

      strscan

    rouge (4.3.0)

    rexml (3.3.9)

    rouge (4.4.0)

    safe_yaml (1.0.5)

    sass-embedded (1.77.5)

      google-protobuf (>= 3.25, < 5.0)

    sass-embedded (1.80.4)

      google-protobuf (~> 4.28)

      rake (>= 13)

    strscan (3.1.0)

    securerandom (0.3.1)

    terminal-table (3.0.2)

      unicode-display_width (>= 1.1.1, < 3)

    tzinfo (2.0.6)

      concurrent-ruby (~> 1.0)

    unicode-display_width (2.5.0)

    webrick (1.8.1)

    unicode-display_width (2.6.0)

    webrick (1.8.2)



PLATFORMS

  ruby
@@ -118,4 +118,4 @@ DEPENDENCIES 
  jemoji



BUNDLED WITH

   2.5.11
 
   2.5.9

pkgs/applications/misc/jekyll/basic/gemset.nix

+42 −43
Original line number Diff line number Diff line 
{

  activesupport = {

    dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"];

    dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "logger" "minitest" "securerandom" "tzinfo"];

    groups = ["default"];

    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "0283wk1zxb76lg79dk501kcf5xy9h25qiw15m86s4nrfv11vqns5";

      sha256 = "1cacrvmn1561fb88fn99ig52wdz1k67s7vbssqwwwljf1kanlgvc";

      type = "gem";

    };

    version = "7.1.3.4";

    version = "7.2.1.2";

  };

  addressable = {

    dependencies = ["public_suffix"];
@@ -56,10 +56,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g";

      sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";

      type = "gem";

    };

    version = "1.3.3";

    version = "1.3.4";

  };

  connection_pool = {

    groups = ["default"];
@@ -138,10 +138,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "0vwnr6fmxig4pkag86yzbznpxk8ii7rhjz0rrprkqvnymhhfnscz";

      sha256 = "1d99vyhmyp2n5zd0qmfymzwbcn71dbnwwvc0m4z14msjb7b8dvf0";

      type = "gem";

    };

    version = "4.27.2";

    version = "4.28.3";

  };

  html-pipeline = {

    dependencies = ["activesupport" "nokogiri"];
@@ -170,10 +170,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16";

      sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw";

      type = "gem";

    };

    version = "1.14.5";

    version = "1.14.6";

  };

  jekyll = {

    dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table" "webrick"];
@@ -181,10 +181,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "0638cvpmk3py1w2dxpav6l0c854y6l94b6gyc2aa16i7r897z64a";

      sha256 = "0124fnqizh7njn99qg4f3jvf9kg2rpm88drs9p9r5hqr50n2i264";

      type = "gem";

    };

    version = "4.3.3";

    version = "4.3.4";

  };

  jekyll-avatar = {

    dependencies = ["jekyll"];
@@ -306,45 +306,45 @@ 
    };

    version = "3.9.0";

  };

  mercenary = {

  logger = {

    groups = ["default"];

    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "0f2i827w4lmsizrxixsrv2ssa3gk1b7lmqh8brk8ijmdb551wnmj";

      sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";

      type = "gem";

    };

    version = "0.4.0";

    version = "1.6.1";

  };

  mini_portile2 = {

  mercenary = {

    groups = ["default"];

    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk";

      sha256 = "0f2i827w4lmsizrxixsrv2ssa3gk1b7lmqh8brk8ijmdb551wnmj";

      type = "gem";

    };

    version = "2.8.7";

    version = "0.4.0";

  };

  minitest = {

  mini_portile2 = {

    groups = ["default"];

    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "0zgq31wa0ygqnmpqh3plsig32xc8k4l99r49ncmidfg91kfagymg";

      sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk";

      type = "gem";

    };

    version = "5.24.0";

    version = "2.8.7";

  };

  mutex_m = {

  minitest = {

    groups = ["default"];

    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn";

      sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix";

      type = "gem";

    };

    version = "0.2.0";

    version = "5.25.1";

  };

  nokogiri = {

    dependencies = ["mini_portile2" "racc"];
@@ -352,10 +352,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk";

      sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq";

      type = "gem";

    };

    version = "1.16.6";

    version = "1.16.7";

  };

  pathutil = {

    dependencies = ["forwardable-extended"];
@@ -373,20 +373,20 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "17m8q2dzm7a74amnab5rf3f3m466i300awihl3ygh4v80wpf3j6j";

      sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";

      type = "gem";

    };

    version = "6.0.0";

    version = "6.0.1";

  };

  racc = {

    groups = ["default"];

    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09";

      sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa";

      type = "gem";

    };

    version = "1.8.0";

    version = "1.8.1";

  };

  rake = {

    groups = ["default"];
@@ -420,25 +420,24 @@ 
    version = "0.11.1";

  };

  rexml = {

    dependencies = ["strscan"];

    groups = ["default"];

    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "09f3sw7f846fpcpwdm362ylqldwqxpym6z0qpld4av7zisrrzbrl";

      sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p";

      type = "gem";

    };

    version = "3.3.1";

    version = "3.3.9";

  };

  rouge = {

    groups = ["default"];

    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "072qvvrcqj0yfr3b0j932mlhvn41i38bq37z7z07i3ikagndkqwy";

      sha256 = "0r0b48945hakgy0y7lg6h1bb7pkfz8jqd0r6777f80ij3sansvbs";

      type = "gem";

    };

    version = "4.3.0";

    version = "4.4.0";

  };

  safe_yaml = {

    groups = ["default"];
@@ -456,20 +455,20 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "1nmy052pm46781s7ca6x3l4yb5p3glh8sf201xwcwpk9rv2av9m2";

      sha256 = "09hydxaq3bwwpflqz93g7pvj5kq0ylj2kvc87q2fvki5h7svbd51";

      type = "gem";

    };

    version = "1.77.5";

    version = "1.80.4";

  };

  strscan = {

  securerandom = {

    groups = ["default"];

    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01";

      sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q";

      type = "gem";

    };

    version = "3.1.0";

    version = "0.3.1";

  };

  terminal-table = {

    dependencies = ["unicode-display_width"];
@@ -498,19 +497,19 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky";

      sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj";

      type = "gem";

    };

    version = "2.5.0";

    version = "2.6.0";

  };

  webrick = {

    groups = ["default"];

    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r";

      sha256 = "089gy5494j560b242vi173wnbj2913hwlwnjkpzld58r96ilc5s3";

      type = "gem";

    };

    version = "1.8.1";

    version = "1.8.2";

  };

}

pkgs/applications/misc/jekyll/default.nix

+15 −12
Original line number Diff line number Diff line 
{ lib, bundlerApp, ruby

, writeShellScriptBin, makeWrapper

, withOptionalDependencies ? false

{

  lib,

  bundlerApp,

  makeWrapper,

  ruby,

  writeShellScriptBin,

  withOptionalDependencies ? false,

}:



let
@@ -21,14 +25,13 @@ let 
    # Else: Don't modify the arguments:

    exec ${ruby}/bin/ruby "$@"

  '';

in bundlerApp {

in

bundlerApp {

  pname = "jekyll";

  exes = [ "jekyll" ];



  inherit ruby;

  gemdir = if withOptionalDependencies

    then ./full

    else ./basic;

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



  nativeBuildInputs = [ makeWrapper ];
@@ -49,9 +52,9 @@ in bundlerApp { 
      host sites right from your GitHub repositories.

    '';

    homepage = "https://jekyllrb.com/";

    #changelog   = "https://raw.githubusercontent.com/jekyll/jekyll/v${version}/History.markdown";

    changelog = "https://jekyllrb.com/news/releases/";

    license = licenses.mit;

    maintainers = [ ];

    maintainers = [ maintainers.anthonyroussel ];

    platforms = platforms.unix;

    mainProgram = "jekyll";

  };

pkgs/applications/misc/jekyll/full/Gemfile

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ gem "jekyll-redirect-from" 
gem "kramdown-syntax-coderay"

gem "mime-types", "~> 3.0"

gem "rdoc", "~> 6.0"

gem "tomlrb", "~> 1.2"

gem "tomlrb"



platform :ruby, :mswin, :mingw, :x64_mingw do

  gem "classifier-reborn", "~> 2.2"

pkgs/applications/misc/jekyll/full/Gemfile.lock

+37 −33
Original line number Diff line number Diff line 
GEM

  remote: https://rubygems.org/

  specs:

    activesupport (7.1.3.4)

    activesupport (7.2.1.2)

      base64

      bigdecimal

      concurrent-ruby (~> 1.0, >= 1.0.2)

      concurrent-ruby (~> 1.0, >= 1.3.1)

      connection_pool (>= 2.2.5)

      drb

      i18n (>= 1.6, < 2)

      logger (>= 1.4.2)

      minitest (>= 5.1)

      mutex_m

      tzinfo (~> 2.0)

      securerandom (>= 0.3)

      tzinfo (~> 2.0, >= 2.0.5)

    addressable (2.8.7)

      public_suffix (>= 2.0.2, < 7.0)

    base64 (0.2.0)
@@ -24,32 +25,34 @@ GEM 
      execjs

    coffee-script-source (1.12.2)

    colorator (1.1.0)

    concurrent-ruby (1.3.3)

    concurrent-ruby (1.3.4)

    connection_pool (2.4.1)

    drb (2.2.1)

    em-websocket (0.5.3)

      eventmachine (>= 0.12.9)

      http_parser.rb (~> 0)

    eventmachine (1.2.7)

    execjs (2.9.1)

    faraday (2.9.2)

      faraday-net_http (>= 2.0, < 3.2)

    faraday-net_http (3.1.0)

    execjs (2.10.0)

    faraday (2.12.0)

      faraday-net_http (>= 2.0, < 3.4)

      json

      logger

    faraday-net_http (3.3.0)

      net-http

    fast-stemmer (1.0.2)

    ffi (1.17.0)

    forwardable-extended (2.6.0)

    gemoji (4.1.0)

    google-protobuf (4.27.2)

    google-protobuf (4.28.3)

      bigdecimal

      rake (>= 13)

    html-pipeline (2.14.3)

      activesupport (>= 2)

      nokogiri (>= 1.4)

    http_parser.rb (0.8.0)

    i18n (1.14.5)

    i18n (1.14.6)

      concurrent-ruby (~> 1.0)

    jekyll (4.3.3)

    jekyll (4.3.4)

      addressable (~> 2.4)

      colorator (~> 1.0)

      em-websocket (~> 0.5)
@@ -84,7 +87,7 @@ GEM 
      html-pipeline (~> 2.3)

      jekyll (>= 3.7, < 5.0)

    jekyll-paginate (1.1.0)

    jekyll-polyglot (1.8.0)

    jekyll-polyglot (1.8.1)

      jekyll (>= 4.0, >= 3.0)

    jekyll-redirect-from (0.16.0)

      jekyll (>= 3.3, < 5.0)
@@ -100,6 +103,7 @@ GEM 
      gemoji (>= 3, < 5)

      html-pipeline (~> 2.2)

      jekyll (>= 3.0, < 5.0)

    json (2.7.4)

    kramdown (2.4.0)

      rexml

    kramdown-parser-gfm (1.1.0)
@@ -113,18 +117,19 @@ GEM 
    listen (3.9.0)

      rb-fsevent (~> 0.10, >= 0.10.3)

      rb-inotify (~> 0.9, >= 0.9.10)

    logger (1.6.1)

    matrix (0.4.2)

    mercenary (0.4.0)

    mime-types (3.5.2)

    mime-types (3.6.0)

      logger

      mime-types-data (~> 3.2015)

    mime-types-data (3.2024.0604)

    mini_magick (4.13.1)

    mime-types-data (3.2024.1001)

    mini_magick (4.13.2)

    mini_portile2 (2.8.7)

    minitest (5.24.0)

    mutex_m (0.2.0)

    minitest (5.25.1)

    net-http (0.4.1)

      uri

    nokogiri (1.16.6)

    nokogiri (1.16.7)

      mini_portile2 (~> 2.8.2)

      racc (~> 1.4)

    octokit (4.25.1)
@@ -134,34 +139,33 @@ GEM 
      forwardable-extended (~> 2.6)

    psych (5.1.2)

      stringio

    public_suffix (6.0.0)

    racc (1.8.0)

    public_suffix (6.0.1)

    racc (1.8.1)

    rake (13.2.1)

    rb-fsevent (0.11.2)

    rb-inotify (0.11.1)

      ffi (~> 1.0)

    rdoc (6.7.0)

      psych (>= 4.0.0)

    rexml (3.3.1)

      strscan

    rouge (4.3.0)

    rexml (3.3.9)

    rouge (4.4.0)

    safe_yaml (1.0.5)

    sass-embedded (1.77.5)

      google-protobuf (>= 3.25, < 5.0)

    sass-embedded (1.80.4)

      google-protobuf (~> 4.28)

      rake (>= 13)

    sawyer (0.9.2)

      addressable (>= 2.3.5)

      faraday (>= 0.17.3, < 3)

    securerandom (0.3.1)

    stringio (3.1.1)

    strscan (3.1.0)

    terminal-table (3.0.2)

      unicode-display_width (>= 1.1.1, < 3)

    tomlrb (1.3.0)

    tomlrb (2.0.3)

    tzinfo (2.0.6)

      concurrent-ruby (~> 1.0)

    unicode-display_width (2.5.0)

    uri (0.13.0)

    webrick (1.8.1)

    unicode-display_width (2.6.0)

    uri (0.13.1)

    webrick (1.8.2)

    yajl-ruby (1.4.3)



PLATFORMS
@@ -187,8 +191,8 @@ DEPENDENCIES 
  liquid-c (~> 4.0)

  mime-types (~> 3.0)

  rdoc (~> 6.0)

  tomlrb (~> 1.2)

  tomlrb

  yajl-ruby (~> 1.4)



BUNDLED WITH

   2.5.11
 
   2.5.9