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

Merge remote-tracking branch 'upstream/master' into HEAD

Browse Source
This commit is contained in:
Frederik Rietdijk
2016-10-26 13:06:43 +02:00
parent fea23020fe 2273849a85
commit 7077a270bf
177 changed files with 4107 additions and 1641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
pkgs/development/compilers/ats2/default.nix
View File

@@ -1,17 +1,53 @@
{ stdenv, fetchurl, gmp }:
{ stdenv, fetchurl, gmp
, withEmacsSupport ? true
, withContrib ? true }:
let
versionPkg = "0.2.11" ;
contrib = fetchurl {
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ;
sha256 = "0kc4nx1904745c1rkj9yfbayidw7rks1mwq0lxmvsgghn98dxwjn" ;
};
postInstallContrib = stdenv.lib.optionalString withContrib
''
local contribDir=$out/lib/ats2-postiats-*/ ;
mkdir -p $contribDir ;
tar -xzf "${contrib}" --strip-components 1 -C $contribDir ;
'';
postInstallEmacs = stdenv.lib.optionalString withEmacsSupport
''
local siteLispDir=$out/share/emacs/site-lisp/ats2 ;
mkdir -p $siteLispDir ;
install -m 0644 -v ./utils/emacs/*.el $siteLispDir ;
'';
in
stdenv.mkDerivation rec {
name = "ats2-${version}";
version = "0.2.7";
version = versionPkg;
src = fetchurl {
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
sha256 = "1w9cncahv0vkqsj4vlfnn7bn61jvgxgjhk7wbppcm3yhb48pkmda";
sha256 = "140xy129fr11bdf4bj6qya9mf0fhnv2x7ksb9j46pf2yzrsrks8g";
};
buildInputs = [ gmp ];
setupHook = ./setup-hook.sh;
setupHook = with stdenv.lib;
let
hookFiles =
[ ./setup-hook.sh ]
++ optional withContrib ./setup-contrib-hook.sh;
in
builtins.toFile "setupHook.sh"
(concatMapStringsSep "\n" builtins.readFile hookFiles);
patches = [ ./installed-lib-directory-version.patch ];
postInstall = postInstallContrib + postInstallEmacs;
meta = with stdenv.lib; {
description = "Functional programming language with dependent types";

99
pkgs/development/compilers/ats2/installed-lib-directory-version.patch Normal file
View File

@@ -0,0 +1,99 @@
Change the name of the library directory to match the version of the package.
diff -Naur ATS2-Postiats-0.2.11/configure postiats-new/configure
--- ATS2-Postiats-0.2.11/configure 2016-10-13 12:03:20.000000000 -0400
+++ postiats-new/configure 2016-10-23 20:17:29.912579618 -0400
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ATS2/Postiats 0.2.10.
+# Generated by GNU Autoconf 2.69 for ATS2/Postiats 0.2.11.
#
# Report bugs to <gmpostiats@gmail.com>.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='ATS2/Postiats'
PACKAGE_TARNAME='ats2-postiats'
-PACKAGE_VERSION='0.2.10'
-PACKAGE_STRING='ATS2/Postiats 0.2.10'
+PACKAGE_VERSION='0.2.11'
+PACKAGE_STRING='ATS2/Postiats 0.2.11'
PACKAGE_BUGREPORT='gmpostiats@gmail.com'
PACKAGE_URL=''
@@ -1242,7 +1242,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ATS2/Postiats 0.2.10 to adapt to many kinds of systems.
+\`configure' configures ATS2/Postiats 0.2.11 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1304,7 +1304,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ATS2/Postiats 0.2.10:";;
+ short | recursive ) echo "Configuration of ATS2/Postiats 0.2.11:";;
esac
cat <<\_ACEOF
@@ -1384,7 +1384,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ATS2/Postiats configure 0.2.10
+ATS2/Postiats configure 0.2.11
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1936,7 +1936,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ATS2/Postiats $as_me 0.2.10, which was
+It was created by ATS2/Postiats $as_me 0.2.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4226,7 +4226,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ATS2/Postiats $as_me 0.2.10, which was
+This file was extended by ATS2/Postiats $as_me 0.2.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4288,7 +4288,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ATS2/Postiats config.status 0.2.10
+ATS2/Postiats config.status 0.2.11
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -Naur ATS2-Postiats-0.2.11/src/CBOOT/config.h postiats-new/src/CBOOT/config.h
--- ATS2-Postiats-0.2.11/src/CBOOT/config.h 2016-10-13 12:03:20.000000000 -0400
+++ postiats-new/src/CBOOT/config.h 2016-10-23 20:16:34.613836556 -0400
@@ -44,7 +44,7 @@
#define PACKAGE_NAME "ATS2/Postiats"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "ATS2/Postiats 0.2.10"
+#define PACKAGE_STRING "ATS2/Postiats 0.2.11"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "ats2-postiats"
@@ -53,7 +53,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.2.10"
+#define PACKAGE_VERSION "0.2.11"
/* The size of `void*', as computed by sizeof. */
#define SIZEOF_VOIDP 8

1
pkgs/development/compilers/ats2/setup-contrib-hook.sh Normal file
View File

@@ -0,0 +1 @@
export PATSHOMERELOC=@out@/lib/ats2-postiats-@version@

5
pkgs/development/compilers/jhc/default.nix
View File

@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
buildInputs = [ perl ghc ];
preConfigure = ''
configureFlagsArray+=("CC=cc")
configureFlagsArray+=("--with-hsc2hs=${ghc}/bin/hsc2hs --cc=cc")
'';
meta = {
description = "Whole-program, globally optimizing Haskell compiler";
homepage = "http://repetae.net/computer/jhc/";

13
pkgs/development/compilers/llvm/3.7/default.nix
View File

@@ -1,4 +1,4 @@
{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }:
{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun }:
let
callPackage = newScope (self // { inherit stdenv isl version fetch; });
@@ -24,8 +24,19 @@ let
clang = wrapCC self.clang-unwrapped;
libcxxClang = ccWrapperFun {
cc = self.clang-unwrapped;
isClang = true;
inherit (self) stdenv;
/* FIXME is this right? */
inherit (stdenv.cc) libc nativeTools nativeLibc;
extraPackages = [ self.libcxx self.libcxxabi ];
};
stdenv = overrideCC stdenv self.clang;
libcxxStdenv = overrideCC stdenv self.libcxxClang;
lldb = callPackage ./lldb.nix {};
libcxx = callPackage ./libc++ {};

13
pkgs/development/compilers/llvm/3.8/default.nix
View File

@@ -1,4 +1,4 @@
{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }:
{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun }:
let
callPackage = newScope (self // { inherit stdenv isl version fetch; });
@@ -24,8 +24,19 @@ let
clang = wrapCC self.clang-unwrapped;
libcxxClang = ccWrapperFun {
cc = self.clang-unwrapped;
isClang = true;
inherit (self) stdenv;
/* FIXME is this right? */
inherit (stdenv.cc) libc nativeTools nativeLibc;
extraPackages = [ self.libcxx self.libcxxabi ];
};
stdenv = overrideCC stdenv self.clang;
libcxxStdenv = overrideCC stdenv self.libcxxClang;
lldb = callPackage ./lldb.nix {};
libcxx = callPackage ./libc++ {};

13
pkgs/development/compilers/llvm/3.9/default.nix
View File

@@ -1,4 +1,4 @@
{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, darwin }:
{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }:
let
callPackage = newScope (self // { inherit stdenv isl version fetch; });
@@ -24,8 +24,19 @@ let
clang = wrapCC self.clang-unwrapped;
libcxxClang = ccWrapperFun {
cc = self.clang-unwrapped;
isClang = true;
inherit (self) stdenv;
/* FIXME is this right? */
inherit (stdenv.cc) libc nativeTools nativeLibc;
extraPackages = [ self.libcxx self.libcxxabi ];
};
stdenv = overrideCC stdenv self.clang;
libcxxStdenv = overrideCC stdenv self.libcxxClang;
lldb = callPackage ./lldb.nix {};
libcxx = callPackage ./libc++ {};

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

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
name = "nim-0.15.0";
name = "nim-0.15.2";
src = fetchurl {
url = "http://nim-lang.org/download/${name}.tar.xz";
sha256 = "1yv9qvc1r7m0m4gwi8mgnabdjz70mwxf5rmv8xhibcmja1856565";
sha256 = "12pyzjx7x4hclzrf3zf6r1qjlp60bzsaqrz0rax2rak2c8qz4pch";
};
buildPhase = "sh build.sh";

18
pkgs/development/compilers/openjdk/8.nix
View File

@@ -22,41 +22,41 @@ let
throw "openjdk requires i686-linux or x86_64 linux";
update = "122";
build = "00";
build = "03";
baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
repover = "jdk8u${update}-b${build}";
paxflags = if stdenv.isi686 then "msp" else "m";
jdk8 = fetchurl {
url = "${baseurl}/archive/${repover}.tar.gz";
sha256 = "0biy2xpb6krinmpj5pqsz0vryd2m6i819csvqnv88rc3750qh13d";
sha256 = "0s3igii73s9jpq8prpvfhymiadr7vi15cllkxjrks7khx0brcs6m";
};
langtools = fetchurl {
url = "${baseurl}/langtools/archive/${repover}.tar.gz";
sha256 = "1wy9n64fvxybpd8lqd2zbiv2z23nfp10bd098lhqw7z46yxbm3ra";
sha256 = "1x9g3z10mskcv08sdgd1vcm1mf4668ww2s4ivx9spf2vdalk9a4x";
};
hotspot = fetchurl {
url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
sha256 = "1hzliyjaz0dq7l934d16c3ddx6kiszl2hkc2cs0rhb09m7q4zcv7";
sha256 = "1zz0k4grqw57mgcrximq7g7h3c149s1x9b6xcwvvl2f6qn791pn9";
};
corba = fetchurl {
url = "${baseurl}/corba/archive/${repover}.tar.gz";
sha256 = "0576r009my434fgv9m7lwd5bvvgbb182aw8z8fwwbi36mf5j3sr5";
sha256 = "1xi2yi6wplzfnx213w8zpc78rbclig13m7zl2mgz61ay2l2v8znh";
};
jdk = fetchurl {
url = "${baseurl}/jdk/archive/${repover}.tar.gz";
sha256 = "1hn40jm2fcs037zx30k1gxw6j24hr50a78zjjaaql73yhhzf74xh";
sha256 = "01r9cwm68dc34qigl3jn0bifmbgf8jgmddr0wi54sn126pn48c2j";
};
jaxws = fetchurl {
url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
sha256 = "1lbvaw3ck0inz9376qh9nw8d1ys93plfpsn1sp9mmwdjyglvznif";
sha256 = "043zwvnq9zjnb06xfcbi3rd15ji80z79cdar7hdx0d8ifgd75wsb";
};
jaxp = fetchurl {
url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
sha256 = "11viwry7fj70wgzfbpslb6j1zpqqzicdf8yyqhw3whf7l6wx2bav";
sha256 = "1ydbwpa4v28npdgla7aiwsfk3k4ylj86vz482zq3j7h30i6w9h4v";
};
nashorn = fetchurl {
url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
sha256 = "057g393kjb9via2a3x3zm7r4g9dslw0nkwn6yppzd8hal325s1wa";
sha256 = "01bpbfwh1ilqn5ls7krmkklsmvl2zhzkqwag49jypiqa0w3vvaih";
};
openjdk8 = stdenv.mkDerivation {
name = "openjdk-8u${update}b${build}";

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

@@ -3,13 +3,13 @@
stdenv.mkDerivation ( rec {
name = "ponyc-${version}";
version = "0.5.1";
version = "0.6.0";
src = fetchFromGitHub {
owner = "ponylang";
repo = "ponyc";
rev = version;
sha256 = "14c6qs3cqn9hk2hrq2d5rd4cmwzzz2fcb02dg5q1blq17pj7mcxa";
sha256 = "10miwsyxl589b0n1h3dbbc2qckq8z8a58s0d53asq88w2gpc339q";
};
buildInputs = [ llvm makeWrapper which ];

6
pkgs/development/compilers/ponyc/disable-tests.patch
View File

@@ -2,15 +2,13 @@ diff --git a/packages/net/_test.pony b/packages/net/_test.pony
index ce26bd7..9a98cc7 100644
--- a/packages/net/_test.pony
+++ b/packages/net/_test.pony
@@ -5,11 +5,7 @@ actor Main is TestList
@@ -5,9 +5,7 @@ actor Main is TestList
new make() => None
fun tag tests(test: PonyTest) =>
- test(_TestBroadcast)
- test(_TestTCPWritev)
- ifdef not windows then
- test(_TestTCPExpect)
- end
- test(_TestTCPExpect)
+ None
class _TestPing is UDPNotify

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

@@ -7,12 +7,12 @@ in
rec {
rustc = callPackage ./rustc.nix {
shortVersion = "1.12.0";
shortVersion = "1.12.1";
isRelease = true;
forceBundledLLVM = false;
configureFlags = [ "--release-channel=stable" ];
srcRev = "3191fbae9da539442351f883bdabcad0d72efcb6";
srcSha = "1mpw6c5jfxy60g786wl8g0ncwikqfbcj67jrdpj3jacywxsxzlby";
srcRev = "d4f39402a0c2c2b94ec0375cd7f7f6d7918113cd";
srcSha = "1lpykjy96rwz4jy28rf7ijca0q9lvckgnbzvcdsrspd5rs2ywfwr";
patches = [
./patches/disable-lockfile-check.patch

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

@@ -1,16 +1,20 @@
{ stdenv, fetchFromGitHub, boost, cmake, jsoncpp }:
stdenv.mkDerivation rec {
version = "0.3.6";
version = "0.4.2";
name = "solc-${version}";
src = fetchFromGitHub {
owner = "ethereum";
repo = "solidity";
rev = "v${version}";
sha256 = "1cynqwy8wr63l3l4wv9z6shhcy6lq0q8pbsh3nav0dg9qgj9sg57";
sha256 = "1d5x3psz8a9z9jnm30aspfvrpd9kblr14cn5vyl21p27x2vdlzr4";
};
patchPhase = ''
echo >commit_hash.txt af6afb0415761b53721f89c7f65064807f41cbd3
'';
buildInputs = [ boost cmake jsoncpp ];
meta = {