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

Merge branch 'master' into staging

Browse Source 
Hydra: ?compare=1401528
This commit is contained in:
Vladimír Čunát
2017-10-14 10:36:13 +02:00
parent 2a4f47dd1a 2fdfefa2da
commit 6525c22ef1
215 changed files with 6811 additions and 7612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/ghcjs/default.nix
View File

@@ -2,5 +2,5 @@
bootPkgs.callPackage ./base.nix {
inherit bootPkgs;
broken = false;
broken = true; # https://hydra.nixos.org/build/62184741
}

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

@@ -72,8 +72,8 @@ in {
'';
};
haxe_3_4 = generic {
version = "3.4.3";
sha256 = "1rrbrc81pilq0d691kp22yjwvvg0kw7q9b9npdghga2ks0hzpr02";
version = "3.4.4";
sha256 = "057psarsmz8q2y9pqv5221vpdya241gcy8xnl2wg9wyscn6z1lx6";
prePatch = ''
sed -i -e 's|"/usr/lib/haxe/std/";|"'"$out/lib/haxe/std/"'";\n&|g' src/main.ml
sed -i -e 's|"neko"|"${neko}/bin/neko"|g' extra/haxelib_src/src/haxelib/client/Main.hx

7
pkgs/development/compilers/hhvm/default.nix
View File

@@ -2,8 +2,8 @@
, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php
, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5
, bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
, libxslt, ocaml, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit
, libvpx, imagemagick, fribidi, gperf, which
, libxslt, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit
, libvpx, imagemagick, fribidi, gperf, which, ocamlPackages
}:
stdenv.mkDerivation rec {
@@ -22,8 +22,9 @@ stdenv.mkDerivation rec {
[ cmake pkgconfig boost libunwind mariadb.client libmemcached pcre gdb git perl
libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml libkrb5
libelf uwimap binutils cyrus_sasl pam glog libpng libxslt libkrb5
gmp libyaml libedit libvpx imagemagick fribidi gperf which
ocamlPackages.ocaml ocamlPackages.ocamlbuild
];
patches = [

5
pkgs/development/compilers/obliv-c/default.nix
View File

@@ -1,8 +1,9 @@
{stdenv, fetchurl, ocaml, libgcrypt, fetchFromGitHub, ocamlPackages, perl}:
{ stdenv, fetchurl, libgcrypt, fetchFromGitHub, ocamlPackages, perl }:
stdenv.mkDerivation rec {
name = "obliv-c-${version}";
version = "0.0pre20170827";
buildInputs = [ ocaml ocamlPackages.findlib perl ];
buildInputs = [ perl ]
++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]);
propagatedBuildInputs = [ libgcrypt ];
src = fetchFromGitHub {
owner = "samee";

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

@@ -3,13 +3,13 @@
stdenv.mkDerivation ( rec {
name = "ponyc-${version}";
version = "0.19.2";
version = "0.19.3";
src = fetchFromGitHub {
owner = "ponylang";
repo = "ponyc";
rev = version;
sha256 = "04vbhkkgpjh19pv2bq4b60lgnk5ck8axqs6fgw4l44j3lvxwlwrh";
sha256 = "0aishczaasp877z1a17iq0vk6pp369bv7yz5mvinr7wm44930qr3";
};
buildInputs = [ llvm makeWrapper which ];