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

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

Browse Source
This commit is contained in:
Eelco Dolstra 2012-10-01 11:43:43 -04:00
commit b78256fbd7
40 changed files with 720 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

188
pkgs/applications/networking/browsers/firefox/13.0.nix
View File

@ -1,188 +0,0 @@
{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper
, # If you want the resulting program to call itself "Firefox" instead
# of "Shiretoko" or whatever, enable this option. However, those
# binaries may not be distributed without permission from the
# Mozilla Foundation, see
# http://www.mozilla.org/foundation/trademarks/.
enableOfficialBranding ? false
}:
assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "13.0.1";
xulVersion = "13.0.1"; # this attribute is used by other packages
src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha1 = "3752f13f26a51dd2e42d2805a707a842e6f8d1b1";
};
commonConfigureFlags =
[ "--enable-optimize"
"--disable-debug"
"--enable-strip"
"--with-system-jpeg"
"--with-system-zlib"
"--with-system-bz2"
"--with-system-nspr"
"--with-system-nss"
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
# "--enable-system-cairo" # disabled for the moment because our Cairo is too old
"--enable-system-sqlite"
"--disable-crashreporter"
"--disable-tests"
"--disable-necko-wifi" # maybe we want to enable this at some point
"--disable-installer"
"--disable-updater"
];
xulrunner = stdenv.mkDerivation rec {
name = "xulrunner-${xulVersion}";
inherit src;
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
xlibs.libXScrnSaver xlibs.scrnsaverproto
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
];
configureFlags =
[ "--enable-application=xulrunner"
"--disable-javaxpcom"
] ++ commonConfigureFlags;
enableParallelBuilding = true;
# Hack to work around make's idea of -lbz2 dependency
preConfigure =
''
find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
stdenv.lib.concatStringsSep ":"
(map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
}' ';'
export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
mkdir ../objdir
cd ../objdir
configureScript=../mozilla-release/configure
''; # */
# !!! Temporary hack.
preBuild =
''
export NIX_ENFORCE_PURITY=
'';
installFlags = "SKIP_GRE_REGISTRATION=1";
postInstall = ''
# Fix some references to /bin paths in the Xulrunner shell script.
substituteInPlace $out/bin/xulrunner \
--replace /bin/pwd "$(type -tP pwd)" \
--replace /bin/ls "$(type -tP ls)"
# Fix run-mozilla.sh search
libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
echo libDir: $libDir
test -n "$libDir"
cd $out/bin
mv xulrunner ../lib/$libDir/
for i in $out/lib/$libDir/*; do
file $i;
if file $i | grep executable &>/dev/null; then
echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
chmod a+x "$out/bin/$(basename "$i")";
fi;
done
for i in $out/lib/$libDir/*.so; do
patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
done
for i in $out/lib/$libDir/{xpcshell,plugin-container}; do
wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir"
done
rm -f $out/bin/run-mozilla.sh
''; # */
meta = {
description = "Mozilla Firefox XUL runner";
homepage = http://www.mozilla.com/en-US/firefox/;
};
passthru = { inherit gtk; version = xulVersion; };
};
firefox = stdenv.mkDerivation rec {
name = "firefox-${firefoxVersion}";
inherit src;
enableParallelBuilding = true;
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
xlibs.pixman yasm mesa sqlite file unzip
];
propagatedBuildInputs = [xulrunner];
configureFlags =
[ "--enable-application=browser"
"--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
"--enable-chrome-format=jar"
"--disable-elf-hack"
]
++ commonConfigureFlags
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
# Hack to work around make's idea of -lbz2 dependency
preConfigure =
''
find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
stdenv.lib.concatStringsSep ":"
(map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
}' ';'
'';
postInstall =
''
ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
for j in $out/bin/*; do
i="$(readlink "$j")";
file $i;
if file $i | grep executable &>/dev/null; then
rm "$out/bin/$(basename "$i")"
echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"
chmod a+x "$out/bin/$(basename "$i")"
fi;
done;
''; # */
meta = {
description = "Mozilla Firefox - the browser, reloaded";
homepage = http://www.mozilla.com/en-US/firefox/;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
passthru = {
inherit gtk xulrunner nspr;
isFirefox3Like = true;
};
};
}

6
pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
View File

@ -45,18 +45,18 @@ in
stdenv.mkDerivation rec {
name = "google-talk-plugin-${version}";
version = "3.5.1.0";
version = "3.6.1.0";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb";
sha256 = "0ml4yirzdcladw11fq5d8lwqfqgb1fh9vpbzbzmhplvyj6mvkqrj";
sha256 = "1h6qa9vh1bbhsxsihm56nqg9is9vnrvnjl8cjz3hqym2w160ycbv";
}
else if stdenv.system == "i686-linux" then
fetchurl {
url = "${baseURL}/google-talkplugin_${version}-1_i386.deb";
sha256 = "1kfd26zygb76iqnr8n3f7k7n9h5bz0rf716n80crqzyasv51mn57";
sha256 = "0d6dfivmm0azfpv283bqs04w6098z8w4cnjgivp80mfd6ndjv8x2";
}
else throw "Google Talk does not support your platform.";

85
pkgs/development/libraries/ffmpeg/1.0.nix Normal file
View File

@ -0,0 +1,85 @@
{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2
, mp3Support ? true, lame ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, vorbisSupport ? true, libvorbis ? null
, vpxSupport ? false, libvpx ? null
, x264Support ? true, x264 ? null
, xvidSupport ? true, xvidcore ? null
, vdpauSupport ? true, libvdpau ? null
, faacSupport ? false, faac ? null
, dc1394Support ? false, libdc1394 ? null
, x11grabSupport ? false, libXext ? null, libXfixes ? null
}:
assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert vorbisSupport -> libvorbis != null;
assert vpxSupport -> libvpx != null;
assert x264Support -> x264 != null;
assert xvidSupport -> xvidcore != null;
assert vdpauSupport -> libvdpau != null;
assert faacSupport -> faac != null;
assert x11grabSupport -> libXext != null && libXfixes != null;
stdenv.mkDerivation rec {
name = "ffmpeg-1.0";
src = fetchurl {
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
sha256 = "1jbi85z2zkk3fh09l9f1s70kpvsz8706ay4lsw75395q8vic70hd";
};
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
# the resulting library is GPL'ed, so it can only be used in GPL'ed
# applications.
configureFlags = [
"--enable-gpl"
"--enable-postproc"
"--enable-swscale"
"--disable-ffplay"
"--enable-shared"
"--enable-runtime-cpudetect"
]
++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
++ stdenv.lib.optional speexSupport "--enable-libspeex"
++ stdenv.lib.optional theoraSupport "--enable-libtheora"
++ stdenv.lib.optional vorbisSupport "--enable-libvorbis"
++ stdenv.lib.optional vpxSupport "--enable-libvpx"
++ stdenv.lib.optional x264Support "--enable-libx264"
++ stdenv.lib.optional xvidSupport "--enable-libxvid"
++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"
++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
++ stdenv.lib.optional x11grabSupport "--enable-x11grab";
buildInputs = [ pkgconfig lame yasm zlib bzip2 ]
++ stdenv.lib.optional mp3Support lame
++ stdenv.lib.optional speexSupport speex
++ stdenv.lib.optional theoraSupport libtheora
++ stdenv.lib.optional vorbisSupport libvorbis
++ stdenv.lib.optional vpxSupport libvpx
++ stdenv.lib.optional x264Support x264
++ stdenv.lib.optional xvidSupport xvidcore
++ stdenv.lib.optional vdpauSupport libvdpau
++ stdenv.lib.optional faacSupport faac
++ stdenv.lib.optional dc1394Support libdc1394
++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ];
enableParallelBuilding = true;
crossAttrs = {
dontSetConfigureCross = true;
configureFlags = configureFlags ++ [
"--cross-prefix=${stdenv.cross.config}-"
"--enable-cross-compile"
"--target_os=linux"
"--arch=${stdenv.cross.arch}"
];
};
meta = {
homepage = http://www.ffmpeg.org/;
description = "A complete, cross-platform solution to record, convert and stream audio and video";
};
}

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "Boolean";
version = "0.0.1";
sha256 = "dafcfb2e9d7f7aa24a3d3ceb385424176297cdf6f6044028d42d0fea1cae7765";
version = "0.1.0";
sha256 = "1843fddsc7x3mf6h69xpg7yjkpaws4v57zg02424mj86m5x6jfgz";
meta = {
description = "Generalized booleans";
license = self.stdenv.lib.licenses.bsd3;

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "DSH";
version = "0.7.8.1";
sha256 = "1yz8rh3hkqc465slfzi7jqhjd1xrmcghjxl7zprxw082p2qvj8g5";
version = "0.7.8.2";
sha256 = "1rs42c05q4s46a1a03srzdq0aijwalhilzifc8ryq4qwjgh7vkwz";
buildDepends = [
convertible csv FerryCore HaXml HDBC json mtl Pathfinder syb text
xhtml

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "dataenc";
version = "0.14.0.3";
sha256 = "1k6k9cpx5ma32gvzf2mdbz4kfiblwfah9875qr13zkl4has9y0pd";
version = "0.14.0.4";
sha256 = "0xnn90nyz4m0rbzykkr5p9270s8dq2bfiz5j7qyzyy5m8vbl15bw";
isLibrary = true;
isExecutable = true;
meta = {

6
pkgs/development/libraries/haskell/directory-tree/default.nix
View File

@ -2,11 +2,11 @@
cabal.mkDerivation (self: {
pname = "directory-tree";
version = "0.10.1";
sha256 = "02acmfdw1yjb0h9dpjy04xxclsasm1p0m6w1dvccd4x2aqc6ybbw";
version = "0.11.0";
sha256 = "07vqwnzbwfjvlwcl50x5jl9yzvqfln0m4k4lam9r5n49wv7p01c9";
buildDepends = [ filepath ];
meta = {
homepage = "http://coder.bsimmons.name/blog/2009/05/directory-tree-module-released/";
homepage = "http://brandon.si/code/directory-tree-module-released/";
description = "A simple directory-like tree datatype, with useful IO functions";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

21
pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ cabal, binary, dataAccessor, distributedProcess, network
, networkMulticast, networkTransport, networkTransportTcp
, transformers
}:
cabal.mkDerivation (self: {
pname = "distributed-process-simplelocalnet";
version = "0.2.0.5";
sha256 = "04cx5pb3pf4wpmqx1zhdc9lrfs0mb8zk7p1qxxlsqg0x63f3353w";
buildDepends = [
binary dataAccessor distributedProcess network networkMulticast
networkTransport networkTransportTcp transformers
];
meta = {
homepage = "http://github.com/haskell-distributed/distributed-process";
description = "Simple zero-configuration backend for Cloud Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

22
pkgs/development/libraries/haskell/distributed-process/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ cabal, binary, dataAccessor, distributedStatic, mtl
, networkTransport, random, rank1dynamic, stm, syb, time
, transformers
}:
cabal.mkDerivation (self: {
pname = "distributed-process";
version = "0.3.1";
sha256 = "048j27mpdmknz2s4ja3q2mla1d2sjbvrpmzx0lz2qas123qz1siq";
buildDepends = [
binary dataAccessor distributedStatic mtl networkTransport random
rank1dynamic stm syb time transformers
];
noHaddock = true;
meta = {
homepage = "http://github.com/haskell-distributed/distributed-process";
description = "Cloud Haskell: Erlang-style concurrency in Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

15
pkgs/development/libraries/haskell/distributed-static/default.nix Normal file
View File

@ -0,0 +1,15 @@
{ cabal, binary, rank1dynamic }:
cabal.mkDerivation (self: {
pname = "distributed-static";
version = "0.2.0.0";
sha256 = "04s3iils9ji8bwizvm36r5ihnd11098346br0919dv1x6g67a610";
buildDepends = [ binary rank1dynamic ];
meta = {
homepage = "http://www.github.com/haskell-distributed/distributed-process";
description = "Compositional, type-safe, polymorphic static values and closures";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/libraries/haskell/ghc-events/default.nix
View File

@ -2,13 +2,12 @@
cabal.mkDerivation (self: {
pname = "ghc-events";
version = "0.4.0.0";
sha256 = "0q1r5jxk8ma8rg65n4iixl5zyk4nxpzi4ywf0jz8y1nbbhbas7g2";
version = "0.4.0.1";
sha256 = "1ic8r3hn1m500xwq1n8wz7fp65vm43n7dkjnn341xdmpd1546wlc";
isLibrary = true;
isExecutable = true;
buildDepends = [ binary mtl ];
noHaddock = true;
jailbreak = true;
meta = {
description = "Library and tool for parsing .eventlog files from GHC";
license = self.stdenv.lib.licenses.bsd3;

6
pkgs/development/libraries/haskell/hs-bibutils/default.nix
View File

@ -2,11 +2,11 @@
cabal.mkDerivation (self: {
pname = "hs-bibutils";
version = "4.12";
sha256 = "0akxi69as7k5c0955yla9wcl1xvcvgzpzy3p1jj781w1lf89p537";
version = "4.15";
sha256 = "1h2vqi6ymhx9wpfv5qzvq4fhc4iand93shsncp8nszk64acmz9z9";
buildDepends = [ syb ];
meta = {
homepage = "http://code.haskell.org/hs-bibutils";
homepage = "http://gorgias.mine.nu/repos/hs-bibutils/";
description = "Haskell bindings to bibutils, the bibliography conversion utilities";
license = "GPL";
platforms = self.ghc.meta.platforms;

4
pkgs/development/libraries/haskell/http-conduit/default.nix
View File

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "1.6.0.4";
sha256 = "1gnr65nkgn99cvll71zka6wrpg9ihhn38mg89841q1w2y0xf1mb0";
version = "1.6.1";
sha256 = "1yzsa6gqhq6s4b2drhx4jd6qdfawf1swrjyffi2bfq1vq8i9ikf2";
buildDepends = [
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
blazeBuilderConduit caseInsensitive certificate conduit cookie

5
pkgs/development/libraries/haskell/hxt/default.nix
View File

@ -4,12 +4,13 @@
cabal.mkDerivation (self: {
pname = "hxt";
version = "9.2.2";
sha256 = "0ichjpshq10b11dyfv1q7rs2m190x3gplx6k54amlxv45nwd1s6r";
version = "9.3.1.0";
sha256 = "0nv7d7ffwq81671c7gyzaqx7xgrgs42svbq5xraij4jbq5406719";
buildDepends = [
binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema
hxtUnicode mtl network parsec
];
jailbreak = true;
meta = {
homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
description = "A collection of tools for processing XML with Haskell";

14
pkgs/development/libraries/haskell/network-multicast/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal, network }:
cabal.mkDerivation (self: {
pname = "network-multicast";
version = "0.0.7";
sha256 = "18qlg4cg7ci1z3mbqh5z16mxkjir0079a0rgm4qk6jbmsnvfsq43";
buildDepends = [ network ];
meta = {
description = "Simple multicast library";
license = self.stdenv.lib.licenses.publicDomain;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

15
pkgs/development/libraries/haskell/network-transport-tcp/default.nix Normal file
View File

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

15
pkgs/development/libraries/haskell/network-transport/default.nix Normal file
View File

@ -0,0 +1,15 @@
{ cabal, binary, transformers }:
cabal.mkDerivation (self: {
pname = "network-transport";
version = "0.2.0.2";
sha256 = "1pipykqwbjmbkgkmk0ss2pvfp72rkxwmz49d1j5xi8b0rlfgw05c";
buildDepends = [ binary transformers ];
meta = {
homepage = "http://github.com/haskell-distributed/distributed-process";
description = "Network abstraction layer";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

17
pkgs/development/libraries/haskell/parallel-io/default.nix Normal file
View File

@ -0,0 +1,17 @@
{ cabal, extensibleExceptions, random }:
cabal.mkDerivation (self: {
pname = "parallel-io";
version = "0.3.2";
sha256 = "1n9y1d1lcdwvhjsfqdlxknl89fxncq17kgin43wlki0c39cgirga";
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";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/random-fu/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "random-fu";
version = "0.2.3.0";
sha256 = "17vn1dz4z00xjpsxjx2dfjnz4qhbn5cbkm2s142kdskiphgxi2f8";
version = "0.2.3.1";
sha256 = "06b4v7012fj1kmnz6i63vbwl9gkhzgk556gmcc62k14299ks8pci";
buildDepends = [
erf gamma monadLoops mtl randomShuffle randomSource rvar syb
transformers vector

15
pkgs/development/libraries/haskell/rank1dynamic/default.nix Normal file
View File

@ -0,0 +1,15 @@
{ cabal, binary }:
cabal.mkDerivation (self: {
pname = "rank1dynamic";
version = "0.1.0.1";
sha256 = "18rlih5bndlm5v4nnv8g2rgvab5n22vd8mcjd0m4wq8fmqkb3x9d";
buildDepends = [ binary ];
meta = {
homepage = "http://github.com/haskell-distributed/distributed-process";
description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

4
pkgs/development/libraries/haskell/simple-sendfile/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "simple-sendfile";
version = "0.2.7";
sha256 = "0chjcn6j5irzjqid3nhh2ya395aqavcar3ygzd01z96ha1nl4dbw";
version = "0.2.8";
sha256 = "11lw8m21cy40hd9nzp80d9jawgv9hd3sfvizjcfbvdc2lpq6m17j";
buildDepends = [ network ];
meta = {
description = "Cross platform library for the sendfile system call";

1
pkgs/development/libraries/haskell/snap/server.nix
View File

@ -14,6 +14,7 @@ cabal.mkDerivation (self: {
filepath MonadCatchIOTransformers mtl network snapCore text time
transformers unixCompat
];
jailbreak = true;
meta = {
homepage = "http://snapframework.com/";
description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework";

1
pkgs/development/libraries/haskell/snap/snap.nix
View File

@ -19,6 +19,7 @@ cabal.mkDerivation (self: {
snapServer stm syb text time transformers unorderedContainers
utf8String vector vectorAlgorithms xmlhtml
];
jailbreak = true;
meta = {
homepage = "http://snapframework.com/";
description = "Top-level package for the Snap Web Framework";

5
pkgs/development/libraries/haskell/vector-space/default.nix
View File

@ -2,11 +2,10 @@
cabal.mkDerivation (self: {
pname = "vector-space";
version = "0.8.2";
sha256 = "09gndxxscyc9w85fih370gag8yd1xbfg94nxkwdvhzvbkns9k2ad";
version = "0.8.3";
sha256 = "1wiwzbzp2fcavps0fqc9rwm50b2yv0ysgs78d29mvwcya1ywwxgw";
buildDepends = [ Boolean MemoTrie NumInstances ];
meta = {
homepage = "http://haskell.org/haskellwiki/vector-space";
description = "Vector & affine spaces, linear maps, and derivatives";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

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

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "warp";
version = "1.3.1.2";
sha256 = "11y1dwzvfhr4fhlh5j2ydwj4d3r92qm55rn9xwbfxmr0vmvm78b5";
version = "1.3.2";
sha256 = "14yib72x3z6fylpkzpr77cvvnr4bn1vdadh2pq6rknszspl6g7iq";
buildDepends = [
blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
httpTypes liftedBase network networkConduit simpleSendfile

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

@ -1,11 +1,11 @@
{stdenv, fetchurl, bash, yasm, which, perl}:
stdenv.mkDerivation rec {
name = "libvpx-1.0.0";
name = "libvpx-1.1.0";
src = fetchurl {
url = http://webm.googlecode.com/files/libvpx-v1.0.0.tar.bz2;
sha256 = "08gyx90ndv0v8dhbhp3jdh6g37pmcjlfwljzsy0nskm4345dpkh7";
url = http://webm.googlecode.com/files/libvpx-v1.1.0.tar.bz2;
sha256 = "1ibjxcdsazqfbbjhb8w56vy3n9qwny2m9q4kzx4rmk9v9g7p9q4w";
};
patchPhase = ''

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

@ -10,11 +10,13 @@ stdenv.mkDerivation rec {
sha256 = "0ynwn7ih5l2b1kpzpibns9bb9wzfjak7mgrb1ji0dkn2q5pv6lr0";
};
enableParallelBuilding = true;
buildInputs = [ SDL autoconf automake libtool gtk m4 pkgconfig mesa ];
preConfigure = ''
touch NEWS AUTHORS ChangeLog
autoreconf -fvi -I acinclude
sh autogen.sh
'';
postInstall = ''

22
pkgs/os-specific/linux/ffado/default.nix
View File

@ -1,13 +1,14 @@
{ stdenv, fetchsvn, dbus, dbus_cplusplus, expat, glibmm, libconfig
{ stdenv, fetchurl, dbus, dbus_cplusplus, expat, glibmm, libconfig
, libavc1394, libiec61883, libraw1394, libxmlxx, makeWrapper, pkgconfig
, pyqt4, python, pythonDBus, qt4, scons }:
stdenv.mkDerivation rec {
name = "libffado-svn-1995";
name = "libffado-${version}";
version = "2.1.0";
src = fetchsvn {
url = "http://subversion.ffado.org/ffado/trunk/libffado";
rev = "1995";
src = fetchurl {
url = "http://www.ffado.org/files/${name}.tgz";
sha256 = "11cxmy31c19720j2171l735rpg7l8i41icsgqscfd2vkbscfmh6y";
};
buildInputs =
@ -18,13 +19,16 @@ stdenv.mkDerivation rec {
patches = [ ./enable-mixer-and-dbus.patch ];
preBuild = "export PYLIBSUFFIX=lib/${python.libPrefix}/site-packages";
# TODO fix ffado-diag, it doesn't seem to use PYPKGDIR
buildPhase = "scons PYPKGDIR=$out/$PYLIBSUFFIX";
buildPhase = ''
export PYLIBSUFFIX=lib/${python.libPrefix}/site-packages
scons PYPKGDIR=$out/$PYLIBSUFFIX
sed -e "s#/usr/local#$out#" -i support/mixer-qt4/ffado/config.py
'';
installPhase = ''
scons PREFIX=$out LIBDIR=$out/lib SHAREDIR=$out/share/libffado \
PYPKGDIR=$out/$PYLIBSUFFIX install
PYPKGDIR=$out/$PYLIBSUFFIX UDEVDIR=$out/lib/udev/rules.d install
sed -e "s#/usr/local#$out#g" -i $out/bin/ffado-diag

13
pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch
View File

@ -1,24 +1,25 @@
--- libffado-r2117/SConstruct 1970-01-01 01:00:01.000000000 +0100
+++ libffado-r2117/SConstruct 2012-04-06 18:26:45.521100690 +0200
@@ -314,10 +314,8 @@
--- libffado-2.1.0/SConstruct 1970-01-01 01:00:01.000000000 +0100
+++ libffado-2.1.0/SConstruct 2012-09-30 16:50:23.603283095 +0000
@@ -349,11 +349,9 @@
# Optional checks follow:
#
# PyQT checks
-# PyQT checks
-build_mixer = False
-if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ):
- env['PYUIC4'] = True
- build_mixer = True
+env['PYUIC4'] = True
+build_mixer = True
+
if conf.CheckForApp( 'xdg-desktop-menu --help' ):
env['XDG_TOOLS'] = True
@@ -348,7 +346,8 @@
@@ -384,7 +382,7 @@
name2 = pkg.replace("+","").replace(".","").replace("-","").upper()
env['%s_FLAGS' % name2] = conf.GetPKGFlags( pkg, pkgs[pkg] )
-if not env['DBUS1_FLAGS'] or not env['DBUSC1_FLAGS'] or not conf.CheckForApp('which dbusxx-xml2cpp'):
+
+if False:
env['DBUS1_FLAGS'] = ""
env['DBUSC1_FLAGS'] = ""

265
pkgs/os-specific/linux/kernel/linux-3.6.nix Normal file
View File

@ -0,0 +1,265 @@
args @ { stdenv, fetchurl, extraConfig ? ""
, perl, mktemp, module_init_tools
, ... }:
let
configWithPlatform = kernelPlatform :
''
# Power management and debugging for powertop.
DEBUG_KERNEL y
PM_ADVANCED_DEBUG y
PM_RUNTIME y
TIMER_STATS y
USB_SUSPEND y
BACKTRACE_SELF_TEST n
CPU_NOTIFIER_ERROR_INJECT? n
DEBUG_DEVRES n
DEBUG_NX_TEST n
DEBUG_STACK_USAGE n
DEBUG_STACKOVERFLOW n
RCU_TORTURE_TEST n
SCHEDSTATS n
# Support drivers that need external firmware.
STANDALONE n
# Make /proc/config.gz available.
IKCONFIG_PROC y
# Optimize with -O2, not -Os.
CC_OPTIMIZE_FOR_SIZE n
# Enable the kernel's built-in memory tester.
MEMTEST y
# Include the CFQ I/O scheduler in the kernel, rather than as a
# module, so that the initrd gets a good I/O scheduler.
IOSCHED_CFQ y
BLK_CGROUP y # required by CFQ
# Enable NUMA.
NUMA? y
# Disable some expensive (?) features.
FTRACE n
KPROBES n
PM_TRACE_RTC n
# Enable various subsystems.
ACCESSIBILITY y # Accessibility support
AUXDISPLAY y # Auxiliary Display support
DONGLE y # Serial dongle support
HIPPI? y
MTD_COMPLEX_MAPPINGS y # needed for many devices
SCSI_LOWLEVEL y # enable lots of SCSI devices
SCSI_LOWLEVEL_PCMCIA y
SPI y # needed for many devices
SPI_MASTER y
WAN y
# Networking options.
IP_PNP n
IPV6_PRIVACY y
NETFILTER_ADVANCED y
IP_VS_PROTO_TCP y
IP_VS_PROTO_UDP y
IP_VS_PROTO_ESP y
IP_VS_PROTO_AH y
IP_DCCP_CCID3 n # experimental
CLS_U32_PERF y
CLS_U32_MARK y
# Wireless networking.
IPW2100_MONITOR y # support promiscuous mode
IPW2200_MONITOR? y # support promiscuous mode
HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
HOSTAP_FIRMWARE_NVRAM y
ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
ATH9K_AHB y # Ditto, AHB bus
B43_PHY_HT y
BCMA_HOST_PCI y
# Some settings to make sure that fbcondecor works - in particular,
# disable tileblitting and the drivers that need it.
# Enable various FB devices.
FB y
FB_EFI y
FB_NVIDIA_I2C y # Enable DDC Support
FB_RIVA_I2C y
FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
FB_ATY_GX y # Mach64 GX support
FB_SAVAGE_I2C y
FB_SAVAGE_ACCEL y
FB_SIS_300 y
FB_SIS_315 y
FB_3DFX_ACCEL y
FB_GEODE y
# Video configuration
# Enable KMS for devices whose X.org driver supports it.
DRM_I915_KMS y
DRM_RADEON_KMS y
# Hybrid graphics support
VGA_SWITCHEROO y
# Sound.
SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
SND_HDA_INPUT_BEEP y # Support digital beep via input layer
SND_USB_CAIAQ_INPUT y
PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
# USB serial devices.
USB_SERIAL_GENERIC y # USB Generic Serial Driver
USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
USB_SERIAL_KEYSPAN_USA28 y
USB_SERIAL_KEYSPAN_USA28X y
USB_SERIAL_KEYSPAN_USA28XA y
USB_SERIAL_KEYSPAN_USA28XB y
USB_SERIAL_KEYSPAN_USA19 y
USB_SERIAL_KEYSPAN_USA18X y
USB_SERIAL_KEYSPAN_USA19W y
USB_SERIAL_KEYSPAN_USA19QW y
USB_SERIAL_KEYSPAN_USA19QI y
USB_SERIAL_KEYSPAN_USA49W y
USB_SERIAL_KEYSPAN_USA49WLC y
# Filesystem options - in particular, enable extended attributes and
# ACLs for all filesystems that support them.
EXT2_FS_XATTR y # Ext2 extended attributes
EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists
EXT2_FS_SECURITY y # Ext2 Security Labels
EXT2_FS_XIP y # Ext2 execute in place support
EXT4_FS_POSIX_ACL y
EXT4_FS_SECURITY y
REISERFS_FS_XATTR y
REISERFS_FS_POSIX_ACL y
REISERFS_FS_SECURITY y
JFS_POSIX_ACL y
JFS_SECURITY y
XFS_QUOTA y
XFS_POSIX_ACL y
XFS_RT y # XFS Realtime subvolume support
OCFS2_DEBUG_MASKLOG n
BTRFS_FS_POSIX_ACL y
UBIFS_FS_XATTR? y
UBIFS_FS_ADVANCED_COMPR y
NFSD_V2_ACL y
NFSD_V3 y
NFSD_V3_ACL y
NFSD_V4 y
CIFS_XATTR y
CIFS_POSIX y
# Security related features.
STRICT_DEVMEM y # Filter access to /dev/mem
SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
# Misc. options.
8139TOO_8129 y
8139TOO_PIO n # PIO is slower
AIC79XX_DEBUG_ENABLE n
AIC7XXX_DEBUG_ENABLE n
AIC94XX_DEBUG n
B43_PCMCIA y
BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
BLK_DEV_IDEACPI y # IDE ACPI support
BLK_DEV_INTEGRITY y
BSD_PROCESS_ACCT_V3 y
BT_HCIUART_BCSP y
BT_HCIUART_H4 y # UART (H4) protocol support
BT_HCIUART_LL y
BT_RFCOMM m
BT_RFCOMM_TTY y # RFCOMM TTY support
CRASH_DUMP n
DMAR? n # experimental
DVB_DYNAMIC_MINORS? y # we use udev
EFI_STUB y # EFI bootloader in the bzImage itself
FUSION y # Fusion MPT device support
IDE_GD_ATAPI y # ATAPI floppy support
IRDA_ULTRA y # Ultra (connectionless) protocol
JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
LOGO n # not needed
MEDIA_ATTACH? y
MEGARAID_NEWGEN y
MICROCODE_AMD y
MODVERSIONS y
MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
MTRR_SANITIZER y
NET_FC y # Fibre Channel driver support
PPP_MULTILINK y # PPP multilink support
REGULATOR y # Voltage and Current Regulator Support
SCSI_LOGGING y # SCSI logging facility
SERIAL_8250 y # 8250/16550 and compatible serial support
SLIP_COMPRESSED y # CSLIP compressed headers
SLIP_SMART y
THERMAL_HWMON y # Hardware monitoring support
USB_DEBUG n
USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
X86_CHECK_BIOS_CORRUPTION y
X86_MCE y
XEN_DOM0 y
# Linux Containers
RT_GROUP_SCHED? y
CGROUP_DEVICE? y
CGROUP_MEM_RES_CTLR? y
CGROUP_MEM_RES_CTLR_SWAP? y
DEVPTS_MULTIPLE_INSTANCES? y
# Enable staging drivers. These are somewhat experimental, but
# they generally don't hurt.
STAGING y
# PROC_EVENTS requires that the netlink connector is not built
# as a module. This is required by libcgroup's cgrulesengd.
CONNECTOR y
PROC_EVENTS y
# Tracing
FTRACE y
FUNCTION_TRACER y
FTRACE_SYSCALLS y
SCHED_TRACER y
# Devtmpfs support.
DEVTMPFS y
${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
${extraConfig}
'';
in
import ./generic.nix (
rec {
version = "3.6";
modDirVersion = "3.6.0";
testing = false;
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
'';
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0kvqj6bhzcq581aav8mjzzxisz7s5vwng7b5kwzp2d8p3kpsdfaa";
};
config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform;
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
}
// removeAttrs args ["extraConfig"]
)

15
pkgs/os-specific/linux/systemd/default.nix
View File

@ -6,20 +6,14 @@
assert stdenv.gcc.libc or null != null;
stdenv.mkDerivation rec {
name = "systemd-192";
name = "systemd-193";
src = fetchurl {
url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz";
sha256 = "03y3y1w3x7bx67jvdxryhns3h1g6nrllln46gqipp35n99alki2m";
sha256 = "1k8fmii15127y4b2kc9id2vkmrjdsbq3kv6fi308k72azbhnpnxr";
};
patches = [ ./reexec.patch ] ++
# Remove this patch after the next update.
stdenv.lib.optional (stdenv.system == "i686-linux") (fetchurl {
url = "https://bugs.freedesktop.org/attachment.cgi?id=67621";
name = "fix-32-bit-build.patch";
sha256 = "1i4xn6lc6iapaasd2lz717b1zrq5ds5g18i7m509fgfwy7w7x95l";
});
patches = [ ./reexec.patch ];
buildInputs =
[ pkgconfig intltool gperf libcap dbus kmod xz pam acl
@ -94,8 +88,9 @@ stdenv.mkDerivation rec {
passthru.interfaceVersion = 2;
meta = {
homepage = http://www.freedesktop.org/wiki/Software/systemd;
homepage = "http://www.freedesktop.org/wiki/Software/systemd";
description = "A system and service manager for Linux";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.simons ];
};
}

4
pkgs/servers/http/apache-httpd/2.4.nix
View File

@ -14,12 +14,12 @@ assert sslSupport -> aprutil.sslSupport && openssl != null;
assert ldapSupport -> aprutil.ldapSupport && openldap != null;
stdenv.mkDerivation rec {
version = "2.4.2";
version = "2.4.3";
name = "apache-httpd-${version}";
src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
sha1 = "8d391db515edfb6623c0c7c6ce5c1b2e1f7c64c2";
sha256 = "17i4zdcjfvxks0p1fbqvab37kr8d6zscqaqan8pqkw8iq6wh48fq";
};
buildInputs = [perl] ++

28
pkgs/servers/mail/spamassassin/default.nix
View File

@ -1,16 +1,16 @@
{ stdenv, fetchurl, buildPerlPackage, perl, HTMLParser, NetDNS, NetAddrIP, DBFile
, HTTPDate, MailDKIM, makeWrapper
, HTTPDate, MailDKIM, LWP, IOSocketSSL, IOSocketInet6, makeWrapper, gnupg1
}:
# TODO:
# TODO: Add the Perl modules ...
#
# DBI
# Encode::Detect
# IP::Country::Fast
# Mail::SPF
# Net::Ident
# Razor2::Client::Agent
#
# - Mail::SPF
# - IP::Country
# - Razor2
# - Net::Ident
# - DBI
# - LWP::UserAgent
# - Encode::Detect
buildPerlPackage rec {
name = "SpamAssassin-3.3.2";
@ -20,18 +20,22 @@ buildPerlPackage rec {
sha256 = "01d2jcpy423zfnhg123wlhzysih1hmb93nxfspiaajzh9r5rn8y7";
};
buildInputs = [ makeWrapper HTMLParser NetDNS NetAddrIP DBFile HTTPDate
MailDKIM ];
buildInputs = [ makeWrapper HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM
LWP IOSocketSSL IOSocketInet6 ];
# Enabling 'taint' mode is desirable, but that flag disables support
# for the PERL5LIB environment variable. Needs further investigation.
makeFlags = "PERL_BIN=${perl}/bin/perl PERL_TAINT=no";
makeMakerFlags = "CONFDIR=/etc/spamassassin LOCALSTATEDIR=/var/lib/spamassassin";
doCheck = false;
postInstall = ''
mv "rules/"* $out/share/spamassassin/
for n in "$out/bin/"*; do
wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB"
wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB" --prefix PATH : "${gnupg1}/bin"
done
'';

19
pkgs/servers/sip/freeswitch/default.nix
View File

@ -1,21 +1,16 @@
{ fetchgit, stdenv, ncurses, curl, pkgconfig, gnutls, readline, openssl, perl, libjpeg
, libzrtpcpp, autoconf, automake, libtool }:
{ fetchurl, stdenv, ncurses, curl, pkgconfig, gnutls, readline, openssl, perl, libjpeg
, libzrtpcpp }:
stdenv.mkDerivation rec {
name = "freeswitch-git-0db52e6";
name = "freeswitch-1.2.3";
src = fetchgit {
url = "git://git.freeswitch.org/freeswitch.git";
rev = "0db52e6e556fce584f1850c3a3b87c8f46ff87c5";
sha256 = "5cc7161c1ba64c5faf3dda2669e9aafd529eaa66be2fd83f284304444bcab9ff";
src = fetchurl {
url = http://files.freeswitch.org/freeswitch-1.2.3.tar.bz2;
sha256 = "0kfvn5f75c6r6yp18almjz9p6llvpm66gpbxcjswrg3ddgbkzg0k";
};
preConfigure = ''
./bootstrap.sh
'';
buildInputs = [ ncurses curl pkgconfig gnutls readline openssl perl libjpeg
autoconf automake libtool libzrtpcpp ];
libzrtpcpp ];
meta = {
description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch";

12
pkgs/tools/misc/plowshare/default.nix
View File

@ -1,16 +1,14 @@
{ stdenv, fetchurl, makeWrapper, curl }:
let
stdenv.mkDerivation rec {
v = "20120807";
name = "plowshare-${version}";
in stdenv.mkDerivation {
name = "plowshare-git${v}";
version = "git20120916";
src = fetchurl {
url = "http://plowshare.googlecode.com/files/plowshare-snapshot-git${v}.tar.gz";
sha256 = "0clryfssaa4rjvsy760p51ppq1275lwvhm9jh3g4mi973xv4n8si";
url = "http://plowshare.googlecode.com/files/plowshare-snapshot-${version}.tar.gz";
sha256 = "eccdb28d49ac47782abc8614202b3a88426cd587371641ecf2ec008880dc6067";
};
buildInputs = [ makeWrapper ];

2
pkgs/tools/networking/aircrack-ng/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchsvn {
url = "http://trac.aircrack-ng.org/svn/trunk";
inherit rev;
sha256 = "0rwj2nk4nyy0l9dg6rpg2h5gpvcygs5irj4i6fdcsr8xf0blq7yw";
sha256 = "d16fd3a4e918fd6a855c0d0ae0c863247a45189e6ec35c0c7082d3d07b6438db";
};
buildInputs = [libpcap openssl zlib];

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

@ -3504,6 +3504,10 @@ let
vpxSupport = if !stdenv.isMips then true else false;
};
ffmpeg_1_0 = callPackage ../development/libraries/ffmpeg/1.0.nix {
vpxSupport = if !stdenv.isMips then true else false;
};
fftw = callPackage ../development/libraries/fftw {
singlePrecision = false;
};
@ -5438,7 +5442,7 @@ let
spamassassin = callPackage ../servers/mail/spamassassin {
inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile
HTTPDate MailDKIM;
HTTPDate MailDKIM LWP IOSocketSSL IOSocketInet6;
};
samba = callPackage ../servers/samba { };
@ -5842,6 +5846,19 @@ let
];
};
linux_3_6 = makeOverridable (import ../os-specific/linux/kernel/linux-3.6.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
kernelPatches =
[
kernelPatches.sec_perm_2_6_24
# kernelPatches.aufs3_5
# kernelPatches.perf3_5
] ++ lib.optionals (platform.kernelArch == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
];
};
/* Linux kernel modules are inherently tied to a specific kernel. So
rather than provide specific instances of those packages for a
specific kernel, we have a function that builds those packages
@ -5967,6 +5984,7 @@ let
linuxPackages_3_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_3 pkgs.linuxPackages_3_3);
linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 pkgs.linuxPackages_3_4);
linuxPackages_3_5 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_5 pkgs.linuxPackages_3_5);
linuxPackages_3_6 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6 pkgs.linuxPackages_3_6);
# The current default kernel / kernel modules.
linux = linuxPackages.kernel;
@ -6907,7 +6925,7 @@ let
firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
firefoxPkgs = pkgs.firefox12Pkgs;
firefoxPkgs = pkgs.firefox15Pkgs;
firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix {
inherit (gnome) libIDL;
@ -6921,12 +6939,6 @@ let
firefox12Wrapper = wrapFirefox { browser = firefox12Pkgs.firefox; };
firefox13Pkgs = callPackage ../applications/networking/browsers/firefox/13.0.nix {
inherit (gnome) libIDL;
};
firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; });
firefox15Pkgs = callPackage ../applications/networking/browsers/firefox/15.0.nix {
inherit (gnome) libIDL;
inherit (pythonPackages) pysqlite;
@ -7872,20 +7884,21 @@ let
inherit stdenv makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon;
plugins =
let
enableAdobeFlash = config.browserNameenableAdobeFlash or true;
enableGnash = config.browserNameenableGnash or false;
cfg = stdenv.lib.attrByPath [ browserName ] {} config;
enableAdobeFlash = cfg.enableAdobeFlash or true;
enableGnash = cfg.enableGnash or false;
in
assert !(enableGnash && enableAdobeFlash);
([ ]
++ lib.optional enableGnash gnash
++ lib.optional enableAdobeFlash flashplayer
# RealPlayer is disabled by default for legal reasons.
++ lib.optional (system != "i686-linux" && config.browserNameenableRealPlayer or false) RealPlayer
++ lib.optional (config.browserNameenableDjvu or false) (djview4)
++ lib.optional (config.browserNameenableMPlayer or false) (MPlayerPlugin browser)
++ lib.optional (config.browserNameenableGeckoMediaPlayer or false) gecko_mediaplayer
++ lib.optional (supportsJDK && config.browserNamejre or false && jrePlugin ? mozillaPlugin) jrePlugin
++ lib.optional (config.browserNameenableGoogleTalkPlugin or false) google_talk_plugin
++ lib.optional (system != "i686-linux" && cfg.enableRealPlayer or false) RealPlayer
++ lib.optional (cfg.enableDjvu or false) (djview4)
++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser)
++ lib.optional (cfg.enableGeckoMediaPlayer or false) gecko_mediaplayer
++ lib.optional (supportsJDK && cfg.jre or false && jrePlugin ? mozillaPlugin) jrePlugin
++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin
);
libs =
if config.browserNameenableQuakeLive or false

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

@ -652,6 +652,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
directoryTree = callPackage ../development/libraries/haskell/directory-tree {};
distributedProcess = callPackage ../development/libraries/haskell/distributed-process {};
distributedProcessSimplelocalnet = callPackage ../development/libraries/haskell/distributed-process-simplelocalnet {};
distributedStatic = callPackage ../development/libraries/haskell/distributed-static {};
distributive = callPackage ../development/libraries/haskell/distributive {};
dlist = callPackage ../development/libraries/haskell/dlist {};
@ -1138,6 +1144,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
networkConduit = callPackage ../development/libraries/haskell/network-conduit {};
networkMulticast = callPackage ../development/libraries/haskell/network-multicast {};
networkTransport = callPackage ../development/libraries/haskell/network-transport {};
networkTransportTcp = callPackage ../development/libraries/haskell/network-transport-tcp {};
newtype = callPackage ../development/libraries/haskell/newtype {};
nonNegative = callPackage ../development/libraries/haskell/non-negative {};
@ -1187,6 +1199,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
parallel_3_2_0_3 = callPackage ../development/libraries/haskell/parallel/3.2.0.3.nix {};
parallel = self.parallel_3_2_0_3;
parallelIo = callPackage ../development/libraries/haskell/parallel-io {};
parseargs = callPackage ../development/libraries/haskell/parseargs {};
parsec_2_1_0_1 = callPackage ../development/libraries/haskell/parsec/2.1.0.1.nix {};
@ -1277,6 +1291,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
randomShuffle = callPackage ../development/libraries/haskell/random-shuffle {};
rank1dynamic = callPackage ../development/libraries/haskell/rank1dynamic {};
ranges = callPackage ../development/libraries/haskell/ranges {};
rvar = callPackage ../development/libraries/haskell/rvar {};

109
pkgs/top-level/python-packages.nix
View File

@ -33,11 +33,13 @@ let pythonPackages = python.modules // rec {
afew = buildPythonPackage rec {
name = "afew-1.0pre";
rev = "6bb3915636aaf86f046a017ffffd9a4ef395e199";
name = "afew-1.0_${rev}";
src = fetchurl {
url = "https://github.com/teythoon/afew/tarball/master";
url = "https://github.com/teythoon/afew/tarball/${rev}";
name = "${name}.tar.bz";
sha256 = "949710f8dcf503f42f2a2d77ea71e48ccf70155a764f75ad29cc93edc120809b";
sha256 = "74926d9ddfa69534cfbd08a82f0acccab2c649558062654d5d2ff2999d201384";
};
propagatedBuildInputs = [ notmuch pkgs.dbacl ];
@ -59,12 +61,13 @@ let pythonPackages = python.modules // rec {
alot = buildPythonPackage rec {
name = "alot-0.3.1";
rev = "27c91058c49d8755d2813d5b78094f40f36ec905";
name = "alot-0.3.3_${rev}";
src = fetchurl {
url = "https://github.com/pazz/alot/tarball/master";
url = "https://github.com/pazz/alot/tarball/${rev}";
name = "${name}.tar.bz";
sha256 = "06683de36688615d3d526198c93133e1131897c888ffa31e83f1ad292eae57af";
sha256 = "67e1033aa91818b7fa4c3911430a4da0f73aca92c3e3832c010038cbf263eec2";
};
doCheck = false;
@ -73,7 +76,7 @@ let pythonPackages = python.modules // rec {
postInstall = ''
wrapProgram $out/bin/alot \
--prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib:${pkgs.file511}/lib
--prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib:${pkgs.file511}/lib:${pkgs.gpgme}/lib
'';
meta = {
@ -700,6 +703,26 @@ let pythonPackages = python.modules // rec {
};
flake8 = buildPythonPackage (rec {
name = "flake8-1.4";
src = fetchurl {
url = "http://pypi.python.org/packages/source/f/flake8/${name}.tar.gz";
md5 = "64acc2c905178f6d6817d88574407fb5";
};
doCheck = false;
meta = {
description = "code checking using pep8 and pyflakes.";
homepage = http://pypi.python.org/pypi/flake8;
license = pkgs.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = python.meta.platforms;
};
});
flask = buildPythonPackage {
name = "flask-0.9";
@ -902,18 +925,21 @@ let pythonPackages = python.modules // rec {
httplib2 = buildPythonPackage rec {
name = "httplib2-0.6.0";
name = "httplib2-0.7.6";
src = fetchurl {
url = "http://httplib2.googlecode.com/files/${name}.tar.gz";
sha256 = "134pldyxayc0x4akzzvkciz2kj1w2dsim1xvd9b1qrpmba70dpjq";
sha256 = "baa7bf431fa9d3c1016562de717e1ebb322a99df72a2918f6b5b8f65fa65bc2e";
};
doCheck = false; # doesn't have a test
meta = {
homepage = http://code.google.com/p/httplib2/;
homepage = "http://code.google.com/p/httplib2";
description = "A comprehensive HTTP client library";
license = pkgs.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = python.meta.platforms;
};
};
@ -1422,6 +1448,26 @@ let pythonPackages = python.modules // rec {
};
});
oauth2 = buildPythonPackage (rec {
name = "auth2-1.5.211";
src = fetchurl {
url = "http://pypi.python.org/packages/source/o/oauth2/oauth2-1.5.211.tar.gz";
sha256 = "82a38f674da1fa496c0fc4df714cbb058540bed72a30c50a2e344b0d984c4d21";
};
propagatedBuildInputs = [ httplib2 ];
doCheck = false;
meta = {
homepage = "https://github.com/simplegeo/python-oauth2";
description = "library for OAuth version 1.0";
license = pkgs.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = stdenv.lib.platforms.linux;
};
});
optfunc = buildPythonPackage ( rec {
name = "optfunc-git";
@ -2656,6 +2702,45 @@ let pythonPackages = python.modules // rec {
};
};
turses = buildPythonPackage (rec {
name = "turses-0.2.5";
src = fetchurl {
url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz";
sha256 = "fbbc0ca93324535bcafa8434395caded8047e40c25d7a4004806415dd6ca023f";
};
propagatedBuildInputs = [ oauth2 urwid tweepy ];
doCheck = false;
meta = {
homepage = "https://github.com/alejandrogomez/turses";
description = "A Twitter client for the console.";
license = pkgs.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = stdenv.lib.platforms.linux;
};
});
tweepy = buildPythonPackage (rec {
name = "tweepy-1.11";
src = fetchurl {
url = "http://pypi.python.org/packages/source/t/tweepy/${name}.tar.gz";
sha256 = "2b9fa225e9254e2cbbb01e59c6e92d9c42e5d41d97e8c74dee93eb09babffde5";
};
doCheck = false;
meta = {
homepage = "https://github.com/tweepy/tweepy";
description = "Twitter library for python";
license = pkgs.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = stdenv.lib.platforms.linux;
};
});
twisted = buildPythonPackage rec {
name = "twisted-10.2.0";
@ -2727,13 +2812,13 @@ let pythonPackages = python.modules // rec {
urwid = buildPythonPackage (rec {
name = "urwid-1.0.1";
name = "urwid-1.0.2";
doCheck = false;
src = fetchurl {
url = "http://excess.org/urwid/${name}.tar.gz";
md5 = "828f7144b94920205e755c249d2e297f";
md5 = "00542bbd15fae7ea60b02a7570edee2b";
};
meta = {

1
pkgs/top-level/release.nix
View File

@ -355,7 +355,6 @@ with (import ./release-lib.nix);
firefox36Pkgs.firefox = linux;
firefox12Pkgs.firefox = linux;
firefox13Pkgs.firefox = linux;
firefox15Pkgs.firefox = linux;
gnome = {