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

Merge 'staging' into closure-size

Browse Source 
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
This commit is contained in:
Vladimír Čunát
2015-04-18 11:00:58 +02:00
parent 2990145170 9de9669496
commit bf414c9d4f
6303 changed files with 375447 additions and 91361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/CGAL/default.nix
View File

@@ -1,13 +1,13 @@
{ stdenv, fetchurl, cmake, boost, gmp, mpfr }:
stdenv.mkDerivation rec {
version = "4.3";
version = "4.5";
name = "cgal-${version}";
src = fetchurl {
url = "https://gforge.inria.fr/frs/download.php/32995/CGAL-${version}.tar.xz";
sha256 = "015vw57dmy43bf63mg3916cgcsbv9dahwv24bnmiajyanj2mhiyc";
url = "https://gforge.inria.fr/frs/download.php/34139/CGAL-${version}.tar.xz";
sha256 = "00shds5yph4s09lqdrb6n60wnw9kpiwa25ghg9mbsgq3fnr8p7kr";
};
buildInputs = [ cmake boost gmp mpfr ];

21
pkgs/development/libraries/LASzip/default.nix Normal file
View File

@@ -0,0 +1,21 @@
{ stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec {
version = "2.2.0";
name = "LASzip-${version}";
src = fetchurl {
url = "https://github.com/LASzip/LASzip/archive/v${version}.tar.gz";
sha256 = "b8e8cc295f764b9d402bc587f3aac67c83ed8b39f1cb686b07c168579c61fbb2";
};
buildInputs = [cmake];
meta = {
description = "Turn quickly bulky LAS files into compact LAZ files without information loss";
homepage = http://www.laszip.org;
license = stdenv.lib.licenses.lgpl2;
maintainers = [ stdenv.lib.maintainers.michelk ];
platforms = stdenv.lib.platforms.linux;
};
}

11
pkgs/development/libraries/SDL/default.nix
View File

@@ -7,7 +7,7 @@
# OSS is no longer supported, for it's much crappier than ALSA and
# PulseAudio.
assert !(stdenv ? cross) -> alsaSupport || pulseaudioSupport;
assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport;
assert openglSupport -> (mesa != null && x11Support);
assert x11Support -> (x11 != null && libXrandr != null);
@@ -51,6 +51,13 @@ stdenv.mkDerivation rec {
"--without-x"
] ++ stdenv.lib.optional alsaSupport "--with-alsa-prefix=${alsaLib}/lib");
# Fix a build failure on OS X Mavericks
# Ticket: https://bugzilla.libsdl.org/show_bug.cgi?id=2085
patches = stdenv.lib.optional stdenv.isDarwin [ (fetchurl {
url = "http://bugzilla-attachments.libsdl.org/attachment.cgi?id=1320";
sha1 = "3137feb503a89a8d606405373905b92dcf7e293b";
}) ];
crossAttrs =stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {
patches = let
f = rev: sha256: fetchurl {
@@ -72,6 +79,6 @@ stdenv.mkDerivation rec {
description = "A cross-platform multimedia library";
homepage = http://www.libsdl.org/;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

6
pkgs/development/libraries/SDL2/default.nix
View File

@@ -7,9 +7,9 @@
# OSS is no longer supported, for it's much crappier than ALSA and
# PulseAudio.
assert alsaSupport || pulseaudioSupport;
assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
assert openglSupport -> (mesa != null && x11Support);
assert openglSupport -> (stdenv.isDarwin || mesa != null && x11Support);
assert x11Support -> (x11 != null && libXrandr != null);
assert alsaSupport -> alsaLib != null;
assert pulseaudioSupport -> pulseaudio != null;
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
description = "A cross-platform multimedia library";
homepage = http://www.libsdl.org/;
license = stdenv.lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.page ];
};
}

18
pkgs/development/libraries/SDL2_ttf/default.nix Normal file
View File

@@ -0,0 +1,18 @@
{ stdenv, fetchurl, SDL2, freetype }:
stdenv.mkDerivation rec {
name = "SDL2_ttf-2.0.12";
src = fetchurl {
url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz";
sha256 = "0vkg6lyj278mdpd52map3rfi65fbq16w67ahmmfcl77a8da60a47";
};
buildInputs = [SDL2 freetype];
postInstall = "ln -s $out/include/SDL2/SDL_ttf.h $out/include/";
meta = {
description = "SDL TrueType library";
};
}

2
pkgs/development/libraries/SDL_image/default.nix
View File

@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
description = "SDL image library";
homepage = http://www.libsdl.org/projects/SDL_image/;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

4
pkgs/development/libraries/SDL_mixer/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL, libogg, libvorbis, enableNativeMidi ? false, fluidsynth ? null }:
{ stdenv, fetchurl, SDL, libogg, libvorbis, smpeg, enableNativeMidi ? false, fluidsynth ? null }:
stdenv.mkDerivation rec {
pname = "SDL_mixer";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n";
};
buildInputs = [SDL libogg libvorbis fluidsynth];
buildInputs = [SDL libogg libvorbis fluidsynth smpeg];
configureFlags = "--disable-music-ogg-shared" + stdenv.lib.optionalString enableNativeMidi " --enable-music-native-midi-gpl";

19
pkgs/development/libraries/SDL_stretch/default.nix Normal file
View File

@@ -0,0 +1,19 @@
{ stdenv, fetchurl, SDL }:
stdenv.mkDerivation {
name = "SDL_stretch-0.3.1";
src = fetchurl {
url = "mirror://sourceforge/sdl-stretch/0.3.1/SDL_stretch-0.3.1.tar.bz2";
sha256 = "1mzw68sn4yxbp8429jg2h23h8xw2qjid51z1f5pdsghcn3x0pgvw";
};
buildInputs = [ SDL ];
meta = {
description = "Stretch Functions For SDL";
homepage = "http://sdl-stretch.sourceforge.net/";
license = stdenv.lib.licenses.lgpl2;
platforms = stdenv.lib.platforms.linux;
};
}

106
pkgs/development/libraries/aalib/darwin.patch Normal file
View File

@@ -0,0 +1,106 @@
diff --git a/src/aaedit.c b/src/aaedit.c
index 09534d2..2ea52f9 100644
--- a/src/aaedit.c
+++ b/src/aaedit.c
@@ -1,6 +1,6 @@
#include <string.h>
#include <ctype.h>
-#include <malloc.h>
+#include <stdlib.h>
#include "aalib.h"
#include "aaint.h"
static void aa_editdisplay(struct aa_edit *e)
diff --git a/src/aakbdreg.c b/src/aakbdreg.c
index def65fe..f4f8efb 100644
--- a/src/aakbdreg.c
+++ b/src/aakbdreg.c
@@ -1,4 +1,4 @@
-#include <malloc.h>
+#include <stdlib.h>
#include "config.h"
#include "aalib.h"
#include "aaint.h"
diff --git a/src/aalib.c b/src/aalib.c
index 11fecc8..e3063b4 100644
--- a/src/aalib.c
+++ b/src/aalib.c
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
#include "aalib.h"
#include "aaint.h"
diff --git a/src/aamoureg.c b/src/aamoureg.c
index 0380828..bb55fe3 100644
--- a/src/aamoureg.c
+++ b/src/aamoureg.c
@@ -1,4 +1,4 @@
-#include <malloc.h>
+#include <stdlib.h>
#include "config.h"
#include "aalib.h"
#include "aaint.h"
diff --git a/src/aarec.c b/src/aarec.c
index 70f4ebc..ee43e8a 100644
--- a/src/aarec.c
+++ b/src/aarec.c
@@ -1,5 +1,5 @@
#include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
#include "aalib.h"
#include "aaint.h"
aa_linkedlist *aa_kbdrecommended = NULL, *aa_mouserecommended = NULL,
diff --git a/src/aaregist.c b/src/aaregist.c
index 54abec0..765155e 100644
--- a/src/aaregist.c
+++ b/src/aaregist.c
@@ -1,4 +1,4 @@
-#include <malloc.h>
+#include <stdlib.h>
#include "config.h"
#include "aalib.h"
#include "aaint.h"
diff --git a/src/aax.c b/src/aax.c
index adcbd82..36e3294 100644
--- a/src/aax.c
+++ b/src/aax.c
@@ -1,4 +1,3 @@
-#include <malloc.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
diff --git a/src/aaxkbd.c b/src/aaxkbd.c
index 30d5903..da2248d 100644
--- a/src/aaxkbd.c
+++ b/src/aaxkbd.c
@@ -1,4 +1,3 @@
-#include <malloc.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
diff --git a/src/aaxmouse.c b/src/aaxmouse.c
index 9935b03..7e725ad 100644
--- a/src/aaxmouse.c
+++ b/src/aaxmouse.c
@@ -1,4 +1,3 @@
-#include <malloc.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
diff --git a/aalib.m4 b/aalib.m4
index c40b8db..991fbda 100644
--- a/aalib.m4
+++ b/aalib.m4
@@ -9,7 +9,7 @@
dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS
dnl
-AC_DEFUN(AM_PATH_AALIB,
+AC_DEFUN([AM_PATH_AALIB],
[dnl
dnl Get the cflags and libraries from the aalib-config script
dnl

2
pkgs/development/libraries/aalib/default.nix
View File

@@ -17,6 +17,8 @@ stdenv.mkDerivation {
configureFlags = "--without-x --with-ncurses=${ncurses}";
patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ];
meta = {
description = "ASCII art graphics library";
};

12
pkgs/development/libraries/accountsservice/default.nix
View File

@@ -2,11 +2,12 @@
, libtool, gobjectIntrospection, polkit, systemd, coreutils }:
stdenv.mkDerivation rec {
name = "accountsservice-0.6.37";
name = "accountsservice-${version}";
version = "0.6.40";
src = fetchurl {
url = http://www.freedesktop.org/software/accountsservice/accountsservice-0.6.37.tar.xz;
sha256 = "1hd58lrl698ij7w1xk3fpj8zp7h6m2hpzvfmbw9sfx4xvhv13cmh";
url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
sha256 = "0ayb3y3l25dmwxlh9g071h02mphjfbkvi2k5f635bayb01k7akzh";
};
buildInputs = [ pkgconfig glib intltool libtool makeWrapper
@@ -24,7 +25,10 @@ stdenv.mkDerivation rec {
--run "${coreutils}/bin/mkdir -p /var/lib/AccountsService/icons"
'';
meta = {
meta = with stdenv.lib; {
description = "D-Bus interface for user account query and manipulation";
homepage = http://www.freedesktop.org/wiki/Software/AccountsService;
license = licenses.gpl3;
maintainers = with maintainers; [ pSub ];
};
}

8
pkgs/development/libraries/adns/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
let
version = "1.4";
version = "1.5.0";
in
stdenv.mkDerivation {
name = "adns-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
"ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-${version}.tar.gz"
"mirror://gnu/adns/adns-${version}.tar.gz"
];
sha256 = "1zm99i9fd5gfijd144ajngn6x73563355im79sqdi98pj6ir4yvi";
sha256 = "0hg89b5n84zjhzvbzrpvhl0hbm4s6d1z2pzllfis64ai656ypibz";
};
preConfigure =
@@ -21,6 +21,10 @@ stdenv.mkDerivation {
# http://thread.gmane.org/gmane.linux.distributions.nixos/1328 for details.
doCheck = false;
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
install_name_tool -id $out/lib/libadns.so.1.5 $out/lib/libadns.so.1.5
'';
meta = {
homepage = "http://www.chiark.greenend.org.uk/~ian/adns/";
description = "Asynchronous DNS Resolver Library";

29
pkgs/development/libraries/afflib/default.nix
View File

@@ -1,15 +1,29 @@
{ stdenv, fetchurl, zlib, curl, expat, fuse, openssl }:
{ stdenv, fetchgit, zlib, curl, expat, fuse, openssl
, autoconf, automake, libtool, python
}:
stdenv.mkDerivation rec {
version = "3.7.4";
version = "3.7.6";
name = "afflib-${version}";
src = fetchurl {
url = "http://digitalcorpora.org/downloads/afflib/${name}.tar.gz";
sha256 = "18j1gjb31qjcmz6lry4m2d933w2a80iagg9g5vrpw5ig80lv10f8";
src = fetchgit {
url = "https://github.com/sshock/AFFLIBv3/";
rev = "refs/tags/v${version}";
sha256 = "11wpjbyja6cn0828sw3951s7dbly11abijk41my3cpy9wnvmiggh";
name = "afflib-${version}-checkout";
};
buildInputs = [ zlib curl expat fuse openssl ];
buildInputs = [ zlib curl expat fuse openssl
libtool autoconf automake python
];
preConfigure = ''
libtoolize -f
autoheader -f
aclocal
automake --add-missing -c
autoconf -f
'';
meta = {
homepage = http://afflib.sourceforge.net/;
@@ -18,7 +32,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.bsdOriginal;
maintainers = [ stdenv.lib.maintainers.raskin ];
inherit version;
downloadPage = "http://digitalcorpora.org/downloads/afflib/";
updateWalker = true;
downloadPage = "https://github.com/sshock/AFFLIBv3/tags";
};
}

23
pkgs/development/libraries/agda/Agda-Sheaves/default.nix Normal file
View File

@@ -0,0 +1,23 @@
{ stdenv, agda, fetchgit }:
agda.mkDerivation (self: rec {
version = "8a06162a8f0f7df308458db91d720cf8f7345d69";
name = "Agda-Sheaves-${version}";
src = fetchgit {
url = "https://github.com/jonsterling/Agda-Sheaves.git";
rev = version;
sha256 = "39e0e4a1f05e359c099cf50a5ec7dd2db7b55f98dcc019f1e4667dca8b37f001";
};
everythingFile = "sheaves.agda";
topSourceDirectories = [ "../$sourceRoot" ];
sourceDirectories = [];
meta = {
homepage = "https://github.com/jonsterling/Agda-Sheaves";
description = "Sheaves in Agda";
license = stdenv.lib.licenses.cc-by-40;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
})

259
pkgs/development/libraries/agda/TotalParserCombinators/contextfile Normal file
View File

@@ -0,0 +1,259 @@
Context:
[Updated the code in response to changes to Agda.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150319181310
Ignore-this: 52b9ff613d7f10b0c8f45591a0759d07
]
[Rolled back most of "Updated the code in response to changes to Agda".
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150319101420
Ignore-this: c2ea7bdf79848235fa3ea64ebda116eb
* One of the Agda changes has been reverted.
]
[Removed an outdated comment.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150217162945
Ignore-this: 3ff7732335750305fe220e65693f0cbf
]
[Added the simplification "nonempty (return x) → fail".
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150217161718
Ignore-this: 56ad6a68c314446d8986a8c1b49655d0
]
[Added Nonempty.nonempty-return.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150217161629
Ignore-this: 68829d3f9a248272c46848daa05ccfe3
]
[Updated the copyright year range.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150212154744
Ignore-this: 3410a12ca1f9de825b00e692b136d500
]
[Updated the code in response to changes to Agda.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150212152207
Ignore-this: 683b5eeca5fa9c8490bceaf68c23a204
]
[Updated the copyright year range.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20141128223227
Ignore-this: 31d3f5e4fdd6fbfad9758d9bfd0d3a3e
]
[Updated the code in response to changes to Agda and the library.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20141128223205
Ignore-this: 6392ec67aab2c534a7195abed55be47
]
[Updated code to reflect changes to Agda.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20140425121055
Ignore-this: 54d80fd647cb897eef85f57e9172f7db
]
[Workaround for (possible) Agda bug.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20140228200347
Ignore-this: b17884ad17a3bdb7faff678622365a8
]
[Updated code to reflect changes to library API.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20130307134644
Ignore-this: 50d070a22a6796b9acdf19d44ba5de16
]
[Updated code to reflect changes to Agda and the library API.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20130228122951
Ignore-this: 761dc4d85683a59cc3667a8706c88093
]
[Turned _◇_ into a constructor.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20120316125431
Ignore-this: 41b492c3106a575f28f146253f78a5ae
]
[Updated code to reflect changes to Agda.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20120316125416
Ignore-this: e77d817d8b391c3b4806119d10848eb3
]
[Updated code to reflect changes to Agda.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20120215103344
Ignore-this: 467716429d5553cd122722108ea82a08
]
[Modified a comment.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20120215103319
Ignore-this: e57d4911f692f8a96a80017d910efc5f
]
[Updated code to reflect change to library API.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20111006160229
Ignore-this: 5359da54e7e6e0f92983fa3ecaccebf3
]
[Updated code to reflect changes to Agda and the library API.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20111003170117
Ignore-this: cbdd35172e372779e12642985cf17268
]
[Rolled back addition of inversion lemmas.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110930150912
Ignore-this: 9c9b083f0afcf95aaaa55a01d871274e
]
[Added inversion lemmas, implemented other lemmas using these lemmas.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110930150842
Ignore-this: 19b832c3f9e14d1e713b5911c094a130
+ This change was a response to a change to Agda's pattern matching
machinery. Subsequently the machinery was made more liberal again,
making this change unnecessary.
]
[Updated code to reflect changes to library API.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110517220158
Ignore-this: ea9771a5014a25cb20afc2118638f8b5
]
[Updated code to reflect changes to Agda.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110512124425
Ignore-this: 97b154661679f574f6ab914583b14580
]
[Proved that many constructions preserve various preorders.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110313012617
Ignore-this: 8008efaff967c228448baa33b82edb81
]
[Updated code to reflect changes to library API.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110313002106
Ignore-this: 94799ba1ae411e59fd8c6c7eac3b8dfb
]
[Simplified TotalRecognisers.LeftRecursion.MatchingParentheses.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110118102159
Ignore-this: 1e01a8092b0c0124979ffc5fe17a245c
]
[Added TotalRecognisers.LeftRecursion.MatchingParentheses.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20110118102146
Ignore-this: 13a3bc91425364e26c3047561655bb25
]
[Added a simplifying backend.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101229012716
Ignore-this: 9ac7ae21cd44c099633678a994fb9a3
]
[Fixed another "bug" in the deep simplifier.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101229010854
Ignore-this: e258adf963436ef715242db23c6808e
+ Sometimes the first layer of bind's right-hand argument was not
simplified.
]
[Made simplify₁ public and changed its type.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228235603
Ignore-this: d39b8453a15089126261e098080223c6
]
[Deep simplification no longer adds casts.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228192850
Ignore-this: 2ba016825adfa3a1e36922869eabfd39
]
[The first constructor in a simplified parser can no longer be a cast.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228175822
Ignore-this: ce3e38cc0b9a096aa436655c9013ae97
]
[Modified the outline.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228173414
Ignore-this: f8866e69f6d1a344e79fb6f708dfa4c
]
[Added an example: a right recursive expression grammar.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228173159
Ignore-this: 9a4d732b451cca08ba19aac5d115c678
]
[Rearranged the code.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228172209
Ignore-this: 50fa29406d0f150669ff3feec4dbe513
]
[Renamed same-bag/set to (initial-bag-)cong.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228170706
Ignore-this: dd3ce43d77dde74cc2428d2568dd2d30
]
[Added TotalParserCombinators.Force.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228153638
Ignore-this: 3b6ff6ea20df0c1293494f06845d17eb
]
[Proved that uses of subst can be erased.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228153621
Ignore-this: f503ba495b923ae521718b6957167128
]
[The deep simplifier no longer skips layers.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228141138
Ignore-this: 733a4a4a9aa0f890ad1740ecfc6a599f
]
[Documented that the deep simplifier misses every second layer.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101228121910
Ignore-this: 8a0baf25b12f63f8748dbc1d16affacf
]
[The simplifier now applies the token-bind rule more often.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101227165413
Ignore-this: 40132fa6f19602886bbe29aadd8a683c
]
[Switched back to deep simplification, now with a proper proof.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101227125434
Ignore-this: ccc46e82f6f9c6c2a27ddb43d315f7dd
]
[Simplified the soundness proof.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101227123839
Ignore-this: fb6826dd9836e34fc3bfdce2928ba13d
]
[Made some _≈[_]P_ constructors conditionally coinductive.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101227123827
Ignore-this: f521f70475403697229051b62343a080
+ The structure of the soundness proof was also changed.
]
[Unified And, AsymmetricChoice and Not.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101225103109
Ignore-this: 5ae8b80e1505fe6e707bb2307d22688c
]
[Modified some comments.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101225101051
Ignore-this: e812d8c3e9720895c368f7a286f8315c
]
[Modified a comment.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101223202647
Ignore-this: 16ea5dc01a4cbe0fe38714b2e4b7ff6
]
[Updated code to reflect changes to library API.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101107162658
Ignore-this: 9e38a10a9997c9825ece6ad9f871b673
]
[Added an alternative backend for TotalRecognisers.Simple.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20101020183743
Ignore-this: a111a89e0c237e132b649561000f53d6
]
[TAG Code corresponding to the paper "Total Parser Combinators" (4).
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20100928013815
Ignore-this: 45ccc28373ed3974047315613eb14833
]

25
pkgs/development/libraries/agda/TotalParserCombinators/default.nix Normal file
View File

@@ -0,0 +1,25 @@
{ stdenv, agda, fetchdarcs, AgdaStdlib }:
agda.mkDerivation (self: rec {
version = "2015-03-19";
name = "TotalParserCombinators-${version}";
src = fetchdarcs {
url = "http://www.cse.chalmers.se/~nad/repos/parser-combinators.code/";
context = ./contextfile;
sha256 = "0jlbz8yni6i7vb2qsd41bdkpchqirvc5pavckaf97z7p4gqi2mlj";
};
buildDepends = [ AgdaStdlib ];
everythingFile = "TotalParserCombinators.agda";
sourceDirectories = [];
topSourceDirectories = [ "../$sourceRoot" ];
meta = with stdenv.lib; {
homepage = "http://www.cse.chalmers.se/~nad/publications/danielsson-parser-combinators.html";
description = "A monadic parser combinator library which guarantees termination of parsing";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
maintainers = with maintainers; [ fuuzetsu ];
};
})

22
pkgs/development/libraries/agda/agda-base/default.nix Normal file
View File

@@ -0,0 +1,22 @@
{ stdenv, agda, fetchurl }:
agda.mkDerivation (self: rec {
version = "0.1";
name = "agda-base-${version}";
src = fetchurl {
url = "https://github.com/pcapriotti/agda-base/archive/v${version}.tar.gz";
sha256 = "124h06p7jdiqr2x6r46sfab9r0cgb0fznr2qs5i1psl5yf3z74h8";
};
sourceDirectories = [ "./." ];
everythingFile = "README.agda";
meta = {
homepage = "https://github.com/pcapriotti/agda-base";
description = "Base library for HoTT in Agda";
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
})

26
pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix Normal file
View File

@@ -0,0 +1,26 @@
{ stdenv, agda, fetchsvn }:
agda.mkDerivation (self: rec {
version = "18734";
name = "agda-iowa-stdlib-${version}";
src = fetchsvn {
url = "https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib";
rev = version;
sha256 = "0aqib88m5n6aqb5lmns9nl62x40yqhg6zpj0zjxibbn4s4qjw9ky";
};
sourceDirectories = [ "./." ];
buildPhase = ''
patchShebangs find-deps.sh
make
'';
meta = {
homepage = "https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib/";
description = "Agda standard library developed at Iowa";
license = stdenv.lib.licenses.free;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
})

23
pkgs/development/libraries/agda/agda-prelude/default.nix Normal file
View File

@@ -0,0 +1,23 @@
{ stdenv, agda, fetchgit }:
agda.mkDerivation (self: rec {
version = "d598f35d88596c5a63766a7188a0c0144e467c8c";
name = "agda-prelude-${version}";
src = fetchgit {
url = "https://github.com/UlfNorell/agda-prelude.git";
rev = version;
sha256 = "bdcffb675d0ad1bafa2b47f581b6a9b90347ae739b6218f89f365fda2cc4f8c8";
};
topSourceDirectories = [ "src" ];
everythingFile = "src/Prelude.agda";
meta = with stdenv.lib; {
homepage = "https://github.com/UlfNorell/agda-prelude";
description = "Programming library for Agda";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
maintainers = with maintainers; [ fuuzetsu ];
};
})

27
pkgs/development/libraries/agda/agda-stdlib/default.nix Normal file
View File

@@ -0,0 +1,27 @@
{ stdenv, agda, fetchgit, ghcWithPackages }:
agda.mkDerivation (self: rec {
version = "2.4.2.3";
name = "agda-stdlib-${version}";
src = fetchgit {
url = "git://github.com/agda/agda-stdlib";
rev = "451446c5d849b8c5d6d34363e3551169eb126cfb";
sha256 = "40a55d3c22fb3462b110859f4cd63e79e086b25f23964b465768397b93c57701";
};
nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];
preConfigure = ''
runhaskell GenerateEverything.hs
'';
topSourceDirectories = [ "src" ];
meta = with stdenv.lib; {
homepage = "http://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary";
description = "A standard library for use with the Agda compiler";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
maintainers = with maintainers; [ jwiegley fuuzetsu ];
};
})

23
pkgs/development/libraries/agda/bitvector/default.nix Normal file
View File

@@ -0,0 +1,23 @@
{ stdenv, agda, fetchgit, AgdaStdlib }:
agda.mkDerivation (self: rec {
version = "f1c173313f2a41d95a8dc6053f9365a24690e18d";
name = "bitvector-${version}";
src = fetchgit {
url = "https://github.com/copumpkin/bitvector.git";
rev = version;
sha256 = "c39f55b709366f2c627d1a3a68d4b013c415b0e0f68ca6b69e387d07e2ce6d9a";
};
buildDepends = [ AgdaStdlib ];
sourceDirectories = [ "Data" ];
meta = {
homepage = "https://github.com/copumpkin/bitvector";
description = "Sequences of bits and common operations on them";
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
})

23
pkgs/development/libraries/agda/categories/default.nix Normal file
View File

@@ -0,0 +1,23 @@
{ stdenv, agda, fetchgit, AgdaStdlib }:
agda.mkDerivation (self: rec {
version = "33409120d071656f5198c658145889ae2e86249c";
name = "categories-${version}";
src = fetchgit {
url = "https://github.com/copumpkin/categories.git";
rev = version;
sha256 = "cb7e8c911e10ab582c077208f5f6675711c0d65f0d9d679639d4b67a467cc4de";
};
buildDepends = [ AgdaStdlib ];
sourceDirectories = [ "Categories" "Graphs" ];
meta = {
homepage = "https://github.com/copumpkin/categories";
description = "Categories parametrized by morphism equality, in Agda";
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
})

43
pkgs/development/libraries/agda/pretty/contextfile Normal file
View File

@@ -0,0 +1,43 @@
Context:
[Updated the code in response to a change to Agda.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150319181428
Ignore-this: f83c3dccfe25a2a5b9d0437d1dce0ec0
]
[Rolled back most of "Updated the code in response to changes to Agda".
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150319101413
Ignore-this: 5a26cf9cf83d0d146cca0c15c857d20c
* One of the Agda changes has been reverted.
]
[Updated the code in response to changes to Agda.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150217101656
Ignore-this: a12921aebbe0fb575ef391ba5789a391
]
[Modified the copyright year range.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150213144338
Ignore-this: 1d1b22457dd6dadcb47f5d7f3eea062
]
[Restored Grammar.Abstract and Grammar.Non-terminal.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20130727225031
Ignore-this: ddccb15caa7a3c26e973997ffdb4eec1
]
[Modified the copyright year range.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20141128164015
Ignore-this: b9c6dddc965738aa2a7670c4c18da67f
]
[Updated the code to reflect changes to the library API.
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20141128163950
Ignore-this: 8094c47f23cef0fcc596ad0c18a92b56
]
[TAG Correct-by-Construction Pretty-Printing (2013-07-28)
Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20130727224432
Ignore-this: 6aab9b2e6b638457767c8821f3c27cb4
]

25
pkgs/development/libraries/agda/pretty/default.nix Normal file
View File

@@ -0,0 +1,25 @@
{ stdenv, agda, fetchdarcs, AgdaStdlib }:
agda.mkDerivation (self: rec {
version = "2015-03-19";
name = "pretty-${version}";
src = fetchdarcs {
url = "http://www.cse.chalmers.se/~nad/repos/pretty/";
context = ./contextfile;
sha256 = "0zmwh9kln7ykpmkx1qhqz64qm2arq62b17vs5fswnxk7mqxsmrf0";
};
buildDepends = [ AgdaStdlib ];
everythingFile = "Pretty.agda";
sourceDirectories = [];
topSourceDirectories = [ "../$sourceRoot" ];
meta = with stdenv.lib; {
homepage = "http://www.cse.chalmers.se/~nad/publications/danielsson-correct-pretty.html";
description = "Correct-by-Construction Pretty-Printing";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
maintainers = with maintainers; [ fuuzetsu ];
};
})

17
pkgs/development/libraries/allegro/5-unstable.nix
View File

@@ -3,7 +3,7 @@ x@{builderDefsPackage
, texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor
, alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc
, xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa
, kbproto, libjpeg, flac
, kbproto, libjpeg, flac, inputproto, libXi, fixesproto, libXfixes
, ...}:
builderDefsPackage
(a :
@@ -16,7 +16,7 @@ let
sourceInfo = rec {
baseName="allegro";
folderSuffix = "-unstable";
version = "5.1.8";
version = "5.1.9";
name="${baseName}-${version}";
project="alleg";
url="mirror://sourceforge/project/${project}/${baseName}${folderSuffix}/${version}/${name}.tar.gz";
@@ -26,17 +26,21 @@ in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = "180mhlhgxqh3ynazf9bssnd3riw77fazjw65yr64w0av53y0h1lz";
sha256 = "0jn1x2l1kz0vi2fvabpk5sbn1cx4k6hwncmf2j8wnrhk8pm5af5h";
};
inherit (sourceInfo) name version;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doCmake" "doMakeInstall"];
phaseNames = ["patchIncludes" "doCmake" "doMakeInstall"];
patchIncludes = a.fullDepEntry ''
sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt src/*.c
'' ["minInit" "doUnpack"];
doCmake = a.fullDepEntry (''
export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm"
export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm -lXi -lXfixes"
cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON .
'') ["minInit" "doUnpack" "addInputs"];
@@ -45,7 +49,7 @@ rec {
meta = {
description = "A game programming library";
license = "free-noncopyleft"; # giftware
license = a.lib.licenses.free; # giftware
maintainers = with a.lib.maintainers;
[
raskin
@@ -55,4 +59,3 @@ rec {
inherit version;
};
}) x

7
pkgs/development/libraries/allegro/5.nix
View File

@@ -15,7 +15,7 @@ let
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="allegro";
version="5.0.10";
version = "5.0.11";
name="${baseName}-${version}";
project="alleg";
url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz";
@@ -25,7 +25,7 @@ in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
sha256 = "0cd51qrh97jrr0xdmnivqgwljpmizg8pixsgvc4blqqlaz4i9zj9";
};
inherit (sourceInfo) name version;
@@ -44,7 +44,7 @@ rec {
meta = {
description = "A game programming library";
license = "free-noncopyleft"; # giftware
license = a.lib.licenses.free; # giftware
maintainers = with a.lib.maintainers;
[
raskin
@@ -54,4 +54,3 @@ rec {
inherit version;
};
}) x

3
pkgs/development/libraries/allegro/default.nix
View File

@@ -43,7 +43,7 @@ rec {
meta = {
branch = "4";
description = "A game programming library";
license = "free-noncopyleft"; # giftware
license = a.lib.licenses.free; # giftware
maintainers = with a.lib.maintainers;
[
raskin
@@ -57,4 +57,3 @@ rec {
};
};
}) x

36
pkgs/development/libraries/appstream/default.nix Normal file
View File

@@ -0,0 +1,36 @@
{ stdenv, fetchurl, cmake, pkgconfig, gettext, intltool
, xmlto, docbook_xsl, docbook_xml_dtd_45
, glib, xapian, libxml2, libyaml, gobjectIntrospection
}:
stdenv.mkDerivation {
name = "appstream-0.8.0";
meta = with stdenv.lib; {
description = "Software metadata handling library";
homepage = "http://www.freedesktop.org/wiki/Distributions/AppStream/Software/";
longDescription =
''
AppStream is a cross-distro effort for building Software-Center applications
and enhancing metadata provided by software components. It provides
specifications for meta-information which is shipped by upstream projects and
can be consumed by other software.
'';
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ iyzsong ];
};
src = fetchurl {
url = "https://github.com/ximion/appstream/archive/APPSTREAM_0_8_0.tar.gz";
sha256 = "16a3b38avrwyl1pp8jdgfjv6cd5mccbmk4asni92l40y5r0xfycr";
};
nativeBuildInputs = [
cmake pkgconfig gettext intltool
xmlto docbook_xsl docbook_xml_dtd_45
gobjectIntrospection
];
buildInputs = [ glib xapian libxml2 libyaml ];
}

8
pkgs/development/libraries/apr-util/default.nix
View File

@@ -2,6 +2,7 @@
, sslSupport ? true, openssl
, bdbSupport ? false, db
, ldapSupport ? true, openldap
, libiconv
}:
assert sslSupport -> openssl != null;
@@ -13,11 +14,11 @@ let
in
stdenv.mkDerivation rec {
name = "apr-util-1.5.3";
name = "apr-util-1.5.4";
src = fetchurl {
url = "mirror://apache/apr/${name}.tar.bz2";
sha256 = "0s1rpqjy5xr03k9s4xrsm5wvhj5286vlkf6jvqayw99yy5sb3vbq";
sha256 = "0bn81pfscy9yjvbmyx442svf43s6dhrdfcsnkpxz43fai5qk5kx6";
};
configureFlags = ''
@@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
buildInputs = stdenv.lib.optional sslSupport openssl;
propagatedBuildInputs = [ makeWrapper apr expat ]
propagatedBuildInputs = [ makeWrapper apr expat libiconv ]
++ optional sslSupport openssl
++ optional bdbSupport db
++ optional ldapSupport openldap;
@@ -49,5 +50,6 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://apr.apache.org/;
description = "A companion library to APR, the Apache Portable Runtime";
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}

17
pkgs/development/libraries/apr/darwin_fix_configure.patch
View File

@@ -1,17 +0,0 @@
diff -Nuar apr-1.4.6/configure apr-1.4.6-darwin-fix-configure/configure
--- apr-1.4.6/configure 2012-02-08 00:17:57.000000000 +0100
+++ apr-1.4.6-darwin-fix-configure/configure 2012-06-06 23:08:56.000000000 +0200
@@ -6854,10 +6854,10 @@
*-apple-darwin*)
if test "x$CPPFLAGS" = "x"; then
- test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp\""
- CPPFLAGS="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp"
+ test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK\""
+ CPPFLAGS="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK"
else
- apr_addto_bugger="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp"
+ apr_addto_bugger="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK"
for i in $apr_addto_bugger; do
apr_addto_duplicate="0"
for j in $CPPFLAGS; do

2
pkgs/development/libraries/apr/default.nix
View File

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1b4qw686bwjn19iyb0lg918q23xxd6s2gnyczhjq992d3m1vwjp9";
};
patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ];
patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];
outputs = [ "dev" "out" ];

17
pkgs/development/libraries/apr/is-this-a-compiler-bug.patch Normal file
View File

@@ -0,0 +1,17 @@
--- apr-1.5.1/file_io/unix/filestat.c 2014-11-01 06:42:50.000000000 -0400
+++ apr-1.5.1/file_io/unix/filestat.c.new 2014-11-01 07:07:32.000000000 -0400
@@ -297,9 +297,11 @@
finfo->pool = pool;
finfo->fname = fname;
fill_out_finfo(finfo, &info, wanted);
- if (wanted & APR_FINFO_LINK)
- wanted &= ~APR_FINFO_LINK;
- return (wanted & ~finfo->valid) ? APR_INCOMPLETE : APR_SUCCESS;
+ if (wanted & APR_FINFO_LINK) {
+ return ((wanted & ~APR_FINFO_LINK) & ~finfo->valid) ? APR_INCOMPLETE : APR_SUCCESS;
+ } else {
+ return (wanted & ~finfo->valid) ? APR_INCOMPLETE : APR_SUCCESS;
+ }
}
else {
#if !defined(ENOENT) || !defined(ENOTDIR)

8
pkgs/development/libraries/asio/default.nix
View File

@@ -1,11 +1,11 @@
{stdenv, fetchurl, boost, openssl}:
stdenv.mkDerivation rec {
name = "asio-1.10.2";
name = "asio-1.10.6";
src = fetchurl {
url = "mirror://sourceforge/asio/${name}.tar.bz2";
sha256 = "1lqxm3gc8rzzjq0m843l59ggbw32bih7smm5spry1j5khfc86p41";
sha256 = "0phr6zq8z78dwhhzs3h27q32mcv1ffg2gyq880rw3xmilx01rmz0";
};
propagatedBuildInputs = [ boost ];
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://asio.sourceforge.net/;
description = "Cross-platform C++ library for network and low-level I/O programming";
license = "boost";
license = stdenv.lib.licenses.boost;
};
}

18
pkgs/development/libraries/aspell/clang.patch Normal file
View File

@@ -0,0 +1,18 @@
--- interfaces/cc/aspell.h 2013-10-13 20:29:33.000000000 +0200
+++ interfaces/cc/aspell.h 2013-10-13 20:30:01.000000000 +0200
@@ -237,6 +237,7 @@
/******************************** errors ********************************/
+#ifndef __cplusplus
extern const struct AspellErrorInfo * const aerror_other;
extern const struct AspellErrorInfo * const aerror_operation_not_supported;
extern const struct AspellErrorInfo * const aerror_cant_copy;
@@ -322,6 +323,7 @@
extern const struct AspellErrorInfo * const aerror_bad_magic;
extern const struct AspellErrorInfo * const aerror_expression;
extern const struct AspellErrorInfo * const aerror_invalid_expression;
+#endif
/******************************* speller *******************************/

5
pkgs/development/libraries/aspell/default.nix
View File

@@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm";
};
patchPhase = ''
patch interfaces/cc/aspell.h < ${./clang.patch}
'';
buildInputs = [ perl ];
doCheck = true;
@@ -31,5 +35,6 @@ stdenv.mkDerivation rec {
homepage = http://aspell.net/;
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = [ ];
platforms = with stdenv.lib.platforms; all;
};
}

10
pkgs/development/libraries/aspell/dictionaries.nix
View File

@@ -176,4 +176,14 @@ in {
};
};
sk = buildDict {
shortName = "sk-2.01-2";
fullName = "Slovak";
src = fetchurl {
url = mirror://gnu/aspell/dict/sk/aspell6-sk-2.01-2.tar.bz2;
sha256 = "19k0m1v5pcf7xr4lxgjkzqkdlks8nyb13bvi1n7521f3i4lhma66";
};
};
}

27
pkgs/development/libraries/assimp/default.nix Normal file
View File

@@ -0,0 +1,27 @@
{ stdenv, fetchurl, unzip, cmake, boost }:
let
major = "3";
minor = "1";
revision = "1";
version = "${major}.${minor}.${revision}";
in
stdenv.mkDerivation {
name = "assimp-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/assimp/assimp-${major}.${minor}/assimp-${version}_no_test_models.zip";
sha256 = "17nyzsqzqpafamhi779f1bkh5mfgj8rpas034x3v9a0hdy3jg66s";
};
buildInputs = [ unzip cmake boost ];
meta = with stdenv.lib; {
description = "Open Asset Import Library is a library to import various 3D model formats";
homepage = http://assimp.sourceforge.net/;
license = licenses.bsd3;
maintainers = with maintainers; [ emery ];
platfroms = platforms.linux;
inherit version;
};
}

2
pkgs/development/libraries/at-spi2-atk/default.nix
View File

@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
intltool dbus_glib at_spi2_core libSM ];
meta = with stdenv.lib; {
platforms = platforms.linux;
platforms = platforms.unix;
};
}

10
pkgs/development/libraries/at-spi2-core/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, fetchurl, python, pkgconfig, popt, intltool, dbus_glib
, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }:
stdenv.mkDerivation (rec {
stdenv.mkDerivation rec {
versionMajor = "2.12";
versionMinor = "0";
moduleName = "at-spi2-core";
@@ -21,12 +21,10 @@ stdenv.mkDerivation (rec {
# ToDo: on non-NixOS we create a symlink from there?
configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/";
NIX_LDFLAGS = with stdenv; lib.optionalString isDarwin "-lintl";
meta = with stdenv.lib; {
platforms = platforms.linux;
platforms = platforms.unix;
};
}
// stdenv.lib.optionalAttrs stdenv.isDarwin {
NIX_LDFLAGS = "-lintl";
}
)

4
pkgs/development/libraries/aterm/2.5.nix
View File

@@ -21,11 +21,13 @@ stdenv.mkDerivation {
dontDisableStatic = true;
NIX_CFLAGS_COMPILE = "-D__USE_BSD";
meta = {
homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm;
license = "LGPL";
description = "Library for manipulation of term data structures in C";
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = stdenv.lib.maintainers.eelco;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}

2
pkgs/development/libraries/aterm/2.8.nix
View File

@@ -30,7 +30,7 @@ stdenv.mkDerivation {
license = "LGPL";
description = "Library for manipulation of term data structures in C";
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = stdenv.lib.maintainers.eelco;
maintainers = [ stdenv.lib.maintainers.eelco ];
broken = true;
};
}

20
pkgs/development/libraries/audio/libsmf/default.nix Normal file
View File

@@ -0,0 +1,20 @@
{ stdenv, fetchurl, autoreconfHook, glib, pkgconfig }:
stdenv.mkDerivation rec {
version = "1.3";
name = "libsmf-${version}";
src = fetchurl {
url = "https://github.com/stump/libsmf/archive/${name}.tar.gz";
sha256 = "1527pcc1vd0l5iks2yw8m0bymcrnih2md5465lwpzw0wgy4rky7n";
};
buildInputs = [ autoreconfHook glib pkgconfig ];
meta = with stdenv.lib; {
description = "A C library for reading and writing Standard MIDI Files";
homepage = https://github.com/stump/libsmf;
license = licenses.bsd2;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
};
}

4
pkgs/development/libraries/audio/lilv/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "lilv-${version}";
version = "0.18.0";
version = "0.20.0";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "1k9wfc08ylgbkwbnvh1fx1bdzl3y59xrrx8gv0vk68yzcvcmv6am";
sha256 = "0aj2plkx56iar8vzjbq2l7hi7sp0ml99m0h44rgwai2x4vqkk2j2";
};
buildInputs = [ lv2 pkgconfig python serd sord sratom ];

4
pkgs/development/libraries/audio/lv2/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "lv2-${version}";
version = "1.8.0";
version = "1.10.0";
src = fetchurl {
url = "http://lv2plug.in/spec/${name}.tar.bz2";
sha256 = "1mxkp7gajh1alw6s358cqwf3qkpr1ld9wfxwswnqrxcd9a7hxjd4";
sha256 = "1md41x9snrp4mcfyli7lyfpvcfa78nfy6xkdy84kppnl8m5qw378";
};
buildInputs = [ gtk libsndfile pkgconfig python ];

2
pkgs/development/libraries/audio/lvtk/default.nix
View File

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ boost gtkmm lv2 pkgconfig python ];
configurePhase = ''
python waf configure --prefix=$out --boost-includes=${boost}/include
python waf configure --prefix=$out --boost-includes="${boost.dev}/include"
'';
buildPhase = "python waf";

4
pkgs/development/libraries/audio/raul/default.nix
View File

@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "raul-svn-${rev}";
rev = "5205";
rev = "5449";
src = fetchsvn {
url = "http://svn.drobilla.net/lad/trunk/raul";
rev = rev;
sha256 = "1rkl7vxhwf6d0qfl2ymfd1qwmh9cl1xv6kkz893xg0blpvzcdmp3";
sha256 = "02ph1hikp1iynwbxbiaf28brkwig7n4lsb3djaivnf14arg5vmzx";
};
buildInputs = [ boost gtk pkgconfig python ];

4
pkgs/development/libraries/audio/sratom/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "sratom-${version}";
version = "0.4.4";
version = "0.4.6";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "1q4044md8nmqah8ay5mf4lgdl6x0sfa4cjqyqk9da8nqzvs2j37s";
sha256 = "080jjiyxjnj7hf25844hd9rb01grvzz1rk8mxcdnakywmspbxfd4";
};
buildInputs = [ lv2 pkgconfig python serd sord ];

4
pkgs/development/libraries/audio/suil/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "suil-${version}";
version = "0.8.0";
version = "0.8.2";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "0y5sbgaivb03vmr3jcpzj16wqxa5h744ml4w3ylzglbxs2bqgl7n";
sha256 = "1s3adyiw7sa5gfvm5wasa61qa23629kprxyv6w8hbxdiwp0hhxkq";
};
buildInputs = [ gtk lv2 pkgconfig python qt4 serd sord sratom ];

7
pkgs/development/libraries/avahi/default.nix
View File

@@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser
, expat, gettext, intltool, glib, libiconvOrEmpty
, expat, gettext, intltool, glib, libiconv
, qt4 ? null
, qt4Support ? false
, withLibdnssdCompat ? false }:
@@ -16,9 +16,8 @@ stdenv.mkDerivation rec {
patches = [ ./no-mkdir-localstatedir.patch ];
buildInputs = [ libdaemon dbus perl perlXMLParser glib expat ]
++ (stdenv.lib.optional qt4Support qt4)
++ libiconvOrEmpty;
buildInputs = [ libdaemon dbus perl perlXMLParser glib expat libiconv ]
++ (stdenv.lib.optional qt4Support qt4);
nativeBuildInputs = [ pkgconfig gettext intltool ];

5
pkgs/development/libraries/axis/builder.sh
View File

@@ -1,5 +0,0 @@
source $stdenv/setup
mkdir -p $out
unpackPhase
mv $directory/* $out

16
pkgs/development/libraries/axis/default.nix
View File

@@ -1,16 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "axis-1.3";
directory = "axis-1_3";
builder = ./builder.sh;
src = fetchurl {
url = "http://archive.apache.org/dist/ws/axis/1_3/axis-bin-1_3.tar.gz";
md5 = "dd8203f08c37872f4fd2bfb45c4bfe04";
};
inherit stdenv;
meta = {
description = "Implementation of the SOAP (Simple Object Access Protocol) submission to W3C";
};
}

16
pkgs/development/libraries/babl/0_0_22.nix
View File

@@ -1,16 +0,0 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "babl-0.0.22";
src = fetchurl {
url = ftp://ftp.gtk.org/pub/babl/0.0/babl-0.0.22.tar.bz2;
sha256 = "0v8gbf9si4sd06199f8lfmrsbvi6i0hxphd34kyvsj6g2kkkg10s";
};
meta = {
description = "Image pixel format conversion library";
homepage = http://gegl.org/babl/;
license = stdenv.lib.licenses.gpl3;
};
}

6
pkgs/development/libraries/babl/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "babl-0.1.10";
name = "babl-0.1.12";
src = fetchurl {
url = "ftp://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
sha256 = "943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4";
url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
sha256 = "01x4an6zixrhn0vibkxpcb7gg348gadydq8gpw82rdqp39zjp01g";
};
meta = {

44
pkgs/development/libraries/belle-sip/default.nix Normal file
View File

@@ -0,0 +1,44 @@
{ stdenv, fetchurl, libantlr3c, jre, polarssl }:
let
# We must use antlr-3.4 with belle-sip-1.4.0
# We might be able to use antlr-3.5+ in the future
antlr = fetchurl {
url = "http://www.antlr3.org/download/antlr-3.4-complete.jar";
sha256 = "1xqbam8vf04q5fasb0m2n1pn5dbp2yw763sj492ncq04c5mqcglx";
};
in
stdenv.mkDerivation rec {
name = "belle-sip-1.4.0";
src = fetchurl {
url = "mirror://savannah/linphone/belle-sip/${name}.tar.gz";
sha256 = "1lwxfvwvclbh0bfwf69jrknqzqh1igzm293wwwbmq4kn8c5fiypz";
};
nativeBuildInputs = [ jre ];
# belle-sip.pc doesn't have a library path for antlr3c or polarssl
propagatedBuildInputs = [ libantlr3c polarssl ];
postPatch = ''
mkdir -p $TMPDIR/share/java
cp ${antlr} $TMPDIR/share/java/antlr.jar
sed -i "s,\(antlr_java_prefixes=\).*,\1\"$TMPDIR/share/java\"," configure
cat configure | grep antlr_java
'';
configureFlags = [
"--with-polarssl=${polarssl}"
];
enableParallelBuild = true;
meta = with stdenv.lib; {
homepage = http://www.linphone.org/index.php/eng;
description = "A Voice-over-IP phone";
license = licenses.gpl2;
platforms = platforms.all;
};
}

33
pkgs/development/libraries/blitz/blitz-gcc47.patch Normal file
View File

@@ -0,0 +1,33 @@
diff -ur blitz-0.10/blitz/bzdebug.h blitz-0.10.new/blitz/bzdebug.h
--- blitz-0.10/blitz/bzdebug.h 2012-05-11 22:11:13.000000000 +0200
+++ blitz-0.10.new/blitz/bzdebug.h 2012-06-28 15:42:38.060656045 +0200
@@ -117,15 +117,15 @@
}
}
- #define BZASSERT(X) checkAssert(X, __FILE__, __LINE__)
- #define BZPRECONDITION(X) checkAssert(X, __FILE__, __LINE__)
- #define BZPOSTCONDITION(X) checkAssert(X, __FILE__, __LINE__)
- #define BZSTATECHECK(X,Y) checkAssert(X == Y, __FILE__, __LINE__)
+ #define BZASSERT(X) blitz::checkAssert(X, __FILE__, __LINE__)
+ #define BZPRECONDITION(X) blitz::checkAssert(X, __FILE__, __LINE__)
+ #define BZPOSTCONDITION(X) blitz::checkAssert(X, __FILE__, __LINE__)
+ #define BZSTATECHECK(X,Y) blitz::checkAssert(X == Y, __FILE__, __LINE__)
#define BZPRECHECK(X,Y) \
{ \
if ((assertFailMode == false) && (!(X))) \
BZ_STD_SCOPE(cerr) << Y << BZ_STD_SCOPE(endl); \
- checkAssert(X, __FILE__, __LINE__); \
+ blitz::checkAssert(X, __FILE__, __LINE__); \
}
#define BZ_DEBUG_MESSAGE(X) \
@@ -138,7 +138,7 @@
}
#define BZ_DEBUG_PARAM(X) X
- #define BZ_PRE_FAIL checkAssert(0)
+ #define BZ_PRE_FAIL blitz::checkAssert(0)
#define BZ_ASM_DEBUG_MARKER
#elif defined(BZ_DEBUG)

13
pkgs/development/libraries/blitz/blitz-testsuite-stencil-et.patch Normal file
View File

@@ -0,0 +1,13 @@
diff --git a/testsuite/stencil-et.cpp b/testsuite/stencil-et.cpp
index b23e979..fe6b5ed 100644
--- a/testsuite/stencil-et.cpp
+++ b/testsuite/stencil-et.cpp
@@ -44,7 +44,7 @@ void test_expr(const T1& d1, const T2& d2)
BZTEST(all(d1==d2));
}
*/
-#define test_expr(d1,d2) BZTEST(all((d1)==(d2)));
+#define test_expr(d1,d2) BZTEST(all((d1)-(d2)<=1e-7));
// Test two vector expressions for equality
template<typename T1, typename T2>

80
pkgs/development/libraries/blitz/default.nix Normal file
View File

@@ -0,0 +1,80 @@
{ stdenv, fetchurl, pkgconfig, gfortran, texinfo
# Select SIMD alignment width (in bytes) for vectorization.
, simdWidth ? 1
# Pad arrays to simdWidth by default?
# Note: Only useful if simdWidth > 1
, enablePadding ? false
# Activate serialization through Boost.Serialize?
, enableSerialization ? true, boost ? null
# Activate test-suite?
# WARNING: Some of the tests require up to 1700MB of memory to compile.
, doCheck ? true
}:
assert enableSerialization -> boost != null;
let
inherit (stdenv.lib) optional optionals optionalString;
in
stdenv.mkDerivation rec {
name = "blitz++-0.10";
src = fetchurl {
url = mirror://sourceforge/blitz/blitz-0.10.tar.gz;
sha256 = "153g9sncir6ip9l7ssl6bhc4qzh0qr3lx2d15qm68hqxj7kg0kl0";
};
patches = [ ./blitz-gcc47.patch ./blitz-testsuite-stencil-et.patch ];
buildInputs = [ pkgconfig gfortran texinfo ]
++ optional (boost != null) boost
;
configureFlags =
[ "--enable-shared"
"--disable-static"
"--enable-fortran"
"--enable-optimize"
"--with-pic=yes"
"--enable-html-docs"
"--disable-doxygen"
"--disable-dot"
"--disable-latex-docs"
"--enable-simd-width=${toString simdWidth}"
]
++ optional enablePadding "--enable-array-length-padding"
++ optional enableSerialization "--enable-serialization"
++ optionals (boost != null) [ "--with-boost=${boost.dev}"
"--with-boost-libdir=${boost.lib}/lib" ]
++ optional stdenv.is64bit "--enable-64bit"
;
enableParallelBuilding = true;
buildFlags = "lib info pdf html";
installTargets = [ "install" "install-info" "install-pdf" "install-html" ];
inherit doCheck;
checkTarget = "check-testsuite check-examples";
meta = {
description = "Fast multi-dimensional array library for C++";
homepage = http://sourceforge.net/projects/blitz/;
license = stdenv.lib.licenses.lgpl3;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = [ stdenv.lib.maintainers.aherrmann ];
longDescription = ''
Blitz++ is a C++ class library for scientific computing which provides
performance on par with Fortran 77/90. It uses template techniques to
achieve high performance. Blitz++ provides dense arrays and vectors,
random number generators, and small vectors (useful for representing
multicomponent or vector fields).
'';
};
}

12
pkgs/development/libraries/boehm-gc/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ lib, stdenv, fetchurl, enableLargeConfig ? false }:
stdenv.mkDerivation rec {
name = "boehm-gc-7.2f";
@@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
outputs = [ "dev" "out" "doc" ];
configureFlags = "--enable-cplusplus";
configureFlags =
[ "--enable-cplusplus" ]
++ lib.optional enableLargeConfig "--enable-large-config";
doCheck = true;
@@ -43,12 +45,12 @@ stdenv.mkDerivation rec {
C or C++ programs, though that is not its primary goal.
'';
homepage = http://www.hpl.hp.com/personal/Hans_Boehm/gc/;
homepage = http://hboehm.info/gc/;
# non-copyleft, X11-style license
license = "http://www.hpl.hp.com/personal/Hans_Boehm/gc/license.txt";
license = http://hboehm.info/gc/license.txt;
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = [ ];
platforms = stdenv.lib.platforms.all;
};
}

31
pkgs/development/libraries/boost-process/default.nix Normal file
View File

@@ -0,0 +1,31 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation {
name = "boost-process-0.5";
src = fetchurl {
url = "http://www.highscore.de/boost/process0.5/process.zip";
sha256 = "1v9y9pffb2b7p642kp9ic4z6kg42ziizmyvbgrqd1ci0i4gn0831";
};
buildInputs = [ unzip ];
unpackPhase = ''
mkdir $name
cd $name
unzip $src
'';
installPhase = ''
mkdir -p $out/include
cp -r boost $out/include
'';
meta = with stdenv.lib; {
homepage = "http://www.highscore.de/boost/process0.5/";
description = "Library to manage system processes";
license = "boost-license";
platforms = platforms.unix;
maintainers = maintainers.abbradar;
};
}

93
pkgs/development/libraries/boost/1.44.nix
View File

@@ -1,93 +0,0 @@
{ stdenv, fetchurl, icu, expat, zlib, bzip2, python
, enableRelease ? true
, enableDebug ? false
, enableSingleThreaded ? false
, enableMultiThreaded ? true
, enableShared ? true
, enableStatic ? false
, enablePIC ? false
, taggedLayout ? false
}:
let
variant = stdenv.lib.concatStringsSep ","
(stdenv.lib.optional enableRelease "release" ++
stdenv.lib.optional enableDebug "debug");
threading = stdenv.lib.concatStringsSep ","
(stdenv.lib.optional enableSingleThreaded "single" ++
stdenv.lib.optional enableMultiThreaded "multi");
link = stdenv.lib.concatStringsSep ","
(stdenv.lib.optional enableShared "shared" ++
stdenv.lib.optional enableStatic "static");
# To avoid library name collisions
finalLayout = if (taggedLayout || (enableRelease && enableDebug) ||
(enableSingleThreaded && enableMultiThreaded) ||
(enableShared && enableStatic)) then
"tagged" else "system";
cflags = if enablePIC then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" else "";
in
stdenv.mkDerivation {
name = "boost-1.44.0";
meta = {
homepage = "http://boost.org/";
description = "Collection of C++ libraries";
license = "boost-license";
maintainers = [ stdenv.lib.maintainers.simons ];
};
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_44_0.tar.bz2";
sha256 = "1nvq36mvzr1fr85q0jh86rk3bk65s1y55jgqgzfg3lcpkl12ihs5";
};
enableParallelBuilding = true;
buildInputs = [icu expat zlib bzip2 python];
configureScript = "./bootstrap.sh";
configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python";
buildPhase = "./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
installPhase = ":";
patches = [
# Patch to get rid of following error, experienced by some packages like encfs, bitcoin:
# terminate called after throwing an instance of 'std::runtime_error'
# what(): locale::facet::_S_create_c_locale name not valid
(fetchurl {
url = https://svn.boost.org/trac/boost/raw-attachment/ticket/4688/boost_filesystem.patch ;
sha256 = "15k91ihzs6190pnryh4cl0b3c2pjpl9d790mr14x16zq52y7px2d";
})
./time_utc_144.patch
./boost-149-cstdint.patch
];
crossAttrs = rec {
buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ];
# all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
# override them.
propagatedBuildInputs = buildInputs;
# We want to substitute the contents of configureFlags, removing thus the
# usual --build and --host added on cross building.
preConfigure = ''
export configureFlags="--prefix=$out --without-icu"
'';
buildPhase = ''
set -x
cat << EOF > user-config.jam
using gcc : cross : $crossConfig-g++ ;
EOF
./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
'';
};
}

96
pkgs/development/libraries/boost/1.49.nix
View File

@@ -1,96 +0,0 @@
{ stdenv, fetchurl, icu, expat, zlib, bzip2, python
, enableRelease ? true
, enableDebug ? false
, enableSingleThreaded ? false
, enableMultiThreaded ? true
, enableShared ? true
, enableStatic ? false
, enablePIC ? false
, enableExceptions ? false
}:
let
variant = stdenv.lib.concatStringsSep ","
(stdenv.lib.optional enableRelease "release" ++
stdenv.lib.optional enableDebug "debug");
threading = stdenv.lib.concatStringsSep ","
(stdenv.lib.optional enableSingleThreaded "single" ++
stdenv.lib.optional enableMultiThreaded "multi");
link = stdenv.lib.concatStringsSep ","
(stdenv.lib.optional enableShared "shared" ++
stdenv.lib.optional enableStatic "static");
# To avoid library name collisions
finalLayout = if ((enableRelease && enableDebug) ||
(enableSingleThreaded && enableMultiThreaded) ||
(enableShared && enableStatic)) then
"tagged" else "system";
cflags = if enablePIC && enableExceptions then
"cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC"
else if enablePIC then
"cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC"
else if enableExceptions then
"cflags=-fexceptions"
else
"";
in
stdenv.mkDerivation {
name = "boost-1.49.0";
meta = {
homepage = "http://boost.org/";
description = "Collection of C++ libraries";
license = "boost-license";
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.simons ];
};
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_49_0.tar.bz2";
sha256 = "0g0d33942rm073jgqqvj3znm3rk45b2y2lplfjpyg9q7amzqlx6x";
};
# See <http://svn.boost.org/trac/boost/ticket/4688>.
patches = [
./CVE-2013-0252.patch # https://svn.boost.org/trac/boost/ticket/7743
./boost_filesystem_post_1_49_0.patch
./time_utc.patch
./boost-149-cstdint.patch
] ++ (stdenv.lib.optional stdenv.isDarwin ./boost-149-darwin.patch );
enableParallelBuilding = true;
buildInputs = [icu expat zlib bzip2 python];
configureScript = "./bootstrap.sh";
configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python";
buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
installPhase = ":";
crossAttrs = rec {
buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ];
# all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
# override them.
propagatedBuildInputs = buildInputs;
# We want to substitute the contents of configureFlags, removing thus the
# usual --build and --host added on cross building.
preConfigure = ''
export configureFlags="--prefix=$out --without-icu"
'';
buildPhase = ''
set -x
cat << EOF > user-config.jam
using gcc : cross : $crossConfig-g++ ;
EOF
./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
'';
};
}

97
pkgs/development/libraries/boost/1.55.nix
View File

@@ -1,99 +1,12 @@
{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames
, toolset ? null
, enableRelease ? true
, enableDebug ? false
, enableSingleThreaded ? false
, enableMultiThreaded ? true
, enableShared ? true
, enableStatic ? false
, enablePIC ? false
, enableExceptions ? false
, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))
}:
{ callPackage, fetchurl, ... } @ args:
let
callPackage ./generic.nix (args // rec {
version = "1.55.0";
variant = stdenv.lib.concatStringsSep ","
(stdenv.lib.optional enableRelease "release" ++
stdenv.lib.optional enableDebug "debug");
threading = stdenv.lib.concatStringsSep ","
(stdenv.lib.optional enableSingleThreaded "single" ++
stdenv.lib.optional enableMultiThreaded "multi");
link = stdenv.lib.concatStringsSep ","
(stdenv.lib.optional enableShared "shared" ++
stdenv.lib.optional enableStatic "static");
# To avoid library name collisions
layout = if taggedLayout then "tagged" else "system";
cflags = if enablePIC && enableExceptions then
"cflags=\"-fPIC -fexceptions\" cxxflags=-fPIC linkflags=-fPIC"
else if enablePIC then
"cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC"
else if enableExceptions then
"cflags=-fexceptions"
else
"";
withToolset = stdenv.lib.optionalString (toolset != null) " --with-toolset=${toolset}";
in
stdenv.mkDerivation {
name = "boost-1.55.0";
meta = {
homepage = "http://boost.org/";
description = "Collection of C++ libraries";
license = "boost-license";
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.simons ];
};
patches = [ ./clang-math.patch ./clang-math-2.patch ];
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_55_0.tar.bz2";
sha256 = "0lkv5dzssbl5fmh2nkaszi8x9qbj80pr4acf9i26sj3rvlih1w7z";
};
enableParallelBuilding = true;
buildInputs =
[ icu expat zlib bzip2 python ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
configureScript = "./bootstrap.sh";
configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python" + withToolset;
buildPhase = "${stdenv.lib.optionalString (toolset == "clang") "unset NIX_ENFORCE_PURITY; "}./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install${withToolset}";
# normal install does not install bjam, this is a separate step
installPhase = ''
cd tools/build/v2
sh bootstrap.sh${withToolset}
./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install${withToolset}
rm $out/bin/bjam
ln -s $out/bin/b2 $out/bin/bjam
rm -rf $out/share/boost-build/example
'';
crossAttrs = rec {
buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ];
# all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
# override them.
propagatedBuildInputs = buildInputs;
# We want to substitute the contents of configureFlags, removing thus the
# usual --build and --host added on cross building.
preConfigure = ''
export configureFlags="--prefix=$out --without-icu"
'';
buildPhase = ''
set -x
cat << EOF > user-config.jam
using gcc : cross : $crossConfig-g++ ;
EOF
./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
'';
};
}
})

10
pkgs/development/libraries/boost/1.56.nix Normal file
View File

@@ -0,0 +1,10 @@
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "1.56.0";
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_56_0.tar.bz2";
sha256 = "07gz62nj767qzwqm3xjh11znpyph8gcii0cqhnx7wvismyn34iqk";
};
})

10
pkgs/development/libraries/boost/1.57.nix Normal file
View File

@@ -0,0 +1,10 @@
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "1.57.0";
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_57_0.tar.bz2";
sha256 = "0rs94vdmg34bwwj23fllva6mhrml2i7mvmlb11zyrk1k5818q34i";
};
})

48
pkgs/development/libraries/boost/CVE-2013-0252.patch
View File

@@ -1,48 +0,0 @@
Index: /boost/locale/utf.hpp
===================================================================
--- /boost/locale/utf.hpp (revision 78304)
+++ /boost/locale/utf.hpp (revision 81590)
@@ -220,4 +220,6 @@
return incomplete;
tmp = *p++;
+ if (!is_trail(tmp))
+ return illegal;
c = (c << 6) | ( tmp & 0x3F);
case 2:
@@ -225,4 +227,6 @@
return incomplete;
tmp = *p++;
+ if (!is_trail(tmp))
+ return illegal;
c = (c << 6) | ( tmp & 0x3F);
case 1:
@@ -230,4 +234,6 @@
return incomplete;
tmp = *p++;
+ if (!is_trail(tmp))
+ return illegal;
c = (c << 6) | ( tmp & 0x3F);
}
Index: /libs/locale/test/test_codepage_converter.cpp
===================================================================
--- /libs/locale/test/test_codepage_converter.cpp (revision 73786)
+++ /libs/locale/test/test_codepage_converter.cpp (revision 81590)
@@ -140,4 +140,18 @@
TEST_TO("\xf8\x90\x80\x80\x80",illegal); // 400 0000
TEST_TO("\xfd\xbf\xbf\xbf\xbf\xbf",illegal); // 7fff ffff
+
+ std::cout << "-- Invalid trail" << std::endl;
+ TEST_TO("\xC2\x7F",illegal);
+ TEST_TO("\xdf\x7F",illegal);
+ TEST_TO("\xe0\x7F\x80",illegal);
+ TEST_TO("\xef\xbf\x7F",illegal);
+ TEST_TO("\xe0\x7F\x80",illegal);
+ TEST_TO("\xef\xbf\x7F",illegal);
+ TEST_TO("\xf0\x7F\x80\x80",illegal);
+ TEST_TO("\xf4\x7f\xbf\xbf",illegal);
+ TEST_TO("\xf0\x90\x7F\x80",illegal);
+ TEST_TO("\xf4\x8f\x7F\xbf",illegal);
+ TEST_TO("\xf0\x90\x80\x7F",illegal);
+ TEST_TO("\xf4\x8f\xbf\x7F",illegal);
std::cout << "-- Invalid length" << std::endl;

15
pkgs/development/libraries/boost/boost-149-cstdint.patch
View File

@@ -1,15 +0,0 @@
diff -ru -x '*~' boost_1_49_0-orig/boost/cstdint.hpp boost_1_49_0/boost/cstdint.hpp
--- boost_1_49_0-orig/boost/cstdint.hpp 2012-01-29 22:58:13.000000000 +0100
+++ boost_1_49_0/boost/cstdint.hpp 2013-12-10 11:48:19.304042208 +0100
@@ -41,7 +41,10 @@
// so we disable use of stdint.h when GLIBC does not define __GLIBC_HAVE_LONG_LONG.
// See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990
//
-#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG))
+#if defined(BOOST_HAS_STDINT_H) \
+ && (!defined(__GLIBC__) \
+ || defined(__GLIBC_HAVE_LONG_LONG) \
+ || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17)))))
// The following #include is an implementation artifact; not part of interface.
# ifdef __hpux

40
pkgs/development/libraries/boost/boost-149-darwin.patch
View File

@@ -1,40 +0,0 @@
diff -rc boost_1_49_0/tools/build/v2/tools/darwin.jam boost_1_49_0-new/tools/build/v2/tools/darwin.jam
*** boost_1_49_0/tools/build/v2/tools/darwin.jam Mon Jun 6 22:36:21 2011
--- boost_1_49_0-new/tools/build/v2/tools/darwin.jam Thu May 23 22:07:45 2013
***************
*** 498,504 ****
flags darwin.compile OPTIONS <link>shared : -dynamic ;
# Misc options.
! flags darwin.compile OPTIONS : -no-cpp-precomp -gdwarf-2 -fexceptions ;
#~ flags darwin.link OPTIONS : -fexceptions ;
# Add the framework names to use.
--- 498,504 ----
flags darwin.compile OPTIONS <link>shared : -dynamic ;
# Misc options.
! flags darwin.compile OPTIONS : -gdwarf-2 -fexceptions ;
#~ flags darwin.link OPTIONS : -fexceptions ;
# Add the framework names to use.
diff -rc boost_1_49_0/tools/build/v2/tools/darwin.py boost_1_49_0-new/tools/build/v2/tools/darwin.py
*** boost_1_49_0/tools/build/v2/tools/darwin.py Wed Oct 28 08:47:51 2009
--- boost_1_49_0-new/tools/build/v2/tools/darwin.py Thu May 23 21:58:12 2013
***************
*** 37,43 ****
feature.feature ('framework', [], ['free'])
toolset.flags ('darwin.compile', 'OPTIONS', '<link>shared', ['-dynamic'])
! toolset.flags ('darwin.compile', 'OPTIONS', None, ['-Wno-long-double', '-no-cpp-precomp'])
toolset.flags ('darwin.compile.c++', 'OPTIONS', None, ['-fcoalesce-templates'])
toolset.flags ('darwin.link', 'FRAMEWORK', '<framework>')
--- 37,43 ----
feature.feature ('framework', [], ['free'])
toolset.flags ('darwin.compile', 'OPTIONS', '<link>shared', ['-dynamic'])
! toolset.flags ('darwin.compile', 'OPTIONS', None, ['-Wno-long-double'])
toolset.flags ('darwin.compile.c++', 'OPTIONS', None, ['-fcoalesce-templates'])
toolset.flags ('darwin.link', 'FRAMEWORK', '<framework>')

90
pkgs/development/libraries/boost/boost-155-clang.patch Normal file
View File

@@ -0,0 +1,90 @@
diff --git a/boost/atomic/detail/cas128strong.hpp b/boost/atomic/detail/cas128strong.hpp
index 906c13e..dcb4d7d 100644
--- a/boost/atomic/detail/cas128strong.hpp
+++ b/boost/atomic/detail/cas128strong.hpp
@@ -196,15 +196,17 @@ class base_atomic<T, void, 16, Sign>
public:
BOOST_DEFAULTED_FUNCTION(base_atomic(void), {})
- explicit base_atomic(value_type const& v) BOOST_NOEXCEPT : v_(0)
+ explicit base_atomic(value_type const& v) BOOST_NOEXCEPT
{
+ memset(&v_, 0, sizeof(v_));
memcpy(&v_, &v, sizeof(value_type));
}
void
store(value_type const& value, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
{
- storage_type value_s = 0;
+ storage_type value_s;
+ memset(&value_s, 0, sizeof(value_s));
memcpy(&value_s, &value, sizeof(value_type));
platform_fence_before_store(order);
platform_store128(value_s, &v_);
@@ -247,7 +249,9 @@ class base_atomic<T, void, 16, Sign>
memory_order success_order,
memory_order failure_order) volatile BOOST_NOEXCEPT
{
- storage_type expected_s = 0, desired_s = 0;
+ storage_type expected_s, desired_s;
+ memset(&expected_s, 0, sizeof(expected_s));
+ memset(&desired_s, 0, sizeof(desired_s));
memcpy(&expected_s, &expected, sizeof(value_type));
memcpy(&desired_s, &desired, sizeof(value_type));
diff --git a/boost/atomic/detail/gcc-atomic.hpp b/boost/atomic/detail/gcc-atomic.hpp
index a130590..4af99a1 100644
--- a/boost/atomic/detail/gcc-atomic.hpp
+++ b/boost/atomic/detail/gcc-atomic.hpp
@@ -958,14 +958,16 @@ class base_atomic<T, void, 16, Sign>
public:
BOOST_DEFAULTED_FUNCTION(base_atomic(void), {})
- explicit base_atomic(value_type const& v) BOOST_NOEXCEPT : v_(0)
+ explicit base_atomic(value_type const& v) BOOST_NOEXCEPT
{
+ memset(&v_, 0, sizeof(v_));
memcpy(&v_, &v, sizeof(value_type));
}
void store(value_type const& v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
{
- storage_type tmp = 0;
+ storage_type tmp;
+ memset(&tmp, 0, sizeof(tmp));
memcpy(&tmp, &v, sizeof(value_type));
__atomic_store_n(&v_, tmp, atomics::detail::convert_memory_order_to_gcc(order));
}
@@ -980,7 +982,8 @@ class base_atomic<T, void, 16, Sign>
value_type exchange(value_type const& v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
{
- storage_type tmp = 0;
+ storage_type tmp;
+ memset(&tmp, 0, sizeof(tmp));
memcpy(&tmp, &v, sizeof(value_type));
tmp = __atomic_exchange_n(&v_, tmp, atomics::detail::convert_memory_order_to_gcc(order));
value_type res;
@@ -994,7 +997,9 @@ class base_atomic<T, void, 16, Sign>
memory_order success_order,
memory_order failure_order) volatile BOOST_NOEXCEPT
{
- storage_type expected_s = 0, desired_s = 0;
+ storage_type expected_s, desired_s;
+ memset(&expected_s, 0, sizeof(expected_s));
+ memset(&desired_s, 0, sizeof(desired_s));
memcpy(&expected_s, &expected, sizeof(value_type));
memcpy(&desired_s, &desired, sizeof(value_type));
const bool success = __atomic_compare_exchange_n(&v_, &expected_s, desired_s, false,
@@ -1010,7 +1015,9 @@ class base_atomic<T, void, 16, Sign>
memory_order success_order,
memory_order failure_order) volatile BOOST_NOEXCEPT
{
- storage_type expected_s = 0, desired_s = 0;
+ storage_type expected_s, desired_s;
+ memset(&expected_s, 0, sizeof(expected_s));
+ memset(&desired_s, 0, sizeof(desired_s));
memcpy(&expected_s, &expected, sizeof(value_type));
memcpy(&desired_s, &desired, sizeof(value_type));
const bool success = __atomic_compare_exchange_n(&v_, &expected_s, desired_s, true,

12
pkgs/development/libraries/boost/boost_filesystem_post_1_49_0.patch
View File

@@ -1,12 +0,0 @@
diff -ubr boost_1_49_0/libs/filesystem/v2/src/v2_path.cpp boost_1_49_0-patched/libs/filesystem/v2/src/v2_path.cpp
--- boost_1_49_0/libs/filesystem/v2/src/v2_path.cpp 2011-01-11 22:39:33.000000000 +0100
+++ boost_1_49_0-patched/libs/filesystem/v2/src/v2_path.cpp 2012-02-25 20:00:33.628767485 +0100
@@ -45,7 +45,7 @@
{
#if !defined(macintosh) && !defined(__APPLE__) && !defined(__APPLE_CC__)
// ISO C calls this "the locale-specific native environment":
- static std::locale lc("");
+ static std::locale lc;
#else // Mac OS
// "All BSD system functions expect their string parameters to be in UTF-8 encoding
// and nothing else."

45
pkgs/development/libraries/boost/clang-math-2.patch Normal file
View File

@@ -0,0 +1,45 @@
From 6bb71fdd8f7cc346d90fb14beb38b7297fc1ffd9 Mon Sep 17 00:00:00 2001
From: Andrey Semashev <andrey.semashev@gmail.com>
Date: Sun, 26 Jan 2014 13:58:48 +0400
Subject: [PATCH] Fixed incorrect initialization of 128-bit values, when no
native support for 128-bit integers is available.
---
boost/atomic/detail/cas128strong.hpp | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/boost/atomic/detail/cas128strong.hpp b/boost/atomic/detail/cas128strong.hpp
index 906c13e..dcb4d7d 100644
--- a/boost/atomic/detail/cas128strong.hpp
+++ b/boost/atomic/detail/cas128strong.hpp
@@ -196,15 +196,17 @@ class base_atomic<T, void, 16, Sign>
public:
BOOST_DEFAULTED_FUNCTION(base_atomic(void), {})
- explicit base_atomic(value_type const& v) BOOST_NOEXCEPT : v_(0)
+ explicit base_atomic(value_type const& v) BOOST_NOEXCEPT
{
+ memset(&v_, 0, sizeof(v_));
memcpy(&v_, &v, sizeof(value_type));
}
void
store(value_type const& value, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
{
- storage_type value_s = 0;
+ storage_type value_s;
+ memset(&value_s, 0, sizeof(value_s));
memcpy(&value_s, &value, sizeof(value_type));
platform_fence_before_store(order);
platform_store128(value_s, &v_);
@@ -247,7 +249,9 @@ class base_atomic<T, void, 16, Sign>
memory_order success_order,
memory_order failure_order) volatile BOOST_NOEXCEPT
{
- storage_type expected_s = 0, desired_s = 0;
+ storage_type expected_s, desired_s;
+ memset(&expected_s, 0, sizeof(expected_s));
+ memset(&desired_s, 0, sizeof(desired_s));
memcpy(&expected_s, &expected, sizeof(value_type));
memcpy(&desired_s, &desired, sizeof(value_type));

65
pkgs/development/libraries/boost/clang-math.patch Normal file
View File

@@ -0,0 +1,65 @@
From e4bde20f2eec0a51be14533871d2123bd2ab9cf3 Mon Sep 17 00:00:00 2001
From: Andrey Semashev <andrey.semashev@gmail.com>
Date: Fri, 28 Feb 2014 12:43:11 +0400
Subject: [PATCH] More compilation fixes for the case when 128-bit integers are
not supported.
---
boost/atomic/detail/gcc-atomic.hpp | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/boost/atomic/detail/gcc-atomic.hpp b/boost/atomic/detail/gcc-atomic.hpp
index a130590..4af99a1 100644
--- a/boost/atomic/detail/gcc-atomic.hpp
+++ b/boost/atomic/detail/gcc-atomic.hpp
@@ -958,14 +958,16 @@ class base_atomic<T, void, 16, Sign>
public:
BOOST_DEFAULTED_FUNCTION(base_atomic(void), {})
- explicit base_atomic(value_type const& v) BOOST_NOEXCEPT : v_(0)
+ explicit base_atomic(value_type const& v) BOOST_NOEXCEPT
{
+ memset(&v_, 0, sizeof(v_));
memcpy(&v_, &v, sizeof(value_type));
}
void store(value_type const& v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
{
- storage_type tmp = 0;
+ storage_type tmp;
+ memset(&tmp, 0, sizeof(tmp));
memcpy(&tmp, &v, sizeof(value_type));
__atomic_store_n(&v_, tmp, atomics::detail::convert_memory_order_to_gcc(order));
}
@@ -980,7 +982,8 @@ class base_atomic<T, void, 16, Sign>
value_type exchange(value_type const& v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
{
- storage_type tmp = 0;
+ storage_type tmp;
+ memset(&tmp, 0, sizeof(tmp));
memcpy(&tmp, &v, sizeof(value_type));
tmp = __atomic_exchange_n(&v_, tmp, atomics::detail::convert_memory_order_to_gcc(order));
value_type res;
@@ -994,7 +997,9 @@ class base_atomic<T, void, 16, Sign>
memory_order success_order,
memory_order failure_order) volatile BOOST_NOEXCEPT
{
- storage_type expected_s = 0, desired_s = 0;
+ storage_type expected_s, desired_s;
+ memset(&expected_s, 0, sizeof(expected_s));
+ memset(&desired_s, 0, sizeof(desired_s));
memcpy(&expected_s, &expected, sizeof(value_type));
memcpy(&desired_s, &desired, sizeof(value_type));
const bool success = __atomic_compare_exchange_n(&v_, &expected_s, desired_s, false,
@@ -1010,7 +1015,9 @@ class base_atomic<T, void, 16, Sign>
memory_order success_order,
memory_order failure_order) volatile BOOST_NOEXCEPT
{
- storage_type expected_s = 0, desired_s = 0;
+ storage_type expected_s, desired_s;
+ memset(&expected_s, 0, sizeof(expected_s));
+ memset(&desired_s, 0, sizeof(desired_s));
memcpy(&expected_s, &expected, sizeof(value_type));
memcpy(&desired_s, &desired, sizeof(value_type));
const bool success = __atomic_compare_exchange_n(&v_, &expected_s, desired_s, true,

181
pkgs/development/libraries/boost/generic.nix Normal file
View File

@@ -0,0 +1,181 @@
{ stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames
, toolset ? if stdenv.isDarwin then "clang" else null
, enableRelease ? true
, enableDebug ? false
, enableSingleThreaded ? false
, enableMultiThreaded ? true
, enableShared ? true
, enableStatic ? false
, enablePIC ? false
, enableExceptions ? false
, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))
, patches ? null
, mpi ? null
# Attributes inherit from specific versions
, version, src
, ...
}:
# We must build at least one type of libraries
assert !enableShared -> enableStatic;
with stdenv.lib;
let
variant = concatStringsSep ","
(optional enableRelease "release" ++
optional enableDebug "debug");
threading = concatStringsSep ","
(optional enableSingleThreaded "single" ++
optional enableMultiThreaded "multi");
link = concatStringsSep ","
(optional enableShared "shared" ++
optional enableStatic "static");
runtime-link = if enableShared then "shared" else "static";
# To avoid library name collisions
layout = if taggedLayout then "tagged" else "system";
cflags = if enablePIC && enableExceptions then
"cflags=\"-fPIC -fexceptions\" cxxflags=-fPIC linkflags=-fPIC"
else if enablePIC then
"cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC"
else if enableExceptions then
"cflags=-fexceptions"
else
"";
withToolset = stdenv.lib.optionalString (toolset != null) "--with-toolset=${toolset}";
genericB2Flags = [
"--includedir=$dev/include"
"--libdir=$lib/lib"
"-j$NIX_BUILD_CORES"
"--layout=${layout}"
"variant=${variant}"
"threading=${threading}"
"runtime-link=${runtime-link}"
"link=${link}"
"${cflags}"
] ++ optional (variant == "release") "debug-symbols=off";
nativeB2Flags = [
"-sEXPAT_INCLUDE=${expat}/include"
"-sEXPAT_LIBPATH=${expat}/lib"
] ++ optional (toolset != null) "toolset=${toolset}"
++ optional (mpi != null) "--user-config=user-config.jam";
nativeB2Args = concatStringsSep " " (genericB2Flags ++ nativeB2Flags);
crossB2Flags = [
"-sEXPAT_INCLUDE=${expat.crossDrv}/include"
"-sEXPAT_LIBPATH=${expat.crossDrv}/lib"
"--user-config=user-config.jam"
"toolset=gcc-cross"
"--without-python"
];
crossB2Args = concatMapStringsSep " " (genericB2Flags ++ crossB2Flags);
builder = b2Args: ''
./b2 ${b2Args}
'';
installer = b2Args: ''
# boostbook is needed by some applications
mkdir -p $dev/share/boostbook
cp -a tools/boostbook/{xsl,dtd} $dev/share/boostbook/
# Let boost install everything else
./b2 ${b2Args} install
# Create a derivation which encompasses everything, making buildInputs nicer
mkdir -p $out/nix-support
echo "$dev $lib" > $out/nix-support/propagated-native-build-inputs
'';
commonConfigureFlags = [
"--includedir=$(dev)/include"
"--libdir=$(lib)/lib"
];
fixup = ''
# Make boost header paths relative so that they are not runtime dependencies
(
cd "$dev"
find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \
-exec sed '1i#line 1 "{}"' -i '{}' \;
)
'';
in
stdenv.mkDerivation {
name = "boost-${version}";
inherit src patches;
meta = {
homepage = "http://boost.org/";
description = "Collection of C++ libraries";
license = stdenv.lib.licenses.boost;
platforms = platforms.unix;
maintainers = with maintainers; [ simons wkennington ];
};
preConfigure = ''
NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")"
if test -f tools/build/src/tools/clang-darwin.jam ; then
substituteInPlace tools/build/src/tools/clang-darwin.jam \
--replace '$(<[1]:D=)' "$lib/lib/\$(<[1]:D=)";
fi;
'' + optionalString (mpi != null) ''
cat << EOF > user-config.jam
using mpi : ${mpi}/bin/mpiCC ;
EOF
'';
NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.isDarwin
"-headerpad_max_install_names";
enableParallelBuilding = true;
buildInputs = [ icu expat zlib bzip2 python ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
configureScript = "./bootstrap.sh";
configureFlags = commonConfigureFlags ++ [
"--with-icu=${icu}"
"--with-python=${python}/bin/python"
] ++ optional (toolset != null) "--with-toolset=${toolset}";
buildPhase = builder nativeB2Args;
installPhase = installer nativeB2Args;
postFixup = fixup;
outputs = [ "out" "dev" "lib" ];
crossAttrs = rec {
buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ];
# all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
# override them.
propagatedBuildInputs = buildInputs;
# We want to substitute the contents of configureFlags, removing thus the
# usual --build and --host added on cross building.
preConfigure = ''
export configureFlags="--without-icu ${concatStringsSep " " commonConfigureFlags}"
set -x
cat << EOF > user-config.jam
using gcc : cross : $crossConfig-g++ ;
EOF
'';
buildPhase = builder crossB2Args;
installPhase = installer crossB2Args;
postFixup = fixup;
};
}

30
pkgs/development/libraries/boost/header-only-wrapper.nix
View File

@@ -1,30 +0,0 @@
{ stdenv, fetchurl, boost }:
let
version = stdenv.lib.removePrefix "boost-" boost.name;
pkgid = stdenv.lib.replaceChars ["-" "."] ["_" "_"] boost.name;
in
stdenv.mkDerivation {
name = "boost-headers-${version}";
src = boost.src;
phases = [ "installPhase" ];
installPhase = ''
mkdir -p $out/include
tar xf $src -C $out/include --strip-components=1 ${pkgid}/boost
'';
preferLocalBuild = true;
meta = {
homepage = "http://boost.org/";
description = "Boost C++ Library Collection";
license = "boost-license";
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.viric stdenv.lib.maintainers.simons ];
};
}

320
pkgs/development/libraries/boost/time_utc.patch
View File

@@ -1,320 +0,0 @@
From: https://build.opensuse.org/package/view_file?file=boost-time_utc.patch&package=boost&project=Application%3AGeo
From: https://svn.boost.org/trac/boost/changeset/78802
Message:
Thread: fix TIME_UTC, WINVER, constexpr for tags, and don't use local files
Only the TIME_UTC_ change is taken
Index: boost_1_49_0/boost/thread/xtime.hpp
===================================================================
--- boost_1_49_0.orig/boost/thread/xtime.hpp
+++ boost_1_49_0/boost/thread/xtime.hpp
@@ -2,7 +2,7 @@
// William E. Kempf
// Copyright (C) 2007-8 Anthony Williams
//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_XTIME_WEK070601_HPP
@@ -20,7 +20,7 @@ namespace boost {
enum xtime_clock_types
{
- TIME_UTC=1
+ TIME_UTC_=1
// TIME_TAI,
// TIME_MONOTONIC,
// TIME_PROCESS,
@@ -53,14 +53,14 @@ struct xtime
boost::posix_time::microseconds((nsec+500)/1000);
#endif
}
-
+
};
inline xtime get_xtime(boost::system_time const& abs_time)
{
xtime res;
boost::posix_time::time_duration const time_since_epoch=abs_time-boost::posix_time::from_time_t(0);
-
+
res.sec=static_cast<xtime::xtime_sec_t>(time_since_epoch.total_seconds());
res.nsec=static_cast<xtime::xtime_nsec_t>(time_since_epoch.fractional_seconds()*(1000000000/time_since_epoch.ticks_per_second()));
return res;
@@ -68,7 +68,7 @@ inline xtime get_xtime(boost::system_tim
inline int xtime_get(struct xtime* xtp, int clock_type)
{
- if (clock_type == TIME_UTC)
+ if (clock_type == TIME_UTC_)
{
*xtp=get_xtime(get_system_time());
return clock_type;
@@ -81,7 +81,7 @@ inline int xtime_cmp(const xtime& xt1, c
{
if (xt1.sec == xt2.sec)
return (int)(xt1.nsec - xt2.nsec);
- else
+ else
return (xt1.sec > xt2.sec) ? 1 : -1;
}
Index: boost_1_49_0/libs/thread/example/starvephil.cpp
===================================================================
--- boost_1_49_0.orig/libs/thread/example/starvephil.cpp
+++ boost_1_49_0/libs/thread/example/starvephil.cpp
@@ -50,7 +50,7 @@ public:
<< "very hot ..." << std::endl;
}
boost::xtime xt;
- boost::xtime_get(&xt, boost::TIME_UTC);
+ boost::xtime_get(&xt, boost::TIME_UTC_);
xt.sec += 3;
boost::thread::sleep(xt);
m_chickens += value;
@@ -85,7 +85,7 @@ void chef()
std::cout << "(" << clock() << ") Chef: cooking ..." << std::endl;
}
boost::xtime xt;
- boost::xtime_get(&xt, boost::TIME_UTC);
+ boost::xtime_get(&xt, boost::TIME_UTC_);
xt.sec += 2;
boost::thread::sleep(xt);
{
@@ -111,7 +111,7 @@ struct phil
if (m_id > 0)
{
boost::xtime xt;
- boost::xtime_get(&xt, boost::TIME_UTC);
+ boost::xtime_get(&xt, boost::TIME_UTC_);
xt.sec += 3;
boost::thread::sleep(xt);
}
Index: boost_1_49_0/libs/thread/example/tennis.cpp
===================================================================
--- boost_1_49_0.orig/libs/thread/example/tennis.cpp
+++ boost_1_49_0/libs/thread/example/tennis.cpp
@@ -1,7 +1,7 @@
// Copyright (C) 2001-2003
// William E. Kempf
//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include <boost/thread/mutex.hpp>
@@ -104,7 +104,7 @@ int main(int argc, char* argv[])
boost::thread thrdb(thread_adapter(&player, (void*)PLAYER_B));
boost::xtime xt;
- boost::xtime_get(&xt, boost::TIME_UTC);
+ boost::xtime_get(&xt, boost::TIME_UTC_);
xt.sec += 1;
boost::thread::sleep(xt);
{
Index: boost_1_49_0/libs/thread/example/thread.cpp
===================================================================
--- boost_1_49_0.orig/libs/thread/example/thread.cpp
+++ boost_1_49_0/libs/thread/example/thread.cpp
@@ -14,7 +14,7 @@ struct thread_alarm
void operator()()
{
boost::xtime xt;
- boost::xtime_get(&xt, boost::TIME_UTC);
+ boost::xtime_get(&xt, boost::TIME_UTC_);
xt.sec += m_secs;
boost::thread::sleep(xt);
Index: boost_1_49_0/libs/thread/example/xtime.cpp
===================================================================
--- boost_1_49_0.orig/libs/thread/example/xtime.cpp
+++ boost_1_49_0/libs/thread/example/xtime.cpp
@@ -10,7 +10,7 @@
int main(int argc, char* argv[])
{
boost::xtime xt;
- boost::xtime_get(&xt, boost::TIME_UTC);
+ boost::xtime_get(&xt, boost::TIME_UTC_);
xt.sec += 1;
boost::thread::sleep(xt); // Sleep for 1 second
}
Index: boost_1_49_0/libs/thread/src/pthread/thread.cpp
===================================================================
--- boost_1_49_0.orig/libs/thread/src/pthread/thread.cpp
+++ boost_1_49_0/libs/thread/src/pthread/thread.cpp
@@ -23,7 +23,7 @@
#include <unistd.h>
#endif
-#include "timeconv.inl"
+#include <libs/thread/src/pthread/timeconv.inl>
namespace boost
{
@@ -354,7 +354,7 @@ namespace boost
cond.timed_wait(lock, xt);
# endif
xtime cur;
- xtime_get(&cur, TIME_UTC);
+ xtime_get(&cur, TIME_UTC_);
if (xtime_cmp(xt, cur) <= 0)
return;
}
@@ -369,7 +369,7 @@ namespace boost
BOOST_VERIFY(!pthread_yield());
# else
xtime xt;
- xtime_get(&xt, TIME_UTC);
+ xtime_get(&xt, TIME_UTC_);
sleep(xt);
# endif
}
Index: boost_1_49_0/libs/thread/src/pthread/timeconv.inl
===================================================================
--- boost_1_49_0.orig/libs/thread/src/pthread/timeconv.inl
+++ boost_1_49_0/libs/thread/src/pthread/timeconv.inl
@@ -20,8 +20,8 @@ const int NANOSECONDS_PER_MICROSECOND =
inline void to_time(int milliseconds, boost::xtime& xt)
{
int res = 0;
- res = boost::xtime_get(&xt, boost::TIME_UTC);
- BOOST_ASSERT(res == boost::TIME_UTC); (void)res;
+ res = boost::xtime_get(&xt, boost::TIME_UTC_);
+ BOOST_ASSERT(res == boost::TIME_UTC_); (void)res;
xt.sec += (milliseconds / MILLISECONDS_PER_SECOND);
xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) *
@@ -56,8 +56,8 @@ inline void to_timespec_duration(const b
{
boost::xtime cur;
int res = 0;
- res = boost::xtime_get(&cur, boost::TIME_UTC);
- BOOST_ASSERT(res == boost::TIME_UTC); (void)res;
+ res = boost::xtime_get(&cur, boost::TIME_UTC_);
+ BOOST_ASSERT(res == boost::TIME_UTC_); (void)res;
if (boost::xtime_cmp(xt, cur) <= 0)
{
@@ -87,8 +87,8 @@ inline void to_duration(boost::xtime xt,
{
boost::xtime cur;
int res = 0;
- res = boost::xtime_get(&cur, boost::TIME_UTC);
- BOOST_ASSERT(res == boost::TIME_UTC); (void)res;
+ res = boost::xtime_get(&cur, boost::TIME_UTC_);
+ BOOST_ASSERT(res == boost::TIME_UTC_); (void)res;
if (boost::xtime_cmp(xt, cur) <= 0)
milliseconds = 0;
@@ -109,8 +109,8 @@ inline void to_microduration(boost::xtim
{
boost::xtime cur;
int res = 0;
- res = boost::xtime_get(&cur, boost::TIME_UTC);
- BOOST_ASSERT(res == boost::TIME_UTC); (void)res;
+ res = boost::xtime_get(&cur, boost::TIME_UTC_);
+ BOOST_ASSERT(res == boost::TIME_UTC_); (void)res;
if (boost::xtime_cmp(xt, cur) <= 0)
microseconds = 0;
Index: boost_1_49_0/libs/thread/src/win32/timeconv.inl
===================================================================
--- boost_1_49_0.orig/libs/thread/src/win32/timeconv.inl
+++ boost_1_49_0/libs/thread/src/win32/timeconv.inl
@@ -17,8 +17,8 @@ const int NANOSECONDS_PER_MICROSECOND =
inline void to_time(int milliseconds, boost::xtime& xt)
{
int res = 0;
- res = boost::xtime_get(&xt, boost::TIME_UTC);
- assert(res == boost::TIME_UTC);
+ res = boost::xtime_get(&xt, boost::TIME_UTC_);
+ assert(res == boost::TIME_UTC_);
xt.sec += (milliseconds / MILLISECONDS_PER_SECOND);
xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) *
@@ -54,8 +54,8 @@ inline void to_timespec_duration(const b
{
boost::xtime cur;
int res = 0;
- res = boost::xtime_get(&cur, boost::TIME_UTC);
- assert(res == boost::TIME_UTC);
+ res = boost::xtime_get(&cur, boost::TIME_UTC_);
+ assert(res == boost::TIME_UTC_);
if (boost::xtime_cmp(xt, cur) <= 0)
{
@@ -85,8 +85,8 @@ inline void to_duration(boost::xtime xt,
{
boost::xtime cur;
int res = 0;
- res = boost::xtime_get(&cur, boost::TIME_UTC);
- assert(res == boost::TIME_UTC);
+ res = boost::xtime_get(&cur, boost::TIME_UTC_);
+ assert(res == boost::TIME_UTC_);
if (boost::xtime_cmp(xt, cur) <= 0)
milliseconds = 0;
@@ -107,8 +107,8 @@ inline void to_microduration(boost::xtim
{
boost::xtime cur;
int res = 0;
- res = boost::xtime_get(&cur, boost::TIME_UTC);
- assert(res == boost::TIME_UTC);
+ res = boost::xtime_get(&cur, boost::TIME_UTC_);
+ assert(res == boost::TIME_UTC_);
if (boost::xtime_cmp(xt, cur) <= 0)
microseconds = 0;
Index: boost_1_49_0/libs/thread/test/test_xtime.cpp
===================================================================
--- boost_1_49_0.orig/libs/thread/test/test_xtime.cpp
+++ boost_1_49_0/libs/thread/test/test_xtime.cpp
@@ -17,8 +17,8 @@ void test_xtime_cmp()
{
boost::xtime xt1, xt2, cur;
BOOST_CHECK_EQUAL(
- boost::xtime_get(&cur, boost::TIME_UTC),
- static_cast<int>(boost::TIME_UTC));
+ boost::xtime_get(&cur, boost::TIME_UTC_),
+ static_cast<int>(boost::TIME_UTC_));
xt1 = xt2 = cur;
xt1.nsec -= 1;
@@ -42,14 +42,14 @@ void test_xtime_get()
boost::xtime orig, cur, old;
BOOST_CHECK_EQUAL(
boost::xtime_get(&orig,
- boost::TIME_UTC), static_cast<int>(boost::TIME_UTC));
+ boost::TIME_UTC_), static_cast<int>(boost::TIME_UTC_));
old = orig;
for (int x=0; x < 100; ++x)
{
BOOST_CHECK_EQUAL(
- boost::xtime_get(&cur, boost::TIME_UTC),
- static_cast<int>(boost::TIME_UTC));
+ boost::xtime_get(&cur, boost::TIME_UTC_),
+ static_cast<int>(boost::TIME_UTC_));
BOOST_CHECK(boost::xtime_cmp(cur, orig) >= 0);
BOOST_CHECK(boost::xtime_cmp(cur, old) >= 0);
old = cur;
Index: boost_1_49_0/libs/thread/test/util.inl
===================================================================
--- boost_1_49_0.orig/libs/thread/test/util.inl
+++ boost_1_49_0/libs/thread/test/util.inl
@@ -28,8 +28,8 @@ inline boost::xtime delay(int secs, int
const int NANOSECONDS_PER_MILLISECOND = 1000000;
boost::xtime xt;
- if (boost::TIME_UTC != boost::xtime_get (&xt, boost::TIME_UTC))
- BOOST_ERROR ("boost::xtime_get != boost::TIME_UTC");
+ if (boost::TIME_UTC_ != boost::xtime_get (&xt, boost::TIME_UTC_))
+ BOOST_ERROR ("boost::xtime_get != boost::TIME_UTC_");
nsecs += xt.nsec;
msecs += nsecs / NANOSECONDS_PER_MILLISECOND;

520
pkgs/development/libraries/boost/time_utc_144.patch
View File

@@ -1,520 +0,0 @@
diff -rc boost_1_44_0/boost/thread/xtime.hpp boost_1_44_0-new/boost/thread/xtime.hpp
*** boost_1_44_0/boost/thread/xtime.hpp 2008-06-18 15:01:08.000000000 +0200
--- boost_1_44_0-new/boost/thread/xtime.hpp 2013-04-12 14:00:27.125713549 +0200
***************
*** 20,26 ****
enum xtime_clock_types
{
! TIME_UTC=1
// TIME_TAI,
// TIME_MONOTONIC,
// TIME_PROCESS,
--- 20,26 ----
enum xtime_clock_types
{
! TIME_UTC_=1
// TIME_TAI,
// TIME_MONOTONIC,
// TIME_PROCESS,
***************
*** 68,74 ****
inline int xtime_get(struct xtime* xtp, int clock_type)
{
! if (clock_type == TIME_UTC)
{
*xtp=get_xtime(get_system_time());
return clock_type;
--- 68,74 ----
inline int xtime_get(struct xtime* xtp, int clock_type)
{
! if (clock_type == TIME_UTC_)
{
*xtp=get_xtime(get_system_time());
return clock_type;
diff -rc boost_1_44_0/libs/interprocess/test/condition_test_template.hpp boost_1_44_0-new/libs/interprocess/test/condition_test_template.hpp
*** boost_1_44_0/libs/interprocess/test/condition_test_template.hpp 2009-10-15 20:45:53.000000000 +0200
--- boost_1_44_0-new/libs/interprocess/test/condition_test_template.hpp 2013-04-12 14:00:20.215658855 +0200
***************
*** 49,56 ****
const int NANOSECONDS_PER_MILLISECOND = 1000000;
boost::xtime xt;
! int ret = boost::xtime_get(&xt, boost::TIME_UTC);
! assert(ret == static_cast<int>(boost::TIME_UTC));(void)ret;
nsecs += xt.nsec;
msecs += nsecs / NANOSECONDS_PER_MILLISECOND;
secs += msecs / MILLISECONDS_PER_SECOND;
--- 49,56 ----
const int NANOSECONDS_PER_MILLISECOND = 1000000;
boost::xtime xt;
! int ret = boost::xtime_get(&xt, boost::TIME_UTC_);
! assert(ret == static_cast<int>(boost::TIME_UTC_));(void)ret;
nsecs += xt.nsec;
msecs += nsecs / NANOSECONDS_PER_MILLISECOND;
secs += msecs / MILLISECONDS_PER_SECOND;
diff -rc boost_1_44_0/libs/interprocess/test/util.hpp boost_1_44_0-new/libs/interprocess/test/util.hpp
*** boost_1_44_0/libs/interprocess/test/util.hpp 2009-10-15 20:45:53.000000000 +0200
--- boost_1_44_0-new/libs/interprocess/test/util.hpp 2013-04-12 14:00:20.219658887 +0200
***************
*** 71,77 ****
boost::xtime xsecs(int secs)
{
boost::xtime ret;
! boost::xtime_get(&ret, boost::TIME_UTC);
ret.sec += secs;
return ret;
}
--- 71,77 ----
boost::xtime xsecs(int secs)
{
boost::xtime ret;
! boost::xtime_get(&ret, boost::TIME_UTC_);
ret.sec += secs;
return ret;
}
diff -rc boost_1_44_0/libs/spirit/classic/test/grammar_mt_tests.cpp boost_1_44_0-new/libs/spirit/classic/test/grammar_mt_tests.cpp
*** boost_1_44_0/libs/spirit/classic/test/grammar_mt_tests.cpp 2008-06-22 17:05:38.000000000 +0200
--- boost_1_44_0-new/libs/spirit/classic/test/grammar_mt_tests.cpp 2013-04-12 14:00:18.836647940 +0200
***************
*** 70,76 ****
{
static long const nanoseconds_per_second = 1000L*1000L*1000L;
boost::xtime xt;
! boost::xtime_get(&xt, boost::TIME_UTC);
xt.nsec+=1000*1000*milliseconds;
while (xt.nsec > nanoseconds_per_second)
{
--- 70,76 ----
{
static long const nanoseconds_per_second = 1000L*1000L*1000L;
boost::xtime xt;
! boost::xtime_get(&xt, boost::TIME_UTC_);
xt.nsec+=1000*1000*milliseconds;
while (xt.nsec > nanoseconds_per_second)
{
diff -rc boost_1_44_0/libs/spirit/classic/test/owi_mt_tests.cpp boost_1_44_0-new/libs/spirit/classic/test/owi_mt_tests.cpp
*** boost_1_44_0/libs/spirit/classic/test/owi_mt_tests.cpp 2008-06-22 17:05:38.000000000 +0200
--- boost_1_44_0-new/libs/spirit/classic/test/owi_mt_tests.cpp 2013-04-12 14:00:18.836647940 +0200
***************
*** 86,92 ****
return test_size;
boost::xtime now;
! boost::xtime_get(&now, boost::TIME_UTC);
unsigned long seconds = now.sec - start_time.sec;
if (seconds < 4)
{
--- 86,92 ----
return test_size;
boost::xtime now;
! boost::xtime_get(&now, boost::TIME_UTC_);
unsigned long seconds = now.sec - start_time.sec;
if (seconds < 4)
{
***************
*** 187,193 ****
void concurrent_creation_of_objects()
{
{
! boost::xtime_get(&start_time, boost::TIME_UTC);
boost::thread thread1(callable_ref(test1));
boost::thread thread2(callable_ref(test2));
boost::thread thread3(callable_ref(test3));
--- 187,193 ----
void concurrent_creation_of_objects()
{
{
! boost::xtime_get(&start_time, boost::TIME_UTC_);
boost::thread thread1(callable_ref(test1));
boost::thread thread2(callable_ref(test2));
boost::thread thread3(callable_ref(test3));
diff -rc boost_1_44_0/libs/thread/example/starvephil.cpp boost_1_44_0-new/libs/thread/example/starvephil.cpp
*** boost_1_44_0/libs/thread/example/starvephil.cpp 2006-09-14 23:51:01.000000000 +0200
--- boost_1_44_0-new/libs/thread/example/starvephil.cpp 2013-04-12 14:00:19.413652507 +0200
***************
*** 50,56 ****
<< "very hot ..." << std::endl;
}
boost::xtime xt;
! boost::xtime_get(&xt, boost::TIME_UTC);
xt.sec += 3;
boost::thread::sleep(xt);
m_chickens += value;
--- 50,56 ----
<< "very hot ..." << std::endl;
}
boost::xtime xt;
! boost::xtime_get(&xt, boost::TIME_UTC_);
xt.sec += 3;
boost::thread::sleep(xt);
m_chickens += value;
***************
*** 85,91 ****
std::cout << "(" << clock() << ") Chef: cooking ..." << std::endl;
}
boost::xtime xt;
! boost::xtime_get(&xt, boost::TIME_UTC);
xt.sec += 2;
boost::thread::sleep(xt);
{
--- 85,91 ----
std::cout << "(" << clock() << ") Chef: cooking ..." << std::endl;
}
boost::xtime xt;
! boost::xtime_get(&xt, boost::TIME_UTC_);
xt.sec += 2;
boost::thread::sleep(xt);
{
***************
*** 111,117 ****
if (m_id > 0)
{
boost::xtime xt;
! boost::xtime_get(&xt, boost::TIME_UTC);
xt.sec += 3;
boost::thread::sleep(xt);
}
--- 111,117 ----
if (m_id > 0)
{
boost::xtime xt;
! boost::xtime_get(&xt, boost::TIME_UTC_);
xt.sec += 3;
boost::thread::sleep(xt);
}
diff -rc boost_1_44_0/libs/thread/example/tennis.cpp boost_1_44_0-new/libs/thread/example/tennis.cpp
*** boost_1_44_0/libs/thread/example/tennis.cpp 2009-10-19 11:18:13.000000000 +0200
--- boost_1_44_0-new/libs/thread/example/tennis.cpp 2013-04-12 14:00:19.412652499 +0200
***************
*** 104,110 ****
boost::thread thrdb(thread_adapter(&player, (void*)PLAYER_B));
boost::xtime xt;
! boost::xtime_get(&xt, boost::TIME_UTC);
xt.sec += 1;
boost::thread::sleep(xt);
{
--- 104,110 ----
boost::thread thrdb(thread_adapter(&player, (void*)PLAYER_B));
boost::xtime xt;
! boost::xtime_get(&xt, boost::TIME_UTC_);
xt.sec += 1;
boost::thread::sleep(xt);
{
diff -rc boost_1_44_0/libs/thread/example/thread.cpp boost_1_44_0-new/libs/thread/example/thread.cpp
*** boost_1_44_0/libs/thread/example/thread.cpp 2006-09-14 23:51:01.000000000 +0200
--- boost_1_44_0-new/libs/thread/example/thread.cpp 2013-04-12 14:00:19.414652515 +0200
***************
*** 14,20 ****
void operator()()
{
boost::xtime xt;
! boost::xtime_get(&xt, boost::TIME_UTC);
xt.sec += m_secs;
boost::thread::sleep(xt);
--- 14,20 ----
void operator()()
{
boost::xtime xt;
! boost::xtime_get(&xt, boost::TIME_UTC_);
xt.sec += m_secs;
boost::thread::sleep(xt);
diff -rc boost_1_44_0/libs/thread/example/xtime.cpp boost_1_44_0-new/libs/thread/example/xtime.cpp
*** boost_1_44_0/libs/thread/example/xtime.cpp 2006-09-14 23:51:01.000000000 +0200
--- boost_1_44_0-new/libs/thread/example/xtime.cpp 2013-04-12 14:00:19.413652507 +0200
***************
*** 10,16 ****
int main(int argc, char* argv[])
{
boost::xtime xt;
! boost::xtime_get(&xt, boost::TIME_UTC);
xt.sec += 1;
boost::thread::sleep(xt); // Sleep for 1 second
}
--- 10,16 ----
int main(int argc, char* argv[])
{
boost::xtime xt;
! boost::xtime_get(&xt, boost::TIME_UTC_);
xt.sec += 1;
boost::thread::sleep(xt); // Sleep for 1 second
}
diff -rc boost_1_44_0/libs/thread/src/pthread/thread.cpp boost_1_44_0-new/libs/thread/src/pthread/thread.cpp
*** boost_1_44_0/libs/thread/src/pthread/thread.cpp 2010-07-09 21:13:09.000000000 +0200
--- boost_1_44_0-new/libs/thread/src/pthread/thread.cpp 2013-04-12 14:00:19.415652523 +0200
***************
*** 350,356 ****
cond.timed_wait(lock, xt);
# endif
xtime cur;
! xtime_get(&cur, TIME_UTC);
if (xtime_cmp(xt, cur) <= 0)
return;
}
--- 350,356 ----
cond.timed_wait(lock, xt);
# endif
xtime cur;
! xtime_get(&cur, TIME_UTC_);
if (xtime_cmp(xt, cur) <= 0)
return;
}
***************
*** 365,371 ****
BOOST_VERIFY(!pthread_yield());
# else
xtime xt;
! xtime_get(&xt, TIME_UTC);
sleep(xt);
# endif
}
--- 365,371 ----
BOOST_VERIFY(!pthread_yield());
# else
xtime xt;
! xtime_get(&xt, TIME_UTC_);
sleep(xt);
# endif
}
diff -rc boost_1_44_0/libs/thread/src/pthread/timeconv.inl boost_1_44_0-new/libs/thread/src/pthread/timeconv.inl
*** boost_1_44_0/libs/thread/src/pthread/timeconv.inl 2010-04-01 17:04:15.000000000 +0200
--- boost_1_44_0-new/libs/thread/src/pthread/timeconv.inl 2013-04-12 14:00:19.414652515 +0200
***************
*** 20,27 ****
inline void to_time(int milliseconds, boost::xtime& xt)
{
int res = 0;
! res = boost::xtime_get(&xt, boost::TIME_UTC);
! BOOST_ASSERT(res == boost::TIME_UTC);
xt.sec += (milliseconds / MILLISECONDS_PER_SECOND);
xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) *
--- 20,27 ----
inline void to_time(int milliseconds, boost::xtime& xt)
{
int res = 0;
! res = boost::xtime_get(&xt, boost::TIME_UTC_);
! BOOST_ASSERT(res == boost::TIME_UTC_);
xt.sec += (milliseconds / MILLISECONDS_PER_SECOND);
xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) *
***************
*** 57,64 ****
{
boost::xtime cur;
int res = 0;
! res = boost::xtime_get(&cur, boost::TIME_UTC);
! BOOST_ASSERT(res == boost::TIME_UTC);
if (boost::xtime_cmp(xt, cur) <= 0)
{
--- 57,64 ----
{
boost::xtime cur;
int res = 0;
! res = boost::xtime_get(&cur, boost::TIME_UTC_);
! BOOST_ASSERT(res == boost::TIME_UTC_);
if (boost::xtime_cmp(xt, cur) <= 0)
{
***************
*** 88,95 ****
{
boost::xtime cur;
int res = 0;
! res = boost::xtime_get(&cur, boost::TIME_UTC);
! BOOST_ASSERT(res == boost::TIME_UTC);
if (boost::xtime_cmp(xt, cur) <= 0)
milliseconds = 0;
--- 88,95 ----
{
boost::xtime cur;
int res = 0;
! res = boost::xtime_get(&cur, boost::TIME_UTC_);
! BOOST_ASSERT(res == boost::TIME_UTC_);
if (boost::xtime_cmp(xt, cur) <= 0)
milliseconds = 0;
***************
*** 110,117 ****
{
boost::xtime cur;
int res = 0;
! res = boost::xtime_get(&cur, boost::TIME_UTC);
! BOOST_ASSERT(res == boost::TIME_UTC);
if (boost::xtime_cmp(xt, cur) <= 0)
microseconds = 0;
--- 110,117 ----
{
boost::xtime cur;
int res = 0;
! res = boost::xtime_get(&cur, boost::TIME_UTC_);
! BOOST_ASSERT(res == boost::TIME_UTC_);
if (boost::xtime_cmp(xt, cur) <= 0)
microseconds = 0;
diff -rc boost_1_44_0/libs/thread/src/win32/timeconv.inl boost_1_44_0-new/libs/thread/src/win32/timeconv.inl
*** boost_1_44_0/libs/thread/src/win32/timeconv.inl 2007-11-25 19:38:02.000000000 +0100
--- boost_1_44_0-new/libs/thread/src/win32/timeconv.inl 2013-04-12 14:00:19.416652531 +0200
***************
*** 17,24 ****
inline void to_time(int milliseconds, boost::xtime& xt)
{
int res = 0;
! res = boost::xtime_get(&xt, boost::TIME_UTC);
! assert(res == boost::TIME_UTC);
xt.sec += (milliseconds / MILLISECONDS_PER_SECOND);
xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) *
--- 17,24 ----
inline void to_time(int milliseconds, boost::xtime& xt)
{
int res = 0;
! res = boost::xtime_get(&xt, boost::TIME_UTC_);
! assert(res == boost::TIME_UTC_);
xt.sec += (milliseconds / MILLISECONDS_PER_SECOND);
xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) *
***************
*** 54,61 ****
{
boost::xtime cur;
int res = 0;
! res = boost::xtime_get(&cur, boost::TIME_UTC);
! assert(res == boost::TIME_UTC);
if (boost::xtime_cmp(xt, cur) <= 0)
{
--- 54,61 ----
{
boost::xtime cur;
int res = 0;
! res = boost::xtime_get(&cur, boost::TIME_UTC_);
! assert(res == boost::TIME_UTC_);
if (boost::xtime_cmp(xt, cur) <= 0)
{
***************
*** 85,92 ****
{
boost::xtime cur;
int res = 0;
! res = boost::xtime_get(&cur, boost::TIME_UTC);
! assert(res == boost::TIME_UTC);
if (boost::xtime_cmp(xt, cur) <= 0)
milliseconds = 0;
--- 85,92 ----
{
boost::xtime cur;
int res = 0;
! res = boost::xtime_get(&cur, boost::TIME_UTC_);
! assert(res == boost::TIME_UTC_);
if (boost::xtime_cmp(xt, cur) <= 0)
milliseconds = 0;
***************
*** 107,114 ****
{
boost::xtime cur;
int res = 0;
! res = boost::xtime_get(&cur, boost::TIME_UTC);
! assert(res == boost::TIME_UTC);
if (boost::xtime_cmp(xt, cur) <= 0)
microseconds = 0;
--- 107,114 ----
{
boost::xtime cur;
int res = 0;
! res = boost::xtime_get(&cur, boost::TIME_UTC_);
! assert(res == boost::TIME_UTC_);
if (boost::xtime_cmp(xt, cur) <= 0)
microseconds = 0;
diff -rc boost_1_44_0/libs/thread/test/test_xtime.cpp boost_1_44_0-new/libs/thread/test/test_xtime.cpp
*** boost_1_44_0/libs/thread/test/test_xtime.cpp 2008-07-08 09:44:55.000000000 +0200
--- boost_1_44_0-new/libs/thread/test/test_xtime.cpp 2013-04-12 14:00:19.432652657 +0200
***************
*** 17,24 ****
{
boost::xtime xt1, xt2, cur;
BOOST_CHECK_EQUAL(
! boost::xtime_get(&cur, boost::TIME_UTC),
! static_cast<int>(boost::TIME_UTC));
xt1 = xt2 = cur;
xt1.nsec -= 1;
--- 17,24 ----
{
boost::xtime xt1, xt2, cur;
BOOST_CHECK_EQUAL(
! boost::xtime_get(&cur, boost::TIME_UTC_),
! static_cast<int>(boost::TIME_UTC_));
xt1 = xt2 = cur;
xt1.nsec -= 1;
***************
*** 42,55 ****
boost::xtime orig, cur, old;
BOOST_CHECK_EQUAL(
boost::xtime_get(&orig,
! boost::TIME_UTC), static_cast<int>(boost::TIME_UTC));
old = orig;
for (int x=0; x < 100; ++x)
{
BOOST_CHECK_EQUAL(
! boost::xtime_get(&cur, boost::TIME_UTC),
! static_cast<int>(boost::TIME_UTC));
BOOST_CHECK(boost::xtime_cmp(cur, orig) >= 0);
BOOST_CHECK(boost::xtime_cmp(cur, old) >= 0);
old = cur;
--- 42,55 ----
boost::xtime orig, cur, old;
BOOST_CHECK_EQUAL(
boost::xtime_get(&orig,
! boost::TIME_UTC_), static_cast<int>(boost::TIME_UTC));
old = orig;
for (int x=0; x < 100; ++x)
{
BOOST_CHECK_EQUAL(
! boost::xtime_get(&cur, boost::TIME_UTC_),
! static_cast<int>(boost::TIME_UTC_));
BOOST_CHECK(boost::xtime_cmp(cur, orig) >= 0);
BOOST_CHECK(boost::xtime_cmp(cur, old) >= 0);
old = cur;
diff -rc boost_1_44_0/libs/thread/test/util.inl boost_1_44_0-new/libs/thread/test/util.inl
*** boost_1_44_0/libs/thread/test/util.inl 2008-11-03 23:29:39.000000000 +0100
--- boost_1_44_0-new/libs/thread/test/util.inl 2013-04-12 14:00:19.433652665 +0200
***************
*** 28,35 ****
const int NANOSECONDS_PER_MILLISECOND = 1000000;
boost::xtime xt;
! if (boost::TIME_UTC != boost::xtime_get (&xt, boost::TIME_UTC))
! BOOST_ERROR ("boost::xtime_get != boost::TIME_UTC");
nsecs += xt.nsec;
msecs += nsecs / NANOSECONDS_PER_MILLISECOND;
--- 28,35 ----
const int NANOSECONDS_PER_MILLISECOND = 1000000;
boost::xtime xt;
! if (boost::TIME_UTC_ != boost::xtime_get (&xt, boost::TIME_UTC))
! BOOST_ERROR ("boost::xtime_get != boost::TIME_UTC_");
nsecs += xt.nsec;
msecs += nsecs / NANOSECONDS_PER_MILLISECOND;

1
pkgs/development/libraries/boringssl/default.nix
View File

@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake perl ];
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
installPhase = ''
mkdir -p $out/bin $out/include $out/lib

64
pkgs/development/libraries/botan/default.nix
View File

@@ -1,58 +1,8 @@
x@{builderDefsPackage
, python
, bzip2, zlib, gmp, openssl
, boost
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
{ callPackage, ... } @ args:
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="botan";
tarBaseName="Botan";
baseVersion = "1.10";
revision = "8";
version="${baseVersion}.${revision}";
name="${baseName}-${version}";
url="http://files.randombit.net/${baseName}/v${baseVersion}/${tarBaseName}-${version}.tbz";
hash = "182f316rbdd6jrqn92vjms3jyb9syn4ic0nzi3b7rfjbj3zdabxw";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
};
inherit (sourceInfo) name version;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall" "fixPkgConfig"];
configureCommand = "python configure.py --with-gnump --with-bzip2 --with-zlib --with-openssl --with-tr1-implementation=boost";
fixPkgConfig = a.fullDepEntry ''
cd "$out"/lib/pkgconfig
ln -s botan-*.pc botan.pc || true
'' ["minInit" "doMakeInstall"];
meta = {
description = "Cryptographic algorithms library";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
unix;
inherit version;
};
passthru = {
updateInfo = {
downloadPage = "http://files.randombit.net/botan/";
};
};
}) x
callPackage ./generic.nix (args // {
baseVersion = "1.10";
revision = "9";
sha256 = "1wldp9py3qcdgswgxya83c03y6345a6cf3vwz0y41bl1l39jfza8";
extraConfigureFlags = "--with-gnump";
})

4
pkgs/development/libraries/botan/default.upstream
View File

@@ -1,9 +1,9 @@
url http://botan.randombit.net/download.html
version_link 'Botan-[0-9]+[.][0-9]*[02468]([.][0-9]+)?[.](tbz|tbz2|tar[.]bz2)$'
version_link 'Botan-[0-9]+[.][0-9]*[02468]([.][0-9]+)?[.](tgz|tbz|tbz2|tar[.]bz2)$'
ensure_version
do_overwrite(){
ensure_hash
set_var_value hash $CURRENT_HASH
set_var_value sha256 $CURRENT_HASH
set_var_value baseVersion ${CURRENT_VERSION%.*}
set_var_value revision ${CURRENT_VERSION##*.}
}

46
pkgs/development/libraries/botan/generic.nix Normal file
View File

@@ -0,0 +1,46 @@
{ stdenv, fetchurl, python, bzip2, zlib, gmp, openssl, boost
# Passed by version specific builders
, baseVersion, revision, sha256
, extraConfigureFlags ? ""
, ...
}:
stdenv.mkDerivation rec {
name = "botan-${version}";
version = "${baseVersion}.${revision}";
src = fetchurl {
name = "Botan-${version}.tgz";
urls = [
"http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.tgz"
"http://botan.randombit.net/releases/Botan-${version}.tgz"
];
inherit sha256;
};
buildInputs = [ python bzip2 zlib gmp openssl boost ];
configurePhase = ''
python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}
'';
enableParallelBuilding = true;
preInstall = ''
patchShebangs src/scripts
'';
postInstall = ''
cd "$out"/lib/pkgconfig
ln -s botan-*.pc botan.pc || true
'';
meta = with stdenv.lib; {
inherit version;
description = "Cryptographic algorithms library";
maintainers = with maintainers; [ raskin ];
platforms = platforms.unix;
license = licenses.bsd2;
};
passthru.updateInfo.downloadPage = "http://files.randombit.net/botan/";
}

64
pkgs/development/libraries/botan/unstable.nix
View File

@@ -1,58 +1,8 @@
x@{builderDefsPackage
, python
, bzip2, zlib, gmp, openssl
, boost
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
{ callPackage, ... } @ args:
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="botan";
tarBaseName="Botan";
baseVersion = "1.11";
revision = "9";
version="${baseVersion}.${revision}";
name="${baseName}-${version}";
url="http://files.randombit.net/${baseName}/v${baseVersion}/${tarBaseName}-${version}.tbz";
hash = "0jgx5va042gmr6nc91p5dd59wnfxlz19mz2nnyv74pvwwmizs09m";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
};
inherit (sourceInfo) name version;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall" "fixPkgConfig"];
configureCommand = "python configure.py --with-gnump --with-bzip2 --with-zlib --with-openssl";
fixPkgConfig = a.fullDepEntry ''
cd "$out"/lib/pkgconfig
ln -s botan-*.pc botan.pc || true
'' ["minInit" "doMakeInstall"];
meta = {
description = "Cryptographic algorithms library";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
unix;
inherit version;
};
passthru = {
updateInfo = {
downloadPage = "http://files.randombit.net/botan/";
};
};
}) x
callPackage ./generic.nix (args // {
baseVersion = "1.11";
revision = "16";
sha256 = "0z3a7jp10w9ipmbzhc2xazd2savxmns57ca2a8d6vvjahxg4w6m3";
openssl = null;
})

5
pkgs/development/libraries/botan/unstable.upstream
View File

@@ -1,9 +1,10 @@
url http://botan.randombit.net/download.html
version_link 'Botan-[0-9]+[.][0-9]+([.][0-9]+)?[.](tbz|tbz2|tar[.]bz2)$'
version_link 'Botan-[0-9]+[.][0-9]+([.][0-9]+)?[.](tgz|tbz|tbz2|tar[.]bz2)$'
ensure_version
attribute_name botanUnstable
do_overwrite(){
ensure_hash
set_var_value hash $CURRENT_HASH
set_var_value sha256 $CURRENT_HASH
set_var_value baseVersion ${CURRENT_VERSION%.*}
set_var_value revision ${CURRENT_VERSION##*.}
}

1
pkgs/development/libraries/box2d/2.0.1.nix
View File

@@ -72,6 +72,7 @@ rec {
platforms = with a.lib.platforms;
linux;
license = "bsd";
branch = "2.0.1";
};
passthru = {
updateInfo = {

4
pkgs/development/libraries/bwidget/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "bwidget-${version}";
version = "1.9.7";
version = "1.9.8";
src = fetchurl {
url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz";
sha256 = "1z2z77l41g01ra7v716c0q3x8s2kx30l4p1kf21ma8bdqa98arp6";
sha256 = "055kpl3ghznk028jnhzsa3p48qgipckfzn2liwq932crxviicl2l";
};
dontBuild = true;

8
pkgs/development/libraries/cairo/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libiconvOrEmpty, libintlOrEmpty
{ stdenv, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty
, expat, zlib, libpng, pixman, fontconfig, freetype, xlibs
, gobjectSupport ? true, glib
, xcbSupport ? true # no longer experimental since 1.12
@@ -11,16 +11,16 @@ assert glSupport -> mesa_noglu != null;
with { inherit (stdenv.lib) optional optionals; };
stdenv.mkDerivation rec {
name = "cairo-1.12.16";
name = "cairo-1.14.2";
src = fetchurl {
url = "http://cairographics.org/releases/${name}.tar.xz";
sha256 = "0inqwsylqkrzcjivdirkjx5nhdgxbdc62fq284c3xppinfg9a195";
sha1 = "c8da68aa66ca0855b5d0ff552766d3e8679e1d24";
};
outputs = [ "dev" "out" "bin" "doc" ];
nativeBuildInputs = [ pkgconfig ] ++ libintlOrEmpty ++ libiconvOrEmpty;
nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty;
propagatedBuildInputs =
with xlibs; [ xlibs.xlibs fontconfig expat freetype pixman zlib libpng ]

6
pkgs/development/libraries/cairomm/default.nix
View File

@@ -1,15 +1,15 @@
{ fetchurl, stdenv, pkgconfig, cairo, x11, fontconfig, freetype, libsigcxx }:
stdenv.mkDerivation rec {
name = "cairomm-1.10.0";
name = "cairomm-1.11.2";
src = fetchurl {
url = "http://cairographics.org/releases/${name}.tar.gz";
sha256 = "13rrp96px95m6xnvmsaqb0wcqsnizg3bz334k0yhlyxf7v29d386";
sha1 = "35e190a03f760924bece5dc1204cc36b3583c806";
};
buildInputs = [ pkgconfig ];
propagatedBuildInputs = [ cairo x11 fontconfig freetype libsigcxx ];
meta = {

15
pkgs/development/libraries/capnproto/default.nix
View File

@@ -1,7 +1,13 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "capnproto-0.4.1";
stdenv.mkDerivation rec {
name = "capnproto-${version}";
version = "0.5.0";
src = fetchurl {
url = "https://capnproto.org/capnproto-c++-${version}.tar.gz";
sha256 = "01fsf60zlyc6rlhnrh8gd9jj5gs52ancb50ml3w7gwq55zgx2rf7";
};
meta = with stdenv.lib; {
homepage = "http://kentonv.github.io/capnproto";
@@ -15,9 +21,4 @@ stdenv.mkDerivation {
platforms = platforms.all;
maintainers = with maintainers; [ cstrahan ];
};
src = fetchurl {
url = "https://capnproto.org/capnproto-c++-0.4.1.tar.gz";
sha256 = "8453e8d508906062f113dbdfff552f41e08083ccf7c9407778a8d107675cd468";
};
}

38
pkgs/development/libraries/ccnx/default.nix Normal file
View File

@@ -0,0 +1,38 @@
{ stdenv, fetchurl, openssl, expat, libpcap }:
let
version = "0.8.2";
in
stdenv.mkDerivation {
name = "ccnx-${version}";
src = fetchurl {
url = "https://github.com/ProjectCCNx/ccnx/archive/ccnx-${version}.tar.gz";
sha256 = "1jyk7i8529821aassxbvzlxnvl5ly0na1qcn3v1jpxhdd0qqpg00";
};
buildInputs = [ openssl expat libpcap ];
preConfigure = ''
mkdir -p $out/include
mkdir -p $out/lib
mkdir -p $out/bin
substituteInPlace csrc/configure --replace "/usr/local" $out --replace "/usr/bin/env sh" "/bin/sh"
'';
meta = with stdenv.lib; {
homepage = "http://www.ccnx.org/";
description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction";
longDescription = ''
To address the Internet’s modern-day requirements with a better
fitting model, PARC has created a new networking architecture
called Content-Centric Networking (CCN), which operates by addressing
and delivering Content Objects directly by Name instead of merely
addressing network end-points. In addition, the CCN security model
explicitly secures individual Content Objects rather than securing
the connection or “pipe”. Named and secured content resides in
distributed caches automatically populated on demand or selectively
pre-populated. When requested by name, CCN delivers named content to
the user from the nearest cache, thereby traversing fewer network hops,
eliminating redundant requests, and consuming less resources overall.
'';
license = licenses.gpl2;
platforms = stdenv.lib.platforms.unix;
maintainers = [ maintainers.sjmackenzie ];
};
}

18
pkgs/development/libraries/ccrtp/default.nix
View File

@@ -1,15 +1,19 @@
{ stdenv, fetchurl, openssl, pkgconfig, libgcrypt, ucommon }:
{ stdenv, fetchurl, pkgconfig, ucommon, openssl, libgcrypt }:
stdenv.mkDerivation {
name = "ccrtp-2.0.6";
stdenv.mkDerivation rec {
name = "ccrtp-2.1.2";
src = fetchurl {
url = mirror://gnu/ccrtp/ccrtp-2.0.6.tar.gz;
sha256 = "06rqwk2w5sikfb3l5bcpxszhq4g7ra840gqx1f011xrmhvclrzir";
url = "mirror://gnu/ccrtp/${name}.tar.gz";
sha256 = "17ili8l7zqbbkzr1rcy4hlnazkf50mds41wg6n7bfdsx3c7cldgh";
};
buildInputs = [ openssl pkgconfig libgcrypt ];
propagatedBuildInputs = [ ucommon ];
buildInputs = [ pkgconfig ];
propagatedBuildInputs = [ ucommon openssl libgcrypt ];
configureFlags = [
"--disable-demos"
];
doCheck = true;

50
pkgs/development/libraries/celt/0.5.1.nix
View File

@@ -1,46 +1,10 @@
x@{builderDefsPackage
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
{ callPackage, fetchurl, ... } @ args:
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="celt";
version="0.5.1.3";
name="${baseName}-${version}";
url="http://downloads.xiph.org/releases/${baseName}/${name}.tar.gz";
hash="0bkam9z5vnrxpbxkkh9kw6yzjka9di56h11iijikdd1f71l5nbpw";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
};
callPackage ./generic.nix (args // rec{
version = "0.5.1.3";
inherit (sourceInfo) name version;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
meta = {
description = "CELT - low-delay audio codec";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
license = "free";
src = fetchurl {
url = "http://downloads.xiph.org/releases/celt/celt-${version}.tar.gz";
sha256 = "0bkam9z5vnrxpbxkkh9kw6yzjka9di56h11iijikdd1f71l5nbpw";
};
passthru = {
updateInfo = {
downloadPage = "http://www.celt-codec.org/downloads/";
};
};
}) x
})

51
pkgs/development/libraries/celt/0.7.nix
View File

@@ -1,47 +1,10 @@
x@{builderDefsPackage
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
{ callPackage, fetchurl, ... } @ args:
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="celt";
version="0.7.1";
name="${baseName}-${version}";
url="http://downloads.xiph.org/releases/${baseName}/${name}.tar.gz";
hash="93f0e2dfb59021b19e69dc0dee855eb89f19397db1dea0d0d6f9329cff933066";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
};
callPackage ./generic.nix (args // rec{
version = "0.7.1";
inherit (sourceInfo) name version;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
meta = {
description = "CELT - low-delay audio codec";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
license = "free";
src = fetchurl {
url = "http://downloads.xiph.org/releases/celt/celt-${version}.tar.gz";
sha256 = "0rihjgzrqcprsv8a1pmiglwik7xqbs2yw3fwd6gb28chnpgy5w4k";
};
passthru = {
updateInfo = {
downloadPage = "http://www.celt-codec.org/downloads/";
};
};
}) x
})

51
pkgs/development/libraries/celt/default.nix
View File

@@ -1,47 +1,10 @@
x@{builderDefsPackage
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
{ callPackage, fetchurl, ... } @ args:
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="celt";
version="0.11.3";
name="${baseName}-${version}";
url="http://downloads.xiph.org/releases/${baseName}/${name}.tar.gz";
hash="0dh893wqbh0q4a0x1xyqryykmnhpv7mkblpch019s04a99fq2r3y";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
};
callPackage ./generic.nix (args // rec{
version = "0.11.3";
inherit (sourceInfo) name version;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
meta = {
description = "Low-delay audio codec";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
license = "free";
src = fetchurl {
url = "http://downloads.xiph.org/releases/celt/celt-${version}.tar.gz";
sha256 = "0dh893wqbh0q4a0x1xyqryykmnhpv7mkblpch019s04a99fq2r3y";
};
passthru = {
updateInfo = {
downloadPage = "http://www.celt-codec.org/downloads/";
};
};
}) x
})

23
pkgs/development/libraries/celt/generic.nix Normal file
View File

@@ -0,0 +1,23 @@
{ stdenv, version, src
, liboggSupport ? true, libogg ? null # if disabled only the library will be built
, ...
}:
# The celt codec has been deprecated and is now a part of the opus codec
stdenv.mkDerivation rec {
name = "celt-${version}";
inherit src;
buildInputs = []
++ stdenv.lib.optional liboggSupport libogg;
meta = with stdenv.lib; {
description = "Ultra-low delay audio codec";
homepage = http://www.celt-codec.org/;
license = licenses.bsd2;
maintainers = with maintainers; [ codyopel raskin ];
platform = platforms.unix;
};
}

51
pkgs/development/libraries/ceres-solver/default.nix Normal file
View File

@@ -0,0 +1,51 @@
{ stdenv
, eigen
, fetchurl
, cmake
, google-gflags ? null
, glog ? null
, runTests ? false
}:
# google-gflags is required to run tests
assert runTests -> google-gflags != null;
let
version = "1.10.0";
# glog currently doesn't build on darwin
# Issue: https://code.google.com/p/google-glog/issues/detail?id=121
useGlog = glog != null && !stdenv.isDarwin;
in
stdenv.mkDerivation {
name = "ceres-solver-${version}";
src = fetchurl {
url = "http://ceres-solver.org/ceres-solver-${version}.tar.gz";
sha256 = "20bb5db05c3e3e14a4062e2cf2b0742d2653359549ecded3e0653104ef3deb17";
};
buildInputs = [ cmake ]
++ stdenv.lib.optional useGlog glog
++ stdenv.lib.optional (google-gflags != null) google-gflags;
inherit eigen;
doCheck = runTests;
checkTarget = "test";
cmakeFlags = "
-DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3
${if !useGlog then "-DMINIGLOG=ON" else ""}
";
meta = with stdenv.lib; {
description = "C++ library for modeling and solving large, complicated optimization problems";
license = licenses.bsd3;
homepage = "http://ceres-solver.org";
maintainers = with stdenv.lib.maintainers; [ giogadi ];
inherit version;
};
}

4
pkgs/development/libraries/check/default.nix
View File

@@ -1,12 +1,12 @@
{ fetchurl, stdenv }:
let version = "0.9.12"; in
let version = "0.9.14"; in
stdenv.mkDerivation {
name = "check-${version}";
src = fetchurl {
url = "mirror://sourceforge/check/${version}/check-${version}.tar.gz";
sha256 = "18qybf3s25s1gydp2lwbc4icnmdc6f9sj21fllcwm81kw5apxm67";
sha256 = "02l4g79d81s07hzywcv1knwj5dyrwjiq2pgxaz7kidxi8m364wn2";
};
# Test can randomly fail: http://hydra.nixos.org/build/7243912

12
pkgs/development/libraries/chromaprint/default.nix
View File

@@ -1,20 +1,20 @@
{ stdenv, fetchurl, cmake, ffmpeg, boost }:
{ stdenv, fetchurl, cmake, boost, ffmpeg }:
stdenv.mkDerivation rec {
name = "chromaprint-${version}";
version = "1.1";
version = "1.2";
src = fetchurl {
url = "http://bitbucket.org/acoustid/chromaprint/downloads/${name}.tar.gz";
sha256 = "04nd8xmy4kgnpfffj6hw893f80bwhp43i01zpmrinn3497mdf53b";
sha256 = "06h36223r4bwcazp42faqs9w9g49wvspivd3z3309b12ld4qjaw2";
};
buildInputs = [ cmake ffmpeg boost ];
nativeBuildInputs = [ cmake ];
buildInputs = [ boost ffmpeg ];
cmakeFlags = [ "-DBUILD_EXAMPLES=ON" ];
postInstall = "installBin examples/fpcalc";
meta = with stdenv.lib; {
homepage = "http://acoustid.org/chromaprint";
description = "AcoustID audio fingerprinting library";

8
pkgs/development/libraries/cil/default.nix
View File

@@ -1,8 +0,0 @@
{stdenv, fetchurl, ocaml, perl}: stdenv.mkDerivation {
name = "cil-1.3.2";
src = fetchurl {
url = http://manju.cs.berkeley.edu/cil/distrib/cil-1.3.2.tar.gz;
md5 = "aba80dd700fcb1411598670cc36a9573";
};
buildInputs = [ocaml perl];
}

12
pkgs/development/libraries/cimg/builder.sh Normal file
View File

@@ -0,0 +1,12 @@
source $stdenv/setup
unpackPhase
cd $sourceRoot
install -dm 755 $out/include/cimg $out/share/doc/cimg/html $out/share/cimg/examples $out/share/cimg/plugins
install -m 644 CImg.h $out/include/cimg
cp -dr --no-preserve=ownership html/* $out/share/doc/cimg/html/
cp -dr --no-preserve=ownership examples/* $out/share/cimg/examples/
cp -dr --no-preserve=ownership plugins/* $out/share/cimg/plugins/

26
pkgs/development/libraries/cimg/default.nix Normal file
View File

@@ -0,0 +1,26 @@
{ stdenv, fetchurl
, unzip }:
stdenv.mkDerivation rec {
name = "cimg-${version}";
version = "1.5.9";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/cimg/CImg-${version}.zip";
sha256 = "1xn20643gcbl76kvy9ajhwbyjjb73mg65q32ma8mdkwn1qhn7f7c";
};
buildInputs = with stdenv.lib;
[ unzip ];
builder = ./builder.sh;
meta = with stdenv.lib; {
description = "A small, open source, C++ toolkit for image processing";
homepage = http://cimg.sourceforge.net/;
license = licenses.cecill-c;
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.linux;
};
}

26
pkgs/development/libraries/cl-ppcre/default.nix
View File

@@ -1,26 +0,0 @@
args :
let
lib = args.lib;
fetchurl = args.fetchurl;
simplyShare = args.simplyShare;
version = lib.attrByPath ["version"] "2.0.0" args;
buildInputs = with args; [ ];
in
rec {
src = fetchurl {
url = http://weitz.de/files/cl-ppcre.tar.gz;
sha256 = "1hrk051yi1qixy0vdig99cbv0v0p825acli65s08yz99b0pjz7m5";
};
inherit buildInputs;
configureFlags = [];
/* doConfigure should be specified separately */
phaseNames = [(simplyShare "cl-ppcre")];
name = "cl-ppcre-" + version;
meta = {
description = "Common Lisp Portable Perl Compatible RegExp library";
};
}

8
pkgs/development/libraries/clearsilver/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, python }:
stdenv.mkDerivation {
name = "clearsilver-0.10.3";
stdenv.mkDerivation rec {
name = "clearsilver-0.10.5";
src = fetchurl {
url = http://www.clearsilver.net/downloads/clearsilver-0.10.3.tar.gz;
md5 = "ff4104b0e58bca1b61d528edbd902769";
url = "http://www.clearsilver.net/downloads/${name}.tar.gz";
sha256 = "1046m1dpq3nkgxbis2dr2x7hynmy51n64465q78d7pdgvqwa178y";
};
builder = ./builder.sh;

Some files were not shown because too many files have changed in this diff Show More