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
2015-07-22 22:33:55 +02:00
parent 055ad0e4e9 3064b6a0cc
commit 2cacf77c13
130 changed files with 1026 additions and 755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/tools/build-managers/cargo/default.nix
View File

@@ -11,8 +11,7 @@ buildRustPackage rec {
src = fetchgit {
url = "https://github.com/rust-lang/cargo.git";
rev = "refs/tags/0.3.0";
sha256 = "1ckb2xd7nm8357imw6b1ci2ar8grnihzan94kvmjrijq6sz8yv9i";
leaveDotGit = true;
sha256 = "0p7p7yivydjkpqb53a8i7pjl719z3gxa6czi0255ccwsh6n9z793";
};
depsSha256 = "1sgdr2akd9xrfmf5g0lbf842b2pdj1ymxk37my0cf2x349rjsf0w";

4
pkgs/development/tools/build-managers/ninja/default.nix
View File

@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "ninja-${version}";
version = "1.5.3";
version = "1.6.0";
src = fetchurl {
name = "${name}.tar.gz";
url = "https://github.com/martine/ninja/archive/v${version}.tar.gz";
sha256 = "1h3yfwcfl61v493vna6jia2fizh8rpig7qw2504cvkr6gid3p5bw";
sha256 = "1ryd1686bd31gfdjxnqm6k1ybnjmjz8v97px7lmdkr4g0vxqhgml";
};
buildInputs = [ python asciidoc re2c ];

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

@@ -11,8 +11,8 @@ stdenv.mkDerivation {
postInstall = ''
for p in $out/bin/*; do
rpath=`patchelf --print-rpath $p`:$out
patchelf --set-rpath $rpath $p
rpath=`patchelf --print-rpath $p || true`:$out
patchelf --set-rpath "$rpath" $p || true
done
'';

4
pkgs/development/tools/parsing/flexc++/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, bobcat, gcc49, icmake, yodl }:
{ stdenv, fetchurl, bobcat, icmake, yodl }:
let version = "2.02.00"; in
stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ bobcat gcc49 ];
buildInputs = [ bobcat ];
nativeBuildInputs = [ icmake yodl ];
postPatch = ''

4
pkgs/development/tools/parsing/re2c/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "re2c-${version}";
version = "0.14.2";
version = "0.14.3";
src = fetchurl {
url = "mirror://sourceforge/re2c/re2c/${version}/${name}.tar.gz";
sha256 = "0c0w5w1dp9v9d0a6smjbnk6zvfs77fx1xd7damap3x3sjxiyn0m7";
sha256 = "113yj5h38isfsjigqvb2j3ammfmxckgwyxmm0h4fyflzb7ghcs0w";
};
meta = {

10
pkgs/development/tools/vagrant/default.nix
View File

@@ -4,7 +4,7 @@
assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
let
version = "1.7.3";
version = "1.7.4";
rake = buildRubyGem {
inherit ruby;
name = "rake-10.3.2";
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_x86_64.deb";
sha256 = "0zg2sdxgrmwqvzqw4z8d6ji8d0cby33nggv0n9ncjxp0wjiv8nkm";
sha256 = "0dl3cskpz7d8mmv0ah86426vlx0lj1wkjdlb5gc868dfsysw5lnw";
}
else
fetchurl {
url = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_i686.deb";
sha256 = "0r23w49jwl3c3g4nns5xnrsrqyfkqsgln91cj30hxkw50d0ldpvs";
sha256 = "0sns9q48c6b2sabp6bwkppx8ffp774jhv69jrv225qrnifx12105";
};
meta = with stdenv.lib; {
@@ -93,12 +93,12 @@ stdenv.mkDerivation rec {
preFixup = ''
# 'hide' the template file from shebang-patching
chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.7.11/lib/bundler/templates/Executable
chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.10.5/lib/bundler/templates/Executable
chmod -x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh
'';
postFixup = ''
chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.7.11/lib/bundler/templates/Executable
chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.10.5/lib/bundler/templates/Executable
chmod +x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh
'';
}