diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b7b5232c170..a18e8a24b12 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -640,6 +640,7 @@ sternenseemann = "Lukas Epple "; stesie = "Stefan Siegl "; steveej = "Stefan Junker "; + StillerHarpo = "Florian Engel "; stumoss = "Stuart Moss "; SuprDewd = "Bjarki Ágúst Guðmundsson "; swarren83 = "Shawn Warren "; diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/pkgs/tools/misc/lolcat/Gemfile.lock index 4b318ea1473..a97f1eb9c87 100644 --- a/pkgs/tools/misc/lolcat/Gemfile.lock +++ b/pkgs/tools/misc/lolcat/Gemfile.lock @@ -1,14 +1,17 @@ GEM remote: http://rubygems.org/ specs: - lolcat (42.1.0) - paint (~> 0.8.3) - trollop (~> 1.16.2) - paint (0.8.7) - trollop (1.16.2) + lolcat (90.8.8) + paint (~> 2.0.0) + trollop (~> 2.1.2) + paint (2.0.1) + trollop (2.1.2) PLATFORMS ruby DEPENDENCIES lolcat + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/tools/misc/lolcat/default.nix b/pkgs/tools/misc/lolcat/default.nix index 21377d7bfa4..827484e885f 100644 --- a/pkgs/tools/misc/lolcat/default.nix +++ b/pkgs/tools/misc/lolcat/default.nix @@ -1,16 +1,19 @@ -{ stdenv, lib, bundlerEnv, gpgme, ruby, ncurses, writeText, zlib, xapian -, pkgconfig, which }: +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + name = "${pname}-${version}"; + pname = "lolcat"; + version = (import ./gemset.nix).lolcat.version; -bundlerEnv { inherit ruby; - pname = "lolcat"; + # expects Gemfile, Gemfile.lock and gemset.nix in the same directory gemdir = ./.; meta = with lib; { description = "A rainbow version of cat"; homepage = https://github.com/busyloop/lolcat; - license = licenses.wtfpl; - maintainers = with maintainers; [ pSub ]; + license = licenses.bsd3; + maintainers = with maintainers; [ StillerHarpo ]; }; } diff --git a/pkgs/tools/misc/lolcat/gemset.nix b/pkgs/tools/misc/lolcat/gemset.nix index 85acf7767a8..6d0962780f4 100644 --- a/pkgs/tools/misc/lolcat/gemset.nix +++ b/pkgs/tools/misc/lolcat/gemset.nix @@ -1,27 +1,27 @@ { - "lolcat" = { - version = "42.1.0"; + lolcat = { + dependencies = ["paint" "trollop"]; source = { + remotes = ["http://rubygems.org"]; + sha256 = "1q031wq8wvp09llb39w0ql5k1zkblvkbmhlvrkc3ym832pibk06f"; type = "gem"; - sha256 = "1jp0g7k958dg709dm1qs7nr8dmi4vlgvmcvqcr1zhk8ygx89rwgc"; }; - dependencies = [ - "paint" - "trollop" - ]; + version = "90.8.8"; }; - "paint" = { - version = "0.8.7"; + paint = { source = { + remotes = ["http://rubygems.org"]; + sha256 = "1gnh9cihc84w4xbw51pg15crjvhblbq6nkzljrp7kmn3434nsg0d"; type = "gem"; - sha256 = "0nl1x0190d44bfczlxdy16gxsvm95y14kxv3k9n92h9ap2zvdyd8"; }; + version = "2.0.1"; }; - "trollop" = { - version = "1.16.2"; + trollop = { source = { + remotes = ["http://rubygems.org"]; + sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8"; type = "gem"; - sha256 = "0frrp90dw266h3kf9g925dppir9l7p8jxknw6dn5nz6fa6c4g5lg"; }; + version = "2.1.2"; }; } \ No newline at end of file