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

Merge branch 'master.upstream' into staging.upstream

Browse Source
This commit is contained in:
William A. Kennington III
2015-11-04 01:00:48 -08:00
parent b983c6b9b5 86ba275a99
commit 4251612faa
147 changed files with 2870 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/analysis/flow/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, libelf }:
{ stdenv, fetchFromGitHub, ocaml, libelf, cf-private, CoreServices }:
stdenv.mkDerivation rec {
version = "0.17.0";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
cp bin/flow $out/bin/
'';
buildInputs = [ ocaml libelf ];
buildInputs = [ ocaml libelf cf-private CoreServices ];
meta = with stdenv.lib; {
homepage = "http://flowtype.org/";
pkgs/development/tools/build-managers/cargo/default.nix
+3 -3
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
, cmake, zlib }:
with ((import ./common.nix) { inherit stdenv; version = "0.5.0"; });
with ((import ./common.nix) { inherit stdenv; version = "0.6.0"; });
with rustPlatform;
@@ -12,10 +12,10 @@ buildRustPackage rec {
src = fetchgit {
url = "git://github.com/rust-lang/cargo";
rev = "refs/tags/${version}";
sha256 = "1wg7vr6fpk9n76ly65lf2z9w1dj5nhykffbwrv46lybd8m3r8x3w";
sha256 = "1kxri32sz9ygnf4wlbj7hc7q9p6hmm5xrb9zzkx23wzkzbcpyjyz";
};
depsSha256 = "1q92q63g9pz7fy9fhx8y0kqarsshmzv1dq18ki3hdd7d5pcbczna";
depsSha256 = "1m045yywv67sx75idbsny59d3dzbqnhr07k41jial5n5zwp87mb9";
buildInputs = [ file curl pkgconfig python openssl cmake zlib ];
pkgs/development/tools/continuous-integration/jenkins/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "jenkins-${version}";
version = "1.633";
version = "1.636";
src = fetchurl {
url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
sha256 = "1s5jihq9shscsdazb1c393qab0djms4by5zn3ciylcgvif431n8m";
sha256 = "1j6wz5npgsgnkg5xyf3ylrziasxwx5plqr72zwx41a83yvncyx3k";
};
meta = with stdenv.lib; {
description = "An extendable open source continuous integration server";
pkgs/development/tools/rust/rustfmt/default.nix
+6 -6
View File
@@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, rustUnstable, makeWrapper }:
{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
with rustUnstable;
with rustPlatform;
buildRustPackage rec {
name = "rustfmt-git-2015-10-17";
name = "rustfmt-git-2015-10-28";
src = fetchFromGitHub {
owner = "nrc";
repo = "rustfmt";
rev = "36c9a3acf95a036f3f9fa72ff3fe175fba55e20b";
sha256 = "1vjnfq3al73qljalr2rvymabcksx6y690gg5r9kgz1lnizlb7yrz";
rev = "bd0fdbb364ba69c69b867f96bc1ea9b59177fb76";
sha256 = "07yxz409yxgwrzm46fhq6kyn9igznb7481kxyk90ngmhdd0a5mfd";
};
depsSha256 = "0vzpq58vfswdwdm2bk44ynk43cmwdxppcbkvpjyfa6sjs2s5x8n9";
depsSha256 = "0qs6ilpvcrvcmxg7a94rbg9rql1hxfljy6gxrvpn59dy8hb1qccb";
meta = with stdenv.lib; {
description = "A tool for formatting Rust code according to style guidelines";