public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2017-02-03 11:47:38 +01:00
parent 787c1add0b 5b759293e0
commit adab4cd58b
143 changed files with 3275 additions and 1859 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
View File

@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
let
version = "1.10.0";
version = "1.10.4";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
sha256 = "1fv4sv92ng4gx53pbpagb6kv2hdab04lf2chsflf10xgzqw5l521";
sha256 = "0csaacghcdnkrpxiwsg8166nmdpnddf77c619i558vj0wdglq45k";
};
docker_arm = fetchurl {
url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
sha256 = "153dbgk6fvl73d5qhainqr9hzicsryc6ynlryi9si40ld82flrsr";
sha256 = "1lsdp4v92v406qiwr435ym4f3zbc1vq6ipwrp7li640frhr2jqpk";
};
in
buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-ci-multi-runner";
rev = "v${version}";
sha256 = "0ma6b6624c8218cz4gg5pr077li7nbs0v3mpgr1hxq7v465spa7j";
sha256 = "0r8f1m9f544ikcknvq1500kfjxbikgqlv7wdayfpazvj6s1zlswg";
};
buildInputs = [ go-bindata ];

4
pkgs/development/tools/continuous-integration/jenkins/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "jenkins-${version}";
version = "2.33";
version = "2.44";
src = fetchurl {
url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
sha256 = "1x1m4d7r128v6i0gpa4z07db6vdw1x9ik0p4a8gsnj6g15fzkdzy";
sha256 = "01v9p0p27czwsk7ljv1879b5qcrhgy7zan6dj8klr9rci1id8x0d";
};
buildCommand = ''

106
pkgs/development/tools/heroku/default.nix
View File

@@ -1,74 +1,56 @@
{ stdenv, fetchurl, bash, buildFHSUserEnv, makeWrapper, writeTextFile
{ stdenv, lib, fetchurl, makeWrapper, buildGoPackage, fetchFromGitHub
, nodejs-6_x, postgresql, ruby }:
with stdenv.lib;
let
version = "3.43.12";
bin_ver = "5.4.7-8dc2c80";
cli = buildGoPackage rec {
name = "cli-${version}";
version = "5.6.14";
arch = {
"x86_64-linux" = "linux-amd64";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
goPackagePath = "github.com/heroku/cli";
sha256 = {
"x86_64-linux" = "0iqjxkdw53dvy54ahmr9yijlxrp5nbikh9z7iss93z753cgxdl06";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
fhsEnv = buildFHSUserEnv {
name = "heroku-fhs-env";
src = fetchFromGitHub {
owner = "heroku";
repo = "cli";
rev = "v${version}";
sha256 = "11jccham1vkmh5284l6i30na4a4y7b1jhi2ci2z2wwx8m3gkypq9";
};
};
heroku = stdenv.mkDerivation rec {
inherit version;
name = "heroku";
meta = {
homepage = "https://toolbelt.heroku.com";
description = "Everything you need to get started using Heroku";
maintainers = with maintainers; [ aflatter mirdhyn ];
license = licenses.mit;
platforms = with platforms; unix;
};
src = fetchurl {
url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz";
sha256 = "1z7z8sl2hkrc8rdvx3h00fbcrxs827xlfp6fji0ap97a6jc0v9x4";
};
bin = fetchurl {
url = "https://cli-assets.heroku.com/branches/stable/${bin_ver}/heroku-v${bin_ver}-${arch}.tar.gz";
inherit sha256;
};
installPhase = ''
cli=$out/share/heroku/cli
mkdir -p $cli
tar xzf $src -C $out --strip-components=1
tar xzf $bin -C $cli --strip-components=1
wrapProgram $out/bin/heroku \
--set HEROKU_NODE_PATH ${nodejs-6_x}/bin/node \
--set XDG_DATA_HOME $out/share \
--set XDG_DATA_DIRS $out/share
# When https://github.com/NixOS/patchelf/issues/66 is fixed, reinstate this and dump the fhsuserenv
#patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
# $cli/bin/heroku
'';
buildInputs = [ fhsEnv ruby postgresql makeWrapper ];
doUnpack = false;
};
in writeTextFile {
in stdenv.mkDerivation rec {
name = "heroku-${version}";
destination = "/bin/heroku";
executable = true;
text = ''
#!${bash}/bin/bash -e
${fhsEnv}/bin/heroku-fhs-env ${heroku}/bin/heroku
version = "3.43.16";
meta = {
homepage = "https://toolbelt.heroku.com";
description = "Everything you need to get started using Heroku";
maintainers = with maintainers; [ aflatter mirdhyn peterhoeg ];
license = licenses.mit;
platforms = with platforms; unix;
};
binPath = lib.makeBinPath [ postgresql ruby ];
buildInputs = [ makeWrapper ];
doUnpack = false;
src = fetchurl {
url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz";
sha256 = "08pai3cjaj7wshhyjcmkvyr1qxv5ab980whcm406798ng8f91hn7";
};
installPhase = ''
mkdir -p $out
tar xzf $src -C $out --strip-components=1
install -Dm755 ${cli}/bin/cli $out/share/heroku/cli/bin/heroku
wrapProgram $out/bin/heroku \
--set HEROKU_NODE_PATH ${nodejs-6_x}/bin/node \
--set XDG_DATA_HOME $out/share \
--set XDG_DATA_DIRS $out/share \
--prefix PATH : ${binPath}
'';
}

4
pkgs/development/tools/misc/strace/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "strace-${version}";
version = "4.14";
version = "4.15";
src = fetchurl {
url = "mirror://sourceforge/strace/${name}.tar.xz";
sha256 = "0bvicjkqk3c09zyxgkakymiqr3618sa2dfpd9f3fdp23n8853vav";
sha256 = "1a9wb2nzfqgwazd0yrlbk48awlfn898n1bdayvdxj7qlssac1kf0";
};
nativeBuildInputs = [ perl ];

4
pkgs/development/tools/ocaml/omake/default.nix
View File

@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "omake-${version}";
version = "0.10.1";
version = "0.10.2";
src = fetchurl {
url = "http://download.camlcity.org/download/${name}.tar.gz";
sha256 = "093ansbppms90hiqvzar2a46fj8gm9iwnf8gn38s6piyp70lrbsj";
sha256 = "1znnlkpz89hk44byvnl1pr92ym6hwfyyw2qm9clq446r6l2z4m64";
};
buildInputs = [ ocaml ncurses ];