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

Merge branch 'origin/master' into staging.

Browse Source 
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
This commit is contained in:
Peter Simons
2014-09-02 12:31:03 +02:00
parent bb61b45d92 2fc76ea054
commit 1c0d15b90e
338 changed files with 5088 additions and 2096 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/compilers/agda/default.nix
View File

@@ -1,15 +1,16 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, alex, binary, boxes, dataHash, deepseq, emacs, equivalence
, filepath, geniplate, happy, hashable, hashtables, haskeline
, haskellSrcExts, mtl, parallel, QuickCheck, STMonadTrans, strict
, text, time, transformers, unorderedContainers, xhtml, zlib
{ cabal, alex, binary, boxes, cpphs, dataHash, deepseq, emacs
, equivalence, filepath, geniplate, happy, hashable, hashtables
, haskeline, haskellSrcExts, mtl, parallel, QuickCheck
, STMonadTrans, strict, text, time, transformers
, unorderedContainers, xhtml, zlib
}:
cabal.mkDerivation (self: {
pname = "Agda";
version = "2.4.0.2";
sha256 = "13c4ipscnlnbv94k93yajrp32mwzikqa8rhc95h8pmqzhjgwyh8b";
version = "2.4.2";
sha256 = "0pgwx79y02a08xn5f6lghw7fsc6wilab5q2gdm9r51yi9gm32aw5";
isLibrary = true;
isExecutable = true;
buildDepends = [
@@ -18,7 +19,8 @@ cabal.mkDerivation (self: {
QuickCheck STMonadTrans strict text time transformers
unorderedContainers xhtml zlib
];
buildTools = [ alex emacs happy ];
buildTools = [ alex cpphs emacs happy ];
noHaddock = true;
postInstall = ''
$out/bin/agda -c --no-main $(find $out/share -name Primitive.agda)
$out/bin/agda-mode compile

4
pkgs/development/compilers/agda/stdlib.nix
View File

@@ -2,11 +2,11 @@
cabal.mkDerivation (self: rec {
pname = "Agda-stdlib";
version = "0.8";
version = "0.8.1";
src = fetchurl {
url = "https://github.com/agda/agda-stdlib/archive/v${version}.tar.gz";
sha256 = "03gdcy2gar46qlmd6w91y05cm1x304ig6bda90ryww9qn05kif78";
sha256 = "0ij4rg4lk0pq01ing285gbmnn23dcf2rhihdcs8bbdpjg52vl4gf";
};
buildDepends = [ filemanip Agda ];

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

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ats2-${version}";
version = "0.1.1";
version = "0.1.2";
src = fetchurl {
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
sha256 = "17yr5zc4cr4zlizhzy43ihfcidl63wjxcc002amzahskib4fsbmb";
sha256 = "1266hl03d4w13qrimq6jsxcmw1mjivl27l3lhf9ddqlz0vy97j6a";
};
buildInputs = [ gmp ];

39
pkgs/development/compilers/fpc/2.4.0.nix
View File

@@ -1,39 +0,0 @@
{ stdenv, fetchurl, gawk }:
let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in
stdenv.mkDerivation rec {
version = "2.4.0";
name = "fpc-${version}";
src = fetchurl {
url = "http://downloads.sourceforge.net/sourceforge/freepascal/fpcbuild-${version}.tar.gz";
sha256 = "1m2g2bafjixbwl5b9lna5h7r56y1rcayfnbp8kyjfd1c1ymbxaxk";
};
buildInputs = [ startFPC gawk ];
preConfigure =
if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then ''
sed -e "s@'/lib/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas
sed -e "s@'/lib64/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas
'' else "";
makeFlags = "NOGDB=1";
installFlags = "INSTALL_PREFIX=\${out}";
postInstall = ''
for i in $out/lib/fpc/*/ppc*; do
ln -fs $i $out/bin/$(basename $i)
done
mkdir -p $out/lib/fpc/etc/
$out/lib/fpc/*/samplecfg $out/lib/fpc/${version} $out/lib/fpc/etc/
'';
meta = {
description = "Free Pascal Compiler from a source distribution";
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}

1
pkgs/development/compilers/fpc/binary-builder.sh
View File

@@ -1,6 +1,7 @@
source $stdenv/setup
tar xf $src
cd */
tarballdir=$(pwd)
for i in *.tar; do tar xvf $i; done
echo "Deploying binaries.."

10
pkgs/development/compilers/fpc/binary.nix
View File

@@ -1,18 +1,18 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "fpc-2.4.0-binary";
name = "fpc-2.6.0-binary";
src =
if stdenv.system == "i686-linux" then
fetchurl {
url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/i386-linux/fpc-2.4.0.i386-linux.tar";
sha256 = "1zas9kp0b36zxqvb9i4idh2l0nb6qpmgah038l77w6las7ghh0dv";
url = "http://sourceforge.net/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.i386-linux.tar";
sha256 = "08yklvrfxvk59bxsd4rh1i6s3cjn0q06dzjs94h9fbq3n1qd5zdf";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/x86_64-linux/fpc-2.4.0.x86_64-linux.tar";
sha256 = "111d11g5ra55hjywx64ldwwflpimsy8zryvap68v0309nyd23f0z";
url = "http://sourceforge.net/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.x86_64-linux.tar";
sha256 = "0k9vi75k39y735fng4jc2vppdywp82j4qhzn7x4r6qjkad64d8lx";
}
else throw "Not supported on ${stdenv.system}.";

11
pkgs/development/compilers/fpc/default.nix
View File

@@ -3,12 +3,12 @@
let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in
stdenv.mkDerivation rec {
version = "2.6.0";
version = "2.6.4";
name = "fpc-${version}";
src = fetchurl {
url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz";
sha256 = "1vxy2y8pm0ribhpdhqlwwz696ncnz4rk2dafbn1mjgipm97qb26p";
sha256 = "1akdlp4n9ai1gnn4yq236i5rx03rs5sjfgk60myb7nb9lk7kp74d";
};
buildInputs = [ startFPC gawk ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
sed -e "s@'/lib64/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas
'' else "";
makeFlags = "NOGDB=1";
makeFlags = "NOGDB=1 FPC=${startFPC}/bin/fpc";
installFlags = "INSTALL_PREFIX=\${out}";
@@ -31,9 +31,14 @@ stdenv.mkDerivation rec {
$out/lib/fpc/*/samplecfg $out/lib/fpc/${version} $out/lib/fpc/etc/
'';
passthru = {
bootstrap = startFPC;
};
meta = {
description = "Free Pascal Compiler from a source distribution";
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
inherit version;
};
}

6
pkgs/development/compilers/fpc/default.upstream Normal file
View File

@@ -0,0 +1,6 @@
url http://sourceforge.net/projects/freepascal/files/Source/
SF_version_dir
version_link 'fpcbuild-[0-9.]+[.]tar[.]gz/download$'
SF_redirect
version '.*-([0-9.]+)[.]tar[.]gz' '\1'
do_overwrite () { do_overwrite_just_version; }

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

@@ -11,8 +11,8 @@
cabal.mkDerivation (self: {
pname = "idris";
version = "0.9.14.1";
sha256 = "11x4f0hvd51m9rlf9r0i5xsjmc73kjsayny4xyv0wgb88v9v737b";
version = "0.9.14.2";
sha256 = "0j64kx357l16z9y9j20i7mvxgqff94bfssbhh1shb13c0pk5lmi6";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "sbcl-${version}";
version = "1.2.0";
version = "1.2.3";
src = fetchurl {
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
sha256 = "13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2";
sha256 = "0lz2a79dlxxyw05s14l6xp35zjsazgbp1dmqygqi0cmd8dc5vj6j";
};
buildInputs = [ ]