Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cb1b139e7752
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 86cd4e24d372
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 26, 2020

  1. gollum: update dependencies

    @Mic92
    Mic92 committed Nov 26, 2020
    Copy the full SHA
    ec59d37 View commit details

  2. Merge pull request #105084 from Mic92/gollum 

    gollum: update dependencies
    @SuperSandro2000
    SuperSandro2000 authored Nov 26, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    86cd4e2 View commit details
Showing with 32 additions and 44 deletions.
  1. +13 −15 pkgs/applications/misc/gollum/Gemfile.lock
  2. +19 −29 pkgs/applications/misc/gollum/gemset.nix
28 changes: 13 additions & 15 deletions pkgs/applications/misc/gollum/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
GEM
remote: https://rubygems.org/
specs:
backports (3.18.1)
concurrent-ruby (1.1.7)
crass (1.0.6)
execjs (2.7.0)
ffi (1.13.1)
gemojione (4.3.3)
json
github-markup (3.0.4)
github-markup (3.0.5)
gollum (5.1.1)
gemojione (~> 4.1)
gollum-lib (~> 5.0)
@@ -25,7 +24,7 @@ GEM
therubyrhino (~> 2.1.0)
uglifier (~> 3.2)
useragent (~> 0.16.2)
gollum-lib (5.0.5)
gollum-lib (5.0.6)
gemojione (~> 4.1)
github-markup (~> 3.0)
gollum-rugged_adapter (~> 1.0)
@@ -42,12 +41,12 @@ GEM
rexml
kramdown-parser-gfm (1.0.1)
kramdown (~> 2.0)
loofah (2.6.0)
loofah (2.8.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2020.0512)
mime-types-data (3.2020.1104)
mini_portile2 (2.4.0)
multi_json (1.15.0)
mustache (0.99.8)
@@ -58,13 +57,13 @@ GEM
octicons (8.5.0)
nokogiri (>= 1.6.3.1)
rack (2.2.3)
rack-protection (2.0.8.1)
rack-protection (2.1.0)
rack
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.4)
rouge (3.22.0)
rouge (3.25.0)
rss (0.2.9)
rexml
ruby2_keywords (0.0.2)
@@ -74,22 +73,21 @@ GEM
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sinatra (2.0.8.1)
sinatra (2.1.0)
mustermann (~> 1.0)
rack (~> 2.0)
rack-protection (= 2.0.8.1)
rack (~> 2.2)
rack-protection (= 2.1.0)
tilt (~> 2.0)
sinatra-contrib (2.0.8.1)
backports (>= 2.8.2)
sinatra-contrib (2.1.0)
multi_json
mustermann (~> 1.0)
rack-protection (= 2.0.8.1)
sinatra (= 2.0.8.1)
rack-protection (= 2.1.0)
sinatra (= 2.1.0)
tilt (~> 2.0)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-helpers (1.3.0)
sprockets-helpers (1.4.0)
sprockets (>= 2.2)
therubyrhino (2.1.2)
therubyrhino_jar (>= 1.7.4, < 1.7.9)
48 changes: 19 additions & 29 deletions pkgs/applications/misc/gollum/gemset.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
{
backports = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qagwshq7zyjgm6k53hbrf4gfrwn6qz5d6rrc83cl59q37v68zsc";
type = "gem";
};
version = "3.18.1";
};
concurrent-ruby = {
groups = ["default"];
platforms = [];
@@ -65,10 +55,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14991x92v8s60hfqv7162jfmdqa20fifn2bz0km3k5cgi01pf9rs";
sha256 = "0rlq9hnvhhndqskl087xwabbvfbfnrvx8ac79iin35wmzpyagl96";
type = "gem";
};
version = "3.0.4";
version = "3.0.5";
};
gollum = {
dependencies = ["gemojione" "gollum-lib" "kramdown" "kramdown-parser-gfm" "mustache" "octicons" "rss" "sass" "sinatra" "sinatra-contrib" "sprockets" "sprockets-helpers" "therubyrhino" "uglifier" "useragent"];
@@ -87,10 +77,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18f3g5px9zznyh6ppqlnjdp1ia8awgrix9lhbfh64rpgxg0b9xlr";
sha256 = "02mc1w4hn9kjrgvg0r46x1bd0h8hq7lqs432dgjfn2dw36kchja4";
type = "gem";
};
version = "5.0.5";
version = "5.0.6";
};
gollum-rugged_adapter = {
dependencies = ["mime-types" "rugged"];
@@ -141,10 +131,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1s9hq8bpn6g5vqr3nzyirn3agn7x8agan6151zvq5vmkf6rvmyb2";
sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh";
type = "gem";
};
version = "2.6.0";
version = "2.8.0";
};
mime-types = {
dependencies = ["mime-types-data"];
@@ -162,10 +152,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753";
sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag";
type = "gem";
};
version = "3.2020.0512";
version = "3.2020.1104";
};
mini_portile2 = {
groups = ["default"];
@@ -246,10 +236,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zyj97bfr1shfgwk4ddmdbw0mdkm4qdyh9s1hl0k7accf3kxx1yi";
sha256 = "159a4j4kragqh0z0z8vrpilpmaisnlz3n7kgiyf16bxkwlb3qlhz";
type = "gem";
};
version = "2.0.8.1";
version = "2.1.0";
};
rb-fsevent = {
groups = ["default"];
@@ -287,10 +277,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wcz7i009wdbymlfsamagqi18m6ih8j60bii0k18f21g70r72i0m";
sha256 = "0yvcv901lrh5rfnk1h4h56hf2m6n9pd6w8n96vag74aakgz3gaxn";
type = "gem";
};
version = "3.22.0";
version = "3.25.0";
};
rss = {
dependencies = ["rexml"];
@@ -351,21 +341,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0riy3hwjab1mr73jcqx3brmbmwspnw3d193j06a5f0fy1w35z15q";
sha256 = "0dd53rzpkxgs697pycbhhgc9vcnxra4ly4xar8ni6aiydx2f88zk";
type = "gem";
};
version = "2.0.8.1";
version = "2.1.0";
};
sinatra-contrib = {
dependencies = ["backports" "multi_json" "mustermann" "rack-protection" "sinatra" "tilt"];
dependencies = ["multi_json" "mustermann" "rack-protection" "sinatra" "tilt"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mmrfm4pqh98f3irjpkvfpazhcx6q42bnx6bbms9dqvmck3mid28";
sha256 = "1rl1iiafz51yzjd0vchl2lni7lmwppjql6cn1fnfxbma707qlcja";
type = "gem";
};
version = "2.0.8.1";
version = "2.1.0";
};
sprockets = {
dependencies = ["concurrent-ruby" "rack"];
@@ -384,10 +374,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14iq8v16l31bfq7pikfmgcv5x6pkc5lbdmwwg6zlzcy1bibcliar";
sha256 = "0513ma356g05lsskhsb363263177h6ccmp475il0p69y18his2ij";
type = "gem";
};
version = "1.3.0";
version = "1.4.0";
};
therubyrhino = {
dependencies = ["therubyrhino_jar"];