ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

synchronize with trunk

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30316
This commit is contained in:
Peter Simons 2011-11-08 10:18:35 +00:00
commit 368ac01473
70 changed files with 829 additions and 2299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/misc/qcad/default.nix
View File

@ -19,15 +19,26 @@ stdenv.mkDerivation {
buildInputs = [ qt3 libpng libXext libX11 ];
patchPhase = ''
prePatch = ''
sed -i 's/-pedantic//' mkspecs/defs.pro
patch -p1 < ${ ./qcad-2.0.4.0-1.src-intptr.patch /* taken from gentoo, fixes amd64 compilation issue */}
# patch -p1 < ${ ./qcad-2.0.4.0-1.src-intptr.patch }
'';
patches = [
/* taken from gentoo, fixes amd64 compilation issue */
./qcad-2.0.4.0-1.src-intptr.patch
/* taken from gentoo, fixes gcc 4.3 or above compilation issue */
./qcad-2.0.4.0-gcc43.patch
];
# probably there is more to be done. But this seems to work for now (eg see gentoo ebuild)
installPhase = ''
ensureDir $out/{bin,share}
cp -r qcad $out/share
# The compilation does not fail with error code. But qcad will not exist
# if it failed.
test -f $out/share/qcad/qcad
cat >> $out/bin/qcad << EOF
#!/bin/sh
cd $out/share/qcad

45
pkgs/applications/misc/qcad/qcad-2.0.4.0-gcc43.patch Normal file
View File

@ -0,0 +1,45 @@
diff -Naur qcad-2.0.4.0-1.src/dxflib/src/dl_writer_ascii.cpp qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer_ascii.cpp
--- qcad-2.0.4.0-1.src/dxflib/src/dl_writer_ascii.cpp 2004-09-14 16:13:01.000000000 -0400
+++ qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer_ascii.cpp 2008-04-27 08:35:47.000000000 -0400
@@ -30,6 +30,7 @@
#endif // _MSC_VER > 1000
#include <stdio.h>
+#include <cstring>
#include "dl_writer_ascii.h"
#include "dl_exception.h"
diff -Naur qcad-2.0.4.0-1.src/dxflib/src/dl_writer.h qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer.h
--- qcad-2.0.4.0-1.src/dxflib/src/dl_writer.h 2004-09-14 16:13:01.000000000 -0400
+++ qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer.h 2008-04-27 08:35:48.000000000 -0400
@@ -34,6 +34,7 @@
#include <iostream>
+#include <cstring>
#include "dl_attributes.h"
diff -Naur qcad-2.0.4.0-1.src/qcadactions/src/rs_actionzoompan.cpp qcad-2.0.4.0-1.src.new/qcadactions/src/rs_actionzoompan.cpp
--- qcad-2.0.4.0-1.src/qcadactions/src/rs_actionzoompan.cpp 2004-09-14 16:13:03.000000000 -0400
+++ qcad-2.0.4.0-1.src.new/qcadactions/src/rs_actionzoompan.cpp 2008-04-27 08:35:48.000000000 -0400
@@ -28,6 +28,7 @@
#include "rs_snapper.h"
#include "rs_point.h"
+#include <cstdlib>
RS_ActionZoomPan::RS_ActionZoomPan(RS_EntityContainer& container,
RS_GraphicView& graphicView)
diff -Naur qcad-2.0.4.0-1.src/qcadlib/src/information/rs_information.h qcad-2.0.4.0-1.src.new/qcadlib/src/information/rs_information.h
--- qcad-2.0.4.0-1.src/qcadlib/src/information/rs_information.h 2004-09-14 16:13:02.000000000 -0400
+++ qcad-2.0.4.0-1.src.new/qcadlib/src/information/rs_information.h 2008-04-27 08:35:48.000000000 -0400
@@ -31,7 +31,7 @@
#include "rs_line.h"
#include "rs_arc.h"
-
+#include <cstdlib>
/**
* Class for getting information about entities. This includes

2
pkgs/applications/networking/esniper/default.nix
View File

@ -10,6 +10,8 @@ stdenv.mkDerivation {
buildInputs = [openssl curl];
patches = [ ./fix-build-with-latest-curl.patch ];
postInstall = ''
sed -e "2i export PATH=\"$out/bin:\$PATH\"" <"frontends/snipe" >"$out/bin/snipe"
chmod 555 "$out/bin/snipe"

10
pkgs/applications/networking/esniper/fix-build-with-latest-curl.patch Normal file
View File

@ -0,0 +1,10 @@
--- esniper-2-26-0/http.c 2011-08-09 21:05:59.000000000 +0200
+++ esniper/http.c 2011-08-10 00:24:43.000000000 +0200
@@ -28,7 +28,6 @@
#include "esniper.h"
#include <ctype.h>
#include <curl/curl.h>
-#include <curl/types.h>
#include <curl/easy.h>
#include <stdlib.h>
#include <string.h>

21
pkgs/applications/networking/instant-messengers/gtmess/default.nix Normal file
View File

@ -0,0 +1,21 @@
{stdenv, fetchurl, ncurses, openssl, tcl, tk}:
stdenv.mkDerivation {
name = "gtmess-0.96";
src = fetchurl {
url = mirror://sourceforge/gtmess/gtmess-0.96.tar.gz;
sha256 = "0w29wyshx32485c7wazj51lvk2j9k1kn2jmwpf916r4513hwplvm";
};
buildInputs = [ ncurses openssl tcl tk];
patches = [ ./va_list.patch ];
meta = {
description = "Console MSN Messenger client for Linux and other unix systems";
homepage = http://gtmess.sourceforge.net/;
license = "GPLv2+";
platforms = with stdenv.lib.platforms; linux;
};
}

22
pkgs/applications/networking/instant-messengers/gtmess/va_list.patch Normal file
View File

@ -0,0 +1,22 @@
diff --git a/src/client/screen.c b/src/client/screen.c
index e8fa75f..d3842ac 100644
--- a/src/client/screen.c
+++ b/src/client/screen.c
@@ -255,7 +255,7 @@ void msg(int attr, const char *fmt, ...)
va_start(ap, fmt);
r = vmsg(attr, SML, fmt, ap);
va_end(ap);
- if (r) vmsg(C_ERR, SML, "msg(): output truncated\n", NULL);
+ if (r) msgn(C_ERR, SML, "msg(): output truncated\n");
}
void msgn(int attr, int size, const char *fmt, ...)
@@ -266,7 +266,7 @@ void msgn(int attr, int size, const char *fmt, ...)
va_start(ap, fmt);
r = vmsg(attr, size, fmt, ap);
va_end(ap);
- if (r) vmsg(C_ERR, SML, "msgn(): output truncated\n", NULL);
+ if (r) msgn(C_ERR, SML, "msgn(): output truncated\n");
}
int screen_shut()

45
pkgs/applications/office/scribus/default.nix
View File

@ -1,50 +1,22 @@
{ stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2
, libart_lgpl, qt, python, cups, fontconfig, libjpeg
, zlib, libpng, xorg, cairo, cmake }:
assert stdenv.gcc.gcc != null;
# NOTE: ! If Scribus doesn't render text try another font.
# a lot of templates, colour palettes, colour profiles or gradients
# will be released with the next version of scribus - So don't miss them
# when upgrading this package
let useCairo = false; in
, zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake }:
stdenv.mkDerivation {
name = "scribus-1.3.3.14";
name = "scribus-1.4.0rc6";
src = fetchurl {
url = mirror://sourceforge/scribus/scribus/1.3.3.14/scribus-1.3.3.14.tar.bz2;
sha256 = "1ig7x6vxhqgjlpnv6hkzpb6gj4yvxsrx7rw900zlp7g6zxl01iyy";
url = mirror://sourceforge/scribus/scribus/scribus-1.4.0.rc6.tar.bz2;
sha256 = "1rrnzxjzhqj4lgyfswly501xlyvm4hsnnq7zw008v0cnkx31icli";
};
cmakeFlags = if useCairo then "-DWANT_CAIRO=1" else "";
configurePhase = ''
set -x
mkdir -p build;
cd build
eval -- "cmake .. $cmakeFlags"
set +x
'';
enableParallelBuilding = true;
buildInputs =
[ pkgconfig /*<- required fro cairo only?*/ cmake freetype lcms libtiff libxml2 libart_lgpl qt
[ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt
python cups fontconfig
xorg.libXaw xorg.libXext xorg.libX11 xorg.libXtst xorg.libXi xorg.libXinerama
libjpeg zlib libpng
] ++ stdenv.lib.optional useCairo cairo;
# fix rpath which is removed by cmake..
postFixup = ''
for i in $buildNativeInputs ${stdenv.gcc.gcc}; do
[ -d "$i/lib" ] && RPATH="$RPATH:$i/lib"
[ -d "$i/lib64" ] && RPATH="$RPATH:$i/lib64"
done
patchelf --set-rpath "''\${RPATH:1}" $out/bin/scribus
'';
libjpeg zlib libpng podofo aspell cairo
];
meta = {
maintainers = [ stdenv.lib.maintainers.marcweber ];
@ -54,4 +26,3 @@ stdenv.mkDerivation {
license = "GPLv2";
};
}

2
pkgs/applications/science/astronomy/gravit/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation {
license = "GPLv2";
longDescription = ''
Gravit is a gravity simulator which runs under Linux, Windows and
Gravit is a gravity simulator which runs under Linux, Windows and
Mac OS X. It uses Newtonian physics using the Barnes-Hut N-body
algorithm. Although the main goal of Gravit is to be as accurate
as possible, it also creates beautiful looking gravity patterns.

5
pkgs/applications/science/astronomy/stellarium/default.nix
View File

@ -1,19 +1,18 @@
{stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv}:
let
name = "stellarium-0.11.0";
name = "stellarium-0.11.1";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sourceforge/stellarium/${name}.tar.gz";
sha256 = "dbedf47dd0744fb325d67d63d1279101be7f4259af2a5e8027f1072012dd2587";
sha256 = "1lrz52g2li92yjsrnxqqfmgjy2jmcqszwqpaq9rz9319nd1f2zpl";
};
buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ];
cmakeFlags = "-DINTL_INCLUDE_DIR= -DINTL_LIBRARIES=";
preConfigure = ''
sed -i -e '/typedef void (\*__GLXextFuncPtr)(void);/d' src/core/external/GLee.h
'';

3
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -48,7 +48,8 @@ rec {
gitAnnex = lib.makeOverridable (import ./git-annex) {
inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which;
inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc
HTTP testpack monadControl hS3 mtl network hslogger hxt json QuickCheck2;
HTTP testpack monadControl hS3 mtl network hslogger hxt json;
QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1;
};
qgit = import ./qgit {

4
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
View File

@ -4,14 +4,14 @@
}:
let
version = "3.20111011";
version = "3.20111025";
in
stdenv.mkDerivation {
name = "git-annex-${version}";
src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz";
sha256 = "6bfd8ff6784d309bc20aaae38b0edd8f71ed44255b584093a881153d8a70c01c";
sha256 = "1ae0fd9551d3397d1b7e5bc1eba9aab47b803bac680c3d019ba6ef7cefe96d27";
};
buildInputs = [

1
pkgs/build-support/fetchhg/nix-prefetch-hg
View File

@ -49,6 +49,7 @@ if test -z "$finalPath"; then
tmpClone=$url
fi
hg archive -q -y -r "$rev" --cwd $tmpClone $tmpArchive
rm -f $tmpArchive/.hg_archival.txt
# Compute the hash.

12
pkgs/build-support/vm/default.nix
View File

@ -1220,22 +1220,22 @@ rec {
};
debian60i386 = {
name = "debian-6.0.2.1-squeeze-i386";
fullName = "Debian 6.0.2.1 Squeeze (i386)";
name = "debian-6.0.3-squeeze-i386";
fullName = "Debian 6.0.3 Squeeze (i386)";
packagesList = fetchurl {
url = mirror://debian/dists/squeeze/main/binary-i386/Packages.bz2;
sha256 = "0fv1vkyaci489a8np1aaqbrwnc2d0as39hadyj9dswhm7zgfvmk1";
sha1 = "90a55b6bb049d0777d06d5b28a1848b38678426b";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
};
debian60x86_64 = {
name = "debian-6.0.2.1-squeeze-amd64";
fullName = "Debian 6.0.2.1 Squeeze (amd64)";
name = "debian-6.0.3-squeeze-amd64";
fullName = "Debian 6.0.3 Squeeze (amd64)";
packagesList = fetchurl {
url = mirror://debian/dists/squeeze/main/binary-amd64/Packages.bz2;
sha256 = "1hvaqsmd801syifqwhpd1aqv30xg33z8g74k5pqcqhxqzah653d5";
sha1 = "071626063ab0a70f10200e2e27a5c7fae29fa4ad";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;

2
pkgs/development/compilers/llvm/clang.nix
View File

@ -53,6 +53,6 @@ stdenv.mkDerivation {
description = "A C language family frontend for LLVM";
license = "BSD";
maintainers = with stdenv.lib.maintainers; [viric shlevy];
platforms = with stdenv.lib.platforms; all;
platforms = with stdenv.lib.platforms; linux;
};
}

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

@ -11,7 +11,7 @@ let version = "0.9.25"; in
sha256 = "0dfycf80x73dz67c97j1ry29wrv35393ai5ry46i1x1fzfq6rv8v";
};
buildInputs = [ perl texinfo ];
buildNativeInputs = [ perl texinfo ];
patches =
[ (fetchurl {

6
pkgs/development/interpreters/ruby/ruby-19.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.gz";
sha256 = "0zmxdqzprbdc5mvmba1i94mpqnqxxlh460jri7bx6i29bibigj0w";
sha256 = "0km3ryc0cs578982x6c3y3n3xr920grnpncmznb447snwd10149v";
};
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
@ -44,8 +44,8 @@ stdenv.mkDerivation rec {
passthru = rec {
majorVersion = "1.9";
minorVersion = "2";
patchLevel = "290";
minorVersion = "3";
patchLevel = "0";
libPath = "lib/ruby/${majorVersion}";
gemPath = "lib/ruby/gems/${majorVersion}";
};

32
pkgs/development/libraries/cogl/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ stdenv, fetchurl_gnome, pkgconfig, mesa, glib, gdk_pixbuf
, pangoSupport ? true, pango, cairo
, libXfixes, libXcomposite, libXdamage, xz }:
stdenv.mkDerivation rec {
name = src.pkgname;
src = fetchurl_gnome {
project = "cogl";
major = "1"; minor = "8"; patchlevel = "0"; extension = "xz";
sha256 = "0b0arg0sjky5y4ypgh8dpznd9f1azhi1d5rhf4zbcw2mkl91qmdi";
};
buildNativeInputs = [ xz pkgconfig ];
propagatedBuildInputs =
[ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage ];
buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];
meta = {
description = "A small open source library for using 3D graphics hardware for rendering";
longDescription =
''
Cogl is a small open source library for using 3D graphics hardware for
rendering. The API departs from the flat state machine style of OpenGL
and is designed to make it easy to write orthogonal components that can
render without stepping on each others toes.
'';
inherit (glib.meta) platforms;
};
}

2
pkgs/development/libraries/glib/2.30.x.nix
View File

@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ zlib libffi ];
passthru.gioModuleDir = "lib/gio/modules";
# glib buildsystem fails to find python, thus hardcodes python2.4 in #!
postInstall = ''rm -rvf $out/share/gtk-doc'';

4
pkgs/development/libraries/haskell/base-unicode-symbols/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "base-unicode-symbols";
version = "0.2.2.1";
sha256 = "095x4mlkn7i9byg6kdp2f7z0x7sizmy4lgsi0rsabazyd3d8rr9l";
version = "0.2.2.2";
sha256 = "13bn580r3wk7g5bq8ry04i2lvrcf576wjzlr0imli8rklkx8k3b8";
meta = {
homepage = "http://haskell.org/haskellwiki/Unicode-symbols";
description = "Unicode alternatives for common functions and operators";

5
pkgs/development/libraries/haskell/blaze-html/default.nix
View File

@ -2,11 +2,12 @@
cabal.mkDerivation (self: {
pname = "blaze-html";
version = "0.4.2.0";
sha256 = "098y9mzq6jr73lavv7ky58bl3aajvdg72y12varpf3v3rr4l0lb2";
version = "0.4.2.1";
sha256 = "0hm2jnz9n68njdrrq73a558qxl2jwcvxmy62mvf2v9q96wyp07yj";
buildDepends = [ blazeBuilder text ];
meta = {
homepage = "http://jaspervdj.be/blaze";
description = "A blazingly fast HTML combinator library for Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [

4
pkgs/development/libraries/haskell/cereal/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cereal";
version = "0.3.3.0";
sha256 = "0bqd5qfvbz77mq0zxgafj011hrxcanrfzvlwhf4j4dzr6yryk53y";
version = "0.3.4.0";
sha256 = "019fc094w2ica9ims83jacy2digbygaww5wb73xyrj3vgjw774xq";
meta = {
description = "A binary serialization library";
license = self.stdenv.lib.licenses.bsd3;

7
pkgs/development/libraries/haskell/gamma/default.nix
View File

@ -2,12 +2,9 @@
cabal.mkDerivation (self: {
pname = "gamma";
version = "0.7.0.1";
sha256 = "0728b5mrzmj9hkaqvikl45jyi2p9hnkl2p6l9yv7wnw557yb0gb2";
version = "0.9.0.1";
sha256 = "02s9m2vlrnfg26c7921x60xxmawzzk27y3czcnvs8hlk01mb1xv7";
buildDepends = [ continuedFractions converge vector ];
preConfigure = ''
sed -i 's|\(vector.*\) && < 0.8|\1|' ${self.pname}.cabal
'';
meta = {
homepage = "https://github.com/mokus0/gamma";
description = "Gamma function and related functions";

6
pkgs/development/libraries/haskell/ghc-mtl/default.nix
View File

@ -2,11 +2,11 @@
cabal.mkDerivation (self: {
pname = "ghc-mtl";
version = "1.0.1.0";
sha256 = "5284e0ecf99511e6263503412faf6fa809dc577c009fde63203d46405eb1b191";
version = "1.0.1.1";
sha256 = "04lm1g27xwwph02k3d8b51nbhi2sw8jx7arqczcqc3rygak10fpn";
buildDepends = [ MonadCatchIOMtl mtl ];
meta = {
homepage = "http://code.haskell.org/~jcpetruzza/ghc-mtl";
homepage = "http://darcsden.com/jcpetruzza/ghc-mtl";
description = "An mtl compatible version of the Ghc-Api monads and monad-transformers";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

6
pkgs/development/libraries/haskell/hint/default.nix
View File

@ -4,14 +4,14 @@
cabal.mkDerivation (self: {
pname = "hint";
version = "0.3.3.2";
sha256 = "1qm74hjz8cxypvavcw7s094zg9ic3r1ll2lj3y159ipc79cw2sn1";
version = "0.3.3.3";
sha256 = "0i7d7c2786c13npbb5np3gaidsq4kkajvm3fn2gx8djrhhlrqw5l";
buildDepends = [
extensibleExceptions ghcMtl ghcPaths haskellSrc MonadCatchIOMtl mtl
random utf8String
];
meta = {
homepage = "http://projects.haskell.org/hint";
homepage = "http://darcsden.com/jcpetruzza/hint";
description = "Runtime Haskell interpreter (GHC API wrapper)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

4
pkgs/development/libraries/haskell/system-fileio/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "system-fileio";
version = "0.3.2.1";
sha256 = "0a0vkbj9z5i74g6kkz3n4ffmvinavmnak0zxsx0fck18ppdgv394";
version = "0.3.3";
sha256 = "0z7y99g8ij9ykpxsgdb0addyibvpv2s95i0wpx4yc7mgi8cl50bx";
buildDepends = [ systemFilepath text time ];
meta = {
homepage = "https://john-millikin.com/software/hs-fileio/";

8
pkgs/development/libraries/haskell/system-filepath/default.nix
View File

@ -1,10 +1,10 @@
{ cabal, text }:
{ cabal, deepseq, text }:
cabal.mkDerivation (self: {
pname = "system-filepath";
version = "0.4.1";
sha256 = "0jb32516xiwgbvr68yrf142fnzxfhn2dwh48nfr06gz65l7y4fcx";
buildDepends = [ text ];
version = "0.4.3";
sha256 = "16a57dipz3aid5n22gzyd9yqmsxm98c3s6vb7minj82q9rbl5z67";
buildDepends = [ deepseq text ];
meta = {
homepage = "https://john-millikin.com/software/hs-filepath/";
description = "High-level, byte-based file and directory path manipulations";

4
pkgs/development/libraries/haskell/tagsoup/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "tagsoup";
version = "0.12.3";
sha256 = "0f41kc6kdzslyhskyql431nq0kkdzf13vn9saqi48ycajnrm1vcb";
version = "0.12.4";
sha256 = "0szm80sgjj173vdax7gv87mfp9xrq1w34i4v83nbvnfwrx8nis4w";
isLibrary = true;
isExecutable = true;
buildDepends = [ text ];

4
pkgs/development/libraries/haskell/text/0.11.1.7.nix → pkgs/development/libraries/haskell/text/0.11.1.9.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "text";
version = "0.11.1.7";
sha256 = "1pjllmqnl4rwa6d2mjcj2kp0w7whwxlb04rsaml7yyyk4dw97a2p";
version = "0.11.1.9";
sha256 = "12lq9v1byrsan7rp7kywkbwp15qyganpkanmln43yylxdzdc8a2k";
buildDepends = [ deepseq ];
meta = {
homepage = "https://github.com/bos/text";

4
pkgs/development/libraries/haskell/uniplate/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "uniplate";
version = "1.6.3";
sha256 = "14p10zhsa9ws0rn2nm0gi25bdyhhs83b6qv8bjyywb02sh15xhkw";
version = "1.6.5";
sha256 = "1g29jbh2clxp87p8qjihgjgi8hdqgzray34bg6hv7whsy053apqs";
buildDepends = [ hashable syb unorderedContainers ];
meta = {
homepage = "http://community.haskell.org/~ndm/uniplate/";

4
pkgs/development/libraries/haskell/vty/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "vty";
version = "4.7.0.4";
sha256 = "1rwki3ch1r3dqzb1cxmzxn05k49ams64licl0silbhsj3qibbj53";
version = "4.7.0.6";
sha256 = "1jb7c4wh8pjb5salh725vxjbx29wy6ph5gvdp177piq40v3zvbg3";
buildDepends = [
deepseq mtl parallel parsec terminfo utf8String vector
];

4
pkgs/development/libraries/haskell/xml-enumerator/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "xml-enumerator";
version = "0.4.2.1";
sha256 = "0xz0a4dk94zg0sm0gy90ymmhzrsdvmqvl3qw2xycys6pzmg51im7";
version = "0.4.3.1";
sha256 = "1j9950vqaanjig6wv2pk582x1znzb141p5apg05z9i0sk1w5hczh";
buildDepends = [
attoparsecText attoparsecTextEnumerator blazeBuilder
blazeBuilderEnumerator dataDefault enumerator failure text

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

@ -5,7 +5,7 @@ let
staticFlags = if static then " --enable-static --disable-shared" else "";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "isl-${version}";
src = fetchurl {
@ -17,6 +17,9 @@ stdenv.mkDerivation {
dontDisableStatic = if static then true else false;
configureFlags = "--with-gmp-prefix=${gmp}" + staticFlags;
crossAttrs = {
configureFlags = configureFlags + " --with-gmp-prefix=${gmp.hostDrv} ";
};
meta = {
homepage = http://www.kotnet.org/~skimo/isl/;

14
pkgs/development/libraries/json-c/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "json-c-0.9";
src = fetchurl {
url = "http://oss.metaparadigm.com/json-c/json-c-0.9.tar.gz";
sha256 = "0xcl8cwzm860f8m0cdzyw6slwcddni4mraw4shvr3qgqkdn4hakh";
};
meta = {
homepage = "http://oss.metaparadigm.com/json-c/";
description = "A JSON implementation in C";
longDescription = "JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects.";
};
}

17
pkgs/development/libraries/json-glib/default.nix
View File

@ -1,19 +1,16 @@
{ stdenv, fetchurl, glib, pkgconfig }:
{ stdenv, fetchurl_gnome, glib, pkgconfig, xz }:
let
pname = "json-glib";
version = "0.10.4";
in
stdenv.mkDerivation rec {
name = pname + "-" + version;
name = src.pkgname;
src = fetchurl {
url = "mirror://gnome/sources/${pname}/0.10/${name}.tar.bz2";
sha256 = "1naydnjagxw5gsq77lhaasjzfv1kp19v6bkybg1krq7rsd0v7n7g";
src = fetchurl_gnome {
project = "json-glib";
major = "0"; minor = "14"; patchlevel = "0"; extension = "xz";
sha256 = "0mpw996cyidspjwns281l5haj9i8azpkfpl4jf98lh3kcqcr07l2";
};
propagatedBuildInputs = [ glib ];
buildInputs = [ pkgconfig ];
buildNativeInputs = [ pkgconfig xz ];
meta = {
homepage = http://live.gnome.org/JsonGlib;

10
pkgs/development/libraries/libical/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, perl}:
stdenv.mkDerivation {
name = "libical-0.43";
stdenv.mkDerivation rec {
name = "libical-0.47";
src = fetchurl {
url = http://superb-east.dl.sourceforge.net/sourceforge/freeassociation/libical-0.43.tar.gz;
md5 = "5f0a1feb60894d0be537aefea5647474";
url = "mirror://sourceforge/freeassociation/${name}.tar.gz";
sha256 = "1218vaaks9lvx31mrc8212kyngw2k68xm0914vrd77ixn55vnk5g";
};
buildInputs = [ perl ];
buildNativeInputs = [ perl ];
}

13
pkgs/development/libraries/libofa/curl-types.patch Normal file
View File

@ -0,0 +1,13 @@
diff -rc libofa-0.9.3/examples/protocol.cpp libofa-0.9.3-new/examples/protocol.cpp
*** libofa-0.9.3/examples/protocol.cpp 2006-05-10 14:05:42.000000000 -0400
--- libofa-0.9.3-new/examples/protocol.cpp 2011-11-06 09:24:05.653283203 -0500
***************
*** 12,18 ****
#include <map>
#include <expat.h>
#include <curl/curl.h>
- #include <curl/types.h>
#include <curl/easy.h>
using namespace std;
--- 12,17 ----

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

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ expat curl fftw ];
patches = [ ./libofa-0.9.3-gcc-4.patch ./libofa-0.9.3-gcc-4.3.patch ./gcc-4.x.patch ];
patches = [ ./libofa-0.9.3-gcc-4.patch ./libofa-0.9.3-gcc-4.3.patch ./gcc-4.x.patch ./curl-types.patch ];
src = fetchurl {
url = "http://musicip-libofa.googlecode.com/files/${name}.tar.gz";

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

@ -1,10 +1,10 @@
{stdenv, fetchurl, cmake, zlib}:
stdenv.mkDerivation rec {
name = "libproxy-0.4.6";
name = "libproxy-0.4.7";
src = fetchurl {
url = "http://libproxy.googlecode.com/files/${name}.tar.gz";
sha256 = "9ad912e63b1efca98fb442240a2bc7302e6021c1d0b1b9363327729f29462f30";
sha256 = "15rp97g3s2xkc842p5qfm8kx3p4awvrwrpl6w71a76qk224abq4g";
};
buildInputs = [cmake zlib];
}

4
pkgs/development/libraries/librdf/raptor.nix
View File

@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
buildInputs = [ libxml2 curl ];
preBuild = ''
sed -e '/curl\/types/d' -i src/*.c src/*.h
'';
meta = {
description = "The RDF Parser Toolkit";
homepage = "http://librdf.org/raptor";

414
pkgs/development/libraries/libtunepimp/gcc-4.x.patch
View File

@ -1,177 +1,237 @@
diff --git a/include/tunepimp-0.5/metadata.h b/include/tunepimp-0.5/metadata.h
index f9bab5d..ea08cf5 100644
--- a/include/tunepimp-0.5/metadata.h
+++ b/include/tunepimp-0.5/metadata.h
@@ -29,6 +29,7 @@
#include <string>
#include <cstdio>
+#include <cstring>
#include "defs.h"
#include "tp_c.h"
diff --git a/lib/c_wrapper.cpp b/lib/c_wrapper.cpp
index 760cc08..66c6111 100644
--- a/lib/c_wrapper.cpp
+++ b/lib/c_wrapper.cpp
@@ -43,6 +43,7 @@
if (obj == NULL) return;
#include <deque>
+#include <cstdlib>
class NotifyData
{
diff --git a/lib/fileio.cpp b/lib/fileio.cpp
index a1602da..abe2b24 100644
--- a/lib/fileio.cpp
+++ b/lib/fileio.cpp
@@ -27,6 +27,8 @@
#include <assert.h>
#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
#include <string>
#ifndef WIN32
#include <unistd.h>
@@ -122,7 +124,8 @@ int taccess(const char *pathname, int mode, const char *encoding)
void tmktempname(const char *path, char *newPath, int newPathLen)
{
- char *ptr, *temp;
+ char *temp;
+ const char *ptr;
temp = (char *)malloc(strlen(path) + 32);
ptr = strrchr(path, dirSepChar);
diff --git a/lib/metadata.cpp b/lib/metadata.cpp
index 0a1a70a..dcd0aa1 100644
--- a/lib/metadata.cpp
+++ b/lib/metadata.cpp
@@ -24,8 +24,9 @@
$Id: metadata.cpp 8359 2006-08-07 20:34:50Z luks $
----------------------------------------------------------------------------*/
-#include <math.h>
-#include <stdio.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
#include "metadata.h"
#include "../config.h"
using namespace std;
diff --git a/lib/protocol.cpp b/lib/protocol.cpp
index 83e8b33..3436f80 100644
--- a/lib/protocol.cpp
+++ b/lib/protocol.cpp
@@ -8,6 +8,7 @@
-------------------------------------------------------------------*/
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <string>
#include <map>
#include <expat.h>
diff --git a/lib/readmeta.cpp b/lib/readmeta.cpp
index 7f325de..5e5513a 100644
--- a/lib/readmeta.cpp
+++ b/lib/readmeta.cpp
@@ -30,7 +30,8 @@
#endif
#endif
-#include <stdio.h>
+#include <cstdio>
+#include <cstdlib>
#ifndef WIN32
#include <unistd.h>
#endif
diff --git a/lib/tunepimp.cpp b/lib/tunepimp.cpp
index bf09383..f1b9b56 100644
--- a/lib/tunepimp.cpp
+++ b/lib/tunepimp.cpp
@@ -30,7 +30,8 @@
#endif
#endif
-#include <stdio.h>
+#include <cstdio>
+#include <cstdlib>
#include <map>
using namespace std;
diff --git a/lib/utf8/utf8util.cpp b/lib/utf8/utf8util.cpp
index a066956..6ea86e4 100644
--- a/lib/utf8/utf8util.cpp
+++ b/lib/utf8/utf8util.cpp
@@ -26,6 +26,7 @@
----------------------------------------------------------------------------*/
#include <stdio.h>
+#include <stdlib.h>
#include "utf8util.h"
#include "utf8.h"
#ifdef WIN32
diff --git a/plugins/mp3/id3_2_3_meta.cpp b/plugins/mp3/id3_2_3_meta.cpp
index fa9a7e0..efac1c9 100644
--- a/plugins/mp3/id3_2_3_meta.cpp
+++ b/plugins/mp3/id3_2_3_meta.cpp
@@ -26,6 +26,7 @@
----------------------------------------------------------------------------*/
#include <stdio.h>
+#include <stdlib.h>
#include <assert.h>
#include <ctype.h>
#include <musicbrainz/mb_c.h>
diff --git a/plugins/mp3/id3_meta.cpp b/plugins/mp3/id3_meta.cpp
index d860bf6..804ca5c 100644
--- a/plugins/mp3/id3_meta.cpp
+++ b/plugins/mp3/id3_meta.cpp
@@ -26,6 +26,7 @@
----------------------------------------------------------------------------*/
#include <stdio.h>
+#include <stdlib.h>
#include <time.h>
#include <ctype.h>
#include <musicbrainz/mb_c.h>
diff --git a/plugins/mp4/mp4.cpp b/plugins/mp4/mp4.cpp
index 9f741e3..dcc7ec9 100644
--- a/plugins/mp4/mp4.cpp
+++ b/plugins/mp4/mp4.cpp
@@ -27,7 +27,8 @@
#include <string.h>
#include <stdio.h>
-#include <mp4.h>
+#include <stdlib.h>
+#include <mp4v2/mp4v2.h>
#include "metadata.h"
#include "plugin.h"
#ifndef WIN32
diff --git a/plugins/wma/wma.cpp b/plugins/wma/wma.cpp
index 3d7a50a..a28901c 100644
--- a/plugins/wma/wma.cpp
+++ b/plugins/wma/wma.cpp
@@ -27,6 +27,7 @@
#include <string.h>
#include <stdio.h>
+#include <stdlib.h>
#include <wmafile.h>
#include "metadata.h"
#include "plugin.h"
diff --git a/plugins/wma/wmafile.cpp b/plugins/wma/wmafile.cpp
index 1b38af8..31fa150 100644
--- a/plugins/wma/wmafile.cpp
+++ b/plugins/wma/wmafile.cpp
@@ -19,6 +19,7 @@
* USA *
***************************************************************************/
+#include <string.h>
#include <tstring.h>
#include <wmafile.h>
#include <wmatag.h>
diff -rc libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h libtunepimp-0.5.3-new/include/tunepimp-0.5/metadata.h
*** libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h 2006-11-18 05:52:08.000000000 -0500
--- libtunepimp-0.5.3-new/include/tunepimp-0.5/metadata.h 2011-11-06 09:00:14.816684749 -0500
***************
*** 29,34 ****
--- 29,35 ----
#include <string>
#include <cstdio>
+ #include <cstring>
#include "defs.h"
#include "tp_c.h"
diff -rc libtunepimp-0.5.3/lib/c_wrapper.cpp libtunepimp-0.5.3-new/lib/c_wrapper.cpp
*** libtunepimp-0.5.3/lib/c_wrapper.cpp 2006-11-18 05:52:33.000000000 -0500
--- libtunepimp-0.5.3-new/lib/c_wrapper.cpp 2011-11-06 09:00:14.816684749 -0500
***************
*** 43,48 ****
--- 43,49 ----
if (obj == NULL) return;
#include <deque>
+ #include <cstdlib>
class NotifyData
{
diff -rc libtunepimp-0.5.3/lib/fileio.cpp libtunepimp-0.5.3-new/lib/fileio.cpp
*** libtunepimp-0.5.3/lib/fileio.cpp 2006-11-18 05:52:33.000000000 -0500
--- libtunepimp-0.5.3-new/lib/fileio.cpp 2011-11-06 09:00:14.816684749 -0500
***************
*** 27,32 ****
--- 27,34 ----
#include <assert.h>
#include <errno.h>
+ #include <string.h>
+ #include <stdlib.h>
#include <string>
#ifndef WIN32
#include <unistd.h>
***************
*** 122,128 ****
void tmktempname(const char *path, char *newPath, int newPathLen)
{
! char *ptr, *temp;
temp = (char *)malloc(strlen(path) + 32);
ptr = strrchr(path, dirSepChar);
--- 124,131 ----
void tmktempname(const char *path, char *newPath, int newPathLen)
{
! char *temp;
! const char *ptr;
temp = (char *)malloc(strlen(path) + 32);
ptr = strrchr(path, dirSepChar);
diff -rc libtunepimp-0.5.3/lib/metadata.cpp libtunepimp-0.5.3-new/lib/metadata.cpp
*** libtunepimp-0.5.3/lib/metadata.cpp 2006-11-18 05:52:33.000000000 -0500
--- libtunepimp-0.5.3-new/lib/metadata.cpp 2011-11-06 09:00:14.817684754 -0500
***************
*** 24,31 ****
$Id: metadata.cpp 8359 2006-08-07 20:34:50Z luks $
----------------------------------------------------------------------------*/
! #include <math.h>
! #include <stdio.h>
#include "metadata.h"
#include "../config.h"
using namespace std;
--- 24,32 ----
$Id: metadata.cpp 8359 2006-08-07 20:34:50Z luks $
----------------------------------------------------------------------------*/
! #include <cmath>
! #include <cstdio>
! #include <cstdlib>
#include "metadata.h"
#include "../config.h"
using namespace std;
diff -rc libtunepimp-0.5.3/lib/protocol.cpp libtunepimp-0.5.3-new/lib/protocol.cpp
*** libtunepimp-0.5.3/lib/protocol.cpp 2006-11-28 15:25:04.000000000 -0500
--- libtunepimp-0.5.3-new/lib/protocol.cpp 2011-11-06 09:00:23.281742454 -0500
***************
*** 8,18 ****
-------------------------------------------------------------------*/
#include <stdio.h>
#include <stdlib.h>
#include <string>
#include <map>
#include <expat.h>
#include <curl/curl.h>
- #include <curl/types.h>
#include <curl/easy.h>
using namespace std;
--- 8,18 ----
-------------------------------------------------------------------*/
#include <stdio.h>
#include <stdlib.h>
+ #include <string.h>
#include <string>
#include <map>
#include <expat.h>
#include <curl/curl.h>
#include <curl/easy.h>
using namespace std;
diff -rc libtunepimp-0.5.3/lib/readmeta.cpp libtunepimp-0.5.3-new/lib/readmeta.cpp
*** libtunepimp-0.5.3/lib/readmeta.cpp 2006-11-18 05:52:33.000000000 -0500
--- libtunepimp-0.5.3-new/lib/readmeta.cpp 2011-11-06 09:00:14.817684754 -0500
***************
*** 30,36 ****
#endif
#endif
! #include <stdio.h>
#ifndef WIN32
#include <unistd.h>
#endif
--- 30,37 ----
#endif
#endif
! #include <cstdio>
! #include <cstdlib>
#ifndef WIN32
#include <unistd.h>
#endif
diff -rc libtunepimp-0.5.3/lib/tunepimp.cpp libtunepimp-0.5.3-new/lib/tunepimp.cpp
*** libtunepimp-0.5.3/lib/tunepimp.cpp 2006-11-18 05:52:33.000000000 -0500
--- libtunepimp-0.5.3-new/lib/tunepimp.cpp 2011-11-06 09:00:14.818684760 -0500
***************
*** 30,36 ****
#endif
#endif
! #include <stdio.h>
#include <map>
using namespace std;
--- 30,37 ----
#endif
#endif
! #include <cstdio>
! #include <cstdlib>
#include <map>
using namespace std;
diff -rc libtunepimp-0.5.3/lib/utf8/utf8util.cpp libtunepimp-0.5.3-new/lib/utf8/utf8util.cpp
*** libtunepimp-0.5.3/lib/utf8/utf8util.cpp 2006-11-18 05:52:26.000000000 -0500
--- libtunepimp-0.5.3-new/lib/utf8/utf8util.cpp 2011-11-06 09:00:14.818684760 -0500
***************
*** 26,31 ****
--- 26,32 ----
----------------------------------------------------------------------------*/
#include <stdio.h>
+ #include <stdlib.h>
#include "utf8util.h"
#include "utf8.h"
#ifdef WIN32
diff -rc libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp libtunepimp-0.5.3-new/plugins/mp3/id3_2_3_meta.cpp
*** libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp 2006-11-18 05:51:07.000000000 -0500
--- libtunepimp-0.5.3-new/plugins/mp3/id3_2_3_meta.cpp 2011-11-06 09:00:14.818684760 -0500
***************
*** 26,31 ****
--- 26,32 ----
----------------------------------------------------------------------------*/
#include <stdio.h>
+ #include <stdlib.h>
#include <assert.h>
#include <ctype.h>
#include <musicbrainz/mb_c.h>
diff -rc libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp libtunepimp-0.5.3-new/plugins/mp3/id3_meta.cpp
*** libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp 2006-11-18 05:51:07.000000000 -0500
--- libtunepimp-0.5.3-new/plugins/mp3/id3_meta.cpp 2011-11-06 09:00:14.818684760 -0500
***************
*** 26,31 ****
--- 26,32 ----
----------------------------------------------------------------------------*/
#include <stdio.h>
+ #include <stdlib.h>
#include <time.h>
#include <ctype.h>
#include <musicbrainz/mb_c.h>
diff -rc libtunepimp-0.5.3/plugins/mp4/mp4.cpp libtunepimp-0.5.3-new/plugins/mp4/mp4.cpp
*** libtunepimp-0.5.3/plugins/mp4/mp4.cpp 2006-11-18 05:51:08.000000000 -0500
--- libtunepimp-0.5.3-new/plugins/mp4/mp4.cpp 2011-11-06 09:00:14.819684766 -0500
***************
*** 27,33 ****
#include <string.h>
#include <stdio.h>
! #include <mp4.h>
#include "metadata.h"
#include "plugin.h"
#ifndef WIN32
--- 27,34 ----
#include <string.h>
#include <stdio.h>
! #include <stdlib.h>
! #include <mp4v2/mp4v2.h>
#include "metadata.h"
#include "plugin.h"
#ifndef WIN32
diff -rc libtunepimp-0.5.3/plugins/wma/wma.cpp libtunepimp-0.5.3-new/plugins/wma/wma.cpp
*** libtunepimp-0.5.3/plugins/wma/wma.cpp 2006-11-18 05:51:28.000000000 -0500
--- libtunepimp-0.5.3-new/plugins/wma/wma.cpp 2011-11-06 09:00:14.819684766 -0500
***************
*** 27,32 ****
--- 27,33 ----
#include <string.h>
#include <stdio.h>
+ #include <stdlib.h>
#include <wmafile.h>
#include "metadata.h"
#include "plugin.h"
diff -rc libtunepimp-0.5.3/plugins/wma/wmafile.cpp libtunepimp-0.5.3-new/plugins/wma/wmafile.cpp
*** libtunepimp-0.5.3/plugins/wma/wmafile.cpp 2006-11-18 05:51:28.000000000 -0500
--- libtunepimp-0.5.3-new/plugins/wma/wmafile.cpp 2011-11-06 09:00:14.819684766 -0500
***************
*** 19,24 ****
--- 19,25 ----
* USA *
***************************************************************************/
+ #include <string.h>
#include <tstring.h>
#include <wmafile.h>
#include <wmatag.h>

18
pkgs/development/libraries/p11-kit/default.nix Normal file
View File

@ -0,0 +1,18 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "p11-kit-0.7";
src = fetchurl {
url = "${meta.homepage}releases/${name}.tar.gz";
sha256 = "1vj86kc7ir1djlb5akrr3w4x4k7h34pq2l4abwgqmcwxbm4j0lln";
};
postInstall = "rm -frv $out/share/gtk-doc";
meta = {
homepage = http://p11-glue.freedesktop.org/;
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.urkud ];
};
}

21
pkgs/development/libraries/phonon/default.nix
View File

@ -1,21 +1,26 @@
{ stdenv, fetchurl, cmake, automoc4, qt4 }:
{ stdenv, fetchurl, cmake, automoc4, qt4, xz }:
let
v = "4.5.1";
in
stdenv.mkDerivation rec {
name = "phonon-4.5.0";
name = "phonon-${v}";
src = fetchurl {
url = "mirror://kde/stable/phonon/4.5.0/src/${name}.tar.bz2";
sha256 = "1p2jhxx3ij9xqxvzdz6fm14b83iag9sk940clgj5jnnw00x93s36";
url = "mirror://kde/stable/phonon/${v}/src/${name}.tar.xz";
sha256 = "1j7lw8w7h2z415vhbp2jlgv3mqwvrspf8xnzb8l0gsfanqfg1001";
};
buildInputs = [ cmake automoc4 qt4 ];
buildInputs = [ qt4 ];
buildNativeInputs = [ cmake automoc4 xz ];
cmakeFlags = "-DPHONON_MKSPECS_DIR=mkspecs";
preConfigure =
''
substituteInPlace CMakeLists.txt \
--replace 'PHONON_MKSPECS_DIR}' 'CMAKE_INSTALL_PREFIX}/mkspecs'
substituteInPlace designer/CMakeLists.txt \
--replace 'QT_PLUGINS_DIR}' 'CMAKE_INSTALL_PREFIX}/lib/qt4/plugins'
--replace '{QT_PLUGINS_DIR}' '{CMAKE_INSTALL_PREFIX}/lib/qt4/plugins'
'';
meta = {

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

@ -3,11 +3,11 @@
assert readline != null -> ncurses != null;
stdenv.mkDerivation {
name = "sqlite-3.7.7.1";
name = "sqlite-3.7.9";
src = fetchurl {
url = http://www.sqlite.org/sqlite-autoconf-3070701.tar.gz;
sha256 = "1pvf72gb6yidc4zjml3k6kwhlvvhbgmbm8hfin9y5jvvbyr3dk3x";
url = http://www.sqlite.org/sqlite-autoconf-3070900.tar.gz;
sha1 = "a9da98a4bde4d9dae5c29a969455d11a03600e11";
};
buildInputs = [ readline ncurses ];

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

@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig icu cluceneCore curl ];
# because curl/types.h disappeared since at least curl 7.21.7
patches = [ ./dont_include_curl_types_h.patch ];
prePatch = ''
patchShebangs .;
'';

24
pkgs/development/libraries/sword/dont_include_curl_types_h.patch Normal file
View File

@ -0,0 +1,24 @@
diff --git a/src/mgr/curlftpt.cpp b/src/mgr/curlftpt.cpp
index 7d2fd3c..046291e 100644
--- a/src/mgr/curlftpt.cpp
+++ b/src/mgr/curlftpt.cpp
@@ -26,7 +26,6 @@
#include <fcntl.h>
#include <curl/curl.h>
-#include <curl/types.h>
#include <curl/easy.h>
#include <swlog.h>
diff --git a/src/mgr/curlhttpt.cpp b/src/mgr/curlhttpt.cpp
index b736050..229d4dd 100644
--- a/src/mgr/curlhttpt.cpp
+++ b/src/mgr/curlhttpt.cpp
@@ -25,7 +25,6 @@
#include <cctype>
#include <curl/curl.h>
-#include <curl/types.h>
#include <curl/easy.h>
#include <swlog.h>

44
pkgs/development/libraries/ti-rpc/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
name = "libtirpc-0.1.8-1";
src = fetchurl {
url = "http://nfsv4.bullopensource.org/tarballs/tirpc/${name}.tar.bz2";
sha256 = "0jf0sj2cv1rm1dm1i226ww9h93srljf8zf0yfy9mvwxg8gqnn5fy";
};
preConfigure =
'' sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i "Makefile.in"
'';
preInstall = "ensureDir $out/etc";
doCheck = true;
meta = {
description = "The transport-independent Sun RPC implementation (TI-RPC)";
longDescription =
'' Currently, NFS commands use the SunRPC routines provided by the
glibc. These routines do not support IPv6 addresses. Ulrich
Drepper, who is the maintainer of the glibc, refuses any change in
the glibc concerning the RPC. He wants the RPC to become a separate
library. Other OS (NetBSD, FreeBSD, Solarix, HP-UX, AIX) have
migrated their SunRPC library to a TI-RPC (Transport Independent
RPC) implementation. This implementation allows the support of
other transports than UDP and TCP over IPv4. FreeBSD provides a
TI-RPC library ported from NetBSD with improvments. This library
already supports IPv6. So, the FreeBSD release 5.2.1 TI-RPC has
been ported to replace the SunRPC of the glibc.
'';
homepage = http://nfsv4.bullopensource.org/doc/tirpc_rpcbind.php;
# Free software license, see
# <http://www.gnu.org/licenses/license-list.html#SISSL>.
license = "Sun Industry Standards Source License 1.0";
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.ludo ];
};
}

4
pkgs/development/tools/haskell/hlint/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hlint";
version = "1.8.17";
sha256 = "0p2sd24zi4a9fynib03dll8jbcc7izbmknfxv80v9j3lb2p8qj5h";
version = "1.8.18";
sha256 = "1dn5ca8z6cvmz8nlyb87glk2sk2pma8pjrg8yamn4vr54zq1bf7a";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/tools/haskell/uuagc/cabal.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "uuagc-cabal";
version = "1.0.0.7";
sha256 = "1ciypx0rrisjbwx8fc9bzkkv975646951ibqpvbxipxzvv5npy9y";
version = "1.0.0.9";
sha256 = "1iifzy58w50162bwj20xmldsyq0xaq0g849zgwxai26881a1jlfg";
buildDepends = [ mtl uulib ];
meta = {
homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";

1
pkgs/development/tools/parsing/bison/bison-2.4.nix
View File

@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
};
buildNativeInputs = [m4];
propagatedBuildInputs = [m4];
doCheck = true;

9
pkgs/development/tools/parsing/flex/flex-2.5.35.nix
View File

@ -11,7 +11,14 @@ stdenv.mkDerivation {
sha256 = "0ysff249mwhq0053bw3hxh58djc0gy7vjan2z1krrf9n5d5vvv0b";
};
buildInputs = [yacc];
propagatedBuildInputs = [m4];
propagatedBuildNativeInputs = [m4];
crossAttrs = {
preConfigure = ''
export ac_cv_func_malloc_0_nonnull=yes
export ac_cv_func_realloc_0_nonnull=yes
'';
};
meta = {
description = "A fast lexical analyser generator";

8
pkgs/games/teeworlds/default.nix
View File

@ -1,11 +1,11 @@
{ fetchurl, stdenv, python, alsaLib, libX11, mesa, SDL, lua5, zlib, bam }:
stdenv.mkDerivation rec {
name = "teeworlds-0.6.0";
name = "teeworlds-0.6.1";
src = fetchurl {
url = "http://www.teeworlds.com/files/${name}-src.tar.gz";
sha256 = "7540ecf10624b7e4e530c44402dc2d162ff40a3fe10bf30e0bb542d3d0a6a721";
url = "http://www.teeworlds.com/files/${name}-source.tar.gz";
sha256 = "025rcz59mdqksja4akn888c8avj9j28rk86vw7w1licdp67x8a33";
};
# Note: Teeworlds requires Python 2.x to compile. Python 3.0 will
@ -62,5 +62,7 @@ EOF
homepage = http://teeworlds.com/;
license = "BSD-style, see `license.txt'";
maintainers = with stdenv.lib.maintainers; [ astsmtl ];
platforms = with stdenv.lib.platforms; linux;
};
}

51
pkgs/games/xonotic/default.nix Normal file
View File

@ -0,0 +1,51 @@
{ stdenv, fetchurl, unzip, SDL, libjpeg, zlib, libvorbis, curl }:
stdenv.mkDerivation rec {
name = "xonotic-0.5.0";
src = fetchurl {
url = "http://dl.xonotic.org/${name}.zip";
sha256 = "03vkbddffnz6ws3gkwc3qvi6icfsyiqq0dqw2vw5hj2kidm25rsq";
};
# Commented out things needed to build cl-release because of errors.
#buildInputs = [ libX11 libXpm libXext xf86dgaproto libXxf86dga libXxf86vm mesa ];
buildInputs = [ unzip SDL libjpeg ];
sourceRoot = "Xonotic/source/darkplaces";
#patchPhase = ''
# substituteInPlace glquake.h \
# --replace 'typedef char GLchar;' '/*typedef char GLchar;*/'
#'';
NIX_LDFLAGS="
-rpath ${zlib}/lib
-rpath ${libvorbis}/lib
-rpath ${curl}/lib
";
buildPhase = ''
DP_FS_BASEDIR="$out/share/xonotic"
#make DP_FS_BASEDIR=$DP_FS_BASEDIR cl-release
make DP_FS_BASEDIR=$DP_FS_BASEDIR sdl-release
make DP_FS_BASEDIR=$DP_FS_BASEDIR sv-release
'';
installPhase = ''
ensureDir "$out/bin"
cp darkplaces-dedicated "$out/bin/xonotic-dedicated"
cp darkplaces-sdl "$out/bin/xonotic-sdl"
cd ../..
ensureDir "$out/share/xonotic"
mv data "$out/share/xonotic"
'';
dontPatchELF = true;
meta = {
description = "A free fast-paced first-person shooter";
longDescription = ''
Xonotic is a free, fast-paced first-person shooter that works on
Windows, OS X and Linux. The project is geared towards providing
addictive arena shooter gameplay which is all spawned and driven
by the community itself. Xonotic is a direct successor of the
Nexuiz project with years of development between them, and it
aims to become the best possible open-source FPS of its kind.
'';
homepage = http://www.xonotic.org;
license = with stdenv.lib.licenses; gpl2Plus;
maintainers = with stdenv.lib.maintainers; [ astsmtl ];
platforms = with stdenv.lib.platforms; linux;
};
}

2
pkgs/lib/attrsets.nix
View File

@ -273,6 +273,6 @@ rec {
# override only the attributes that are already present in the old set
# useful for deep-overriding
overrideExisting = old: new:
old // listToAttrs (map (attr: nameValuePair attr (attrByPath [attr] (getAttr attr old) new)) (attrNames old));
old // listToAttrs (map (attr: nameValuePair attr (attrByPath [attr] (getAttr attr old) new)) (attrNames old));
}

2
pkgs/lib/maintainers.nix
View File

@ -27,7 +27,7 @@
simons = "Peter Simons <simons@cryp.to>";
thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
viric = "Lluís Batlle i Rossell <viriketo@gmail.com>";
viric = "Lluís Batlle i Rossell <viric@viric.name>";
winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
z77z = "Marco Maggesi <maggesi@math.unifi.it>";
}

12
pkgs/os-specific/linux/drbd/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, flex, udev }:
{ stdenv, fetchurl, flex, udev, perl }:
assert stdenv.isLinux;
@ -10,14 +10,20 @@ stdenv.mkDerivation rec {
sha256 = "096njwxjpwvnl259gxq6cr6n0r6ba0h5aryvgk05hqi95jx927vg";
};
buildInputs = [ flex ];
patches = [ ./pass-force.patch ];
configureFlags = "--without-distro --without-legacy_utils --without-pacemaker --localstatedir=/var --sysconfdir=/etc";
buildInputs = [ flex perl ];
configureFlags = "--without-distro --without-pacemaker --localstatedir=/var --sysconfdir=/etc";
preConfigure =
''
export PATH=${udev}/sbin:$PATH
substituteInPlace user/Makefile.in --replace /sbin/ $out/sbin/
substituteInPlace user/legacy/Makefile.in \
--replace /sbin/ $out/sbin/ \
--replace '$(DESTDIR)/lib/drbd' $out/lib/drbd
substituteInPlace user/drbdadm_usage_cnt.c --replace /lib/drbd $out/lib/drbd
substituteInPlace scripts/drbd.rules --replace /sbin/drbdadm $out/sbin/drbdadm
'';

15
pkgs/os-specific/linux/drbd/pass-force.patch Normal file
View File

@ -0,0 +1,15 @@
Propagate the --force flag in the legacy drbdadm to drbdsetup.
Otherwise "drbdadm primary --force" won't work as expected (the kernel
will say "State change failed: Need access to UpToDate data").
diff -ru -x '*~' drbd-8.4.0-orig/user/legacy/drbdadm_main.c drbd-8.4.0/user/legacy/drbdadm_main.c
--- drbd-8.4.0-orig/user/legacy/drbdadm_main.c 2011-07-07 06:55:39.000000000 -0400
+++ drbd-8.4.0/user/legacy/drbdadm_main.c 2011-11-02 14:51:04.000000000 -0400
@@ -1547,6 +1547,7 @@
for (i = 0; i < soi; i++) {
argv[NA(argc)] = setup_opts[i];
}
+ if (force) argv[NA(argc)] = "--force";
argv[NA(argc)] = 0;
setenv("DRBD_RESOURCE", res->name, 1);

3
pkgs/os-specific/linux/iproute/default.nix
View File

@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
+ " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}"
+ " MANDIR=$(out)/share/man";
buildInputs = [bison flex db4 iptables];
buildInputs = [db4 iptables];
buildNativeInputs = [bison flex db4];
meta = {
homepage =

1778
pkgs/os-specific/linux/kernel/efi-stub.patch
View File

File diff suppressed because it is too large Load Diff

9
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -415,13 +415,4 @@ rec {
name = "glibc-getline";
patch = ./getline.patch;
};
efi_stub =
{
# Patch to enable making the kernel a bootable efi image to avoid
# needing a bootloader on efi systems
# From the x86/efi-stub branch of git://github.com/mfleming/linux-2.6.git
name = "efi-stub";
patch = ./efi-stub.patch;
};
}

13
pkgs/os-specific/linux/pam/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, flex, cracklib, libxcrypt }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "linux-pam-1.1.1";
src = fetchurl {
@ -17,6 +17,17 @@ stdenv.mkDerivation {
crossAttrs = {
# Skip libxcrypt cross-building, as it fails for mips and armv5tel
propagatedBuildInputs = [ flex.hostDrv cracklib.hostDrv ];
preConfigure = preConfigure + ''
ar x ${flex.hostDrv}/lib/libfl.a
mv libyywrap.o libyywrap-target.o
ar x ${flex}/lib/libfl.a
mv libyywrap.o libyywrap-host.o
export LDFLAGS="$LDFLAGS $PWD/libyywrap-target.o"
sed -e 's/@CC@/gcc/' -i doc/specs/Makefile.in
'';
postConfigure = ''
sed -e "s@ $PWD/libyywrap-target.o@ $PWD/libyywrap-host.o@" -i doc/specs/Makefile
'';
};
postInstall = ''

39
pkgs/servers/mail/postfix/db-linux3.patch Normal file
View File

@ -0,0 +1,39 @@
diff --git a/makedefs b/makedefs
index b8b98c8..94443c0 100644
--- a/makedefs
+++ b/makedefs
@@ -341,20 +341,20 @@ EOF
esac
;;
Linux.3*) SYSTYPE=LINUX3
- if [ -f /usr/include/db.h ]
- then
- : we are all set
- elif [ -f /usr/include/db/db.h ]
- then
- CCARGS="$CCARGS -I/usr/include/db"
- else
- # On a properly installed system, Postfix builds
- # by including <db.h> and by linking with -ldb
- echo "No <db.h> include file found." 1>&2
- echo "Install the appropriate db*-devel package first." 1>&2
- echo "See the RELEASE_NOTES file for more information." 1>&2
- exit 1
- fi
+ #if [ -f /usr/include/db.h ]
+ #then
+ #: we are all set
+ #elif [ -f /usr/include/db/db.h ]
+ #then
+ #CCARGS="$CCARGS -I/usr/include/db"
+ #else
+ ## On a properly installed system, Postfix builds
+ ## by including <db.h> and by linking with -ldb
+ #echo "No <db.h> include file found." 1>&2
+ #echo "Install the appropriate db*-devel package first." 1>&2
+ #echo "See the RELEASE_NOTES file for more information." 1>&2
+ #exit 1
+ #fi
SYSLIBS="-ldb"
for name in nsl resolv
do

24
pkgs/servers/mail/postfix/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, db4, glibc, openssl, cyrus_sasl
, coreutils, findutils, gnused, gnugrep
, coreutils, findutils, gnused, gnugrep, bison, perl
}:
assert stdenv.isLinux;
stdenv.mkDerivation {
name = "postfix-2.2.11";
name = "postfix-2.8.6";
src = fetchurl {
url = ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/postfix-2.2.11.tar.gz;
sha256 = "04hxpyd3h1f48fnppjwqqxbil13bcwidzpfkra2pgm7h42d9blq7";
url = ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/postfix-2.8.6.tar.gz;
sha256 = "1rfsfhna5hy5lc6hkg1zc2862pdc5c1y9z6aiy8rinlmzrfplhlb";
};
installTargets = ["non-interactive-package"];
@ -26,8 +26,8 @@ stdenv.mkDerivation {
mkdir $out/share/postfix/conf
cp conf/* $out/share/postfix/conf
sed -e 's@PATH=.*@PATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:$out/sbin@' -i $out/share/postfix/conf/post-install
sed -e '2aPATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:$out/sbin' -i $out/share/postfix/conf/postfix-script
sed -e 's@PATH=.*@PATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin@' -i $out/share/postfix/conf/post-install $out/libexec/postfix/post-install
sed -e '2aPATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin' -i $out/share/postfix/conf/postfix-script $out/libexec/postfix/postfix-script
chmod a+x $out/share/postfix/conf/{postfix-script,post-install}
'';
@ -43,12 +43,18 @@ stdenv.mkDerivation {
export sample_directory=$out/share/postfix/doc/samples
export readme_directory=$out/share/postfix/doc
make makefiles CCARGS='-DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -DHAS_DB -I${cyrus_sasl}/include/sasl' AUXLIBS='-lssl -lcrypto -lsasl2 -ldb'
make makefiles CCARGS='-DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${cyrus_sasl}/include/sasl' AUXLIBS='-lssl -lcrypto -lsasl2 -ldb -lnsl'
'';
buildInputs = [db4 openssl cyrus_sasl];
buildInputs = [db4 openssl cyrus_sasl bison perl];
patches = [./postfix-2.2.9-db.patch ./postfix-2.2.9-lib.patch];
patches = [ ./postfix-2.2.9-db.patch ./postfix-2.2.9-lib.patch ./db-linux3.patch ];
postPatch = ''
sed -i -e s,/usr/bin,/var/run/current-system/sw/bin, \
-e s,/usr/sbin,/var/run/current-system/sw/sbin, \
-e s,:/sbin,, src/util/sys_defs.h
'';
inherit glibc;
}

26
pkgs/servers/pulseaudio/default.nix
View File

@ -1,16 +1,19 @@
{ stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi
, gconf, gtk, libX11, libICE, libSM, libXtst, libXi, intltool, gettext
, gconf, gtk, intltool, gettext
, alsaLib, libsamplerate, libsndfile, speex, bluez, udev
, jackaudioSupport ? false, jackaudio ? null }:
, jackaudioSupport ? false, jackaudio ? null
, x11Support ? false, xlibs
, xz, json_c
}:
assert jackaudioSupport -> jackaudio != null;
stdenv.mkDerivation rec {
name = "pulseaudio-0.9.23";
name = "pulseaudio-1.1";
src = fetchurl {
url = "http://freedesktop.org/software/pulseaudio/releases/${name}.tar.gz";
sha256 = "0kms3w1i48j9368amr8wv83gk4szrnglh1biyp8jyqyb2k388gmg";
url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-1.1.tar.xz";
sha256 = "1vpm0681zj2jvhbabvnmrmfxr3172k4x58kjb39y5g3fdw9k3rbg";
};
# Since `libpulse*.la' contain `-lgdbm', it must be propagated.
@ -19,9 +22,11 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig gnum4 libtool intltool glib dbus avahi
libsamplerate libsndfile speex alsaLib bluez udev
#gtk gconf libX11 libICE libSM libXtst libXi
xz json_c
#gtk gconf
]
++ stdenv.lib.optional jackaudioSupport jackaudio;
++ stdenv.lib.optional jackaudioSupport jackaudio
++ stdenv.lib.optional x11Support xlibs.xlibs;
preConfigure = ''
# Change the `padsp' script so that it contains the full path to
@ -32,6 +37,11 @@ stdenv.mkDerivation rec {
# Move the udev rules under $(prefix).
sed -i "src/Makefile.in" \
-e "s|udevrulesdir[[:blank:]]*=.*$|udevrulesdir = $out/lib/udev/rules.d|g"
# don't install proximity-helper as root and setuid
sed -i "src/Makefile.in" \
-e "s|chown root|true |" \
-e "s|chmod r+s |true |"
'';
configureFlags = ''
@ -41,7 +51,7 @@ stdenv.mkDerivation rec {
${if jackaudioSupport then "--enable-jack" else ""}
'';
installFlags = "sysconfdir=$(out)/etc";
installFlags = "pulseconfdir=$(out)/etc dbuspolicydir=$out/etc/dbus-1/system.d xdgautostartdir=$out/etc/xdg/autostart";
enableParallelBuilding = true;

8
pkgs/tools/misc/grub/1.9x.nix
View File

@ -77,7 +77,11 @@ stdenv.mkDerivation rec {
license = "GPLv3+";
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.gnu;
maintainers = with stdenv.lib.maintainers; [ ludo shlevy ];
platforms = if EFIsupport then
[ "i686-linux" "x86_64-linux" ]
else
stdenv.lib.platforms.gnu;
};
}

156
pkgs/tools/networking/curl/connect-timeout.patch
View File

@ -1,156 +0,0 @@
diff -rc curl-7.19.3-orig/lib/connect.c curl-7.19.3/lib/connect.c
*** curl-7.19.3-orig/lib/connect.c 2009-01-02 23:30:50.000000000 +0100
--- curl-7.19.3/lib/connect.c 2009-01-21 15:04:08.000000000 +0100
***************
*** 115,121 ****
singleipconnect(struct connectdata *conn,
const Curl_addrinfo *ai, /* start connecting to this */
long timeout_ms,
! bool *connected);
/*
* Curl_timeleft() returns the amount of milliseconds left allowed for the
--- 115,122 ----
singleipconnect(struct connectdata *conn,
const Curl_addrinfo *ai, /* start connecting to this */
long timeout_ms,
! bool *connected,
! bool *timed_out);
/*
* Curl_timeleft() returns the amount of milliseconds left allowed for the
***************
*** 541,546 ****
--- 542,548 ----
{
curl_socket_t sockfd;
Curl_addrinfo *ai;
+ bool timed_out;
/* first close the failed socket */
sclose(conn->sock[sockindex]);
***************
*** 554,560 ****
ai = conn->ip_addr->ai_next;
while(ai) {
! sockfd = singleipconnect(conn, ai, 0L, connected);
if(sockfd != CURL_SOCKET_BAD) {
/* store the new socket descriptor */
conn->sock[sockindex] = sockfd;
--- 556,562 ----
ai = conn->ip_addr->ai_next;
while(ai) {
! sockfd = singleipconnect(conn, ai, 0L, connected, &timed_out);
if(sockfd != CURL_SOCKET_BAD) {
/* store the new socket descriptor */
conn->sock[sockindex] = sockfd;
***************
*** 714,720 ****
singleipconnect(struct connectdata *conn,
const Curl_addrinfo *ai,
long timeout_ms,
! bool *connected)
{
struct Curl_sockaddr_ex addr;
char addr_buf[128];
--- 716,723 ----
singleipconnect(struct connectdata *conn,
const Curl_addrinfo *ai,
long timeout_ms,
! bool *connected,
! bool *timed_out)
{
struct Curl_sockaddr_ex addr;
char addr_buf[128];
***************
*** 730,735 ****
--- 733,740 ----
struct sockaddr_in6 * const sa6 = (void *)&addr.sa_addr;
#endif
+ *timed_out = FALSE;
+
/*
* The Curl_sockaddr_ex structure is basically libcurl's external API
* curl_sockaddr structure with enough space available to directly hold
***************
*** 880,887 ****
infof(data, "connected\n");
return sockfd;
}
! else if(WAITCONN_TIMEOUT == rc)
infof(data, "Timeout\n");
else {
data->state.os_errno = error;
infof(data, "%s\n", Curl_strerror(conn, error));
--- 885,894 ----
infof(data, "connected\n");
return sockfd;
}
! else if(WAITCONN_TIMEOUT == rc) {
! *timed_out = TRUE;
infof(data, "Timeout\n");
+ }
else {
data->state.os_errno = error;
infof(data, "%s\n", Curl_strerror(conn, error));
***************
*** 911,918 ****
int num_addr;
Curl_addrinfo *ai;
Curl_addrinfo *curr_addr;
- struct timeval after;
struct timeval before = Curl_tvnow();
/*************************************************************
--- 918,925 ----
int num_addr;
Curl_addrinfo *ai;
Curl_addrinfo *curr_addr;
+ bool timed_out;
struct timeval before = Curl_tvnow();
/*************************************************************
***************
*** 955,973 ****
curr_addr = curr_addr->ai_next, aliasindex++) {
/* start connecting to the IP curr_addr points to */
! sockfd = singleipconnect(conn, curr_addr, timeout_per_addr, connected);
if(sockfd != CURL_SOCKET_BAD)
break;
! /* get a new timeout for next attempt */
! after = Curl_tvnow();
! timeout_ms -= Curl_tvdiff(after, before);
! if(timeout_ms < 0) {
failf(data, "connect() timed out!");
return CURLE_OPERATION_TIMEDOUT;
}
- before = after;
} /* end of connect-to-each-address loop */
*sockconn = sockfd; /* the socket descriptor we've connected */
--- 962,978 ----
curr_addr = curr_addr->ai_next, aliasindex++) {
/* start connecting to the IP curr_addr points to */
! sockfd = singleipconnect(conn, curr_addr, timeout_per_addr, connected, &timed_out);
if(sockfd != CURL_SOCKET_BAD)
break;
! /* if this is the last address and it timed out, propagate the
! timeout to the caller */
! if(!curr_addr->ai_next && timed_out) {
failf(data, "connect() timed out!");
return CURLE_OPERATION_TIMEDOUT;
}
} /* end of connect-to-each-address loop */
*sockconn = sockfd; /* the socket descriptor we've connected */

15
pkgs/tools/networking/curl/default.nix
View File

@ -10,11 +10,11 @@ assert sslSupport -> openssl != null;
assert scpSupport -> libssh2 != null;
stdenv.mkDerivation rec {
name = "curl-7.21.0";
name = "curl-7.22.0";
src = fetchurl {
url = "http://curl.haxx.se/download/${name}.tar.bz2";
sha256 = "1fl7sh38i746b57aqjqjaykwq4rhm2p1phzrgnc2h6wm2k2b95gy";
sha256 = "04ji7v06f33y6plvikwj283ad6fxxxjpm7as9xw25c924f3dm85x";
};
# Zlib and OpenSSL must be propagated because `libcurl.la' contains
@ -59,17 +59,6 @@ stdenv.mkDerivation rec {
substituteInPlace configure --replace /usr/bin /no-such-path
'';
patches = [
/* Fixes broken retry support when a timeout is used. The
select() system call (used to wait for the connection to come
up) can return slightly before the computed deadline (a few
milliseconds). Curl will think the problem is something else,
proceed with the next IP address (which usually doesn't exist),
then barf with a CURLE_COULDNT_CONNECT error, which is
considered non-transient so it won't retry. */
./connect-timeout.patch
];
meta = {
description = "A command line tool for transferring files with URL syntax";
homepage = http://curl.haxx.se/;

22
pkgs/tools/networking/dnstop/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ stdenv, fetchurl, libpcap, ncurses }:
stdenv.mkDerivation {
name = "dnstop-20110502";
src = fetchurl {
url = http://dns.measurement-factory.com/tools/dnstop/src/dnstop-20110502.tar.gz;
sha256 = "0ra3xjf7dwvq5xm6qbqd2al35vigibihy46rsz1860qrn3wycy12";
};
buildInputs = [ libpcap ncurses ];
preInstall = ''
ensureDir $out/share/man/man8 $out/bin
'';
meta = {
description = "libpcap application that displays DNS traffic on your network";
homepage = "http://dns.measurement-factory.com/tools/dnstop";
license = "BSD";
};
}

4
pkgs/tools/networking/ntp/default.nix
View File

@ -3,11 +3,11 @@
assert stdenv.isLinux -> libcap != null;
stdenv.mkDerivation rec {
name = "ntp-4.2.6p2";
name = "ntp-4.2.6p4";
src = fetchurl {
url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz";
sha256 = "1n79scfvgjk8hn1fr4q2kkk6xm83k68r4p488ai09nm20dwqp2a2";
sha256 = "1ww1hpy0yfmj13vs46d80hs48hy8ig6kn6p6d8q2syym02khxhyy";
};
configureFlags = ''

21
pkgs/top-level/all-packages.nix
View File

@ -571,6 +571,8 @@ let
# TODO i18n can be installed as well, implement it?
};
dnstop = callPackage ../tools/networking/dnstop { };
dhcp = callPackage ../tools/networking/dhcp { };
dhcpcd = callPackage ../tools/networking/dhcpcd { };
@ -787,7 +789,7 @@ let
grub2 = grub19x;
# grub2_efi = callPackage ../tools/misc/grub/1.9x.nix { EFIsupport = true; };
grub2_efi = callPackage ../tools/misc/grub/1.9x.nix { EFIsupport = true; };
gssdp = callPackage ../development/libraries/gssdp {
inherit (gnome) libsoup;
@ -799,6 +801,8 @@ let
gtkvnc = callPackage ../tools/admin/gtk-vnc {};
gtmess = callPackage ../applications/networking/instant-messengers/gtmess { };
gupnp = callPackage ../development/libraries/gupnp {
inherit (gnome) libsoup;
};
@ -909,7 +913,7 @@ let
lftp = callPackage ../tools/networking/lftp { };
libtirpc = callPackage ../development/libraries/libtirpc { };
libtirpc = callPackage ../development/libraries/ti-rpc { };
libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
@ -3189,6 +3193,8 @@ let
cminpack = callPackage ../development/libraries/cminpack { };
cogl = callPackage ../development/libraries/cogl { };
coin3d = callPackage ../development/libraries/coin3d { };
commoncpp2 = callPackage ../development/libraries/commoncpp2 { };
@ -3579,7 +3585,7 @@ let
gtkLibs = pkgs.gtkLibs224;
inherit (pkgs.gtkLibs) glib gtk pango cairo;
inherit (pkgs.gtkLibs) glib gtk pango cairo gdk_pixbuf;
gtkLibs1x = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs1x; in {
@ -3745,6 +3751,8 @@ let
json_glib = callPackage ../development/libraries/json-glib { };
json_c = callPackage ../development/libraries/json-c { };
libjson = callPackage ../development/libraries/libjson { };
judy = callPackage ../development/libraries/judy { };
@ -4338,6 +4346,8 @@ let
ortp = callPackage ../development/libraries/ortp { };
p11_kit = callPackage ../development/libraries/p11-kit { };
pangoxsl = callPackage ../development/libraries/pangoxsl {
inherit (gtkLibs) glib pango;
};
@ -5631,7 +5641,6 @@ let
kernelPatches =
[ #kernelPatches.fbcondecor_2_6_38
kernelPatches.sec_perm_2_6_24
kernelPatches.efi_stub
#kernelPatches.aufs2_1_2_6_38
#kernelPatches.mips_restart_2_6_36
];
@ -7298,7 +7307,7 @@ let
scribus = callPackage ../applications/office/scribus {
inherit (gnome) libart_lgpl;
qt = qt3;
qt = qt4;
};
seeks = callPackage ../tools/networking/p2p/seeks { };
@ -7926,6 +7935,8 @@ let
# TODO: the corresponding nix file is missing
# xracer = callPackage ../games/xracer { };
xonotic = callPackage ../games/xonotic { };
xsokoban = builderDefsPackage (import ../games/xsokoban) {
inherit (xlibs) libX11 xproto libXpm libXt;
};

8
pkgs/top-level/haskell-packages.nix
View File

@ -143,7 +143,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok
HTTP = self.HTTP_4000_1_2; # 7.2 ok, 7.3 ok
deepseq = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok
text = self.text_0_11_1_7; # 7.2 ok, 7.3 ok
text = self.text_0_11_1_9; # 7.2 ok, 7.3 ok
transformers = self.transformers_0_2_2_0; # 7.2 ok, 7.3 ok
mtl = self.mtl_2_0_1_0; # 7.2 ok, 7.3 ok
random = self.random_1_0_0_3; # 7.2 ok, 7.3 ok
@ -193,7 +193,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
self : self.haskellPlatformArgs_2011_2_0_1 self // {
haskellPlatform = self.haskellPlatform_2011_2_0_1;
mtl1 = self.mtl_1_1_1_1;
text = self.text_0_11_1_7;
text = self.text_0_11_1_9;
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
};
@ -1185,8 +1185,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {};
text_0_11_0_6 = callPackage ../development/libraries/haskell/text/0.11.0.6.nix {};
text_0_11_1_7 = callPackage ../development/libraries/haskell/text/0.11.1.7.nix {};
text = self.text_0_11_1_7;
text_0_11_1_9 = callPackage ../development/libraries/haskell/text/0.11.1.9.nix {};
text = self.text_0_11_1_9;
thespian = callPackage ../development/libraries/haskell/thespian {};