alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge remote-tracking branch 'origin/master' into x-updates

Browse source
This commit is contained in:
Eelco Dolstra 2012-10-08 13:48:30 -04:00
parent c1719a5835 25b702d2d6
commit 41e9f7cfed
81 changed files with 611 additions and 589 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/applications/audio/calf/default.nix
View file

@ -1,22 +1,25 @@
{ stdenv, fetchurl, cairo, expat, glib, gtk, jackaudio, ladspaH
, libglade, lv2, pkgconfig }:
{ stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib
, gtk, jackaudio, ladspaH , libglade, lv2, pkgconfig }:
stdenv.mkDerivation rec {
name = "calf-${version}";
version = "0.0.18.6";
version = "0.0.19-rc7";
src = fetchurl {
url = "mirror://sourceforge/calf/${name}.tar.gz";
sha256 = "03w6jjkrr6w8da6qzd0x4dlkg295c6jxby500x4cj07wpbpk6irh";
sha256 = "0515pzc7ishrq0j5hza83s0yp3x34r977h776lpky389whcyf45j";
};
buildInputs =
[ cairo jackaudio gtk glib expat libglade ladspaH lv2 pkgconfig ];
buildInputs = [
cairo expat fftwSinglePrec fluidsynth glib gtk jackaudio ladspaH
libglade lv2 pkgconfig
];
meta = with stdenv.lib; {
homepage = http://calf.sourceforge.net;
description = "A set of high quality open source audio plugins for musicians";
license = licenses.lgpl2;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
};
}

58
pkgs/applications/audio/distrho/default.nix Normal file
View file

@ -0,0 +1,58 @@
{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, jackaudio
, libxslt, lv2, pkgconfig, premake, xlibs }:
let
rev = "7815b3545978e";
in
stdenv.mkDerivation rec {
name = "distrho-${rev}";
src = fetchgit {
url = "git://distrho.git.sf.net/gitroot/distrho/distrho";
inherit rev;
sha256 = "2e260f16ee67b1166c39e2d55c8dd5593902c8b3d8d86485545ef83139e1e844";
};
patchPhase = ''
sed -e "s#xsltproc#${libxslt}/bin/xsltproc#" -i Makefile
sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile
'';
buildInputs = [
alsaLib fftwSinglePrec freetype jackaudio pkgconfig premake
xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext
xlibs.libXinerama xlibs.libXrender
];
buildPhase = ''
sh ./scripts/premake-update.sh linux
make standalone
make lv2
# generate lv2 ttl
sh scripts/generate-ttl.sh
'';
installPhase = ''
mkdir -p $out/bin
cp bin/standalone/* $out/bin/
mkdir -p $out/lib/lv2
cp -a bin/lv2/* $out/lib/lv2/
'';
meta = with stdenv.lib; {
homepage = http://distrho.sourceforge.net;
description = "A collection of cross-platform audio effects and plugins";
longDescription = ''
Includes:
3BandEQ bitmangler drowaudio-distortion drowaudio-flanger
drowaudio-tremolo eqinox HybridReverb2 juce_pitcher sDelay
TAL-Filter TAL-NoiseMaker TAL-Reverb-2 TAL-Vocoder-2 ThePilgrim
Wolpertinger argotlunar capsaicin drowaudio-distortionshaper
drowaudio-reverb drumsynth highlife JuceDemoPlugin PingPongPan
TAL-Dub-3 TAL-Filter-2 TAL-Reverb TAL-Reverb-3 TheFunction vex
'';
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
};
}

36
pkgs/applications/networking/browsers/chromium/default.nix
View file

@ -5,6 +5,7 @@
, libevent, expat, libjpeg
, libpng, libxml2, libxslt
, xdg_utils, yasm, zlib
, libusb1, libexif
, python, perl, pkgconfig
, nspr, udev, krb5
@ -55,21 +56,23 @@ let
use_system_flac = true;
use_system_libevent = true;
use_system_libexpat = true;
use_system_libexif = true;
use_system_libjpeg = true;
use_system_libpng = true;
use_system_libusb = true;
use_system_libxml = true;
use_system_speex = true;
use_system_ssl = cfg.openssl;
use_system_stlport = true;
use_system_xdg_utils = true;
use_system_yasm = true;
use_system_zlib = true;
use_system_zlib = false; # http://crbug.com/143623
use_system_harfbuzz = false;
use_system_icu = false;
use_system_libwebp = false; # See chromium issue #133161
use_system_libwebp = false; # http://crbug.com/133161
use_system_skia = false;
use_system_sqlite = false; # See chromium issue #22208
use_system_sqlite = false; # http://crbug.com/22208
use_system_v8 = false;
};
@ -78,23 +81,20 @@ let
libevent expat libjpeg
libpng libxml2 libxslt
xdg_utils yasm zlib
libusb1 libexif
];
seccompPatch = let
pre22 = versionOlder sourceInfo.version "22.0.0.0";
in if pre22 then ./enable_seccomp.patch else ./enable_seccomp22.patch;
maybeSeccompPatch = let
pre23 = versionOlder sourceInfo.version "23.0.0.0";
in optional pre23 ./enable_seccomp.patch;
# XXX: this reverts r151720 to prevent http://crbug.com/143623
maybeRevertZlibChanges = let
below22_91 = versionOlder sourceInfo.version "22.0.1229.91";
maybeBpfTemporaryFix = let
patch = fetchurl {
name = "revert-r151720";
url = "http://git.chromium.org/gitweb/?p=chromium.git;a=commitdiff_plain;"
+ "hp=4419ec6414b33b6b19bb2e380b4998ed5193ecab;"
+ "h=0fabb4fda7059a8757422e8a44e70deeab28e698";
sha256 = "0n0d6mkg89g8q63cifapzpg9dxfs2n6xvk4k13szhymvf67b77pf";
url = "https://chromiumcodereview.appspot.com/download/issue11032056_1_2.diff";
sha256 = "eb13dc627940ad56939837ad1093b2c388f6cf79f1f25cdc1b2e25e987c73d1c";
};
in optional (below22_91) patch;
needPatch = !versionOlder sourceInfo.version "23.0.1271.0";
in optional needPatch patch;
in stdenv.mkDerivation rec {
name = "${packageName}-${version}";
@ -127,10 +127,10 @@ in stdenv.mkDerivation rec {
prePatch = "patchShebangs .";
patches = optional (!cfg.selinux) seccompPatch
++ optional cfg.cups ./cups_allow_deprecated.patch
patches = optional cfg.cups ./cups_allow_deprecated.patch
++ optional cfg.pulseaudio ./pulseaudio_array_bounds.patch
++ maybeRevertZlibChanges;
++ maybeSeccompPatch
++ maybeBpfTemporaryFix;
postPatch = optionalString cfg.openssl ''
cat $opensslPatches | patch -p1 -d third_party/openssl/openssl

22
pkgs/applications/networking/browsers/chromium/enable_seccomp.patch
View file

@ -1,12 +1,12 @@
diff --git a/content/common/seccomp_sandbox.h b/content/common/seccomp_sandbox.h
index a07d6f3..a622a35 100644
--- a/content/common/seccomp_sandbox.h
+++ b/content/common/seccomp_sandbox.h
@@ -29,15 +29,9 @@ static bool SeccompSandboxEnabled() {
// TODO(evan): turn on for release too once we've flushed out all the bugs,
// allowing us to delete this file entirely and just rely on the "disabled"
// switch.
-#ifdef NDEBUG
diff --git a/content/common/sandbox_linux.cc b/content/common/sandbox_linux.cc
index d4618e5..108f846 100644
--- a/content/common/sandbox_linux.cc
+++ b/content/common/sandbox_linux.cc
@@ -38,15 +38,9 @@ void LogSandboxStarted(const std::string& sandbox_name) {
// Implement the command line enabling logic for seccomp-legacy.
bool IsSeccompLegacyDesired() {
#if defined(SECCOMP_SANDBOX)
-#if defined(NDEBUG)
- // Off by default; allow turning on with a switch.
- return CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableSeccompSandbox);
@ -15,6 +15,6 @@ index a07d6f3..a622a35 100644
return !CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableSeccompSandbox);
-#endif // NDEBUG
}
#endif // SECCOMP_SANDBOX
return false;
}

20
pkgs/applications/networking/browsers/chromium/enable_seccomp22.patch
View file

@ -1,20 +0,0 @@
diff --git a/content/common/sandbox_linux.cc b/content/common/sandbox_linux.cc
index d4618e5..108f846 100644
--- a/content/common/sandbox_linux.cc
+++ b/content/common/sandbox_linux.cc
@@ -38,15 +38,9 @@ void LogSandboxStarted(const std::string& sandbox_name) {
// Implement the command line enabling logic for seccomp-legacy.
bool IsSeccompLegacyDesired() {
#if defined(SECCOMP_SANDBOX)
-#if defined(NDEBUG)
- // Off by default; allow turning on with a switch.
- return CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableSeccompSandbox);
-#else
// On by default; allow turning off with a switch.
return !CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableSeccompSandbox);
-#endif // NDEBUG
#endif // SECCOMP_SANDBOX
return false;
}

12
pkgs/applications/networking/browsers/chromium/sources.nix
View file

@ -1,14 +1,14 @@
# This file is autogenerated from update.sh in the same directory.
{
dev = {
version = "23.0.1271.10";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.10.tar.bz2";
sha256 = "1jm9fhnq978lfn21xripf7l2n362axinggnxlz7rcc9as1y086y3";
version = "24.0.1284.2";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1284.2.tar.bz2";
sha256 = "0lp3r4n3d71wy2ndzcfwvrp9vc1ii98pxip1c8hfinz994ca1ykx";
};
beta = {
version = "22.0.1229.91";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.91.tar.bz2";
sha256 = "1b47rb5hw0k2fwc4jvmjpmxbhmqxgkz66j3mrjy4f8im41hmndyw";
version = "23.0.1271.17";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.17.tar.bz2";
sha256 = "1nyc2s378sx7ymmginipiphygg7s59iwg2kirlbgz60fl8wygzv2";
};
stable = {
version = "22.0.1229.79";

10
pkgs/applications/networking/browsers/opera/default.nix
View file

@ -13,18 +13,18 @@ let
in
stdenv.mkDerivation rec {
name = "opera-12.00-1467";
name = "opera-12.02-1578";
src =
if stdenv.system == "i686-linux" then
fetchurl {
url = "${mirror}/linux/1200/${name}.i386.linux.tar.xz";
sha256 = "d5683f5a4cf0cfd9ce715359b77909c7923c85bcec98513907c1844285356fdc";
url = "${mirror}/linux/1202/${name}.i386.linux.tar.xz";
sha256 = "60ccef14673818a8690fe3b76f861d180e2d8d3b87513b1652e6117c6dff3e86";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "${mirror}/linux/1200/${name}.x86_64.linux.tar.xz";
sha256 = "7c3dbe122b1fd20123f1b48a420dea080cc24ede4183d47d66b383c2b7ca5051";
url = "${mirror}/linux/1202/${name}.x86_64.linux.tar.xz";
sha256 = "e861f14b984898b5a2c0d04915e515a5677152dc302b614a3ac1bb13da7a9b81";
}
else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";

4
pkgs/development/compilers/edk2/default.nix
View file

@ -14,8 +14,8 @@ edk2 = stdenv.mkDerivation {
src = fetchsvn {
url = https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2;
rev = "13094";
sha256 = "1qfpal0y4sas204ydg3pg3634dm25q1vr94mpgmbdh6yqcviah3h";
rev = "13783";
sha256 = "18sx0nwcnghij7737xdnmgwk5vm0ax4p0v3ybggqqs8cdhzfghil";
};
buildInputs = [ libuuid pythonFull ];

166
pkgs/development/compilers/haxe/default.nix
View file

@ -1,141 +1,37 @@
args: with args;
{ stdenv, fetchsvn, ocaml, zlib, neko }:
let
stdenv.mkDerivation {
name = "haxe-2.10";
src_haxe_swflib = {
# REGION AUTO UPDATE: { name = "haxe_swflib"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/swflib"; groups = "haxe_group"; }
src = sourceFromHead "haxe_swflib-F_10-43-46.tar.gz"
(fetchurl { url = "http://mawercer.de/~nix/repos/haxe_swflib-F_10-43-46.tar.gz"; sha256 = "a63de75e48bf500ef0e8ef715d178d32f0ef113ded8c21bbca698a8cc70e7b58"; });
# END
}.src;
buildInputs = [ocaml zlib neko];
src_haxe_extc = {
# REGION AUTO UPDATE: { name = "haxe_extc"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/extc"; groups = "haxe_group"; }
src = sourceFromHead "haxe_extc-F_10-43-47.tar.gz"
(fetchurl { url = "http://mawercer.de/~nix/repos/haxe_extc-F_10-43-47.tar.gz"; sha256 = "d0a9980527d62ac6cfe27925ddb0964d334ec382f813fdfb8bd6c59fbbede730"; });
# END
}.src;
src_haxe_extlib_dev = {
# REGION AUTO UPDATE: { name = "haxe_extlib_dev"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/extlib-dev"; groups = "haxe_group"; }
src = sourceFromHead "haxe_extlib_dev-F_10-43-48.tar.gz"
(fetchurl { url = "http://mawercer.de/~nix/repos/haxe_extlib_dev-F_10-43-48.tar.gz"; sha256 = "6b9037230e2615dd5e22f4e7f4165c84f2816bc526957683afc945394fcdf67e"; });
# END
}.src;
src_haxe_xml_light = {
# REGION AUTO UPDATE: { name = "haxe_xml_light"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/xml-light"; groups = "haxe_group"; }
src = sourceFromHead "haxe_xml_light-F_10-43-48.tar.gz"
(fetchurl { url = "http://mawercer.de/~nix/repos/haxe_xml_light-F_10-43-48.tar.gz"; sha256 = "be29d9e22ad0dbcb3d447cbbc14907aff5f89bb562b8db369659d299f3a5b44f"; });
# END
}.src;
src_haxe_neko_include = {
# REGION AUTO UPDATE: { name = "haxe_neko_include"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "neko/libs/include/ocaml"; groups = "haxe_group"; }
src = sourceFromHead "haxe_neko_include-F_10-43-49.tar.gz"
(fetchurl { url = "http://mawercer.de/~nix/repos/haxe_neko_include-F_10-43-49.tar.gz"; sha256 = "e49efc1b348fa6e0f6fb40079a2d380b947d9ebda31843bc293f3cc77f8453db"; });
# END
}.src;
src_haxe = {
# REGION AUTO UPDATE: { name="haxe-read-only"; type="svn"; url="http://haxe.googlecode.com/svn/trunk"; groups = "haxe_group"; }
src = sourceFromHead "haxe-read-only-3220.tar.gz"
(fetchurl { url = "http://mawercer.de/~nix/repos/haxe-read-only-3220.tar.gz"; sha256 = "2b6702dca95d0829e539cea07b8224e3848e584a425ce8f8e0984a7a2bf7b1f8"; });
# END
}.src;
# the HaXe compiler
haxe = stdenv.mkDerivation {
name = "haxe-cvs";
buildInputs = [ocaml zlib makeWrapper];
src = src_haxe;
inherit zlib;
buildPhase = ''
set -x
mkdir -p ocaml/{swflib,extc,extlib-dev,xml-light} neko/libs
# strange setup. install.ml seems to co the same repo again into haxe directory!
mkdir haxe
tar xfz $src --strip-components=1 -C haxe
t(){ tar xfz $1 -C $2 --strip-components=2; }
t ${src_haxe_swflib} ocaml/swflib
t ${src_haxe_extc} ocaml/extc
t ${src_haxe_extlib_dev} ocaml/extlib-dev
t ${src_haxe_xml_light} ocaml/xml-light
t ${src_haxe_neko_include} neko/libs
sed -e '/download();/d' \
-e "s@/usr/lib/@''${zlib}/lib/@g" \
doc/install.ml > install.ml
ocaml install.ml
'';
# probably rpath should be set properly
installPhase = ''
mkdir -p $out/lib/haxe
cp -r bin $out/bin
wrapProgram "$out/bin/haxe" \
--set "LD_LIBRARY_PATH" $zlib/lib \
--set HAXE_LIBRARY_PATH "''${HAXE_LIBRARY_PATH}''${HAXE_LIBRARY_PATH:-:}:$out/lib/haxe/std:."
cp -r std $out/lib/haxe/
'';
meta = {
description = "programming language targeting JavaScript, Flash, NekVM, PHP, C++";
homepage = http://haxe.org;
license = ["GPLv2" "BSD2" /*?*/ ]; # -> docs/license.txt
maintainers = [args.lib.maintainers.marcweber];
platforms = args.lib.platforms.linux;
};
};
# build a tool found in std/tools/${name} source directory
# the .hxml files contain a recipe to cerate a binary.
tool = { name, description }: stdenv.mkDerivation {
inherit name;
src = src_haxe;
buildPhase = ''
cd std/tools/${name};
haxe *.hxml
mkdir -p $out/bin
mv ${name} $out/bin/
'';
buildInputs = [haxe neko];
dontStrip=1;
installPhase=":";
meta = {
inherit description;
homepage = http://haxe.org;
# license = "?"; TODO
maintainers = [args.lib.maintainers.marcweber];
platforms = args.lib.platforms.linux;
};
};
in
{
inherit haxe;
haxelib = tool {
name = "haxelib";
description = "haxelib is a HaXe library management tool similar to easyinstall or ruby gems";
src = fetchsvn {
url = "http://haxe.googlecode.com/svn/tags/v2-10";
sha256 = "dbd3c655e4136eb68a165ef83b96bfc1f0f2eb9ec8729603b19bcd717a61a679";
};
prePatch = ''
sed -i -e 's|com.class_path <- \[|&"'"$out/lib/haxe/std/"'";|' main.ml
'';
postBuild = ''
find std/tools -name '*.n' -delete
rm std/tools/haxedoc/haxedoc std/tools/haxelib/haxelib
'';
installPhase = ''
install -vd "$out/bin" "$out/lib/haxe/std"
install -vt "$out/bin" haxe haxelib haxedoc
cp -vr std "$out/lib/haxe"
'';
dontStrip = true;
meta = {
description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++";
homepage = http://haxe.org;
license = ["GPLv2" "BSD2" /*?*/ ]; # -> docs/license.txt
maintainers = [stdenv.lib.maintainers.marcweber];
platforms = stdenv.lib.platforms.linux;
};
}

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "idris";
version = "0.9.3.1";
sha256 = "1dqb7gd5jn5f062hfwrirrfxv6ac1f6khkfax912j01mg147hv9a";
version = "0.9.4.1";
sha256 = "1f1jrgnclr0443rbhfcnm0vvbb2jcliskqm6vq1c0xgywab7bjhx";
isLibrary = false;
isExecutable = true;
buildDepends = [

27
pkgs/development/compilers/llvm/3.1.nix
View file

@ -1,27 +0,0 @@
{ stdenv, fetchurl, perl, groff, cmake, python }:
let version = "3.1"; in
stdenv.mkDerivation {
name = "llvm-${version}";
src = fetchurl {
url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz";
sha256 = "1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab";
};
buildInputs = [ perl groff cmake python ];
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
enableParallelBuilding = true;
meta = {
homepage = http://llvm.org/;
description = "Collection of modular and reusable compiler and toolchain technologies";
license = "BSD";
maintainers = with stdenv.lib.maintainers; [viric shlevy raskin];
platforms = with stdenv.lib.platforms; all;
};
}

54
pkgs/development/compilers/llvm/clang-include-paths.patch
View file

@ -1,49 +1,21 @@
diff -Naur clang-3.0.src-orig/lib/Driver/ToolChains.cpp clang-3.0.src/lib/Driver/ToolChains.cpp
--- clang-3.0.src-orig/lib/Driver/ToolChains.cpp 2011-11-17 02:40:32.000000000 -0500
+++ clang-3.0.src/lib/Driver/ToolChains.cpp 2011-12-19 06:29:27.562428830 -0500
@@ -1926,14 +1926,17 @@
diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp
--- clang-3.1.src-orig/lib/Driver/ToolChains.cpp 2012-05-11 20:16:02.000000000 -0400
+++ clang-3.1.src/lib/Driver/ToolChains.cpp 2012-10-08 01:13:01.044083509 -0400
@@ -2146,9 +2146,6 @@
if (DriverArgs.hasArg(options::OPT_nostdinc))
return;
+#if 0
if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include");
+#endif
- if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
- addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include");
-
if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
llvm::sys::Path P(D.ResourceDir);
P.appendComponent("include");
addSystemInclude(DriverArgs, CC1Args, P.str());
}
+#if 0
if (DriverArgs.hasArg(options::OPT_nostdlibinc))
return;
@@ -1998,6 +2001,8 @@
@@ -2264,6 +2261,7 @@
return;
addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/include");
+#endif
+ addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + C_INCLUDE_PATH);
}
static bool addLibStdCXXIncludePaths(Twine Base, Twine TargetArchDir,
@@ -2030,6 +2035,7 @@
bool IsTarget64Bit = (TargetArch == llvm::Triple::x86_64 ||
TargetArch == llvm::Triple::ppc64);
+#if 0
StringRef CxxIncludeRoot(CXX_INCLUDE_ROOT);
if (!CxxIncludeRoot.empty()) {
StringRef CxxIncludeArch(CXX_INCLUDE_ARCH);
@@ -2072,6 +2078,10 @@
GCCInstallation.getTriple() + Suffix,
DriverArgs, CC1Args);
}
+#endif
+ addLibStdCXXIncludePaths(CPP_INCLUDE_PATH,
+ CPP_HOST,
+ DriverArgs, CC1Args);
}
/// DragonFly - DragonFly tool chain which can call as(1) and ld(1) directly.
// Check if libc++ has been enabled and provide its include paths if so.
+ // !!! Will need to modify this if/when nixpkgs uses libc++
if (GetCXXStdlibType(DriverArgs) == ToolChain::CST_Libcxx) {
// libc++ is always installed at a fixed path on Linux currently.
addSystemInclude(DriverArgs, CC1Args,

75
pkgs/development/compilers/llvm/clang-ld-flags.patch
View file

@ -1,38 +1,57 @@
diff -Naur clang-3.0.src-orig/lib/Driver/ToolChains.cpp clang-3.0.src/lib/Driver/ToolChains.cpp
--- clang-3.0.src-orig/lib/Driver/ToolChains.cpp 2011-11-17 02:40:32.000000000 -0500
+++ clang-3.0.src/lib/Driver/ToolChains.cpp 2011-12-19 05:32:38.695513475 -0500
@@ -1800,6 +1800,7 @@
diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp
--- clang-3.1.src-orig/lib/Driver/ToolChains.cpp 2012-05-11 20:16:02.000000000 -0400
+++ clang-3.1.src/lib/Driver/ToolChains.cpp 2012-10-08 01:22:53.458850737 -0400
@@ -2077,16 +2077,6 @@
addPathIfExists(LibPath + "/../" + Multilib, Paths);
}
}
- addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths);
- addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths);
- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
- addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths);
-
- // Try walking via the GCC triple path in case of multiarch GCC
- // installations with strange symlinks.
- if (GCCInstallation.isValid())
- addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
- "/../../" + Multilib, Paths);
Linker = GetProgramPath("ld");
+#if 0
LinuxDistro Distro = DetectLinuxDistro(Arch);
if (IsOpenSuse(Distro) || IsUbuntu(Distro)) {
@@ -1882,6 +1883,7 @@
addPathIfExists(SysRoot + "/lib", Paths);
addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
addPathIfExists(SysRoot + "/usr/lib", Paths);
+#endif
// Add the non-multilib suffixed paths (if potentially different).
if (GCCInstallation.isValid()) {
@@ -2100,8 +2090,6 @@
addPathIfExists(LibPath, Paths);
}
}
- addPathIfExists(SysRoot + "/lib", Paths);
- addPathIfExists(SysRoot + "/usr/lib", Paths);
}
bool Linux::HasNativeLLVMSupport() const {
diff -Naur clang-3.0.src-orig/lib/Driver/Tools.cpp clang-3.0.src/lib/Driver/Tools.cpp
--- clang-3.0.src-orig/lib/Driver/Tools.cpp 2011-11-07 05:27:39.000000000 -0500
+++ clang-3.0.src/lib/Driver/Tools.cpp 2011-12-19 05:34:44.075325534 -0500
@@ -4306,6 +4306,7 @@
diff -Naur clang-3.1.src-orig/lib/Driver/Tools.cpp clang-3.1.src/lib/Driver/Tools.cpp
--- clang-3.1.src-orig/lib/Driver/Tools.cpp 2012-04-18 17:32:25.000000000 -0400
+++ clang-3.1.src/lib/Driver/Tools.cpp 2012-10-08 01:25:23.913501995 -0400
@@ -5210,24 +5210,6 @@
ToolChain.getArch() == llvm::Triple::thumb ||
(!Args.hasArg(options::OPT_static) &&
!Args.hasArg(options::OPT_shared))) {
+#if 0
CmdArgs.push_back("-dynamic-linker");
if (ToolChain.getArch() == llvm::Triple::x86)
CmdArgs.push_back("/lib/ld-linux.so.2");
@@ -4318,6 +4319,7 @@
CmdArgs.push_back("/lib64/ld64.so.1");
else
CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
+#endif
- CmdArgs.push_back("-dynamic-linker");
- if (ToolChain.getArch() == llvm::Triple::x86)
- CmdArgs.push_back("/lib/ld-linux.so.2");
- else if (ToolChain.getArch() == llvm::Triple::arm ||
- ToolChain.getArch() == llvm::Triple::thumb)
- CmdArgs.push_back("/lib/ld-linux.so.3");
- else if (ToolChain.getArch() == llvm::Triple::mips ||
- ToolChain.getArch() == llvm::Triple::mipsel)
- CmdArgs.push_back("/lib/ld.so.1");
- else if (ToolChain.getArch() == llvm::Triple::mips64 ||
- ToolChain.getArch() == llvm::Triple::mips64el)
- CmdArgs.push_back("/lib64/ld.so.1");
- else if (ToolChain.getArch() == llvm::Triple::ppc)
- CmdArgs.push_back("/lib/ld.so.1");
- else if (ToolChain.getArch() == llvm::Triple::ppc64)
- CmdArgs.push_back("/lib64/ld64.so.1");
- else
- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
}
CmdArgs.push_back("-o");

21
pkgs/development/compilers/llvm/clang.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, perl, groff, llvm, cmake }:
let version = "3.0"; in
let version = "3.1"; in
stdenv.mkDerivation {
name = "clang-${version}";
@ -10,20 +10,19 @@ stdenv.mkDerivation {
patches = stdenv.lib.optionals (stdenv.gcc.libc != null)
[ ./clang-include-paths.patch ./clang-ld-flags.patch ];
postPatch = stdenv.lib.optionalString (stdenv.gcc.libc != null) ''
sed -i -e 's,C_INCLUDE_PATH,"${stdenv.gcc.libc}/include/",' \
-e 's,CPP_HOST,"'$(${stdenv.gcc}/bin/cc -dumpmachine)'",' \
-e 's,CPP_INCLUDE_PATH,"${stdenv.gcc.gcc}/include/c++/${stdenv.gcc.gcc.version}",' \
lib/Driver/ToolChains.cpp
'';
cmakeFlags = [ "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_TARGETS_TO_BUILD=all"];
cmakeFlags = [
"-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"
"-DCMAKE_BUILD_TYPE=Release"
"-DLLVM_TARGETS_TO_BUILD=all"
] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [
"-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/"
];
enableParallelBuilding = true;
src = fetchurl {
url = "http://llvm.org/releases/${version}/clang-${version}.tar.gz";
sha256 = "0v8j9rgmb7w74ihc44zfxa22q17c946n5b6prwl38z3d6pd74kmn";
url = "http://llvm.org/releases/${version}/clang-${version}.src.tar.gz";
sha256 = "11m7sm9f8qcrayckfg3z91zb3fimilpm0f7azn7q7qnkvhay4qzz";
};
passthru = { gcc = stdenv.gcc.gcc; };

12
pkgs/development/compilers/llvm/default.nix
View file

@ -1,16 +1,16 @@
{ stdenv, fetchurl, perl, groff, cmake }:
{ stdenv, fetchurl, perl, groff, cmake, python }:
let version = "3.0"; in
let version = "3.1"; in
stdenv.mkDerivation {
name = "llvm-${version}";
src = fetchurl {
url = "http://llvm.org/releases/${version}/llvm-${version}.tar.gz";
sha256 = "0xq4gi7lflv8ilfckslhfvnja5693xjii1yvzz39kklr6hfv37ji";
url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz";
sha256 = "1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab";
};
buildInputs = [ perl groff cmake ];
buildInputs = [ perl groff cmake python ];
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
@ -20,7 +20,7 @@ stdenv.mkDerivation {
homepage = http://llvm.org/;
description = "Collection of modular and reusable compiler and toolchain technologies";
license = "BSD";
maintainers = with stdenv.lib.maintainers; [viric shlevy];
maintainers = with stdenv.lib.maintainers; [viric shlevy raskin];
platforms = with stdenv.lib.platforms; all;
};
}

97
pkgs/development/compilers/neko/default.nix
View file

@ -1,69 +1,44 @@
{ composableDerivation, lib, fetchurl, mysql, apacheHttpd, zlib, sqlite
, pcre, apr, gtk, boehmgc, pkgconfig, makeWrapper, sourceFromHead }:
{ stdenv, fetchurl, boehmgc, zlib, sqlite, pcre }:
let
stdenv.mkDerivation rec {
name = "neko-${version}";
version = "1.8.2";
inherit (composableDerivation) edf wwf;
libs = [ mysql apacheHttpd zlib sqlite pcre apr gtk ];
includes = lib.concatMapStrings (x: ''"${x}/include",'' ) libs + ''"{gkt}/include/gtk-2.0",'';
in
composableDerivation.composableDerivation {} ( fixed : {
name = "neko-cvs";
# REGION AUTO UPDATE: { name="neko"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "neko"; groups = "haxe_group"; }
src = sourceFromHead "neko-F_16-06-48.tar.gz"
(fetchurl { url = "http://mawercer.de/~nix/repos/neko-F_16-06-48.tar.gz"; sha256 = "e952582a26099b7a5568d0798839a6d349331510ffe6d7936b4537d60b6ccf26"; });
# END
# optionally remove apache mysql like gentoo does?
# they just remove libs/{apache,mod_neko}
buildInputs = [boehmgc pkgconfig makeWrapper] ++ libs;
# apr should be in apacheHttpd propagatedBuildInputs
preConfigure = ''
sed -i \
-e 's@"/usr/include",@${includes}@' \
src/tools/install.neko
sed -i "s@/usr/local@$out@" Makefile vm/load.c
# make sure that nekotools boot finds the neko executable and not our wrapper:
mkdir -p $out/{bin,lib}
sed -i "s@\"neko\"@\".neko-wrapped\"@" src/tools/nekoboot.neko
ln -s ./neko bin/.neko-wrapped
'';
inherit zlib;
meta = {
description = "Neko is an high-level dynamicly typed programming language";
homepage = http://nekovm.org;
license = ["GPLv2" ]; # -> docs/license.txt
maintainers = [ lib.maintainers.marcweber ];
platforms = lib.platforms.linux;
src = fetchurl {
url = "http://nekovm.org/_media/neko-${version}.tar.gz";
sha256 = "099727w6dk689z3pcgbhsqjl74zzrh82a5vb2abxynamcqxcgz1w";
};
# if stripping was done neko and nekoc would be the same. ?!
dontStrip = 1;
prePatch = with stdenv.lib; let
libs = concatStringsSep "," (map (lib: "\"${lib}/include\"") buildInputs);
in ''
sed -i -e '/^search_includes/,/^}/c \
search_includes = function(_) { return $array(${libs}) }
' src/tools/install.neko
sed -i -e '/allocated = strdup/s|"[^"]*"|"'"$out/lib/neko:$out/bin"'"|' \
vm/load.c
# temporarily, fixed in 1.8.3
sed -i -e 's/^#if defined(_64BITS)/& || defined(__x86_64__)/' vm/neko.h
# neko-wrapped: nekotools boot has to find it. So don't prefix wrapped executable by "."
postInstall = ''
for prog in nekotools nekoc; do
wrapProgram "$out/bin/$prog" \
--prefix "LD_LIBRARY_PATH" $out/lib/neko
for disabled_mod in mod_neko{,2} mod_tora{,2} mysql ui; do
sed -i -e '/^libs/,/^}/{/^\s*'"$disabled_mod"'\s*=>/,/^\s*}/d}' \
src/tools/install.neko
done
wrapProgram "$out/bin/neko" \
--prefix "LD_LIBRARY_PATH" $out/lib/neko
# create symlink so that nekotools boot finds not wrapped neko-wrapped executable
ln -s ln -s ../../bin/.neko-wrapped $out/lib/neko
'';
# TODO make them optional and make them work
patches = [ ./disable-modules.patch ];
})
makeFlags = "INSTALL_PREFIX=$(out)";
buildInputs = [ boehmgc zlib sqlite pcre ];
dontStrip = true;
preInstall = ''
install -vd "$out/lib" "$out/bin"
'';
meta = {
description = "A high-level dynamically typed programming language";
homepage = http://nekovm.org;
license = stdenv.lib.licenses.lgpl21;
maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux;
};
}

59
pkgs/development/compilers/neko/disable-modules.patch
View file

@ -1,59 +0,0 @@
diff --git a/src/tools/install.neko b/src/tools/install.neko
index 4cffa5e..5702add 100644
--- a/src/tools/install.neko
+++ b/src/tools/install.neko
@@ -39,26 +39,6 @@ buffer_string = $loader.loadprim("std@buffer_string",1);
// LIBS DATAS
libs = {
- mod_neko => {
- src => $array("../../vm/stats","mod_neko","cgi"),
- inc => "httpd.h",
- incname => "Apache 1.3.x"
- },
- mod_neko2 => {
- src => $array("../../vm/stats","mod_neko","cgi"),
- inc => $array("httpd.h","apr.h"),
- incname => "Apache 2.2.x",
- cflags => "-D_LARGEFILE64_SOURCE",
- realdir => "mod_neko",
- apache2 => true,
- },
- mysql => {
- src => $array("mysql"),
- inc => "mysql.h",
- incname => "MySQL 4.+"
- lib => "libmysqlclient_r.a",
- lparams => "-lz -lssl"
- },
mysql5 => {
src => $array("../common/sha1","../common/socket","my_proto/my_proto","my_proto/my_api","mysql"),
inc => $array(),
@@ -83,27 +63,6 @@ libs = {
incname => "Sqlite 3",
lparams => "-lsqlite3",
},
- ui => {
- src => $array("ui"),
- inc => switch system { "Mac" => "Carbon.h" default => "gtk/gtk.h" },
- incname => switch system { "Mac" => "Carbon" default => "GTK+2.0" },
- cflags => switch system { "Mac" => "" default => "`pkg-config --cflags gtk+-2.0`" },
- lparams => switch system { "Mac" => "-framework Carbon" default => "`pkg-config --libs gtk+-2.0` -lgthread-2.0" },
- },
- mod_tora => {
- src => $array("../common/socket","protocol","mod_tora"),
- inc => "httpd.h",
- incname => "Apache 1.3.x",
- cflags => "-I../common",
- },
- mod_tora2 => {
- src => $array("../common/socket","protocol","mod_tora"),
- inc => $array("httpd.h","apr.h"),
- incname => "Apache 2.2.x",
- cflags => "-D_LARGEFILE64_SOURCE -I../common",
- realdir => "mod_tora",
- apache2 => true,
- },
}
// PLATFORM

8
pkgs/development/libraries/audio/suil/default.nix
View file

@ -1,15 +1,15 @@
{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom }:
{ stdenv, fetchurl, gtk, lv2, pkgconfig, python, serd, sord, sratom, qt4 }:
stdenv.mkDerivation rec {
name = "suil-${version}";
version = "0.6.2";
version = "0.6.4";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "1rqi16zqnaf30gr2gwb8wbhg8a2l3m5fllf7rabldmgj4b4jlyzp";
sha256 = "12pz2w74rhhi6gsskfs6l71vw8qfz8906kbjf5w6jyy1x4kkdca2";
};
buildInputs = [ lv2 pkgconfig python serd sord sratom ];
buildInputs = [ gtk lv2 pkgconfig python qt4 serd sord sratom ];
configurePhase = "python waf configure --prefix=$out";

6
pkgs/development/libraries/gnu-efi/default.nix
View file

@ -3,11 +3,11 @@
}:
stdenv.mkDerivation {
name = "gnu-efi-3.0p";
name = "gnu-efi-3.0r";
src = fetchurl {
url = "mirror://sourceforge/gnu-efi/gnu-efi_3.0p.orig.tar.gz";
sha256 = "1pm4wk1gma7mb8z19js7kb5y31a0zk308mkafmq6gb0b2a0i39cn";
url = "mirror://sourceforge/gnu-efi/gnu-efi_3.0r.orig.tar.gz";
sha256 = "1zi298wsg8v29xj4azcawqfjbxqi2w7l60agf7x2ph2lnqlga2v5";
};
meta = {

4
pkgs/development/libraries/haskell/Cabal/1.16.0.nix → pkgs/development/libraries/haskell/Cabal/1.16.0.1.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "Cabal";
version = "1.16.0";
sha256 = "0ia2ysqbnnbfv75l8617bys5iaq8aygcbd1ijqcbzd3asf8flyms";
version = "1.16.0.1";
sha256 = "03h0fsdm00i5pq37j3d7rjw3gnqkmacvgvdhcrmmamn5q81qld5g";
buildDepends = [ filepath ];
meta = {
homepage = "http://www.haskell.org/cabal/";

4
pkgs/development/libraries/haskell/binary/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "binary";
version = "0.6.1.0";
sha256 = "0d423k37973f5v9mz9401zmsfdgspnf9h6s9xgr3zh19giz7c3js";
version = "0.6.2.0";
sha256 = "0nm4vsgyz7ml6w3lk5hrh34i7s7li32gj7bgs75w636kln338aab";
meta = {
homepage = "https://github.com/kolmodin/binary";
description = "Binary serialisation for Haskell values using lazy ByteStrings";

4
pkgs/development/libraries/haskell/citeproc-hs/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "citeproc-hs";
version = "0.3.4";
sha256 = "17w6fpmlhbfd8jxxz4s6ybz3dswf0i96fjjbs05ykh4i97rs62nv";
version = "0.3.5";
sha256 = "134sdz22h2aqwy3cmn0vw91nmbp3ckpjg5djxsg93ddl08ahr4zr";
buildDepends = [
filepath hsBibutils HTTP json mtl network pandocTypes parsec syb
time utf8String xml

5
pkgs/development/libraries/haskell/conduit/default.nix
View file

@ -4,12 +4,13 @@
cabal.mkDerivation (self: {
pname = "conduit";
version = "0.5.2.4";
sha256 = "17959j5frfbl5af4pmxhfb4swrjckk4fh5wmd5bwsbs824glb97a";
version = "0.5.2.5";
sha256 = "1savaq8n29cry75jl8rfk35q24s5bvm57j1zhnp3dcvj2i6w9k3y";
buildDepends = [
liftedBase monadControl resourcet text transformers
transformersBase void
];
jailbreak = true;
meta = {
homepage = "http://github.com/snoyberg/conduit";
description = "Streaming data processing library";

4
pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "data-accessor-template";
version = "0.2.1.9";
sha256 = "14zp2zjxlkdi33cjif9lc1kl8m0x4brh0pk3d34wk1g1bfzynijc";
version = "0.2.1.10";
sha256 = "11a4c0g74ppl7nls0dhx6xs47dfcq1wp7bd8qgdba6hhn645afzy";
buildDepends = [ dataAccessor utilityHt ];
meta = {
homepage = "http://www.haskell.org/haskellwiki/Record_access";

4
pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix
View file

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "distributed-process-simplelocalnet";
version = "0.2.0.5";
sha256 = "04cx5pb3pf4wpmqx1zhdc9lrfs0mb8zk7p1qxxlsqg0x63f3353w";
version = "0.2.0.6";
sha256 = "1mgsmxxy1fcbxh8p82078c70fj7iv6wr8g47r4d0c3jwz84xya57";
buildDepends = [
binary dataAccessor distributedProcess network networkMulticast
networkTransport networkTransportTcp transformers

6
pkgs/development/libraries/haskell/distributed-process/default.nix
View file

@ -5,8 +5,10 @@
cabal.mkDerivation (self: {
pname = "distributed-process";
version = "0.3.1";
sha256 = "048j27mpdmknz2s4ja3q2mla1d2sjbvrpmzx0lz2qas123qz1siq";
version = "0.4.0.1";
sha256 = "0yi0403665l01gkqbsix9f4hj8c8m4i42nwjq2i63x259qz2njwi";
isLibrary = true;
isExecutable = true;
buildDepends = [
binary dataAccessor distributedStatic mtl networkTransport random
rank1dynamic stm syb time transformers

4
pkgs/development/libraries/haskell/distributed-static/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "distributed-static";
version = "0.2.0.0";
sha256 = "04s3iils9ji8bwizvm36r5ihnd11098346br0919dv1x6g67a610";
version = "0.2.1";
sha256 = "0cdwizm4fr2akw7hsqdrvqk06h1lybpxjiczv3kmd0lyc4cb7kyc";
buildDepends = [ binary rank1dynamic ];
meta = {
homepage = "http://www.github.com/haskell-distributed/distributed-process";

4
pkgs/development/libraries/haskell/edit-distance/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "edit-distance";
version = "0.2.1";
sha256 = "1zhiyzgqmxi4mn7zn5q6rg03hgff9y5f9xizbs00069v7ncygi38";
version = "0.2.1.1";
sha256 = "1d8h38cn3azvsp2dp5gycglm5bwwd8plbag8ypi38yj6c35a82yn";
isLibrary = true;
isExecutable = true;
buildDepends = [ random ];

4
pkgs/development/libraries/haskell/file-embed/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "file-embed";
version = "0.0.4.5";
sha256 = "18rhcjll5gj790g5balk3xhnmmgjh2bixik8vna5drs7y9i0innp";
version = "0.0.4.6";
sha256 = "0p2vs56s1jy5xaw3axzfsir925z2a46624n32x797lga9khm3qvp";
meta = {
homepage = "https://github.com/snoyberg/file-embed";
description = "Use Template Haskell to embed file contents directly";

4
pkgs/development/libraries/haskell/gloss/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "gloss";
version = "1.7.6.1";
sha256 = "1gwmrnwn1x0hs9jp2qsjp737wahbdsjrp2kp7gpz9pkq4a6jmjmx";
version = "1.7.6.4";
sha256 = "0nyz9iicc6d96yn6yxzwz08g106qb2aadrxlw120wl01aqfw4xis";
buildDepends = [ bmp GLUT OpenGL ];
meta = {
homepage = "http://gloss.ouroborus.net";

4
pkgs/development/libraries/haskell/happstack/happstack-server.nix
View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "happstack-server";
version = "7.0.5";
sha256 = "11ialzvjdqmf62yl5r9yxir8fg5agfg1fysf3c3ja5456k07b466";
version = "7.0.7";
sha256 = "0r9bk82zjzlsi6j6dnz5b73qacpfdyhsn5ds98cn7gkqyf4yg7cj";
buildDepends = [
base64Bytestring blazeHtml extensibleExceptions filepath hslogger
html monadControl mtl network parsec sendfile syb systemFilepath

4
pkgs/development/libraries/haskell/hashtables/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hashtables";
version = "1.0.1.7";
sha256 = "0swk501whj08jj9q1d1lwg06nakimxnr7797zx8y8275f5mmisi7";
version = "1.0.1.8";
sha256 = "0skrzvzasm0hg4631nhfppsb7mn60pnxk4v31gipzz780sbx9zi8";
buildDepends = [ hashable primitive vector ];
meta = {
homepage = "http://github.com/gregorycollins/hashtables";

4
pkgs/development/libraries/haskell/hspec/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hspec";
version = "1.3.0";
sha256 = "0kl9mdksy8bifb37dfb9y8mnnjlq0x1h970cgzv9idq61gafii4n";
version = "1.3.0.1";
sha256 = "1xgj1yg49vb524blswclr0yw4pvfpbmjyh0b62fac14mawl89v36";
isLibrary = true;
isExecutable = true;
buildDepends = [

5
pkgs/development/libraries/haskell/http-conduit/default.nix
View file

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "1.6.1";
sha256 = "1yzsa6gqhq6s4b2drhx4jd6qdfawf1swrjyffi2bfq1vq8i9ikf2";
version = "1.6.1.1";
sha256 = "00xixsp1n37mb2in20lsxf460cyjbsp8dj2avys6hyrdn14ki130";
buildDepends = [
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
blazeBuilderConduit caseInsensitive certificate conduit cookie
@ -17,6 +17,7 @@ cabal.mkDerivation (self: {
monadControl mtl network regexCompat resourcet socks text time tls
tlsExtra transformers transformersBase utf8String void zlibConduit
];
jailbreak = true;
meta = {
homepage = "http://www.yesodweb.com/book/http-conduit";
description = "HTTP client package with conduit interface and HTTPS support";

8
pkgs/development/libraries/haskell/json/default.nix
View file

@ -1,10 +1,10 @@
{ cabal, mtl, parsec, syb }:
{ cabal, mtl, parsec, syb, text }:
cabal.mkDerivation (self: {
pname = "json";
version = "0.6";
sha256 = "1f5l1992r2gm8fivqfljhgs3nix4qf7h3rji78rsq1kf3r9shz32";
buildDepends = [ mtl parsec syb ];
version = "0.7";
sha256 = "18v8vbx3pyskf3ap4lpy2d3461gghfsq5bzjyrjvqsd2r9r44rfk";
buildDepends = [ mtl parsec syb text ];
meta = {
description = "Support for serialising Haskell to and from JSON";
license = self.stdenv.lib.licenses.bsd3;

4
pkgs/development/libraries/haskell/libmpd/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "libmpd";
version = "0.8.0";
sha256 = "0sn9yqiqr011glb7q0f3xj24wkkvnib0khzf833npcas4420d0ya";
version = "0.8.0.1";
sha256 = "16j2c0dnwllsb979gqf1cl4ylvpldcj8k32ddpp4wf62lbb1mqxm";
buildDepends = [ filepath mtl network text time utf8String ];
meta = {
homepage = "http://github.com/joachifm/libmpd-haskell";

4
pkgs/development/libraries/haskell/lifted-base/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "lifted-base";
version = "0.1.2";
sha256 = "0js94dlfy2wjl026jcj2l399ly4zgw0cgxkmil6lsm34gcy9vrvq";
version = "0.2";
sha256 = "12ai34wb1sd6fza50arlpvsdc6l2nwrrcik0xakf2q0ddzjmhjfb";
buildDepends = [
baseUnicodeSymbols monadControl transformersBase
];

4
pkgs/development/libraries/haskell/multiarg/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "multiarg";
version = "0.4.0.0";
sha256 = "04m4ynf6x8rlnlmnl6a7jj42fszjc1bly4h3jyjxxsqjdynrv81q";
version = "0.6.0.0";
sha256 = "1qrw1rajdvrvd297a7lpfkxm5qqhwmnnl5jiagjwzb9lckgpy87y";
buildDepends = [ explicitException utf8String ];
meta = {
homepage = "https://github.com/massysett/multiarg";

5
pkgs/development/libraries/haskell/network-conduit/default.nix
View file

@ -3,11 +3,12 @@
cabal.mkDerivation (self: {
pname = "network-conduit";
version = "0.5.0.2";
sha256 = "0ragnwhc8szh680iyzyz6fbprqd3drr8sb970h1p2l4i22srkm39";
version = "0.6.0";
sha256 = "0y296v8b6xrxs9jw6az6flz9nsqgk60cnpc954pmp6mi5q8mbv7i";
buildDepends = [
conduit liftedBase monadControl network transformers
];
jailbreak = true;
meta = {
homepage = "http://github.com/snoyberg/conduit";
description = "Stream socket data using conduits";

6
pkgs/development/libraries/haskell/network-transport-tcp/default.nix
View file

@ -2,12 +2,12 @@
cabal.mkDerivation (self: {
pname = "network-transport-tcp";
version = "0.2.0.3";
sha256 = "0jlw59ib6yzkv2qggza571k2nhxnwvwj42zdgzz6wh2bgdyihayw";
version = "0.3.0";
sha256 = "0x2rz0h890bfay52af2wcvja706dr4r6wgfs9csjf7y3jf53nc63";
buildDepends = [ dataAccessor network networkTransport ];
meta = {
homepage = "http://github.com/haskell-distributed/distributed-process";
description = "TCP instantation of Network.Transport";
description = "TCP instantiation of Network.Transport";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];

4
pkgs/development/libraries/haskell/network-transport/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "network-transport";
version = "0.2.0.2";
sha256 = "1pipykqwbjmbkgkmk0ss2pvfp72rkxwmz49d1j5xi8b0rlfgw05c";
version = "0.3.0";
sha256 = "1i6sn5x3z1r9l7xwag68s5gsii137d5dajwr0abcbv6143ph3bvm";
buildDepends = [ binary transformers ];
meta = {
homepage = "http://github.com/haskell-distributed/distributed-process";

5
pkgs/development/libraries/haskell/parallel-io/default.nix
View file

@ -2,12 +2,11 @@
cabal.mkDerivation (self: {
pname = "parallel-io";
version = "0.3.2";
sha256 = "1n9y1d1lcdwvhjsfqdlxknl89fxncq17kgin43wlki0c39cgirga";
version = "0.3.2.1";
sha256 = "0wrmz0i5s8p87840pacdnpf2fi12nips4yc72vymifrc1wvlc42q";
isLibrary = true;
isExecutable = true;
buildDepends = [ extensibleExceptions random ];
jailbreak = true;
meta = {
homepage = "http://batterseapower.github.com/parallel-io";
description = "Combinators for executing IO actions in parallel on a thread pool";

1
pkgs/development/libraries/haskell/persistent/default.nix
View file

@ -15,6 +15,7 @@ cabal.mkDerivation (self: {
unorderedContainers vector
];
extraLibraries = [ sqlite ];
jailbreak = true;
meta = {
homepage = "http://www.yesodweb.com/book/persistent";
description = "Type-safe, multi-backend data serialization";

1
pkgs/development/libraries/haskell/resourcet/default.nix
View file

@ -9,6 +9,7 @@ cabal.mkDerivation (self: {
buildDepends = [
liftedBase monadControl mtl transformers transformersBase
];
jailbreak = true;
meta = {
homepage = "http://github.com/snoyberg/conduit";
description = "Deterministic allocation and freeing of scarce resources";

4
pkgs/development/libraries/haskell/snap/loader-dynamic.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "snap-loader-dynamic";
version = "0.9.0";
sha256 = "1pbpvi20an077klvha1dflnlxpfb6m81n9d50hjhidf6430cmmhm";
version = "0.9.0.1";
sha256 = "1pzn8lfqngn8cqm1dpxn5wsx70xcd7r90rd2948n4p5309qgh9mq";
buildDepends = [ directoryTree hint mtl snapCore time ];
meta = {
homepage = "http://snapframework.com/";

4
pkgs/development/libraries/haskell/stringsearch/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "stringsearch";
version = "0.3.6.3";
sha256 = "1f0sl1zjya8glvlscf3g5i0in0ai1knls7kg9dp82grg2k287sgz";
version = "0.3.6.4";
sha256 = "16g0x0n8x3bg3mij7w3r5m3h2i2dn3bd298n14iccdwhfnlzm91b";
meta = {
homepage = "https://bitbucket.org/dafis/stringsearch";
description = "Fast searching, splitting and replacing of ByteStrings";

4
pkgs/development/libraries/haskell/stylish-haskell/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "stylish-haskell";
version = "0.5.1.0";
sha256 = "0vriwgx7z8azqmci9lq7xlvn0v12p5nj9s6i4jvxsjam538qll94";
version = "0.5.2.0";
sha256 = "1g02ih4hgn2chv56vy8dcql7x421w15m4fsgqnff236znxarn0v7";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/temporary/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "temporary";
version = "1.1.2.3";
sha256 = "1x4jljggbcdq90h578yyvc8z1i9zmlhvqfz2dym8kj8pq4qiwixd";
version = "1.1.2.4";
sha256 = "1j8kc22rz2wqg90n5wcxb06ylqv3lnz764077kvwhrw7mhmbp7jz";
buildDepends = [ filepath ];
meta = {
homepage = "http://www.github.com/batterseapower/temporary";

4
pkgs/development/libraries/haskell/tls-extra/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "tls-extra";
version = "0.4.6";
sha256 = "1xl55i4nr7kyc3qxi8zmq18m0xhlwlrx9fwkck22krshqgq2i6nn";
version = "0.4.7";
sha256 = "1ykmwkzq2vwjvcvg8c9b020baqxp3w7w0x7ka7jrk88aqmil9hiq";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/uu-parsinglib/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "uu-parsinglib";
version = "2.7.3.4";
sha256 = "1f582cr17qxwrhxx6pdv503ldm4ccbnbv9pcksibgparfyc25bnv";
version = "2.7.4";
sha256 = "1cznyn09a3glfkvvzqma3bhjinddkp6v2xwiy5x403v0wy8y565j";
buildDepends = [ ListLike time ];
meta = {
homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";

4
pkgs/development/libraries/haskell/vector-algorithms/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "vector-algorithms";
version = "0.5.4.1";
sha256 = "00dikjmy1pyyn3mmq7sjnmd91xcg7q3n3yiil3dqi1fgr0787xng";
version = "0.5.4.2";
sha256 = "08pb6mkghf9h5011vxrfdrfq6g26jk4gxmjh9s3hpdiwybf3ab64";
buildDepends = [ primitive vector ];
meta = {
homepage = "http://code.haskell.org/~dolio/";

5
pkgs/development/libraries/haskell/warp/default.nix
View file

@ -5,13 +5,14 @@
cabal.mkDerivation (self: {
pname = "warp";
version = "1.3.2";
sha256 = "14yib72x3z6fylpkzpr77cvvnr4bn1vdadh2pq6rknszspl6g7iq";
version = "1.3.3.1";
sha256 = "0nz5n574lgaii6i9ncc6dkzw2aw6g7hwjjq7v8njly2vpwygxn7s";
buildDepends = [
blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
httpTypes liftedBase network networkConduit simpleSendfile
transformers unixCompat void wai
];
patchPhase = "sed -i -e 's|, lifted-base.*|, lifted-base|' warp.cabal";
meta = {
homepage = "http://github.com/yesodweb/wai";
description = "A fast, light-weight web server for WAI applications";

4
pkgs/development/libraries/haskell/yaml/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "yaml";
version = "0.8.0.2";
sha256 = "14blcsylbf9wx4yw8fsk8ddjvg844x97xfc1h7r4ls9l9ar7k95j";
version = "0.8.1";
sha256 = "0cirffxydjh5650s1i0mq1v839pl2dljwmrjnmjf44fcqsvanvyg";
buildDepends = [
aeson attoparsec conduit resourcet text transformers
unorderedContainers vector

1
pkgs/development/libraries/haskell/yesod-auth/default.nix
View file

@ -16,6 +16,7 @@ cabal.mkDerivation (self: {
unorderedContainers wai yesodCore yesodForm yesodJson
yesodPersistent
];
jailbreak = true;
meta = {
homepage = "http://www.yesodweb.com/";
description = "Authentication for Yesod";

5
pkgs/development/libraries/haskell/yesod-core/default.nix
View file

@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "yesod-core";
version = "1.1.2";
sha256 = "1pgwqghj9kc9kh90515nswz5ssbmm2y6miw5j6sx4dha0xncqvgs";
version = "1.1.2.1";
sha256 = "195r19xsd3fvsirz62mkfxqgw5zi4lx700ly08h1i0kvmfnfx1g8";
buildDepends = [
aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
clientsession conduit cookie failure fastLogger hamlet httpTypes
@ -19,6 +19,7 @@ cabal.mkDerivation (self: {
text time transformers transformersBase vector wai waiExtra
yesodRoutes
];
jailbreak = true;
meta = {
homepage = "http://www.yesodweb.com/";
description = "Creation of type-safe, RESTful web applications";

4
pkgs/development/libraries/haskell/yesod-default/default.nix
View file

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "yesod-default";
version = "1.1.0";
sha256 = "124407a0in474l71jja04ds0xh84ac5i3jv62iswxlcp1y9f52bq";
version = "1.1.0.2";
sha256 = "0gjf819mrg3h50c8qlnh8i3xzq0z8mdz8bbqrpjx1haljcgxrzm3";
buildDepends = [
dataDefault hamlet networkConduit shakespeareCss shakespeareJs text
transformers unorderedContainers wai waiExtra warp yaml yesodCore

4
pkgs/development/libraries/haskell/yesod-routes/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "yesod-routes";
version = "1.1.0";
sha256 = "0r0a3s1dngqp2vcq0cdsbqf1lsyhygj2x4a93csr2iyn244zgxnx";
version = "1.1.0.1";
sha256 = "1b248ry96p1nyp21c3r9rd3awpdhpqrwj3s6d66pmjf8p0gl5vda";
buildDepends = [ pathPieces text vector ];
meta = {
homepage = "http://www.yesodweb.com/";

5
pkgs/development/libraries/haskell/yesod/default.nix
View file

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "yesod";
version = "1.1.1";
sha256 = "0666g2ap6ignqif9vwis2bnsb45jb19llw9z20nsfs0q3wj8ykn3";
version = "1.1.1.2";
sha256 = "0gq4ijfjlkiqw4bp9hxs8r41vlhz33v5l9k1maqjy62d446lrgvw";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -19,7 +19,6 @@ cabal.mkDerivation (self: {
transformers unixCompat unorderedContainers wai waiExtra warp yaml
yesodAuth yesodCore yesodForm yesodJson yesodPersistent zlib
];
jailbreak = true;
meta = {
homepage = "http://www.yesodweb.com/";
description = "Creation of type-safe, RESTful web applications";

28
pkgs/development/libraries/libc++/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ stdenv, fetchsvn, cmake }:
let rev = "165151"; in
stdenv.mkDerivation {
name = "libc++-pre${rev}";
src = fetchsvn {
url = "http://llvm.org/svn/llvm-project/libcxx/trunk";
inherit rev;
sha256 = "00l8xx5nc3cjlmln7c1sy1i4v844has9kbfxrsziwkalzbgwaslz";
};
buildInputs = [ cmake ];
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
enableParallelBuilding = true;
meta = {
homepage = http://libcxx.llvm.org/;
description = "A new implementation of the C++ standard library, targeting C++11";
license = "BSD";
maintainers = stdenv.lib.maintainers.shlevy;
platforms = stdenv.lib.platforms.all;
};
}

8
pkgs/development/libraries/libicns/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, libpng, jasper }:
stdenv.mkDerivation {
name = "libicns-0.8.0";
stdenv.mkDerivation rec {
name = "libicns-0.8.1";
src = fetchurl {
url = mirror://sourceforge/icns/libicns-0.8.0.tar.gz;
sha256 = "0jh67nm07jr1nfkfjid3jjw7fyw5hvj6a2fqan1bhg6gyr2hswla";
url = "mirror://sourceforge/icns/${name}.tar.gz";
sha256 = "1hjm8lwap7bjyyxsyi94fh5817xzqhk4kb5y0b7mb6675xw10prk";
};
buildInputs = [ libpng jasper ];

4
pkgs/development/libraries/libraw1394/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "libraw1394-2.0.8";
name = "libraw1394-2.1.0";
src = fetchurl {
url = "mirror://kernel/linux/libs/ieee1394/${name}.tar.gz";
sha256 = "0cwd8xn7wsm7nddbz7xgynxcjb1m4v2vjw1ky4dd6r5cv454hslk";
sha256 = "0w5sw06p51wfq2ahgql93ljkkp3hqprifzcxq8dq71c8zcbgyg58";
};
meta = {

4
pkgs/development/tools/build-managers/cmake/default.nix
View file

@ -7,7 +7,7 @@ with stdenv.lib;
let
os = stdenv.lib.optionalString;
majorVersion = "2.8";
minorVersion = "7";
minorVersion = "9";
version = "${majorVersion}.${minorVersion}";
in
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
sha256 = "17zmxh0gyis6w05d2km0swlvy94h3w10jgra0fpa5qcg7l2j628k";
sha256 = "1yg68ng732cfm5c0h91chqwhg06zdh45bybm353kd1myk5rwqgfw";
};
patches =

4
pkgs/development/tools/haskell/BNFC-meta/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "BNFC-meta";
version = "0.3.0.3";
sha256 = "06k8jnb4gw96gc0ffmczbywn4q2n87zwqa0pl0ada3ldvwaagv4l";
version = "0.3.0.5";
sha256 = "0blssa72r2ff4avbibw9a4p8gxy228f3lb1vc9aqr881v79b2cpp";
buildDepends = [ alexMeta happyMeta haskellSrcMeta syb ];
noHaddock = true;
meta = {

4
pkgs/development/tools/haskell/alex-meta/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "alex-meta";
version = "0.3.0.3";
sha256 = "08w7z2iq2s557vi9kp2x8qp1lwvh49skffbjm8kxrf2bn2il5q48";
version = "0.3.0.4";
sha256 = "0d0ii1djigydj2papcilkr8mazp70vg6hy179h28j9i1bshp3anp";
buildDepends = [ haskellSrcMeta QuickCheck ];
noHaddock = true;
meta = {

4
pkgs/development/tools/haskell/happy-meta/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "happy-meta";
version = "0.2.0.4";
sha256 = "1s1inv2l2hwdlvypn6wpiadmi5y5mpcjawiqjb1hv0d8y43dpz54";
version = "0.2.0.5";
sha256 = "103hi87azqv11l8lq1rv0v9v88sl227g31snvkn8db6b4cfrwrxk";
buildDepends = [ haskellSrcMeta mtl ];
meta = {
description = "Quasi-quoter for Happy parsers";

8
pkgs/development/tools/haskell/tar/0.4.0.0.nix → pkgs/development/tools/haskell/tar/0.4.0.1.nix
View file

@ -1,10 +1,10 @@
{ cabal, filepath }:
{ cabal, filepath, time }:
cabal.mkDerivation (self: {
pname = "tar";
version = "0.4.0.0";
sha256 = "04qijdfyiqb64q58g0bf46qfgaxqjl3kl68x6z31cv36p3hpplx3";
buildDepends = [ filepath ];
version = "0.4.0.1";
sha256 = "0vbsv7h3zgp30mlgsw156jkv1rqy5zbm98as9haf7x15hd6jf254";
buildDepends = [ filepath time ];
meta = {
description = "Reading, writing and manipulating \".tar\" archive files.";
license = self.stdenv.lib.licenses.bsd3;

18
pkgs/misc/sane-backends/default.nix
View file

@ -1,21 +1,27 @@
{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null
{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null
, pkgconfig ? null
, gt68xxFirmware ? null }:
let
firmware = gt68xxFirmware {inherit fetchurl;};
in
assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux");
stdenv.mkDerivation {
name = "sane-backends-1.0.22";
stdenv.mkDerivation rec {
version = "1.0.23";
name = "sane-backends-${version}";
src = fetchurl {
url = http://alioth.debian.org/frs/download.php/3503/sane-backends-1.0.22.tar.gz;
sha256 = "0m0cz4ljw9asqvpryl6gx1ndwf7ll2qinlvql9whnzs901la314z";
url = "https://launchpad.net/ubuntu/+archive/primary/+files/sane-backends_${version}.orig.tar.gz";
sha256 = "4d4f5b2881615af7fc0ed75fdde7dc623a749e80e40f3f792fe4010163cbb029";
};
udevSupport = hotplugSupport;
buildInputs = if libusb != null then [libusb] else [];
buildInputs = []
++ stdenv.lib.optional (libusb != null) libusb
++ stdenv.lib.optional (libv4l != null) libv4l
++ stdenv.lib.optional (pkgconfig != null) pkgconfig
;
postInstall = ''
if test "$udevSupport" = "1"; then

2
pkgs/os-specific/linux/ffado/default.nix
View file

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
# TODO fix ffado-diag, it doesn't seem to use PYPKGDIR
buildPhase = ''
export PYLIBSUFFIX=lib/${python.libPrefix}/site-packages
scons PYPKGDIR=$out/$PYLIBSUFFIX
scons PYPKGDIR=$out/$PYLIBSUFFIX DEBUG=False
sed -e "s#/usr/local#$out#" -i support/mixer-qt4/ffado/config.py
'';

4
pkgs/servers/mail/spamassassin/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, buildPerlPackage, perl, HTMLParser, NetDNS, NetAddrIP, DBFile
, HTTPDate, MailDKIM, LWP, IOSocketSSL, IOSocketInet6, makeWrapper, gnupg1
, HTTPDate, MailDKIM, LWP, IOSocketSSL, makeWrapper, gnupg1
}:
# TODO: Add the Perl modules ...
@ -21,7 +21,7 @@ buildPerlPackage rec {
};
buildInputs = [ makeWrapper HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM
LWP IOSocketSSL IOSocketInet6 ];
LWP IOSocketSSL ];
# Enabling 'taint' mode is desirable, but that flag disables support
# for the PERL5LIB environment variable. Needs further investigation.

6
pkgs/tools/backup/obnam/default.nix
View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, python, pythonPackages, pycrypto, attr }:
pythonPackages.buildPythonPackage {
name = "obnam-1.1";
name = "obnam-1.2";
namePrefix = "";
src = fetchurl rec {
url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_1.1.orig.tar.gz";
sha256 = "763693e5ea4e8d6a63b1a16c2aacd5fe0dc97abc687c8f0dde5840f77d549349";
url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_1.2.orig.tar.gz";
sha256 = "33457452726d5c393d98c565b8e1ab3ac11276cc42bf67c4eee6c4e4ac9976d6";
};
buildInputs = [ pythonPackages.sphinx attr ];

35
pkgs/tools/misc/debian-devscripts/default.nix Normal file
View file

@ -0,0 +1,35 @@
{stdenv, fetchurl, perl, CryptSSLeay, LWP, unzip, xz, dpkg, TimeDate, DBFile
, FileDesktopEntry, libxslt, docbook_xsl, python, setuptools, makeWrapper
}:
stdenv.mkDerivation rec {
version = "2.12.4";
name = "debian-devscripts-${version}";
src = fetchurl {
url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.gz";
sha256 = "34bcbec78bd4fe34d9f1326b9d1477ff2410e20e2dca6b7bfbf2bf92dbb83904";
};
buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile
FileDesktopEntry libxslt python setuptools makeWrapper ];
preConfigure = ''
export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}";
sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile
sed -e 's/ translated_manpages//; s/--install-layout=deb//; s@--root="[^ ]*"@--prefix="'"$out"'"@' -i Makefile */Makefile
tgtpy="$out/lib/${python.libPrefix}/site-packages"
mkdir -p "$tgtpy"
export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy"
sed -re "s@/usr( |$|/)@$out\\1@" -i Makefile* */Makefile*
sed -re "s@/etc( |$|/)@$out/etc\\1@" -i Makefile* */Makefile*
'';
postInstall = ''
for i in "$out/bin"/*; do
wrapProgram "$i" \
--prefix PERL5LIB : "$PERL5LIB" \
--prefix PERL5LIB : "$out/share/devscripts"
done
'';
meta = {
description = ''Debian package maintenance scripts'';
license = "GPL (various)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only...
maintainers = with stdenv.lib.maintainers; [raskin];
};
}

8
pkgs/tools/misc/refind/default.nix
View file

@ -1,22 +1,22 @@
{ stdenv, fetchurl, gnu_efi, unzip }:
let version = "0.2.3"; in
let version = "0.4.5"; in
stdenv.mkDerivation {
name = "refind-${version}";
src = fetchurl {
url = "mirror://sourceforge/refind/refind-src-${version}.zip";
sha256 = "0q3p4mczr6wchk4vbgsb0cq7829vk3b3kg9qaizrb02pdak3s2nf";
sha256 = "05nbalsl5csgph0v2amzgay9k2vzm47z8n1n6blbh9hvb7j5vn2c";
};
buildInputs = [ unzip ];
buildFlags = [ "prefix=" "EFIINC=${gnu_efi}/include/efi" "GNUEFILIB=${gnu_efi}/lib" "EFILIB=${gnu_efi}/lib" "EFICRT0=${gnu_efi}/lib" ];
buildFlags = [ "prefix=" "EFIINC=${gnu_efi}/include/efi" "GNUEFILIB=${gnu_efi}/lib" "EFILIB=${gnu_efi}/lib" "EFICRT0=${gnu_efi}/lib" "LOCAL_CFLAGS=-I${gnu_efi}/include" ];
installPhase = ''
mkdir -pv $out
install -v -m644 refind/refind.efi refind.conf-sample $out
install -v -m644 refind/refind*.efi refind.conf-sample $out
mv -v icons $out
'';

19
pkgs/tools/networking/nss-myhostname/default.nix Normal file
View file

@ -0,0 +1,19 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "nss-myhostname-0.3";
src = fetchurl {
url = "http://0pointer.de/lennart/projects/nss-myhostname/${name}.tar.gz";
sha256 = "1wnawxklsv3z796l752j7a21gvj2615fk12qr1bir3apipm499rb";
};
patches = [ ./nscd-segfault.patch ./ignore-ipv6-link-local.patch ];
meta = {
description = "Name Service Switch module ensuring that the hostname always resolves to a valid address";
homepage = http://0pointer.de/lennart/projects/nss-myhostname/;
maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.linux;
};
}

13
pkgs/tools/networking/nss-myhostname/ignore-ipv6-link-local.patch Normal file
View file

@ -0,0 +1,13 @@
--- nss-myhostname-0.3/netlink.c 2011-05-09 08:56:34.344579140 -0400
+++ nss-myhostname-0.3-new/netlink.c 2012-10-06 23:52:10.577755588 -0400
@@ -179,6 +179,10 @@
ifaddrmsg->ifa_scope == RT_SCOPE_NOWHERE)
continue;
+ if (ifaddrmsg->ifa_family == AF_INET6 &&
+ ifaddrmsg->ifa_scope == RT_SCOPE_LINK)
+ continue;
+
if (ifaddrmsg->ifa_flags & IFA_F_DEPRECATED)
continue;

15
pkgs/tools/networking/nss-myhostname/nscd-segfault.patch Normal file
View file

@ -0,0 +1,15 @@
--- nss-myhostname-0.3/nss-myhostname.c 2011-05-09 09:01:27.421581560 -0400
+++ nss-myhostname-0.3-new/nss-myhostname.c 2012-10-06 23:40:09.836894004 -0400
@@ -177,7 +177,11 @@
/* Verify the size matches */
assert(idx == ms);
- *pat = r_tuple_prev;
+ /* Nscd expects us to store the first record in **pat. */
+ if (*pat)
+ **pat = *r_tuple_prev;
+ else
+ *pat = r_tuple_prev;
if (ttlp)
*ttlp = 0;

23
pkgs/tools/package-management/cabal-install/1.16.0.nix Normal file
View file

@ -0,0 +1,23 @@
{ cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }:
cabal.mkDerivation (self: {
pname = "cabal-install";
version = "1.16.0";
sha256 = "0yg8h028sixvzx42v1spjyx4qfhpsar38cvz9188m62rac8ak8az";
isLibrary = false;
isExecutable = true;
buildDepends = [
Cabal filepath HTTP mtl network random time zlib
];
postInstall = ''
mkdir $out/etc
mv bash-completion $out/etc/bash_completion.d
'';
meta = {
homepage = "http://www.haskell.org/cabal/";
description = "The command-line interface for Cabal and Hackage";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

17
pkgs/tools/package-management/dpkg/default.nix
View file

@ -1,16 +1,16 @@
{stdenv, fetchurl, perl, zlib, bzip2}:
{stdenv, fetchurl, perl, zlib, bzip2, xz}:
let version = "1.14.29"; in
let version = "1.16.8"; in
stdenv.mkDerivation {
name = "dpkg-${version}";
src = fetchurl {
url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.gz";
sha256 = "0cynms4vziy957r4zskybbid87sz99vrfy8d999vlhxgc74c2zpa";
url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
sha256 = "4a1f4611390d93f1f198d910d3a4e4913b3cf81702b31f585a1872ca98df0eaa";
};
configureFlags = "--without-dselect --with-admindir=/var/lib/dpkg";
configureFlags = "--disable-dselect --with-admindir=/var/lib/dpkg ";
preConfigure = ''
# Can't use substitute pending resolution of NIXPKGS-89.
@ -24,11 +24,12 @@ stdenv.mkDerivation {
chmod +x $TMPDIR/dpkg
PATH=$TMPDIR:$PATH
substituteInPlace src/Makefile.in --replace "install-data-local:" "disabled:"
substituteInPlace dpkg-split/Makefile.in --replace "install-data-local:" "disabled:"
for i in $(find . -name Makefile.in); do
substituteInPlace $i --replace "install-data-local:" "disabled:" ;
done
'';
buildInputs = [ perl zlib bzip2 ];
buildInputs = [ perl zlib bzip2 xz ];
meta = {
description = "The Debian package manager";

20
pkgs/top-level/all-packages.nix
View file

@ -591,6 +591,10 @@ let
dcraw = callPackage ../tools/graphics/dcraw { };
debian_devscripts = callPackage ../tools/misc/debian-devscripts {
inherit (perlPackages) CryptSSLeay LWP TimeDate DBFile FileDesktopEntry;
};
debootstrap = callPackage ../tools/misc/debootstrap { };
detox = callPackage ../tools/misc/detox { };
@ -1165,6 +1169,8 @@ let
inherit (pythonPackages) pysqlite;
};
nss_myhostname = callPackage ../tools/networking/nss-myhostname {};
nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {};
ntfs3g = callPackage ../tools/filesystems/ntfs-3g { };
@ -2328,11 +2334,7 @@ let
# Reasonably current HEAD snapshot.
haskellPackages_ghcHEAD = haskell.packages_ghcHEAD;
haxeDist = import ../development/compilers/haxe {
inherit fetchurl sourceFromHead stdenv lib ocaml zlib makeWrapper neko;
};
haxe = haxeDist.haxe;
haxelib = haxeDist.haxelib;
haxe = callPackage ../development/compilers/haxe { };
falcon = builderDefsPackage (import ../development/interpreters/falcon) {
inherit cmake;
@ -2404,7 +2406,6 @@ let
jikes = callPackage ../development/compilers/jikes { };
julia = callPackage ../development/compilers/julia {
llvm = llvm_3_1;
pcre = pcre_8_30;
liblapack = liblapack.override {shared = true;};
fftw = fftw.override {pthreads = true;};
@ -2418,7 +2419,6 @@ let
};
llvm = callPackage ../development/compilers/llvm { };
llvm_3_1 = callPackage ../development/compilers/llvm/3.1.nix { };
mitscheme = callPackage ../development/compilers/mit-scheme { };
@ -3034,6 +3034,8 @@ let
csslint = callPackage ../development/web/csslint { };
libcxx = callPackage ../development/libraries/libc++ { stdenv = pkgs.clangStdenv; };
dejagnu = callPackage ../development/tools/misc/dejagnu { };
ddd = callPackage ../development/tools/misc/ddd { };
@ -5455,7 +5457,7 @@ let
spamassassin = callPackage ../servers/mail/spamassassin {
inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile
HTTPDate MailDKIM LWP IOSocketSSL IOSocketInet6;
HTTPDate MailDKIM LWP IOSocketSSL;
};
samba = callPackage ../servers/samba { };
@ -6678,6 +6680,8 @@ let
inherit (pkgs.gnome) libart_lgpl libgnomeui;
};
distrho = callPackage ../applications/audio/distrho {};
djvulibre = callPackage ../applications/misc/djvulibre { };
djview = callPackage ../applications/graphics/djview { };

11
pkgs/top-level/haskell-packages.nix
View file

@ -143,7 +143,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
transformers = self.transformers_0_3_0_0; # 7.6 ok
xhtml = self.xhtml_3000_2_1; # 7.6 ok
zlib = self.zlib_0_5_4_0; # 7.6 ok
cabalInstall = self.cabalInstall_0_14_0; # 7.6 ok
cabalInstall = self.cabalInstall_1_16_0; # 7.6 ok
alex = self.alex_3_0_1; # 7.6 ok
haddock = self.haddock_2_12_0; # 7.6 ok
happy = self.happy_1_18_10; # 7.6 ok
@ -537,7 +537,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
};
Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; };
Cabal_1_16_0 = callPackage ../development/libraries/haskell/Cabal/1.16.0.nix { cabal = self.cabal.override { Cabal = null; }; };
Cabal_1_16_0_1 = callPackage ../development/libraries/haskell/Cabal/1.16.0.1.nix { cabal = self.cabal.override { Cabal = null; }; };
Cabal = null; # core package in GHC
cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {};
@ -1841,8 +1841,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
};
tar_0_3_2_0 = callPackage ../development/tools/haskell/tar/0.3.2.0.nix {};
tar_0_4_0_0 = callPackage ../development/tools/haskell/tar/0.4.0.0.nix {};
tar = self.tar_0_4_0_0;
tar_0_4_0_1 = callPackage ../development/tools/haskell/tar/0.4.0.1.nix {};
tar = self.tar_0_4_0_1;
threadscope = callPackage ../development/tools/haskell/threadscope {};
@ -1889,7 +1889,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
cabalInstall_0_8_2 = callPackage ../tools/package-management/cabal-install/0.8.2.nix {};
cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {};
cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {};
cabalInstall = self.cabalInstall_0_14_0;
cabalInstall_1_16_0 = callPackage ../tools/package-management/cabal-install/1.16.0.nix {};
cabalInstall = self.cabalInstall_1_16_0;
jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal {};

27
pkgs/top-level/perl-packages.nix
View file

@ -1578,6 +1578,19 @@ rec {
};
};
FileBaseDir = buildPerlPackage rec {
version = "0.03";
name = "File-BaseDir-${version}";
configurePhase = ''
preConfigure || true
perl Build.PL PREFIX="$out" prefix="$out"
'';
src = fetchurl {
url = "mirror://cpan/modules/by-module/File/${name}.tar.gz";
sha256 = "0029cba7a3b5d8aa5f7d03cb1b7ba2bcf2829382f7f26aa3bee06fce8611a886";
};
};
FileCopyRecursive = buildPerlPackage rec {
name = "File-Copy-Recursive-0.38";
src = fetchurl {
@ -1586,6 +1599,20 @@ rec {
};
};
FileDesktopEntry = buildPerlPackage rec {
version = "0.04";
name = "File-DesktopEntry-${version}";
configurePhase = ''
preConfigure || true
perl Build.PL PREFIX="$out" prefix="$out"
'';
src = fetchurl {
url = "mirror://cpan/modules/by-module/File/${name}.tar.gz";
sha256 = "d7f80d8bd303651a43dc1810c73740d38a0d2b158fb33cd3b6ca4d3a566da7cb";
};
propagatedBuildInputs = [ FileBaseDir ];
};
FileFindRule = buildPerlPackage rec {
name = "File-Find-Rule-0.32";
src = fetchurl {

50
pkgs/top-level/python-packages.nix
View file

@ -1735,6 +1735,32 @@ let pythonPackages = python.modules // rec {
};
});
pyaudio = pkgs.stdenv.mkDerivation rec {
name = "python-pyaudio-${version}";
version = "0.2.4";
src = fetchurl {
url = "http://people.csail.mit.edu/hubert/pyaudio/packages/pyaudio-${version}.tar.gz";
md5 = "623809778f3d70254a25492bae63b575";
};
buildInputs = [ python pkgs.portaudio ];
installPhase = ''
python setup.py install --prefix=$out
'';
doCheck = false;
meta = {
description = "Python bindings for PortAudio";
homepage = "http://people.csail.mit.edu/hubert/pyaudio/";
license = stdenv.lib.licenses.mit;
};
};
Babel = buildPythonPackage (rec {
name = "Babel-0.9.6";
@ -3094,11 +3120,11 @@ let pythonPackages = python.modules // rec {
};
cliapp = buildPythonPackage rec {
name = "cliapp-1.20120630";
name = "cliapp-1.20120929";
src = fetchurl rec {
url = "http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_1.20120630.orig.tar.gz";
sha256 = "6beeb1fb3077561540094584ce36055266ac67b80f158b9b82fe4075096f4716";
url = "http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_1.20120929.orig.tar.gz";
sha256 = "30d5077e53b3e45f892b1c49feaaf4f47e4664400ed71435e77a82a2b823a0f8";
};
buildInputs = [ sphinx ];
@ -3114,11 +3140,11 @@ let pythonPackages = python.modules // rec {
};
tracing = buildPythonPackage rec {
name = "tracing-0.6";
name = "tracing-0.7";
src = fetchurl rec {
url = "http://code.liw.fi/debian/pool/main/p/python-tracing/python-tracing_0.6.orig.tar.gz";
sha256 = "1164cf05891f9bca93fb87413f32d2c4da90348adbf69b0ad36a464b7adcd354";
url = "http://code.liw.fi/debian/pool/main/p/python-tracing/python-tracing_0.7.orig.tar.gz";
sha256 = "9954a1b0cc6b957d15975b048f929bbdd46766d397a6fa51bf8f6498b9459276";
};
buildInputs = [ sphinx ];
@ -3134,11 +3160,11 @@ let pythonPackages = python.modules // rec {
};
ttystatus = buildPythonPackage rec {
name = "ttystatus-0.19";
name = "ttystatus-0.21";
src = fetchurl rec {
url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_0.19.orig.tar.gz";
sha256 = "7cc112a4783f2e0c354c5244f8e50b18733b5957677b56a755c1016e04c0c28d";
url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_0.21.orig.tar.gz";
sha256 = "4a1f3a41c9bd3b5d2bd8e6f093890857301e590aa1d428fc9a6dca591227244c";
};
buildInputs = [ sphinx ];
@ -3154,11 +3180,11 @@ let pythonPackages = python.modules // rec {
};
larch = buildPythonPackage rec {
name = "larch-1.20120527";
name = "larch-1.20121006";
src = fetchurl rec {
url = "http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_1.20120527.orig.tar.gz";
sha256 = "2865a1bfa6bd276bf746e8e7cb73d5199d0b6d00045d8c92e158626687d3bbe1";
url = "http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_1.20121006.orig.tar.gz";
sha256 = "b4482981010e9c22ee3fce6fdc664b8fc0a1a3a18ed30b40f247f3b44437ccfa";
};
buildInputs = [ sphinx ];