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

Merge branch 'ericson2314-cross-master' into staging

Browse Source
This commit is contained in:
John Ericson
2018-01-16 13:05:39 -05:00
parent 990ff97c6d 5d8b359db7
commit 5a754e75b4
40 changed files with 724 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/ispc/default.nix
View File

@@ -3,8 +3,8 @@ testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is n
}:
stdenv.mkDerivation rec {
version = "20170807";
rev = "6e0fc2f148e95afad998a7c7f4d7908d29fd8e44";
version = "1.9.2";
rev = "v${version}";
inherit testedTargets;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
owner = "ispc";
repo = "ispc";
inherit rev;
sha256 = "17fwnfm8a329lgfhjwcvji4h1fm4iqmc28wz23hvgqbpj8lk6qgh";
sha256 = "0zaw7mwvly1csbdcbz9j8ry89n0r1fag1m1f579l4mgg1x6ksqry";
};
# there are missing dependencies in the Makefile, causing sporadic build failures

8
pkgs/development/compilers/mono/5.4.nix Normal file
View File

@@ -0,0 +1,8 @@
{ stdenv, callPackage, Foundation, libobjc }:
callPackage ./generic-cmake.nix (rec {
inherit Foundation libobjc;
version = "5.4.1.6";
sha256 = "1pv5lmyxjr8z9s17jx19850k43ylzqlbzsgr5jxj1knmkbza1zdx";
enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65820147
})

4
pkgs/development/compilers/ponyc/default.nix
View File

@@ -3,13 +3,13 @@
stdenv.mkDerivation ( rec {
name = "ponyc-${version}";
version = "0.21.2";
version = "0.21.3";
src = fetchFromGitHub {
owner = "ponylang";
repo = "ponyc";
rev = version;
sha256 = "0gdkm1mihn266km3q5ma7nhvjpzwdzmy39cxb7kkz8aal2nmvwri";
sha256 = "0cdp6wbpirl3jnlqkm0hbxyz67v00nwhi4hvk4sq2g74f36j2bnm";
};
buildInputs = [ llvm makeWrapper which ];

6
pkgs/development/compilers/solc/default.nix
View File

@@ -1,9 +1,9 @@
{ stdenv, fetchzip, fetchgit, boost, cmake, z3 }:
let
version = "0.4.17";
rev = "bdeb9e52a2211510644fb53df93fb98258b40a65";
sha256 = "1x6q2rlq6gxggidgsy6li7m4phwr1hcfi65pq9yimz64ddqfiira";
version = "0.4.19";
rev = "c4cbbb054b5ed3b8ceaa21ee5b47b0704762ff40";
sha256 = "1h2ziwdswghj4aa3vd3k3y2ckfiwjk6x38w2kp4m324k2ydxd15c";
jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz;
jsoncpp = fetchzip {
url = jsoncppURL;