diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-02-09 08:42:04 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-09 08:42:04 +0100 |
commit | 6bea415b5e3f4ab70afcea4c646ad76d9c073c89 (patch) | |
tree | 8f5e976cd8aecc6029b4019e16f0177e0a66a093 /pkgs/development/tools | |
parent | b846a53d2a3cba3002a4d6fb064f579677eac52c (diff) | |
parent | 4bf9f8afc39e9d0c0629635652804b81fe3e3332 (diff) | |
download | nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.gz nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.bz2 nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.lz nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.xz nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.zst nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/analysis/flow/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/analysis/rr/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/leiningen/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/database/squirrel-sql/default.nix | 69 | ||||
-rw-r--r-- | pkgs/development/tools/misc/binutils/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/misc/hydra/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/misc/openocd/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/tools/profiling/systemtap/default.nix | 18 | ||||
-rw-r--r-- | pkgs/development/tools/rhc/Gemfile | 2 | ||||
-rw-r--r-- | pkgs/development/tools/rhc/Gemfile.lock | 21 | ||||
-rw-r--r-- | pkgs/development/tools/rhc/default.nix | 24 | ||||
-rw-r--r-- | pkgs/development/tools/rhc/gemset.nix | 97 | ||||
-rw-r--r-- | pkgs/development/tools/rust/racerd/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/tools/wp-cli/default.nix | 4 |
14 files changed, 183 insertions, 93 deletions
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index d6164ef2e4e0..4e15ed8572ea 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.37.1"; + version = "0.37.4"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "1n3pc3nfh7bcaard7y2fy7hjq4k6777wp9xv50r3zg4454mgbmsy"; + sha256 = "0v3hi2wn4ysybmd768wdmijlbnq41i6yzzzj5d7cmd4blzd9c0nq"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 11ba86724e6b..27d7cb306582 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python2Packages, which, procps, gdb }: stdenv.mkDerivation rec { - version = "4.4.0"; + version = "4.5.0"; name = "rr-${version}"; src = fetchFromGitHub { owner = "mozilla"; repo = "rr"; rev = version; - sha256 = "1ijzs5lwscg0k5ch1bljiqqh35rzai75xcgghgkjbz86ynmf62rd"; + sha256 = "114g1yhpjfyxcn0fkvnfi03lhrs11pj0a1945j2j8z90hx4dwba8"; }; postPatch = '' diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 39a39f949a52..1e5fb8458e51 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.6.1"; + version = "2.7.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "1ndirl36gbba12cs5vw22k2zrbpqdmnpi1gciwqb1zbib2s1akg8"; + sha256 = "0rmshl4xchf3blwvar4q9dpxm9xznn3yzas4vwxqiq3yhapgqkn0"; }; jarsrc = fetchurl { # NOTE: This is actually a .jar, Github has issues url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip"; - sha256 = "1533msarx6gb3xc2sp2nmspllnqy7anpnv9a0ifl0psxm3xph06p"; + sha256 = "0ivwb1qlxs1hyical0fjgavm9wfkw3f10sk67p5g2p5lpf4pxp1d"; }; JARNAME = "${name}-standalone.jar"; diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix new file mode 100644 index 000000000000..afac17e121ad --- /dev/null +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -0,0 +1,69 @@ +# To enable specific database drivers, override this derivation and pass the +# driver packages in the drivers argument (e.g. mysql_jdbc, postgresql_jdbc). +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip +, jre +, drivers ? [] +}: +let + version = "3.7.1"; +in stdenv.mkDerivation rec { + name = "squirrel-sql-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; + sha256 = "1v141ply57k5krwbnnmz4mbs9hs8rbys0bkjz69gvxlqjizyiq23"; + }; + + buildInputs = [ + jre makeWrapper stdenv unzip + ]; + + unpackPhase = '' + unzip ${src} + ''; + + buildPhase = '' + cd squirrelsql-${version}-standard + chmod +x squirrel-sql.sh + ''; + + installPhase = '' + mkdir -p $out/share/squirrel-sql + cp -r . $out/share/squirrel-sql + + mkdir -p $out/bin + cp="" + for pkg in ${builtins.concatStringsSep " " drivers}; do + if test -n "$cp"; then + cp="$cp:" + fi + cp="$cp"$(echo $pkg/share/java/*.jar | tr ' ' :) + done + makeWrapper $out/share/squirrel-sql/squirrel-sql.sh $out/bin/squirrel-sql \ + --set CLASSPATH "$cp" \ + --set JAVA_HOME "${jre}" + + mkdir -p $out/share/icons/hicolor/32x32/apps + ln -s $out/share/squirrel-sql/icons/acorn.png \ + $out/share/icons/hicolor/32x32/apps/squirrel-sql.png + ln -s ${desktopItem}/share/applications $out/share + ''; + + desktopItem = makeDesktopItem { + name = "squirrel-sql"; + exec = "squirrel-sql"; + comment = meta.description; + desktopName = "SQuirreL SQL"; + genericName = "SQL Client"; + categories = "Development;"; + icon = "squirrel-sql"; + }; + + meta = { + description = "Universal SQL Client"; + homepage = http://squirrel-sql.sourceforge.net/; + license = stdenv.lib.licenses.lgpl21; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ khumba ]; + }; +} diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index e61acd598cf6..6ac9f3febc42 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ]; outputs = [ "out" ] - ++ optional (!stdenv.isDarwin) "lib" # problems in Darwin stdenv + ++ optional (cross == null && !stdenv.isDarwin) "lib" # problems in Darwin stdenv ++ [ "info" ] ++ optional (cross == null) "dev"; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index dbd53c65050c..0906492ad101 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -61,15 +61,15 @@ let }; in releaseTools.nixBuild rec { name = "hydra-${version}"; - version = "2016-12-09"; + version = "2017-02-03"; inherit stdenv; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "de55303197d997c4fc5503b52b1321ae9528583d"; - sha256 = "0nimqsbpjxfwha6d5gp6a7jh50i83z1llmx30da4bscsic8z1xly"; + rev = "a366f362e197476615a813e2cc904b60db28e65f"; + sha256 = "0q7bywh59aqgpgj9ca2xscszxal9c3c90bs7sb4cfg7w8g6m69hf"; }; buildInputs = diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index ea52fff64ccb..3349213a741b 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "openocd-${version}"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { url = "mirror://sourceforge/openocd/openocd-${version}.tar.bz2"; - sha256 = "0hzlnm19c4b35vsxs6ik94xbigv3ykdgr8gzrdir6sqmkan44w43"; + sha256 = "1bhn2c85rdz4gf23358kg050xlzh7yxbbwmqp24c0akmh3bff4kk"; }; buildInputs = [ libftdi libusb1 pkgconfig hidapi ]; @@ -26,7 +26,12 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p "$out/etc/udev/rules.d" - ln -s "$out/share/openocd/contrib/99-openocd.rules" "$out/etc/udev/rules.d/99-openocd.rules" + rules="$out/share/openocd/contrib/60-openocd.rules" + if [ ! -f "$rules" ]; then + echo "$rules is missing, must update the Nix file." + exit 1 + fi + ln -s "$rules" "$out/etc/udev/rules.d/" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index b78727802454..a16bdbc539a9 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -1,11 +1,11 @@ { fetchgit, pkgconfig, gettext, runCommand, makeWrapper -, elfutils, kernel, gnumake }: +, elfutils, kernel, gnumake, python2, pythonPackages, binutils }: let ## fetchgit info url = git://sourceware.org/git/systemtap.git; - rev = "a10bdceb7c9a7dc52c759288dd2e555afcc5184a"; - sha256 = "1kllzfnh4ksis0673rma5psglahl6rvy0xs5v05qkqn6kl7irmg1"; - version = "2016-09-16"; + rev = "276ed27a3cc64531542ab73bb36bb04784e79bbc"; + sha256 = "11967dx3cjs96v3ncfljw0h7blsgg9wm8g9z2270q9a90988g2c2"; + version = "2017-02-04"; inherit (kernel) stdenv; inherit (stdenv) lib; @@ -14,7 +14,13 @@ let stapBuild = stdenv.mkDerivation { name = "systemtap-${version}"; src = fetchgit { inherit url rev sha256; }; - buildInputs = [ elfutils pkgconfig gettext ]; + buildInputs = [ elfutils pkgconfig gettext python2 pythonPackages.setuptools ]; + # FIXME: Workaround for bug in kbuild, where quoted -I"/foo" flags would get mangled in out-of-tree kbuild dirs + postPatch = '' + substituteInPlace buildrun.cxx --replace \ + 'o << "EXTRA_CFLAGS += -I\"" << s.runtime_path << "\"" << endl;' \ + 'o << "EXTRA_CFLAGS += -I" << s.runtime_path << endl;' + ''; enableParallelBuilding = true; }; @@ -48,5 +54,5 @@ in runCommand "systemtap-${kernel.version}-${version}" { rm $out/bin/stap makeWrapper $stapBuild/bin/stap $out/bin/stap \ --add-flags "-r $kernelBuildDir" \ - --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc elfutils gnumake ]} + --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc binutils elfutils gnumake ]} '' diff --git a/pkgs/development/tools/rhc/Gemfile b/pkgs/development/tools/rhc/Gemfile index ad167c7422ff..a780461e254e 100644 --- a/pkgs/development/tools/rhc/Gemfile +++ b/pkgs/development/tools/rhc/Gemfile @@ -1,2 +1,4 @@ source 'https://rubygems.org' + +gem 'archive-tar-minitar', '>= 0.5.2.1', github: 'peterhoeg/archive-tar-minitar' gem 'rhc' diff --git a/pkgs/development/tools/rhc/Gemfile.lock b/pkgs/development/tools/rhc/Gemfile.lock index 83fa877550db..004c293b9655 100644 --- a/pkgs/development/tools/rhc/Gemfile.lock +++ b/pkgs/development/tools/rhc/Gemfile.lock @@ -1,27 +1,31 @@ +GIT + remote: git://github.com/peterhoeg/archive-tar-minitar.git + revision: dae32ca550a87dba32597115ae18805db4782ebe + specs: + archive-tar-minitar (0.5.2.1) + GEM remote: https://rubygems.org/ specs: - archive-tar-minitar (0.5.2) commander (4.2.1) highline (~> 1.6.11) highline (1.6.21) httpclient (2.6.0.1) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (2.9.2) - net-ssh-gateway (1.2.0) - net-ssh (>= 2.6.5) + net-ssh (4.0.1) + net-ssh-gateway (2.0.0) + net-ssh (>= 4.0.0) net-ssh-multi (1.2.1) net-ssh (>= 2.6.5) net-ssh-gateway (>= 1.2.0) open4 (1.3.4) - rhc (1.36.4) + rhc (1.38.7) archive-tar-minitar commander (>= 4.0, < 4.3.0) highline (~> 1.6.11) - httpclient (>= 2.4.0) + httpclient (>= 2.4.0, < 2.7.0) net-scp (>= 1.1.2) - net-ssh (>= 2.0.11, < 2.9.3) net-ssh-multi (>= 1.2.0) open4 @@ -29,7 +33,8 @@ PLATFORMS ruby DEPENDENCIES + archive-tar-minitar (>= 0.5.2.1)! rhc BUNDLED WITH - 1.10.5 + 1.13.6 diff --git a/pkgs/development/tools/rhc/default.nix b/pkgs/development/tools/rhc/default.nix index e6b342dd7b62..da8a8e2e77db 100644 --- a/pkgs/development/tools/rhc/default.nix +++ b/pkgs/development/tools/rhc/default.nix @@ -1,10 +1,24 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby_2_2, stdenv, makeWrapper }: -bundlerEnv { - name = "rhc-1.36.4"; +stdenv.mkDerivation rec { + name = "rhc-1.38.7"; - inherit ruby; - gemdir = ./.; + env = bundlerEnv { + name = "rhc-1.38.7-gems"; + + ruby = ruby_2_2; + + gemdir = ./.; + }; + + buildInputs = [ makeWrapper ]; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${env}/bin/rhc $out/bin/rhc + ''; meta = with lib; { homepage = https://github.com/openshift/rhc; diff --git a/pkgs/development/tools/rhc/gemset.nix b/pkgs/development/tools/rhc/gemset.nix index 6b2733968901..933a7dc95afa 100644 --- a/pkgs/development/tools/rhc/gemset.nix +++ b/pkgs/development/tools/rhc/gemset.nix @@ -1,95 +1,84 @@ { - "archive-tar-minitar" = { - version = "0.5.2"; + archive-tar-minitar = { source = { - type = "gem"; - sha256 = "1j666713r3cc3wb0042x0wcmq2v11vwwy5pcaayy5f0lnd26iqig"; + fetchSubmodules = false; + rev = "dae32ca550a87dba32597115ae18805db4782ebe"; + sha256 = "0fvxacbcb52fm5dis451kdd7dv74z8p6nm4vnfqf7jg2aghcxdkd"; + type = "git"; + url = "git://github.com/peterhoeg/archive-tar-minitar.git"; }; + version = "0.5.2.1"; }; - "commander" = { - version = "4.2.1"; + commander = { source = { - type = "gem"; + remotes = ["https://rubygems.org"]; sha256 = "1zwfhswnbhwv0zzj2b3s0qvpqijbbnmh7zvq6v0274rqbxyf1jwc"; + type = "gem"; }; - dependencies = [ - "highline" - ]; + version = "4.2.1"; }; - "highline" = { - version = "1.6.21"; + highline = { source = { - type = "gem"; + remotes = ["https://rubygems.org"]; sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1"; + type = "gem"; }; + version = "1.6.21"; }; - "httpclient" = { - version = "2.6.0.1"; + httpclient = { source = { - type = "gem"; + remotes = ["https://rubygems.org"]; sha256 = "0haz4s9xnzr73mkfpgabspj43bhfm9znmpmgdk74n6gih1xlrx1l"; + type = "gem"; }; + version = "2.6.0.1"; }; - "net-scp" = { - version = "1.2.1"; + net-scp = { source = { - type = "gem"; + remotes = ["https://rubygems.org"]; sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; + type = "gem"; }; - dependencies = [ - "net-ssh" - ]; + version = "1.2.1"; }; - "net-ssh" = { - version = "2.9.2"; + net-ssh = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "02xj3pcpqr32nlak0vsx71gd5z65jl3q1hwi2x157vabw1kgjanq"; type = "gem"; - sha256 = "1p0bj41zrmw5lhnxlm1pqb55zfz9y4p9fkrr9a79nrdmzrk1ph8r"; }; + version = "4.0.1"; }; - "net-ssh-gateway" = { - version = "1.2.0"; + net-ssh-gateway = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l3v761y32aw0n8lm0c0m42lr4ay8cq6q4sc5yc68b9fwlfvb70x"; type = "gem"; - sha256 = "1nqkj4wnj26r81rp3g4jqk7bkd2nqzjil3c9xqwchi0fsbwv2niy"; }; - dependencies = [ - "net-ssh" - ]; + version = "2.0.0"; }; - "net-ssh-multi" = { - version = "1.2.1"; + net-ssh-multi = { source = { - type = "gem"; + remotes = ["https://rubygems.org"]; sha256 = "13kxz9b6kgr9mcds44zpavbndxyi6pvyzyda6bhk1kfmb5c10m71"; + type = "gem"; }; - dependencies = [ - "net-ssh" - "net-ssh-gateway" - ]; + version = "1.2.1"; }; - "open4" = { - version = "1.3.4"; + open4 = { source = { - type = "gem"; + remotes = ["https://rubygems.org"]; sha256 = "1cgls3f9dlrpil846q0w7h66vsc33jqn84nql4gcqkk221rh7px1"; + type = "gem"; }; + version = "1.3.4"; }; - "rhc" = { - version = "1.36.4"; + rhc = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yaq42szq81ph44q7ckzml9yrhz1pkjfik77rxvfzlf90l1g2ibk"; type = "gem"; - sha256 = "1dkg39x3y3sxq71md5c8akq4y7ynjwcdy8ysm6d1k9b2rj0s5wdb"; }; - dependencies = [ - "archive-tar-minitar" - "commander" - "highline" - "httpclient" - "net-scp" - "net-ssh" - "net-ssh-multi" - "open4" - ]; + version = "1.38.7"; }; } \ No newline at end of file diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index e5d275ec1f52..95f014cc2d70 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "racerd-${version}"; - version = "2016-08-23"; + version = "2016-12-24"; src = fetchgit { url = "git://github.com/jwilm/racerd.git"; - rev = "5d685ed26ba812a1afe892a8c0d12eb6abbeeb3d"; - sha256 = "1ww96nc00l8p28rnln31n92x0mp2p5jnaqh2nwc8xi3r559p1y5i"; + rev = "dc090ea11d550cd513416d21227d558dbfd2fcb6"; + sha256 = "0jfryb1b32m6bn620gd7y670cfipaswj1cppzkybm4xg6abqh07b"; }; doCheck = false; - depsSha256 = "13vkabr6bbl2nairxpn3lhqxcr3larasjk03r4hzrn7ff7sy40h2"; + depsSha256 = "1vv6fyisi11bcajxkq3ihpl59yh504xmnsr222zj15hmivn0jwf2"; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 6a9d56573e2e..c52f2553e3d6 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, php }: let - version = "1.0.0"; + version = "1.1.0"; bin = "bin/wp"; ini = "etc/php/wp-cli.ini"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "06a80fz9na9arjdpmnislwr0121kkg11kxfqmac0axa9vkv9fjcp"; + sha256 = "08b2lzc8fa9f5xldbdza6x3lg6jsp3wfwpyy187gxqw5pmqp11xc"; }; buildCommand = '' |