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

Merge branch 'origin/master' into stdenv-updates.

Browse Source 
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
This commit is contained in:
Peter Simons
2013-10-18 18:57:24 +02:00
parent ea6f711e8e 06d6c3ed5d
commit 6be8ad3392
1177 changed files with 57151 additions and 6093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ stdenv.mkDerivation {
meta = {
homepage = "http://www.aldor.org/";
description = "Aldor is a programming language with an expressive type system";
description = "Programming language with an expressive type system";
license = stdenv.lib.licenses.asl20;
longDescription = ''

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

@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "Clean is a general purpose, state-of-the-art, pure and lazy functional programming language.";
description = "General purpose, state-of-the-art, pure and lazy functional programming language";
longDescription = ''
Clean is a general purpose, state-of-the-art, pure and lazy functional
programming language designed for making real-world applications. Some

12
pkgs/development/compilers/edk2/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchsvn, libuuid, pythonFull, iasl }:
{ stdenv, fetchgit, libuuid, pythonFull, iasl }:
let
@@ -10,12 +10,12 @@ else
throw "Unsupported architecture";
edk2 = stdenv.mkDerivation {
name = "edk2-2013-03-19";
name = "edk2-2013-10-09";
src = fetchsvn {
url = https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2;
rev = "14211";
sha256 = "1rhrv7cyazb1d4gw3s8fv0c245iankvb9pqx6nngbkkxkcswvnw7";
src = fetchgit {
url = git://github.com/tianocore/edk2;
rev = "5bcb62a4098c9bde9be6af0833a025adc768e08d";
sha256 = "3e2958877061bf6bbfb28b150743d7244486929c1c320bdb1ff2586774aa042a";
};
buildInputs = [ libuuid pythonFull ];

2
pkgs/development/compilers/gwt/2.4.0.nix
View File

@@ -18,6 +18,6 @@ stdenv.mkDerivation {
meta = {
homepage = http://code.google.com/webtoolkit/;
description = "Google Web Toolkit (GWT) is a development toolkit for building and optimizing complex browser-based applications.";
description = "Google Web Toolkit (GWT) is a development toolkit for building and optimizing complex browser-based applications";
};
}

21
pkgs/development/compilers/idris/default.nix
View File

@@ -1,20 +1,21 @@
{ cabal, ansiTerminal, binary, boehmgc, Cabal, filepath, gmp, happy
, haskeline, languageJava, libffi, llvmGeneral, llvmGeneralPure
, mtl, parsec, parsers, split, text, time, transformers, trifecta
, unorderedContainers, utf8String, vector, vectorBinaryInstances
{ cabal, ansiTerminal, ansiWlPprint, binary, boehmgc, Cabal
, filepath, gmp, happy, haskeline, languageJava, libffi
, llvmGeneral, llvmGeneralPure, mtl, parsec, parsers, split, text
, time, transformers, trifecta, unorderedContainers, utf8String
, vector, vectorBinaryInstances
}:
cabal.mkDerivation (self: {
pname = "idris";
version = "0.9.9.2";
sha256 = "0xfwnlf3jca64i4piyx9scmk4z8f6rak2cvrcjwji505a9vaa0rw";
version = "0.9.9.3";
sha256 = "1l19xx0xbcwlnnh2w0rmri7wwixffzfrafpbji64nwyx1awz4iab";
isLibrary = false;
isExecutable = true;
buildDepends = [
ansiTerminal binary Cabal filepath haskeline languageJava libffi
llvmGeneral llvmGeneralPure mtl parsec parsers split text time
transformers trifecta unorderedContainers utf8String vector
vectorBinaryInstances
ansiTerminal ansiWlPprint binary Cabal filepath haskeline
languageJava libffi llvmGeneral llvmGeneralPure mtl parsec parsers
split text time transformers trifecta unorderedContainers
utf8String vector vectorBinaryInstances
];
buildTools = [ happy ];
extraLibraries = [ boehmgc gmp ];

5
pkgs/development/compilers/jdk/dlj-bundle-builder.sh
View File

@@ -37,6 +37,11 @@ else
jrePath=$out/jre
fi
if test -n "$jce"; then
unzip $jce
cp -v jce/*.jar $jrePath/lib/security
fi
rpath=$rpath${rpath:+:}$jrePath/lib/$architecture/jli
# set all the dynamic linkers

12
pkgs/development/compilers/jdk/jdk6-linux.nix
View File

@@ -6,6 +6,7 @@
, xlibs ? null
, installjdk ? true
, pluginSupport ? true
, installjce ? false
}:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
@@ -24,6 +25,15 @@ let
else
abort "jdk requires i686-linux or x86_64 linux";
jce =
if installjce then
requireFile {
name = "jce_policy-6.zip";
url = http://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html;
sha256 = "0qljzfxbikm8br5k7rkamibp1vkyjrf6blbxpx6hn4k46f62bhnh";
}
else
null;
in
stdenv.mkDerivation {
@@ -65,7 +75,7 @@ stdenv.mkDerivation {
[stdenv.gcc.libc] ++
(if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt] else []);
inherit swingSupport pluginSupport architecture;
inherit swingSupport pluginSupport architecture jce;
inherit (xlibs) libX11;
mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";

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

@@ -8,7 +8,7 @@ let
in
stdenv.mkDerivation rec {
pname = "julia";
date = "20130611";
date = "20131013";
name = "${pname}-git-${date}";
grisu_ver = "1.1.1";
@@ -65,8 +65,8 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "git://github.com/JuliaLang/julia.git";
rev = "60cc4e44bf415dcda90f2bbe22300f842fe44098";
sha256 = "018s0zyvdkxjldbvcdv40q3v2gcjznyyql5pv3zhhy1iq11jddfz";
rev = "76d2b87a45fff637473c4c342c9f5f9387675fda";
sha256 = "079g44r27lv0wsfbg84ihrmgzl73djjjr41xjiaqdph55zqfbn4f";
};
buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib
@@ -131,7 +131,7 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "High-level performance-oriented dynamical language for technical computing.";
description = "High-level performance-oriented dynamical language for technical computing";
homepage = "http://julialang.org/";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.raskin ];

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

@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "MLton is an open-source, whole-program, optimizing Standard ML compiler.";
description = "Open-source, whole-program, optimizing Standard ML compiler";
longDescription = ''
MLton is an open source, whole-program optimizing compiler for the Standard ML programming language.
MLton aims to produce fast executables, and to encourage rapid prototyping and modular programming

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

@@ -4,11 +4,11 @@ let
s= # Generated upstream information
rec {
baseName="sbcl";
version="1.1.8";
version="1.1.12";
name="${baseName}-${version}";
hash="1fmcpsi2bddfpz3impm9i62y9p15r3mc4xgm1dg0k77l33859jip";
url="mirror://sourceforge/project/sbcl/sbcl/1.1.8/sbcl-1.1.8-source.tar.bz2";
sha256="1fmcpsi2bddfpz3impm9i62y9p15r3mc4xgm1dg0k77l33859jip";
hash="0mvl6lpi44yv6jv3xhyyzvf9g7bdlj691iz3ydpn66v0vg5i554c";
url="mirror://sourceforge/project/sbcl/sbcl/1.1.12/sbcl-1.1.12-source.tar.bz2";
sha256="0mvl6lpi44yv6jv3xhyyzvf9g7bdlj691iz3ydpn66v0vg5i554c";
};
buildInputs = with a; [
clisp makeWrapper

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

@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
dontDisableStatic = true;
meta = {
description = "Ur/Web supports construction of dynamic web applications backed by SQL databases.";
description = "Construct dynamic web applications backed by SQL databases";
longDescription = ''
Ur is a programming language in the tradition of ML and Haskell, but
featuring a significantly richer type system. Ur is functional, pure,

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

@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
buildInputs = [ readline gmp zlib ];
configureFlags = "--enable-tabling=yes";
meta = {
homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/";
description = "Yap Prolog System is a ISO-compatible high-performance Prolog compiler";