diff options
Diffstat (limited to 'pkgs/development/tools')
32 files changed, 1010 insertions, 135 deletions
diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 5955f34b58e9..e89d8c113a16 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "085lm8v7biixy6rykq836gfy91jcccpz9qpk8i9x339dzy2b2q4l"; }; - buildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ]; + nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ]; makeFlags = ''PREFIX=$(out) CFGDIR=$(out)/cfg''; diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 29559bf8b0ef..ab9954735f35 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -1,6 +1,9 @@ -{stdenv, fetchurl, yacc }: +{ stdenv, fetchurl, makeWrapper, yacc, gcc }: -stdenv.mkDerivation rec { +let + binPath = stdenv.lib.makeBinPath [ gcc ]; + +in stdenv.mkDerivation rec { name = "spin-${version}"; version = "6.4.5"; url-version = stdenv.lib.replaceChars ["."] [""] version; @@ -13,11 +16,16 @@ stdenv.mkDerivation rec { sha256 = "0x8qnwm2xa8f176c52mzpvnfzglxs6xgig7bcgvrvkb3xf114224"; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ yacc ]; sourceRoot = "Spin/Src${version}"; - installPhase = "install -D spin $out/bin/spin"; + installPhase = '' + install -D spin $out/bin/spin + wrapProgram $out/bin/spin \ + --prefix PATH : ${binPath} + ''; meta = with stdenv.lib; { description = "Formal verification tool for distributed software systems"; diff --git a/pkgs/development/tools/analysis/verasco/default.nix b/pkgs/development/tools/analysis/verasco/default.nix new file mode 100644 index 000000000000..9b3ff8e570d6 --- /dev/null +++ b/pkgs/development/tools/analysis/verasco/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, coq, ocamlPackages +, tools ? stdenv.cc +}: + +stdenv.mkDerivation rec { + name = "verasco-1.3"; + src = fetchurl { + url = "http://compcert.inria.fr/verasco/release/${name}.tgz"; + sha256 = "0zvljrpwnv443k939zlw1f7ijwx18nhnpr8jl3f01jc5v66hr2k8"; + }; + + buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml findlib menhir zarith ]); + + preConfigure = '' + substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc' + ''; + + configureFlags = [ + "-toolprefix ${tools}/bin/" + (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux") + ]; + + prefixKey = "-prefix "; + + enableParallelBuilding = true; + buildFlags = "proof extraction ccheck"; + + installPhase = '' + mkdir -p $out/bin + cp ccheck $out/bin/ + ln -s $out/bin/ccheck $out/bin/verasco + if [ -e verasco.ini ] + then + mkdir -p $out/share + cp verasco.ini $out/share/ + fi + mkdir -p $out/lib/compcert + cp -riv runtime/include $out/lib/compcert + ''; + + meta = { + homepage = http://compcert.inria.fr/verasco/; + description = "A static analyzer for the CompCert subset of ISO C 1999"; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = stdenv.lib.licenses.unfree; + platforms = with stdenv.lib.platforms; darwin ++ linux; + }; +} diff --git a/pkgs/development/tools/chefdk/Gemfile b/pkgs/development/tools/chefdk/Gemfile index 9cd40fd3f4b6..7d974e498910 100644 --- a/pkgs/development/tools/chefdk/Gemfile +++ b/pkgs/development/tools/chefdk/Gemfile @@ -1,3 +1,17 @@ -source "https://rubygems.org" +source 'https://rubygems.org' gem 'chef-dk' +gem 'pry' +gem 'test-kitchen' +gem 'inspec' +gem 'kitchen-inspec' +gem 'kitchen-vagrant' +gem 'berkshelf' +gem 'chef-vault' +gem 'foodcritic' +gem 'ohai' +gem 'rubocop' +gem 'knife-spork' +gem 'fauxhai' +gem 'chefspec' +gem 'chef-provisioning' diff --git a/pkgs/development/tools/chefdk/Gemfile.lock b/pkgs/development/tools/chefdk/Gemfile.lock index 28b0e7f8aa43..ddbb1f5f1ddf 100644 --- a/pkgs/development/tools/chefdk/Gemfile.lock +++ b/pkgs/development/tools/chefdk/Gemfile.lock @@ -1,35 +1,74 @@ GEM remote: https://rubygems.org/ specs: + addressable (2.4.0) + app_conf (0.4.2) + ast (2.2.0) + berkshelf (4.3.0) + addressable (~> 2.3, >= 2.3.4) + berkshelf-api-client (~> 2.0, >= 2.0.2) + buff-config (~> 1.0) + buff-extensions (~> 1.0) + buff-shell_out (~> 0.1) + celluloid (= 0.16.0) + celluloid-io (~> 0.16.1) + cleanroom (~> 1.0) + faraday (~> 0.9) + httpclient (~> 2.7) + minitar (~> 0.5, >= 0.5.4) + octokit (~> 4.0) + retryable (~> 2.0) + ridley (~> 4.5) + solve (~> 2.0) + thor (~> 0.19) + berkshelf-api-client (2.0.2) + faraday (~> 0.9.1) + httpclient (~> 2.7.0) + ridley (~> 4.5) + buff-config (1.0.1) + buff-extensions (~> 1.0) + varia_model (~> 0.4) + buff-extensions (1.0.0) + buff-ignore (1.1.1) + buff-ruby_engine (0.1.0) + buff-shell_out (0.2.0) + buff-ruby_engine (~> 0.1.0) builder (3.2.2) - chef (12.5.1) - chef-config (= 12.5.1) - chef-zero (~> 4.2, >= 4.2.2) + celluloid (0.16.0) + timers (~> 4.0.0) + celluloid-io (0.16.2) + celluloid (>= 0.16.0) + nio4r (>= 1.1.0) + chef (12.8.1) + bundler (>= 1.10) + chef-config (= 12.8.1) + chef-zero (~> 4.5) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) ffi-yajl (~> 2.2) highline (~> 1.6, >= 1.6.9) - mixlib-authentication (~> 1.3) + mixlib-authentication (~> 1.4) mixlib-cli (~> 1.4) mixlib-log (~> 1.3) mixlib-shellout (~> 2.0) - net-ssh (~> 2.6) + net-ssh (>= 2.9, < 4.0) net-ssh-multi (~> 1.1) ohai (>= 8.6.0.alpha.1, < 9) plist (~> 3.1.0) - pry (~> 0.9) - rspec-core (~> 3.2) - rspec-expectations (~> 3.2) - rspec-mocks (~> 3.2) + proxifier (~> 1.0) + rspec-core (~> 3.4) + rspec-expectations (~> 3.4) + rspec-mocks (~> 3.4) rspec_junit_formatter (~> 0.2.0) serverspec (~> 2.7) specinfra (~> 2.10) syslog-logger (~> 1.6) - chef-config (12.5.1) + uuidtools (~> 2.1.5) + chef-config (12.8.1) mixlib-config (~> 2.0) mixlib-shellout (~> 2.0) - chef-dk (0.10.0) - chef (~> 12.0, >= 12.2.1) + chef-dk (0.11.2) + chef (~> 12.5) chef-provisioning (~> 1.2) cookbook-omnifetch (~> 0.2, >= 0.2.2) diff-lcs (~> 1.0) @@ -39,92 +78,184 @@ GEM mixlib-shellout (~> 2.0) paint (~> 1.0) solve (~> 2.0, >= 2.0.1) - chef-provisioning (1.5.0) - cheffish (~> 1.3, >= 1.3.1) + chef-provisioning (1.6.0) + cheffish (>= 1.3.1, < 3.0) inifile (~> 2.0) mixlib-install (~> 0.7.0) net-scp (~> 1.0) - net-ssh (~> 2.0) + net-ssh (>= 2.9, < 4.0) net-ssh-gateway (~> 1.2.0) winrm (~> 1.3) - chef-zero (4.3.2) + chef-vault (2.8.0) + chef-zero (4.5.0) ffi-yajl (~> 2.2) hashie (>= 2.0, < 4.0) mixlib-log (~> 1.3) rack uuidtools (~> 2.1) - cheffish (1.6.0) + cheffish (2.0.2) chef-zero (~> 4.3) - coderay (1.1.0) + compat_resource + chefspec (4.6.0) + chef (>= 11.14) + fauxhai (~> 3.0, >= 3.0.1) + rspec (~> 3.0) + cleanroom (1.0.0) + coderay (1.1.1) + compat_resource (12.8.0) cookbook-omnifetch (0.2.2) minitar (~> 0.5.4) diff-lcs (1.2.5) + diffy (3.1.0) + docker-api (1.26.2) + excon (>= 0.38.0) + json erubis (2.7.0) + excon (0.48.0) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) + fauxhai (3.1.0) + net-ssh ffi (1.9.10) - ffi-yajl (2.2.2) + ffi-yajl (2.2.3) libyajl2 (~> 1.2) + foodcritic (6.0.1) + erubis + gherkin (~> 2.11) + nokogiri (>= 1.5, < 2.0) + rake + rufus-lru (~> 1.0) + treetop (~> 1.4) + yajl-ruby (~> 1.1) + gherkin (2.12.2) + multi_json (~> 1.3) + git (1.3.0) gssapi (1.2.0) ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) hashie (3.4.3) highline (1.7.8) - httpclient (2.7.0.1) + hitimes (1.2.3) + httpclient (2.7.1) inifile (2.0.2) - ipaddress (0.8.0) + inspec (0.14.8) + json (~> 1.8) + method_source (~> 0.8) + pry (~> 0) + r-train (~> 0.10.1) + rainbow (~> 2) + rspec (~> 3.3) + rspec-its (~> 1.2) + rubyzip (~> 1.1) + thor (~> 0.19) + ipaddress (0.8.3) + json (1.8.3) + kitchen-inspec (0.12.3) + inspec (~> 0.14.1) + test-kitchen (~> 1.6) + kitchen-vagrant (0.19.0) + test-kitchen (~> 1.4) + knife-spork (1.6.1) + app_conf (>= 0.4.0) + chef (>= 11.0.0) + diffy (>= 3.0.1) + git (>= 1.2.5) libyajl2 (1.2.0) little-plugger (1.1.4) logging (2.0.0) little-plugger (~> 1.1) multi_json (~> 1.10) method_source (0.8.2) - mime-types (2.99) + mini_portile2 (2.0.0) minitar (0.5.4) - mixlib-authentication (1.3.0) + mixlib-authentication (1.4.0) mixlib-log + rspec-core (~> 3.2) + rspec-expectations (~> 3.2) + rspec-mocks (~> 3.2) mixlib-cli (1.5.0) mixlib-config (2.2.1) - mixlib-install (0.7.0) + mixlib-install (0.7.1) mixlib-log (1.6.0) - mixlib-shellout (2.2.5) + mixlib-shellout (2.2.6) molinillo (0.2.3) multi_json (1.11.2) + multipart-post (2.0.0) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (2.9.2) + net-ssh (3.0.2) net-ssh-gateway (1.2.0) net-ssh (>= 2.6.5) net-ssh-multi (1.2.1) net-ssh (>= 2.6.5) net-ssh-gateway (>= 1.2.0) net-telnet (0.1.1) + nio4r (1.2.1) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) nori (2.6.0) - ohai (8.7.0) + octokit (4.3.0) + sawyer (~> 0.7.0, >= 0.5.3) + ohai (8.12.0) chef-config (>= 12.5.0.alpha.1, < 13) ffi (~> 1.9) ffi-yajl (~> 2.2) ipaddress - mime-types (~> 2.0) mixlib-cli mixlib-config (~> 2.0) mixlib-log mixlib-shellout (~> 2.0) + plist rake (~> 10.1) systemu (~> 2.6.4) wmi-lite (~> 1.0) - paint (1.0.0) + paint (1.0.1) + parser (2.3.0.6) + ast (~> 2.2) plist (3.1.0) + polyglot (0.3.5) + powerpack (0.1.1) + proxifier (1.0.3) pry (0.10.3) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) + r-train (0.10.3) + docker-api (~> 1.26.2) + json (~> 1.8) + mixlib-shellout (~> 2.1) + net-scp (~> 1.2) + net-ssh (>= 2.9, < 4.0) + winrm (~> 1.6) + winrm-fs (~> 0.3) rack (1.6.4) - rake (10.4.2) + rainbow (2.1.0) + rake (10.5.0) + retryable (2.0.3) + ridley (4.5.0) + addressable + buff-config (~> 1.0) + buff-extensions (~> 1.0) + buff-ignore (~> 1.1) + buff-shell_out (~> 0.1) + celluloid (~> 0.16.0) + celluloid-io (~> 0.16.1) + chef-config (>= 12.5.0) + erubis + faraday (~> 0.9.0) + hashie (>= 2.0.2, < 4.0.0) + httpclient (~> 2.7) + json (>= 1.7.7) + mixlib-authentication (>= 1.3.0) + retryable (~> 2.0) + semverse (~> 1.1) + varia_model (~> 0.4.0) rspec (3.4.0) rspec-core (~> 3.4.0) rspec-expectations (~> 3.4.0) rspec-mocks (~> 3.4.0) - rspec-core (3.4.1) + rspec-core (3.4.4) rspec-support (~> 3.4.0) rspec-expectations (3.4.0) diff-lcs (>= 1.2.0, < 2.0) @@ -132,49 +263,97 @@ GEM rspec-its (1.2.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.4.0) + rspec-mocks (3.4.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.4.0) rspec-support (3.4.1) rspec_junit_formatter (0.2.3) builder (< 4) rspec-core (>= 2, < 4, != 2.12.0) - rubyntlm (0.4.0) + rubocop (0.38.0) + parser (>= 2.3.0.6, < 3.0) + powerpack (~> 0.1) + rainbow (>= 1.99.1, < 3.0) + ruby-progressbar (~> 1.7) + unicode-display_width (~> 1.0, >= 1.0.1) + ruby-progressbar (1.7.5) + rubyntlm (0.6.0) + rubyzip (1.2.0) + rufus-lru (1.0.5) + safe_yaml (1.0.4) + sawyer (0.7.0) + addressable (>= 2.3.5, < 2.5) + faraday (~> 0.8, < 0.10) semverse (1.2.1) - serverspec (2.24.3) + serverspec (2.31.0) multi_json rspec (~> 3.0) rspec-its - specinfra (~> 2.43) + specinfra (~> 2.53) sfl (2.2) slop (3.6.0) - solve (2.0.1) + solve (2.0.2) molinillo (~> 0.2.3) semverse (~> 1.1) - specinfra (2.44.5) + specinfra (2.53.1) net-scp - net-ssh (~> 2.7) + net-ssh (>= 2.7, < 3.1) net-telnet sfl syslog-logger (1.6.8) systemu (2.6.5) + test-kitchen (1.6.0) + mixlib-install (~> 0.7) + mixlib-shellout (>= 1.2, < 3.0) + net-scp (~> 1.1) + net-ssh (>= 2.9, < 4.0) + safe_yaml (~> 1.0) + thor (~> 0.18) + thor (0.19.1) + timers (4.0.4) + hitimes + treetop (1.6.5) + polyglot (~> 0.3) + unicode-display_width (1.0.2) uuidtools (2.1.5) - winrm (1.3.6) + varia_model (0.4.1) + buff-extensions (~> 1.0) + hashie (>= 2.0.2, < 4.0.0) + winrm (1.7.2) builder (>= 2.1.2) gssapi (~> 1.2) gyoku (~> 1.0) httpclient (~> 2.2, >= 2.2.0.2) logging (>= 1.6.1, < 3.0) nori (~> 2.0) - rubyntlm (~> 0.4.0) - uuidtools (~> 2.1.2) + rubyntlm (~> 0.6.0) + winrm-fs (0.3.2) + erubis (~> 2.7) + logging (>= 1.6.1, < 3.0) + rubyzip (~> 1.1) + winrm (~> 1.5) wmi-lite (1.0.0) + yajl-ruby (1.2.1) PLATFORMS ruby DEPENDENCIES + berkshelf chef-dk + chef-provisioning + chef-vault + chefspec + fauxhai + foodcritic + inspec + kitchen-inspec + kitchen-vagrant + knife-spork + ohai + pry + rubocop + test-kitchen BUNDLED WITH 1.10.5 diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index 3b427aae4d25..80f9ef56abce 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, bundlerEnv, ruby, perl, autoconf }: bundlerEnv { - name = "chefdk-0.10.0"; + name = "chefdk-0.11.2"; inherit ruby; gemfile = ./Gemfile; diff --git a/pkgs/development/tools/chefdk/gemset.nix b/pkgs/development/tools/chefdk/gemset.nix index cb4c1fcb67d6..87faa3105ad6 100644 --- a/pkgs/development/tools/chefdk/gemset.nix +++ b/pkgs/development/tools/chefdk/gemset.nix @@ -1,4 +1,104 @@ { + "addressable" = { + version = "2.4.0"; + source = { + type = "gem"; + sha256 = "0mpn7sbjl477h56gmxsjqb89r5s3w7vx5af994ssgc3iamvgzgvs"; + }; + }; + "app_conf" = { + version = "0.4.2"; + source = { + type = "gem"; + sha256 = "1yqwhr7d9i0cgavqkkq0b4pfqpn213dbhj5ayygr293wplm0jh57"; + }; + }; + "ast" = { + version = "2.2.0"; + source = { + type = "gem"; + sha256 = "14md08f8f1mmr2v7lczqnf1n1v8bal73gvg6ldhvkds1bmbnkrlb"; + }; + }; + "berkshelf" = { + version = "4.3.0"; + source = { + type = "gem"; + sha256 = "1dsbyq3749b9133rmnzjak7rsysyps1ryalc2r4rxyihflmxhix9"; + }; + dependencies = [ + "addressable" + "berkshelf-api-client" + "buff-config" + "buff-extensions" + "buff-shell_out" + "celluloid" + "celluloid-io" + "cleanroom" + "faraday" + "httpclient" + "minitar" + "octokit" + "retryable" + "ridley" + "solve" + "thor" + ]; + }; + "berkshelf-api-client" = { + version = "2.0.2"; + source = { + type = "gem"; + sha256 = "0xbn8q2xi09x5a7ma6wqs13gkpzj4ly21vls7m7ffv3sw8x29cyc"; + }; + dependencies = [ + "faraday" + "httpclient" + "ridley" + ]; + }; + "buff-config" = { + version = "1.0.1"; + source = { + type = "gem"; + sha256 = "0r3h3mk1dj7pc4zymz450bdqp23faqprx363ji4zfdg8z6r31jfh"; + }; + dependencies = [ + "buff-extensions" + "varia_model" + ]; + }; + "buff-extensions" = { + version = "1.0.0"; + source = { + type = "gem"; + sha256 = "1jqb5sn38qgx66lc4km6rljzz05myijjw12hznz1fk0k4qfw6yzk"; + }; + }; + "buff-ignore" = { + version = "1.1.1"; + source = { + type = "gem"; + sha256 = "1ghzhkgbq7f5fc7xilw0c9gspxpdhqhq3ygi1ybjm6r0dxlmvdb4"; + }; + }; + "buff-ruby_engine" = { + version = "0.1.0"; + source = { + type = "gem"; + sha256 = "1llpwpmzkakbgz9fc3vr1298cx1n9zv1g25fwj80xnnr7428aj8p"; + }; + }; + "buff-shell_out" = { + version = "0.2.0"; + source = { + type = "gem"; + sha256 = "0sphb69vxm346ys2laiz174k5jx628vfwz9ch8g2w9plc4xkxf3p"; + }; + dependencies = [ + "buff-ruby_engine" + ]; + }; "builder" = { version = "3.2.2"; source = { @@ -6,11 +106,32 @@ sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2"; }; }; + "celluloid" = { + version = "0.16.0"; + source = { + type = "gem"; + sha256 = "044xk0y7i1xjafzv7blzj5r56s7zr8nzb619arkrl390mf19jxv3"; + }; + dependencies = [ + "timers" + ]; + }; + "celluloid-io" = { + version = "0.16.2"; + source = { + type = "gem"; + sha256 = "1l1x0p6daa5vskywrvaxdlanwib3k5pps16axwyy4p8d49pn9rnx"; + }; + dependencies = [ + "celluloid" + "nio4r" + ]; + }; "chef" = { - version = "12.5.1"; + version = "12.8.1"; source = { type = "gem"; - sha256 = "0hf6766wmh1dg7f09hi80s8hn1knvzgnaimbhvc05b4q973k5lmb"; + sha256 = "16wb3ymnl7rbayy8qp35fp0947cnq2y9bac7xzhc1njp5j2p6lhg"; }; dependencies = [ "chef-config" @@ -27,7 +148,7 @@ "net-ssh-multi" "ohai" "plist" - "pry" + "proxifier" "rspec-core" "rspec-expectations" "rspec-mocks" @@ -35,13 +156,14 @@ "serverspec" "specinfra" "syslog-logger" + "uuidtools" ]; }; "chef-config" = { - version = "12.5.1"; + version = "12.8.1"; source = { type = "gem"; - sha256 = "18iqlf9x3iavh6183zlkiasxsz45drshihmk8yj56prrzfiys67m"; + sha256 = "0chgbdv9c1xfkhzx3kmpr8lj0wjdbziixgln2y3ryn84x4fg84ic"; }; dependencies = [ "mixlib-config" @@ -49,10 +171,10 @@ ]; }; "chef-dk" = { - version = "0.10.0"; + version = "0.11.2"; source = { type = "gem"; - sha256 = "0gxm8dbq7y4bf9wb8zad9q5idsl88f1nm3rvnd2am0xka6bnxv29"; + sha256 = "1qfx5qclvh3kwjgfs18iwdn0knpgka5py7mwi4r0mz2sw14wq5wk"; }; dependencies = [ "chef" @@ -68,10 +190,10 @@ ]; }; "chef-provisioning" = { - version = "1.5.0"; + version = "1.6.0"; source = { type = "gem"; - sha256 = "1xln9hf8mcm81cmw96ccmyzrak54fbjrl9wgii37rx04v4a2435n"; + sha256 = "1nxgia4zyhyqbrz65q7lgjwx8ba5iyzxdxa181y0s4aqqpv0j45g"; }; dependencies = [ "cheffish" @@ -83,11 +205,18 @@ "winrm" ]; }; + "chef-vault" = { + version = "2.8.0"; + source = { + type = "gem"; + sha256 = "0dbvawlrfx9mqjyh8q71jjfh987xqqv3f6c0pmcjp6qxs95l1dqq"; + }; + }; "chef-zero" = { - version = "4.3.2"; + version = "4.5.0"; source = { type = "gem"; - sha256 = "1djnxs97kj13vj1hxx4v6978pkwm8i03p76gbirbp3z2zs6jyvjf"; + sha256 = "1lqvmgjniviahrhim8k67qddnwh5p7wzw33r1wga4z136pfka1zx"; }; dependencies = [ "ffi-yajl" @@ -98,20 +227,47 @@ ]; }; "cheffish" = { - version = "1.6.0"; + version = "2.0.2"; source = { type = "gem"; - sha256 = "10aj660azybnf7444a604pjs8p9pvwm3n4mavy8mp3g30yr07paq"; + sha256 = "0mvp7kybgp3nm2sdcmlx8bv147hcdjx745a8k97bx1m47isv97ax"; }; dependencies = [ "chef-zero" + "compat_resource" ]; }; + "chefspec" = { + version = "4.6.0"; + source = { + type = "gem"; + sha256 = "1ikn8k6xdqixdjga50jmkqajz2z2z71dg4j3dsmd31hv1mdbp7wz"; + }; + dependencies = [ + "chef" + "fauxhai" + "rspec" + ]; + }; + "cleanroom" = { + version = "1.0.0"; + source = { + type = "gem"; + sha256 = "1r6qa4b248jasv34vh7rw91pm61gzf8g5dvwx2gxrshjs7vbhfml"; + }; + }; "coderay" = { - version = "1.1.0"; + version = "1.1.1"; + source = { + type = "gem"; + sha256 = "1x6z923iwr1hi04k6kz5a6llrixflz8h5sskl9mhaaxy9jx2x93r"; + }; + }; + "compat_resource" = { + version = "12.8.0"; source = { type = "gem"; - sha256 = "059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s"; + sha256 = "0zp1dd1wkbgxbazvs7acqyk1xjls0wq1pd5ilhj6zi63lpychgy5"; }; }; "cookbook-omnifetch" = { @@ -131,6 +287,24 @@ sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; }; }; + "diffy" = { + version = "3.1.0"; + source = { + type = "gem"; + sha256 = "1azibizfv91sjbzhjqj1pg2xcv8z9b8a7z6kb3wpl4hpj5hil5kj"; + }; + }; + "docker-api" = { + version = "1.26.2"; + source = { + type = "gem"; + sha256 = "0sg2xazcga21pmlb9yy1z5f3yyzqa2ly5b2h2cxfhyfda6k748wk"; + }; + dependencies = [ + "excon" + "json" + ]; + }; "erubis" = { version = "2.7.0"; source = { @@ -138,6 +312,33 @@ sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; }; }; + "excon" = { + version = "0.48.0"; + source = { + type = "gem"; + sha256 = "0hjfd2p2mhklavhy8gy1ygm390iz3imx71065dcr9r28s3wk63gf"; + }; + }; + "faraday" = { + version = "0.9.2"; + source = { + type = "gem"; + sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6"; + }; + dependencies = [ + "multipart-post" + ]; + }; + "fauxhai" = { + version = "3.1.0"; + source = { + type = "gem"; + sha256 = "0ff8wappc4n4v7v6969zm64c36qiadfw3igl8cyqrpp36fnqm04d"; + }; + dependencies = [ + "net-ssh" + ]; + }; "ffi" = { version = "1.9.10"; source = { @@ -146,15 +347,48 @@ }; }; "ffi-yajl" = { - version = "2.2.2"; + version = "2.2.3"; source = { type = "gem"; - sha256 = "013n5cf80p2wfpmj1mdjkbmcyx3hg4c81wl3bamglaf4i12a2qk2"; + sha256 = "14wgy2isc5yir4zdkk0l3hzh1s1ycwblqb1hllbv4g9svb9naqbz"; }; dependencies = [ "libyajl2" ]; }; + "foodcritic" = { + version = "6.0.1"; + source = { + type = "gem"; + sha256 = "06pi4984g6vwfzqvsf73zpw4h1p63bl7yn2sjb9mqd896bb3v6cn"; + }; + dependencies = [ + "erubis" + "gherkin" + "nokogiri" + "rake" + "rufus-lru" + "treetop" + "yajl-ruby" + ]; + }; + "gherkin" = { + version = "2.12.2"; + source = { + type = "gem"; + sha256 = "1mxfgw15pii1jmq00xxbyp77v71mh3bp99ndgwzfwkxvbcisha25"; + }; + dependencies = [ + "multi_json" + ]; + }; + "git" = { + version = "1.3.0"; + source = { + type = "gem"; + sha256 = "1waikaggw7a1d24nw0sh8fd419gbf7awh000qhsf411valycj6q3"; + }; + }; "gssapi" = { version = "1.2.0"; source = { @@ -189,11 +423,18 @@ sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr"; }; }; + "hitimes" = { + version = "1.2.3"; + source = { + type = "gem"; + sha256 = "1fr9raz7652bnnx09dllyjdlnwdxsnl0ig5hq9s4s8vackvmckv4"; + }; + }; "httpclient" = { - version = "2.7.0.1"; + version = "2.7.1"; source = { type = "gem"; - sha256 = "0k6bqsaqq6c824vrbfb5pkz8bpk565zikd10w85rzj2dy809ik6c"; + sha256 = "1y01wgmvwz8r4ycr87d12niglpk0nlh2hkpgy9bnmm8as7kgs428"; }; }; "inifile" = { @@ -203,12 +444,71 @@ sha256 = "03rpacxnrnisjhd2zhc7629ica958bkdbakicl5kipw1wbprck25"; }; }; + "inspec" = { + version = "0.14.8"; + source = { + type = "gem"; + sha256 = "0whd57f82ml0awn7wgfi8gj3mwl7njww22hn2ciabxafqld9xrri"; + }; + dependencies = [ + "json" + "method_source" + "pry" + "r-train" + "rainbow" + "rspec" + "rspec-its" + "rubyzip" + "thor" + ]; + }; "ipaddress" = { - version = "0.8.0"; + version = "0.8.3"; + source = { + type = "gem"; + sha256 = "1x86s0s11w202j6ka40jbmywkrx8fhq8xiy8mwvnkhllj57hqr45"; + }; + }; + "json" = { + version = "1.8.3"; + source = { + type = "gem"; + sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc"; + }; + }; + "kitchen-inspec" = { + version = "0.12.3"; + source = { + type = "gem"; + sha256 = "1vjb9pxb4ga9ppr35k6vsqh053k35b4fxamzg99g17y1rijp6dbj"; + }; + dependencies = [ + "inspec" + "test-kitchen" + ]; + }; + "kitchen-vagrant" = { + version = "0.19.0"; + source = { + type = "gem"; + sha256 = "0sydjihhvnr40vqnj7bg65zxf00crwvwdli1av03ghhggrp5scla"; + }; + dependencies = [ + "test-kitchen" + ]; + }; + "knife-spork" = { + version = "1.6.1"; source = { type = "gem"; - sha256 = "0cwy4pyd9nl2y2apazp3hvi12gccj5a3ify8mi8k3knvxi5wk2ir"; + sha256 = "104f3xq4gfy7rszc8zbfakg9wlnwnf8k9zij9ahdq4id3sdf1ylb"; }; + dependencies = [ + "app_conf" + "chef" + "diffy" + "git" + ]; }; "libyajl2" = { version = "1.2.0"; @@ -242,11 +542,11 @@ sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2"; }; }; - "mime-types" = { - version = "2.99"; + "mini_portile2" = { + version = "2.0.0"; source = { type = "gem"; - sha256 = "1hravghdnk9qbibxb3ggzv7mysl97djh8n0rsswy3ssjaw7cbvf2"; + sha256 = "056drbn5m4khdxly1asmiik14nyllswr6sh3wallvsywwdiryz8l"; }; }; "minitar" = { @@ -257,13 +557,16 @@ }; }; "mixlib-authentication" = { - version = "1.3.0"; + version = "1.4.0"; source = { type = "gem"; - sha256 = "1c5p5ipa3cssmwgdn0q3lyy1w7asikh9qfpnn7xcfz2f9m7v02zg"; + sha256 = "0qk6mln2bkp6jgkz3sh5r69lzipzjs4dqdixqq12wzvwapmgc0zj"; }; dependencies = [ "mixlib-log" + "rspec-core" + "rspec-expectations" + "rspec-mocks" ]; }; "mixlib-cli" = { @@ -281,10 +584,10 @@ }; }; "mixlib-install" = { - version = "0.7.0"; + version = "0.7.1"; source = { type = "gem"; - sha256 = "0ll1p7v7fp3rf11dz8pifz33jhl4bdg779n4hzlnbia2z7xfsa2w"; + sha256 = "1ws2syfimnqzlff2fp6yj5v7zgnzmi3pj9kbkg7xlmd9fhnkb0n7"; }; }; "mixlib-log" = { @@ -295,10 +598,10 @@ }; }; "mixlib-shellout" = { - version = "2.2.5"; + version = "2.2.6"; source = { type = "gem"; - sha256 = "1is07rar0x8n9h67j4iyrxz2yfgis4bnhh3x7vhbbi6khqqixg79"; + sha256 = "1xfs7yp533qx3nsd4x2q2r125awyxcizgdc4dwgdlxsa1n1pj0pd"; }; }; "molinillo" = { @@ -315,6 +618,13 @@ sha256 = "1rf3l4j3i11lybqzgq2jhszq7fh7gpmafjzd14ymp9cjfxqg596r"; }; }; + "multipart-post" = { + version = "2.0.0"; + source = { + type = "gem"; + sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + }; + }; "net-scp" = { version = "1.2.1"; source = { @@ -326,10 +636,10 @@ ]; }; "net-ssh" = { - version = "2.9.2"; + version = "3.0.2"; source = { type = "gem"; - sha256 = "1p0bj41zrmw5lhnxlm1pqb55zfz9y4p9fkrr9a79nrdmzrk1ph8r"; + sha256 = "1k3hrgr899dlhkn53c4hnn5qzbhc7lwks0vaqgw95gg74hn1ivqw"; }; }; "net-ssh-gateway" = { @@ -360,6 +670,23 @@ sha256 = "13qxznpwmc3hs51b76wqx2w29r158gzzh8719kv2gpi56844c8fx"; }; }; + "nio4r" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "1adnm77xfxck0mrvid5d7lwng783gh580rh3y18nq4bwdikr6nha"; + }; + }; + "nokogiri" = { + version = "1.6.7.2"; + source = { + type = "gem"; + sha256 = "11sbmpy60ynak6s3794q32lc99hs448msjy8rkp84ay7mq7zqspv"; + }; + dependencies = [ + "mini_portile2" + ]; + }; "nori" = { version = "2.6.0"; source = { @@ -367,34 +694,54 @@ sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn"; }; }; + "octokit" = { + version = "4.3.0"; + source = { + type = "gem"; + sha256 = "1hq47ck0z03vr3rzblyszihn7x2m81gv35chwwx0vrhf17nd27np"; + }; + dependencies = [ + "sawyer" + ]; + }; "ohai" = { - version = "8.7.0"; + version = "8.12.0"; source = { type = "gem"; - sha256 = "1f10kgxh89iwij54yx8q11n1q87653ckvdmdwg8cwz3qlgf4flhy"; + sha256 = "0l7vdfnfm4plla6q4qkngwpmy0ah53pnymlwfzc7iy6jn2n9ibpm"; }; dependencies = [ "chef-config" "ffi" "ffi-yajl" "ipaddress" - "mime-types" "mixlib-cli" "mixlib-config" "mixlib-log" "mixlib-shellout" + "plist" "rake" "systemu" "wmi-lite" ]; }; "paint" = { - version = "1.0.0"; + version = "1.0.1"; source = { type = "gem"; - sha256 = "0mhwj6w60q40w4f6jz8xx8bv1kghjvsjc3d8q8pnslax4fkmzbp1"; + sha256 = "1z1fqyyc2jiv6yabv467h652cxr2lmxl5gqqg7p14y28kdqf0nhj"; }; }; + "parser" = { + version = "2.3.0.6"; + source = { + type = "gem"; + sha256 = "1r14k5jlsc5ivxjm1kljhk9sqp50rnd71n0mzx18hz135nvw1hbz"; + }; + dependencies = [ + "ast" + ]; + }; "plist" = { version = "3.1.0"; source = { @@ -402,6 +749,27 @@ sha256 = "0rh8nddwdya888j1f4wix3dfan1rlana3mc7mwrvafxir88a1qcs"; }; }; + "polyglot" = { + version = "0.3.5"; + source = { + type = "gem"; + sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; + }; + }; + "powerpack" = { + version = "0.1.1"; + source = { + type = "gem"; + sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43"; + }; + }; + "proxifier" = { + version = "1.0.3"; + source = { + type = "gem"; + sha256 = "1abzlg39cfji1nx3i8kmb5k3anr2rd392yg2icms24wkqz9g9zj0"; + }; + }; "pry" = { version = "0.10.3"; source = { @@ -414,6 +782,22 @@ "slop" ]; }; + "r-train" = { + version = "0.10.3"; + source = { + type = "gem"; + sha256 = "1hn0aap2lq15p97mb91h32yfsw8rh4imhyjlbs4jx9x52h2q6nam"; + }; + dependencies = [ + "docker-api" + "json" + "mixlib-shellout" + "net-scp" + "net-ssh" + "winrm" + "winrm-fs" + ]; + }; "rack" = { version = "1.6.4"; source = { @@ -421,13 +805,53 @@ sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5"; }; }; + "rainbow" = { + version = "2.1.0"; + source = { + type = "gem"; + sha256 = "11licivacvfqbjx2rwppi8z89qff2cgs67d4wyx42pc5fg7g9f00"; + }; + }; "rake" = { - version = "10.4.2"; + version = "10.5.0"; source = { type = "gem"; - sha256 = "1rn03rqlf1iv6n87a78hkda2yqparhhaivfjpizblmxvlw2hk5r8"; + sha256 = "0jcabbgnjc788chx31sihc5pgbqnlc1c75wakmqlbjdm8jns2m9b"; }; }; + "retryable" = { + version = "2.0.3"; + source = { + type = "gem"; + sha256 = "0lr3wasxwdyzr0bag179003hs2ycn9w86m450pazc81v19j4x1dq"; + }; + }; + "ridley" = { + version = "4.5.0"; + source = { + type = "gem"; + sha256 = "0y0p45y3xp37gg8ab132x4i0iggl3p907wfklhr5gb7r5yj6sj4r"; + }; + dependencies = [ + "addressable" + "buff-config" + "buff-extensions" + "buff-ignore" + "buff-shell_out" + "celluloid" + "celluloid-io" + "chef-config" + "erubis" + "faraday" + "hashie" + "httpclient" + "json" + "mixlib-authentication" + "retryable" + "semverse" + "varia_model" + ]; + }; "rspec" = { version = "3.4.0"; source = { @@ -441,10 +865,10 @@ ]; }; "rspec-core" = { - version = "3.4.1"; + version = "3.4.4"; source = { type = "gem"; - sha256 = "0zl4fbrzl4gg2bn3fhv910q04sm2jvzdidmvd71gdgqwbzk0zngn"; + sha256 = "1z2zmy3xaq00v20ykamqvnynzv2qrrnbixc6dn0jw1c5q9mqq9fp"; }; dependencies = [ "rspec-support" @@ -473,10 +897,10 @@ ]; }; "rspec-mocks" = { - version = "3.4.0"; + version = "3.4.1"; source = { type = "gem"; - sha256 = "0iw9qvpawj3cfcg3xipi1v4y11g9q4f5lvmzgksn6f0chf97sjy1"; + sha256 = "0sk8ijq5d6bwhvjq94gfm02fssxkm99bgpasqazsmmll5m1cn7vr"; }; dependencies = [ "diff-lcs" @@ -501,13 +925,66 @@ "rspec-core" ]; }; + "rubocop" = { + version = "0.38.0"; + source = { + type = "gem"; + sha256 = "0qgwq558n41z2id7nwc3bh7z8h9yh7c9zdasqn8p30p0p72f5520"; + }; + dependencies = [ + "parser" + "powerpack" + "rainbow" + "ruby-progressbar" + "unicode-display_width" + ]; + }; + "ruby-progressbar" = { + version = "1.7.5"; + source = { + type = "gem"; + sha256 = "0hynaavnqzld17qdx9r7hfw00y16ybldwq730zrqfszjwgi59ivi"; + }; + }; "rubyntlm" = { - version = "0.4.0"; + version = "0.6.0"; + source = { + type = "gem"; + sha256 = "00k1cll10mcyg6qpdzyrazm5pjbpj7wq54ki2y8vxz86842vbsgp"; + }; + }; + "rubyzip" = { + version = "1.2.0"; source = { type = "gem"; - sha256 = "03xmi8mxcbc5laad10r6b705dk4vyhl9lr7h940f2rhibymxq45x"; + sha256 = "10a9p1m68lpn8pwqp972lv61140flvahm3g9yzbxzjks2z3qlb2s"; }; }; + "rufus-lru" = { + version = "1.0.5"; + source = { + type = "gem"; + sha256 = "1vrsbvcsl7yspzb761p2gbl7dwz0d1j82msbjsksf8hi4cv970s5"; + }; + }; + "safe_yaml" = { + version = "1.0.4"; + source = { + type = "gem"; + sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; + }; + }; + "sawyer" = { + version = "0.7.0"; + source = { + type = "gem"; + sha256 = "1cn48ql00mf1ag9icmfpj7g7swh7mdn7992ggynjqbw1gh15bs3j"; + }; + dependencies = [ + "addressable" + "faraday" + ]; + }; "semverse" = { version = "1.2.1"; source = { @@ -516,10 +993,10 @@ }; }; "serverspec" = { - version = "2.24.3"; + version = "2.31.0"; source = { type = "gem"; - sha256 = "03v6qqshqjsvbbjf1pwbi2mzgqg84wdbhnqb3gdbl1m9bz7sxg1n"; + sha256 = "169mh6s4drxy9qs7f01gqcaq1qfkvy9hdc1ny3lnk0aiwfcm2s1p"; }; dependencies = [ "multi_json" @@ -543,10 +1020,10 @@ }; }; "solve" = { - version = "2.0.1"; + version = "2.0.2"; source = { type = "gem"; - sha256 = "0009xvg40y59bijds5njnwfshfw68wmj54yz3qy538g9rpxvmqp1"; + sha256 = "0mwdd6z3vbzna9vphnkgdghy40xawn0yiwhamvb6spfk6n2c80kb"; }; dependencies = [ "molinillo" @@ -554,10 +1031,10 @@ ]; }; "specinfra" = { - version = "2.44.5"; + version = "2.53.1"; source = { type = "gem"; - sha256 = "018i3bmmy7lc21hagvwfmz2sdfj0v87a7yy3z162lcpq62vxw89r"; + sha256 = "17jbrn7nm6c72qy1nw064c0yi9cimd295s7j6x9bm878cbyq9i6i"; }; dependencies = [ "net-scp" @@ -580,6 +1057,55 @@ sha256 = "0gmkbakhfci5wnmbfx5i54f25j9zsvbw858yg3jjhfs5n4ad1xq1"; }; }; + "test-kitchen" = { + version = "1.6.0"; + source = { + type = "gem"; + sha256 = "1glmvjm24fmlbhm8q4lzi1ynds77ip3s4s5q6fdjlhdanh6jrgwz"; + }; + dependencies = [ + "mixlib-install" + "mixlib-shellout" + "net-scp" + "net-ssh" + "safe_yaml" + "thor" + ]; + }; + "thor" = { + version = "0.19.1"; + source = { + type = "gem"; + sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; + }; + }; + "timers" = { + version = "4.0.4"; + source = { + type = "gem"; + sha256 = "1jx4wb0x182gmbcs90vz0wzfyp8afi1mpl9w5ippfncyk4kffvrz"; + }; + dependencies = [ + "hitimes" + ]; + }; + "treetop" = { + version = "1.6.5"; + source = { + type = "gem"; + sha256 = "1lg7j8xf8yxmnz1v8zkwhs4l6j30kq2pxvvrvpah2frlaqz077dh"; + }; + dependencies = [ + "polyglot" + ]; + }; + "unicode-display_width" = { + version = "1.0.2"; + source = { + type = "gem"; + sha256 = "1cffs73zrn788dyd1vv91p0mcxgx2g1sis6552ggmfib3f148gbi"; + }; + }; "uuidtools" = { version = "2.1.5"; source = { @@ -587,11 +1113,22 @@ sha256 = "0zjvq1jrrnzj69ylmz1xcr30skf9ymmvjmdwbvscncd7zkr8av5g"; }; }; + "varia_model" = { + version = "0.4.1"; + source = { + type = "gem"; + sha256 = "1qm9fhizfry055yras9g1129lfd48fxg4lh0hck8h8cvjdjz1i62"; + }; + dependencies = [ + "buff-extensions" + "hashie" + ]; + }; "winrm" = { - version = "1.3.6"; + version = "1.7.2"; source = { type = "gem"; - sha256 = "1rx42y5w9d3w6axxwdj9zckzsgsjk172zxn52w2jj65spl98vxbc"; + sha256 = "1as865gd6f0g0hppw8plki1i4afpn6lcx89sgi52v1mlgwxfifff"; }; dependencies = [ "builder" @@ -601,7 +1138,19 @@ "logging" "nori" "rubyntlm" - "uuidtools" + ]; + }; + "winrm-fs" = { + version = "0.3.2"; + source = { + type = "gem"; + sha256 = "08j2ip9wx1vcx45kd9ws6lb6znfq9gib1n2j7shzs10rxwgs1bj8"; + }; + dependencies = [ + "erubis" + "logging" + "rubyzip" + "winrm" ]; }; "wmi-lite" = { @@ -611,4 +1160,11 @@ sha256 = "06pm7jr2gcnphhhswha2kqw0vhxy91i68942s7gqriadbc8pq9z3"; }; }; + "yajl-ruby" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf"; + }; + }; } \ No newline at end of file diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index f416345028f9..dc885f09b5bc 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "1.650"; + version = "1.652"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "0iypkyjcsfj36j683a6yis4q0wil6m8l065fx8v2p7ba4j2ql00n"; + sha256 = "09xcsgfhxshfqgg0aighby8dx1qgzh7fkfkynyv5xg1m216z21jx"; }; meta = with stdenv.lib; { description = "An extendable open source continuous integration server"; diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index e5c2060b5e9b..338f3323d947 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchzip, qt4, sqlite, cmake }: +{ stdenv, fetchFromGitHub, qt4, sqlite, cmake }: stdenv.mkDerivation rec { - version = "3.7.0"; + version = "3.8.0"; name = "sqlitebrowser-${version}"; - src = fetchzip { - name = "${name}-src"; - url = "https://github.com/sqlitebrowser/sqlitebrowser/archive/v${version}.tar.gz"; - sha256 = "1zsgylnxk4lyg7p6k6pv8d3mh1k0wkfcplh5c5da3x3i9a3qs78j"; + src = fetchFromGitHub { + repo = "sqlitebrowser"; + owner = "sqlitebrowser"; + rev = "v${version}"; + sha256 = "009yaamf6f654dl796f1gmj3rb34d55w87snsfgk33gpy6x19ccp"; }; buildInputs = [ qt4 sqlite cmake ]; diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix new file mode 100644 index 000000000000..a8806127d356 --- /dev/null +++ b/pkgs/development/tools/erlang/cuter/default.nix @@ -0,0 +1,43 @@ +{stdenv, autoconf, which, writeText, makeWrapper, fetchFromGitHub, erlang, + erlangPackages, z3, python27 }: + +stdenv.mkDerivation rec { + name = "cuter"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "aggelgian"; + repo = "cuter"; + rev = "v${version}"; + sha256 = "1ax1pj6ji4w2mg3p0nh2lzmg3n9mgfxk4cf07pll51yrcfpfrnfv"; + }; + + setupHook = writeText "setupHook.sh" '' + addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" + ''; + buildInputs = with erlangPackages; [ autoconf erlang z3 python27 makeWrapper which ]; + + buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target"; + configurePhase = '' + autoconf + ./configure --prefix $out + ''; + + installPhase = '' + mkdir -p "$out/lib/erlang/lib/cuter-${version}" + mkdir -p "$out/bin" + cp -r * "$out/lib/erlang/lib/cuter-${version}" + cp cuter "$out/bin/cuter" + wrapProgram $out/bin/cuter \ + --prefix PATH : "${python27}/bin" \ + --suffix PYTHONPATH : "${z3}/lib/python2.7/site-packages" \ + --suffix ERL_LIBS : "$out/lib/erlang/lib" + ''; + + meta = { + description = "A concolic testing tool for the Erlang functional programming language"; + license = stdenv.lib.licenses.gpl3; + homepage = "https://github.com/aggelgian/cuter"; + maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; + }; +} diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix index 169c8fdd68a0..7ff283176e1d 100644 --- a/pkgs/development/tools/galen/default.nix +++ b/pkgs/development/tools/galen/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "galen"; - version = "2.2.1"; + version = "2.2.3"; name = "${pname}-${version}"; inherit jdk; src = fetchurl { - url = "https://github.com/galenframework/galen/releases/download/galen-2.2.1/galen-bin-${version}.zip"; - sha256 = "0zwrh3bxcgkwip6z9lvy3hn53kfr99cdij64c57ff8d95xilclhb"; + url = "https://github.com/galenframework/galen/releases/download/galen-${version}/galen-bin-${version}.zip"; + sha256 = "13kvxbw68g82rv8bp9g4fkrrsd7nag1a4bspilqi2wnxc51c8mqq"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index 14777b95b85e..6cce86a80627 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "g-wrap-1.9.15"; src = fetchurl { url = "mirror://savannah/g-wrap/${name}.tar.gz"; - sha256 = "140fcvp24pqmfmiibhjxl3s75hj26ln7pkl2wxas84lnchbj9m4d"; + sha256 = "0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg"; }; # Note: Glib support is optional, but it's quite useful (e.g., it's diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix index 68c85fb29515..87dc173dd878 100644 --- a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix +++ b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "cabal2nix"; - version = "20151217"; + version = "20160308"; src = fetchFromGitHub { owner = "nixos"; repo = "cabal2nix"; rev = "v${version}"; - sha256 = "1140ym5j1prvzyfw8q784dr0hwvfw6s4h63j3a4j67cawa2dbkr5"; + sha256 = "02lj3x0rgpxvaimwbbjjgwm4ka0wkk4x5h35jjygz6bkr5lv3m52"; }; postUnpack = "sourceRoot+=/${pname}"; isLibrary = false; diff --git a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix index 7aac407e3ceb..5aa4370b26f9 100644 --- a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix +++ b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix @@ -11,8 +11,8 @@ mkDerivation rec { src = fetchFromGitHub { owner = "nixos"; repo = "cabal2nix"; - rev = "v20151217"; - sha256 = "1140ym5j1prvzyfw8q784dr0hwvfw6s4h63j3a4j67cawa2dbkr5"; + rev = "v20160308"; + sha256 = "02lj3x0rgpxvaimwbbjjgwm4ka0wkk4x5h35jjygz6bkr5lv3m52"; }; postUnpack = "sourceRoot+=/${pname}"; libraryHaskellDepends = [ diff --git a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix index b2b3b46581aa..ce1d9303cdcd 100644 --- a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix +++ b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix @@ -7,12 +7,12 @@ mkDerivation rec { pname = "hackage2nix"; - version = "20151217"; + version = "20160308"; src = fetchFromGitHub { owner = "nixos"; repo = "cabal2nix"; rev = "v${version}"; - sha256 = "1140ym5j1prvzyfw8q784dr0hwvfw6s4h63j3a4j67cawa2dbkr5"; + sha256 = "02lj3x0rgpxvaimwbbjjgwm4ka0wkk4x5h35jjygz6bkr5lv3m52"; }; postUnpack = "sourceRoot+=/${pname}"; isLibrary = false; diff --git a/pkgs/development/tools/jo/default.nix b/pkgs/development/tools/jo/default.nix new file mode 100644 index 000000000000..09b5edeeecdf --- /dev/null +++ b/pkgs/development/tools/jo/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchFromGitHub, autoreconfHook}: + +stdenv.mkDerivation rec { + name = "jo-${version}"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "jpmens"; + repo = "jo"; + + rev = "v${version}"; + sha256="0vyi0aaxsp6x3cvym7mlcfdsxjhj5h0b00mqc42mg8kc95cyp2c1"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + description = "A small utility to create JSON objects"; + homepage = https://github.com/jpmens/jo; + license = licenses.gpl2Plus; + maintainers = [maintainers.markus1189]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix index 0f99cabbb96b..606cc5146470 100644 --- a/pkgs/development/tools/misc/trv/default.nix +++ b/pkgs/development/tools/misc/trv/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation { description = "Shim for vrt to enable bootstrapping"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index 20373c923e7e..ae253180aee1 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A software system for writing extensible parsers for programming languages"; homepage = https://github.com/ocaml/camlp4; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/tools/ocaml/camlp5/5.15.nix b/pkgs/development/tools/ocaml/camlp5/5.15.nix index adfdb4bd204c..e8cda36f101b 100644 --- a/pkgs/development/tools/ocaml/camlp5/5.15.nix +++ b/pkgs/development/tools/ocaml/camlp5/5.15.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { homepage = "${webpage}"; license = stdenv.lib.licenses.bsd3; branch = "5"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z ]; diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index d9f364234308..83dd74d321ec 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { ''; homepage = http://pauillac.inria.fr/~ddr/camlp5/; license = licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ z77z vbgl ]; diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 746be6dd0812..5d9757f2666e 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { homepage = http://projects.camlcity.org/projects/findlib.html; description = "O'Caml library manager"; license = stdenv.lib.licenses.mit; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z stdenv.lib.maintainers.vbmithr diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index ca5230d1e086..3258aaf08c2f 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { homepage = http://ocsigen.org/js_of_ocaml/; description = "Compiler of OCaml bytecode to Javascript. It makes it possible to run Ocaml programs in a Web browser"; license = licenses.lgpl2; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.gal_bolle ]; diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index e823466f4174..70d90752aceb 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { homepage = http://oasis.forge.ocamlcore.org/; description = "Configure, build and install system for OCaml projects"; license = licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ vbgl z77z ]; diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index 79c81c5c447c..9bea3e9dc17d 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { homepage = http://www.typerex.org/ocaml-top.html; license = stdenv.lib.licenses.gpl3; description = "A simple cross-platform OCaml code editor built for top-level evaluation"; - platforms = ocamlPackages.ocaml.meta.platforms; + platforms = ocamlPackages.ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix index 0a402d4ba469..f3caa42b8fd7 100644 --- a/pkgs/development/tools/ocaml/ocamlify/default.nix +++ b/pkgs/development/tools/ocaml/ocamlify/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod; description = "Generate OCaml modules from source files"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.lgpl21; maintainers = with stdenv.lib.maintainers; [ z77z diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix index 65359049a96d..7ff73ff28dc2 100644 --- a/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod; description = "Generate OCaml modules from source files"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ z77z ]; diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix index 1b37c21fdfa7..28efaf4cf3d2 100644 --- a/pkgs/development/tools/ocaml/ocamlscript/default.nix +++ b/pkgs/development/tools/ocaml/ocamlscript/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://martin.jambon.free.fr/ocamlscript.html; license = licenses.boost; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; description = "Natively-compiled OCaml scripts"; maintainers = [ maintainers.vbgl ]; }; diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index 31b99ada2a38..48657a8e19d0 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { between source files. ''; license = licenses.gpl3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.jirkamarsik ]; }; } diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index 224ce57808f9..d146dd5e9731 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { homepage = "http://typerex.ocamlpro.com/ocp-indent.html"; description = "A customizable tool to indent OCaml code"; license = licenses.gpl3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.jirkamarsik ]; }; } diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index 76be5f8bd47d..37f90c41100a 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { homepage = http://typerex.ocamlpro.com/ocp-index.html; description = "A simple and light-weight documentation extractor for OCaml"; license = stdenv.lib.licenses.lgpl3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix index 40188734a996..9f318afc67d7 100644 --- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation { description = "Omake build system"; homepage = "${webpage}"; license = "GPL"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index c9addf55312c..b5de65b7c10f 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/diml/utop; license = stdenv.lib.licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; |