Merge pull request #326313 from helsinki-systems/oxidized_0.30.1 (2a91d31c) · Commits · nix / nixpkgs

pkgs/tools/admin/oxidized/Gemfile

+2 −2

Original line number	Diff line number	Diff line
		source 'https://rubygems.org'

		gem 'oxidized', '0.29.1'
		gem 'oxidized-web', '0.13.1'
		gem 'oxidized', '0.30.1'
		gem 'oxidized-web', '0.14.0'

		# The version on rubygems is not up2date
		gem 'oxidized-script', git: 'https://github.com/ytti/oxidized-script.git', ref: '988cded5d89f52e274afb545bd3e011e19d5d22d'

pkgs/tools/admin/oxidized/Gemfile.lock

+60 −48

Original line number	Diff line number	Diff line
		@@ -11,80 +11,92 @@ GEM
		remote: https://rubygems.org/
		specs:
		asetus (0.4.0)
		backports (3.24.1)
		bcrypt_pbkdf (1.1.0)
		charlock_holmes (0.7.7)
		base64 (0.2.0)
		bcrypt_pbkdf (1.1.1)
		charlock_holmes (0.7.9)
		date (3.3.4)
		ed25519 (1.3.0)
		emk-sinatra-url-for (0.2.1)
		sinatra (>= 0.9.1.1)
		ffi (1.15.5)
		haml (5.2.2)
		temple (>= 0.8.0)
		haml (6.3.0)
		temple (>= 0.8.2)
		thor
		tilt
		htmlentities (4.3.4)
		json (2.6.3)
		json (2.7.2)
		multi_json (1.15.0)
		net-ssh (7.1.0)
		mustermann (3.0.0)
		ruby2_keywords (~> 0.0.1)
		net-ftp (0.3.7)
		net-protocol
		time
		net-protocol (0.2.2)
		timeout
		net-scp (4.0.0)
		net-ssh (>= 2.6.5, < 8.0.0)
		net-ssh (7.2.3)
		net-telnet (0.2.0)
		oxidized (0.29.1)
		nio4r (2.7.3)
		oxidized (0.30.1)
		asetus (~> 0.1)
		bcrypt_pbkdf (~> 1.0)
		ed25519 (~> 1.2)
		net-ftp (~> 0.2)
		net-scp (~> 4.0)
		net-ssh (~> 7.1)
		net-telnet (~> 0.2)
		psych (~> 3.3.2)
		rugged (~> 1.6)
		slop (~> 4.6)
		oxidized-web (0.13.1)
		oxidized-web (0.14.0)
		charlock_holmes (~> 0.7.5)
		emk-sinatra-url-for (~> 0.2)
		haml (~> 5.0)
		haml (~> 6.0)
		htmlentities (~> 4.3)
		json (>= 1.7.0)
		json (~> 2.3)
		oxidized (~> 0.26)
		puma (~> 3.11.4)
		rack-test (~> 0.7.0)
		sass (~> 3.3)
		sinatra (~> 1.4, >= 1.4.6)
		sinatra-contrib (~> 1.4, >= 1.4.6)
		puma (>= 3.11.4, < 6.5.0)
		sinatra (>= 1.4.6, < 5.0)
		sinatra-contrib (>= 1.4.6, < 5.0)
		psych (3.3.4)
		puma (3.11.4)
		rack (1.6.13)
		rack-protection (1.5.5)
		rack
		rack-test (0.7.0)
		rack (>= 1.0, < 3)
		rb-fsevent (0.11.2)
		rb-inotify (0.10.1)
		ffi (~> 1.0)
		rugged (1.6.3)
		sass (3.7.4)
		sass-listen (~> 4.0.0)
		sass-listen (4.0.0)
		rb-fsevent (~> 0.9, >= 0.9.4)
		rb-inotify (~> 0.9, >= 0.9.7)
		sinatra (1.4.8)
		rack (~> 1.5)
		rack-protection (~> 1.4)
		tilt (>= 1.3, < 3)
		sinatra-contrib (1.4.7)
		backports (>= 2.0)
		multi_json
		rack-protection
		rack-test
		sinatra (~> 1.4.0)
		tilt (>= 1.3, < 3)
		puma (6.4.2)
		nio4r (~> 2.0)
		rack (3.1.7)
		rack-protection (4.0.0)
		base64 (>= 0.1.0)
		rack (>= 3.0.0, < 4)
		rack-session (2.0.0)
		rack (>= 3.0.0)
		ruby2_keywords (0.0.5)
		rugged (1.7.2)
		sinatra (4.0.0)
		mustermann (~> 3.0)
		rack (>= 3.0.0, < 4)
		rack-protection (= 4.0.0)
		rack-session (>= 2.0.0, < 3)
		tilt (~> 2.0)
		sinatra-contrib (4.0.0)
		multi_json (>= 0.0.2)
		mustermann (~> 3.0)
		rack-protection (= 4.0.0)
		sinatra (= 4.0.0)
		tilt (~> 2.0)
		slop (4.10.1)
		temple (0.10.1)
		tilt (2.1.0)
		temple (0.10.3)
		thor (1.3.1)
		tilt (2.4.0)
		time (0.3.0)
		date
		timeout (0.4.1)

		PLATFORMS
		x86_64-linux

		DEPENDENCIES
		oxidized (= 0.29.1)
		oxidized (= 0.30.1)
		oxidized-script!
		oxidized-web (= 0.13.1)
		oxidized-web (= 0.14.0)
		psych (~> 3.3.2)

		BUNDLED WITH
		2.3.26
		2.5.9

pkgs/tools/admin/oxidized/gemset.nix

+128 −75

Original line number	Diff line number	Diff line
		@@ -9,77 +9,77 @@
		};
		version = "0.4.0";
		};
		backports = {
		base64 = {
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "1f3zcy0q88rw3clk0r7bai7sp4r253lndf0qmdgczq1ykbm219w3";
		sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
		type = "gem";
		};
		version = "3.24.1";
		version = "0.2.0";
		};
		bcrypt_pbkdf = {
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445";
		sha256 = "04rb3rp9bdxn1y3qiflfpj7ccwb8ghrfbydh5vfz1l9px3fpg41g";
		type = "gem";
		};
		version = "1.1.0";
		version = "1.1.1";
		};
		charlock_holmes = {
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p";
		sha256 = "1c1dws56r7p8y363dhyikg7205z59a3bn4amnv2y488rrq8qm7ml";
		type = "gem";
		};
		version = "0.7.7";
		version = "0.7.9";
		};
		ed25519 = {
		date = {
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "0zb2dr2ihb1qiknn5iaj1ha1w9p7lj9yq5waasndlfadz225ajji";
		sha256 = "149jknsq999gnhy865n33fkk22s0r447k76x9pmcnnwldfv2q7wp";
		type = "gem";
		};
		version = "1.3.0";
		version = "3.3.4";
		};
		emk-sinatra-url-for = {
		dependencies = ["sinatra"];
		ed25519 = {
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "0rd5b1lraklv0hblzdnmw2z3dragfg0qqk7wxbpn58f8y7jxzjgj";
		sha256 = "0zb2dr2ihb1qiknn5iaj1ha1w9p7lj9yq5waasndlfadz225ajji";
		type = "gem";
		};
		version = "0.2.1";
		version = "1.3.0";
		};
		ffi = {
		emk-sinatra-url-for = {
		dependencies = ["sinatra"];
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
		sha256 = "0rd5b1lraklv0hblzdnmw2z3dragfg0qqk7wxbpn58f8y7jxzjgj";
		type = "gem";
		};
		version = "1.15.5";
		version = "0.2.1";
		};
		haml = {
		dependencies = ["temple" "tilt"];
		dependencies = ["temple" "thor" "tilt"];
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "035fgbfr20m08w4603ls2lwqbggr0vy71mijz0p68ib1am394xbf";
		sha256 = "15yxph91zswbnfy7szpdcfbdfqqn595ff290hm4f6fcnhryvhvlf";
		type = "gem";
		};
		version = "5.2.2";
		version = "6.3.0";
		};
		htmlentities = {
		groups = ["default"];
		@@ -96,10 +96,10 @@
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6";
		sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q";
		type = "gem";
		};
		version = "2.6.3";
		version = "2.7.2";
		};
		multi_json = {
		groups = ["default"];
		@@ -111,15 +111,59 @@
		};
		version = "1.15.0";
		};
		mustermann = {
		dependencies = ["ruby2_keywords"];
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "0rwbq20s2gdh8dljjsgj5s6wqqfmnbclhvv2c2608brv7jm6jdbd";
		type = "gem";
		};
		version = "3.0.0";
		};
		net-ftp = {
		dependencies = ["net-protocol" "time"];
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "1vhwqx8k5xscl6j6gdf1xs1lz6fwm8k8s1n7pwhk22cxnxcfmnnh";
		type = "gem";
		};
		version = "0.3.7";
		};
		net-protocol = {
		dependencies = ["timeout"];
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "1a32l4x73hz200cm587bc29q8q9az278syw3x6fkc9d1lv5y0wxa";
		type = "gem";
		};
		version = "0.2.2";
		};
		net-scp = {
		dependencies = ["net-ssh"];
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "1si2nq9l6jy5n2zw1q59a5gaji7v9vhy8qx08h4fg368906ysbdk";
		type = "gem";
		};
		version = "4.0.0";
		};
		net-ssh = {
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "0yx0pb5fmziz92bw8qzbh8vf20lr56nd3s6q8h0gsgr307lki687";
		sha256 = "0sqbq5aks9xxnldbd2hy20ypnd59zcra98ql0r7jjc26s5rgc18n";
		type = "gem";
		};
		version = "7.1.0";
		version = "7.2.3";
		};
		net-telnet = {
		groups = ["default"];
		@@ -131,16 +175,26 @@
		};
		version = "0.2.0";
		};
		nio4r = {
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "017nbw87dpr4wyk81cgj8kxkxqgsgblrkxnmmadc77cg9gflrfal";
		type = "gem";
		};
		version = "2.7.3";
		};
		oxidized = {
		dependencies = ["asetus" "bcrypt_pbkdf" "ed25519" "net-ssh" "net-telnet" "rugged" "slop"];
		dependencies = ["asetus" "bcrypt_pbkdf" "ed25519" "net-ftp" "net-scp" "net-ssh" "net-telnet" "psych" "rugged" "slop"];
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "1ww8iv89zvklnvq9cv2lb6wyb5y73hinzm6xgd21za4204aanlps";
		sha256 = "0ry9rwksjb80wxd42zv5m5444n5hwhkbr4spa895jk2c1k5q1y0c";
		type = "gem";
		};
		version = "0.29.1";
		version = "0.30.1";
		};
		oxidized-script = {
		dependencies = ["oxidized" "slop"];
		@@ -156,15 +210,15 @@
		version = "0.6.0";
		};
		oxidized-web = {
		dependencies = ["charlock_holmes" "emk-sinatra-url-for" "haml" "htmlentities" "json" "oxidized" "puma" "rack-test" "sass" "sinatra" "sinatra-contrib"];
		dependencies = ["charlock_holmes" "emk-sinatra-url-for" "haml" "htmlentities" "json" "oxidized" "puma" "sinatra" "sinatra-contrib"];
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "07qmal83h1h5dqapgirq5yrnclbm3xhcjqkj80lla3dq18jmjhqs";
		sha256 = "0mf1kxjg49fxf988sqd9cni8j5r8xsp3218370ppinsy39l50782";
		type = "gem";
		};
		version = "0.13.1";
		version = "0.14.0";
		};
		psych = {
		groups = ["default"];
		@@ -177,150 +231,149 @@
		version = "3.3.4";
		};
		puma = {
		dependencies = ["nio4r"];
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "06qiqx1pcfwq4gi9pdrrq8r6hgh3rwl7nl51r67zpm5xmqlp0g10";
		sha256 = "0i2vaww6qcazj0ywva1plmjnj6rk23b01szswc5jhcq7s2cikd1y";
		type = "gem";
		};
		version = "3.11.4";
		version = "6.4.2";
		};
		rack = {
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "0wr1f3g9rc9i8svfxa9cijajl1661d817s56b2w7rd572zwn0zi0";
		sha256 = "12z55b90vvr4sh93az2yfr3fg91jivsag8lcg0k360d99vdq568f";
		type = "gem";
		};
		version = "1.6.13";
		version = "3.1.7";
		};
		rack-protection = {
		dependencies = ["rack"];
		dependencies = ["base64" "rack"];
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss";
		sha256 = "1xmvcxgm1jq92hqxm119gfk95wzl0d46nb2c2c6qqsm4ra2n3nyh";
		type = "gem";
		};
		version = "1.5.5";
		version = "4.0.0";
		};
		rack-test = {
		rack-session = {
		dependencies = ["rack"];
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "0f50ljlbg38g21q242him0n12r0fz7r3rs9n6p8ppahzh7k22x11";
		sha256 = "10afdpmy9kh0qva96slcyc59j4gkk9av8ilh58cnj0qq7q3b416v";
		type = "gem";
		};
		version = "0.7.0";
		version = "2.0.0";
		};
		rb-fsevent = {
		ruby2_keywords = {
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423";
		sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
		type = "gem";
		};
		version = "0.11.2";
		version = "0.0.5";
		};
		rb-inotify = {
		dependencies = ["ffi"];
		rugged = {
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005";
		sha256 = "1sccng15h8h3mcjxfgvxy85lfpswbj0nhmzwwsqdffbzqgsb2jch";
		type = "gem";
		};
		version = "0.10.1";
		version = "1.7.2";
		};
		rugged = {
		sinatra = {
		dependencies = ["mustermann" "rack" "rack-protection" "rack-session" "tilt"];
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "016bawsahkhxx7p8azxirpl7y2y7i8a027pj8910gwf6ipg329in";
		sha256 = "0za92lv4s7xhgkkm6xxf7ib0b3bsyj8drxgkrskgsb5g3mxnixjl";
		type = "gem";
		};
		version = "1.6.3";
		version = "4.0.0";
		};
		sass = {
		dependencies = ["sass-listen"];
		sinatra-contrib = {
		dependencies = ["multi_json" "mustermann" "rack-protection" "sinatra" "tilt"];
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0";
		sha256 = "0r9khg85m60w0i77jpnm2irh9m4k0ia4mlicapj8dr7s6ykqd9dh";
		type = "gem";
		};
		version = "3.7.4";
		version = "4.0.0";
		};
		sass-listen = {
		dependencies = ["rb-fsevent" "rb-inotify"];
		slop = {
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
		sha256 = "1iyrjskgxyn8i1679qwkzns85p909aq77cgx2m4fs5ygzysj4hw4";
		type = "gem";
		};
		version = "4.0.0";
		version = "4.10.1";
		};
		sinatra = {
		dependencies = ["rack" "rack-protection" "tilt"];
		temple = {
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq";
		sha256 = "0fwia5hvc1xz9w7vprzjnsym3v9j5l9ggdvy70jixbvpcpz4acfz";
		type = "gem";
		};
		version = "1.4.8";
		version = "0.10.3";
		};
		sinatra-contrib = {
		dependencies = ["backports" "multi_json" "rack-protection" "rack-test" "sinatra" "tilt"];
		thor = {
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "0vi3i0icbi2figiayxpvxbqpbn1syma7w4p4zw5mav1ln4c7jnfr";
		sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps";
		type = "gem";
		};
		version = "1.4.7";
		version = "1.3.1";
		};
		slop = {
		tilt = {
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "1iyrjskgxyn8i1679qwkzns85p909aq77cgx2m4fs5ygzysj4hw4";
		sha256 = "0kds7wkxmb038cwp6ravnwn8k65ixc68wpm8j5jx5bhx8ndg4x6z";
		type = "gem";
		};
		version = "4.10.1";
		version = "2.4.0";
		};
		temple = {
		time = {
		dependencies = ["date"];
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "1jj8lny5hp8gm920k73r6xpb40j5mpiw1dcr8g5id4hxjggkw8by";
		sha256 = "0c15v19hyxjcfzaviqlwhgajgyrrlb0pjilza6mkv49bhspy6av6";
		type = "gem";
		};
		version = "0.10.1";
		version = "0.3.0";
		};
		tilt = {
		timeout = {
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "1qmhi6d9przjzhsyk9g5pq2j75c656msh6xzprqd2mxgphf23jxs";
		sha256 = "16mvvsmx90023wrhf8dxc1lpqh0m8alk65shb7xcya6a9gflw7vg";
		type = "gem";
		};
		version = "2.1.0";
		version = "0.4.1";
		};
		}