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

This commit is contained in:
Eelco Dolstra 2012-10-05 17:57:45 -04:00
commit c1719a5835
44 changed files with 663 additions and 404 deletions

2
.gitignore vendored
View file

@ -1,2 +1,4 @@
*~
,*
.*.swp
.*.swo

View file

@ -1,20 +1,20 @@
{ stdenv, fetchurl, perl, libX11, xineLib, libjpeg, libpng, libtiff, pkgconfig,
{ stdenv, fetchurl, perl, libX11, libjpeg, libpng, libtiff, pkgconfig,
librsvg, glib, gtk, libXext, libXxf86vm, poppler }:
stdenv.mkDerivation {
name = "eaglemode-0.84.0";
src = fetchurl {
url = mirror://sourceforge/eaglemode/eaglemode-0.84.0.tar.bz2;
sha256 = "0n20b419j0l7h7jr4s3f3n09ka0ysg9nqs8mcwsrx24rcq7nv0cs";
};
buildInputs = [ perl libX11 xineLib libjpeg libpng libtiff pkgconfig
buildInputs = [ perl libX11 libjpeg libpng libtiff pkgconfig
librsvg glib gtk libXxf86vm libXext poppler ];
# The program tries to dlopen both Xxf86vm and Xext, so we use the
# trick on NIX_LDFLAGS and dontPatchELF to make it find them.
# I use 'yes y' to skip a build error linking with xineLib,
# I use 'yes y' to skip a build error linking with xineLib,
# because xine stopped exporting "_x_vo_new_port"
# http://sourceforge.net/projects/eaglemode/forums/forum/808824/topic/5115261
buildPhase = ''
@ -30,7 +30,7 @@ stdenv.mkDerivation {
# Run 'eaglemode.sh', not 'eaglemode'.
ln -s $out/eaglemode.sh $out/bin/eaglemode.sh
'';
meta = {
homepage = "http://eaglemode.sourceforge.net";
description = "Zoomable User Interface";

View file

@ -1,17 +1,18 @@
{ stdenv, fetchurl, pkgconfig, zlib, freetype, libjpeg, jbig2dec, openjpeg
, libX11, libXext }:
stdenv.mkDerivation rec {
name = "mupdf-0.7";
name = "mupdf-1.1";
src = fetchurl {
url = "http://mupdf.com/download/archive/${name}.tar.gz";
sha256 = "e7f6307fa472575d27fe893e787ddb3fc927f03ba4ae23105f917189e81960a6";
url = "http://mupdf.com/download/archive/${name}-source.tar.gz";
sha256 = "e54666bbe1d9f0a5464349bfbeffcf676c4a0fcad3efb89eba1f20d4ac991f34";
};
buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ];
preBuild = ''
export makeFlags="prefix=$out"
export NIX_CFLAGS_COMPILE=" $NIX_CFLAGS_COMPILE -I$(echo ${openjpeg}/include/openjpeg-*) "
'';
meta = {

View file

@ -1,23 +0,0 @@
source $stdenv/setup
dontStrip=1
dontPatchELF=1
sourceRoot=$TMPDIR
unpackPhase() {
tar xvzf $src;
for a in *; do
if [ -d $a ]; then
cd $a
break
fi
done
}
installPhase() {
mkdir -p $out/lib/mozilla/plugins
cp -pv libflashplayer.so $out/lib/mozilla/plugins
patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so
}
genericBuild

View file

@ -1,88 +0,0 @@
{ stdenv
, fetchurl
, zlib
, alsaLib
, curl
, nss
, nspr
, fontconfig
, freetype
, expat
, libX11
, libXext
, libXrender
, libXt
, gtk
, glib
, pango
, cairo
, atk
, gdk_pixbuf
, debug ? false
/* you have to add ~/mm.cfg :
TraceOutputFileEnable=1
ErrorReportingEnable=1
MaxWarnings=1
in order to read the flash trace at ~/.macromedia/Flash_Player/Logs/flashlog.txt
Then FlashBug (a FireFox plugin) shows the log as well
*/
}:
let
src =
if stdenv.system == "x86_64-linux" then
if debug then
# no plans to provide a x86_64 version:
# http://labs.adobe.com/technologies/flashplayer10/faq.html
throw "no x86_64 debugging version available"
else {
# -> http://labs.adobe.com/downloads/flashplayer10.html
version = "10.3.181.34";
url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_2_p3_64bit_linux_111710.tar.gz;
sha256 = "1w2zs2f0q1vpx4ia9pj1k4p830dwz7ypyn302mi48wcpz1wzc1gg";
}
else if stdenv.system == "i686-linux" then
if debug then {
# The debug version also contains a player
version = "10.2_p2-debug-r092710";
url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_32bit_debug_linux_092710.tar.gz;
sha256 = "11w3mxa39l4mnlsqzlwbdh1sald549afyqbx2kbid7in5qzamlcc";
} else {
version = "10.3.183.10";
url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz;
sha256 = "0fj51dg0aa813b44yn8dvmmvw4qwi8vbi0x8n1bcqrcld3sbpmfz";
}
else throw "Flash Player is not supported on this platform";
in
stdenv.mkDerivation {
name = "flashplayer-${src.version}";
builder = ./builder.sh;
src = fetchurl { inherit (src) url sha256; };
inherit zlib alsaLib;
passthru = {
mozillaPlugin = "/lib/mozilla/plugins";
};
rpath = stdenv.lib.makeLibraryPath
[ zlib alsaLib curl nss nspr fontconfig freetype expat libX11
libXext libXrender libXt gtk glib pango atk cairo gdk_pixbuf
];
buildPhase = ":";
meta = {
description = "Adobe Flash Player browser plugin";
homepage = http://www.adobe.com/products/flashplayer/;
};
}

View file

@ -11,8 +11,9 @@
, libX11
, libXext
, libXrender
, libXcursor
, libXt
, gtk
, gtk
, glib
, pango
, cairo
@ -65,7 +66,7 @@ stdenv.mkDerivation {
name = "flashplayer-${src.version}";
builder = ./builder.sh;
src = fetchurl { inherit (src) url sha256; };
inherit zlib alsaLib;
@ -76,7 +77,7 @@ stdenv.mkDerivation {
rpath = stdenv.lib.makeLibraryPath
[ zlib alsaLib curl nss nspr fontconfig freetype expat libX11
libXext libXrender libXt gtk glib pango atk cairo gdk_pixbuf
libXext libXrender libXcursor libXt gtk glib pango atk cairo gdk_pixbuf
];
buildPhase = ":";

View file

@ -1,14 +0,0 @@
source $stdenv/setup
dontStrip=1
dontPatchELF=1
sourceRoot=.
installPhase() {
mkdir -p $out/lib/mozilla/plugins
cp -p libflashplayer.so $out/lib/mozilla/plugins
patchelf --set-rpath $rpath $out/lib/mozilla/plugins/libflashplayer.so
}
genericBuild

View file

@ -1,47 +0,0 @@
{ stdenv
, fetchurl
, zlib
, alsaLib
, nss
, nspr
, fontconfig
, freetype
, expat
, libX11
, libXext
, libXrender
, libXt
, gtk
, glib
, pango
, atk
, customSrc ? null
}:
assert stdenv.system == "i686-linux";
stdenv.mkDerivation {
name = "flashplayer-9.0.124.0";
builder = ./builder.sh;
src = if customSrc == null then
fetchurl {
url = http://download.macromedia.com/pub/flashplayer/installers/current/9/install_flash_player_9.tar.gz;
sha256 = "1cnsjgmy7rwj3spzb5mmpmvzxjp435jisl0dd8s4rf4xskyy6d6r";
}
else customSrc;
inherit zlib alsaLib;
passthru = {
mozillaPlugin = "/lib/mozilla/plugins";
};
rpath = stdenv.lib.makeLibraryPath [zlib alsaLib nss nspr fontconfig freetype expat libX11 libXext libXrender libXt gtk glib pango atk] ;
meta = {
description = "Adobe Flash Player browser plugin";
homepage = http://www.adobe.com/products/flashplayer/;
};
}

View file

@ -63,6 +63,10 @@
name = "liberation-fonts-ttf-1.07.1.tar.gz";
md5 = "0be45d54cc5e1c2e3102e32b8c190346";
}
{
name = "liberation-fonts-ttf-2.00.0.tar.gz";
md5 = "cfbf1ac6f61bf6cf45342a0cc9381be5";
}
{
name = "swingExSrc.zip";
md5 = "35c94d2df8893241173de1d16b6034c0";

View file

@ -16,10 +16,10 @@ let
langsSpaces = stdenv.lib.concatStringsSep " " langs;
major = "3";
minor = "6";
patch = "1";
patch = "2";
tweak = "2";
subdir = "${major}.${minor}.${patch}";
version = "${subdir}.${tweak}";
version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
fetchThirdParty = {name, md5}: fetchurl {
inherit name md5;
url = "http://dev-www.libreoffice.org/src/${md5}-${name}";
@ -36,17 +36,17 @@ let
}) ] ++ (map fetchThirdParty (import ./libreoffice-srcs.nix));
translations = fetchSrc {
name = "translations";
sha256 = "0id4ad8h3fl4s2ax6r4w4af74xvagkv0qwy50f483lqq3a3pl7fl";
sha256 = "a6ef65d5acfe9be19a3d4d743cd23a1017733f651ffc57f5773a24704a282c33";
};
help = fetchSrc {
name = "help";
sha256 = "0jd3l3rkhmdvrvgklkmrh9zsg9hlv3vhy6s97fnzhpzr90sjqrs1";
sha256 = "55ec6ef5eef4bbf2298c3b864f67c8424ebb5ccbe7bcd6ca59abba2867989e31";
};
core = fetchSrc {
name = "core";
sha256 = "12zc0zviy1p3gk1v5nm4ks4rzscn68lpnl3kis4q693zhsk8jyh3";
sha256 = "5ec07ffacec09c4dcee9246cb132f7a59a618b395835e781735fd61bf47e8d37";
};
};
in

View file

@ -1,36 +1,41 @@
{ alsaSupport ? true, xvSupport ? true, theoraSupport ? true, cacaSupport ? true
, xineramaSupport ? true, randrSupport ? true, dvdnavSupport ? true
, stdenv, fetchurl, fetchsvn, fetchgit, x11, freetype, fontconfig, zlib
, alsaLib ? null, libXv ? null, libtheora ? null, libcaca ? null
, libXinerama ? null, libXrandr ? null, libdvdnav ? null
, cdparanoia ? null, cddaSupport ? true
, amrnb ? null, amrwb ? null, amrSupport ? false
, x11Support ? true, libX11 ? null, libXext ? null
, jackaudioSupport ? false, jackaudio ? null
, x264Support ? false, x264 ? null
, xvidSupport ? false, xvidcore ? null
{ stdenv, fetchurl, freetype, pkgconfig, yasm, freefont_ttf
, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null
, xineramaSupport ? true, libXinerama ? null
, xvSupport ? true, libXv ? null
, alsaSupport ? true, alsaLib ? null
, screenSaverSupport ? true, libXScrnSaver ? null
, vdpauSupport ? false, libvdpau ? null
, cddaSupport ? true, cdparanoia ? null
, dvdnavSupport ? true, libdvdnav ? null
, bluraySupport ? true, libbluray ? null
, amrSupport ? false, amrnb ? null, amrwb ? null
, cacaSupport ? true, libcaca ? null
, lameSupport ? true, lame ? null
, speexSupport ? true, speex ? null
, screenSaverSupport ? true, libXScrnSaver
, pulseSupport ? false, pulseaudio
, mesa, pkgconfig, unzip, yasm, freefont_ttf
, vdpauSupport ? false, libvdpau ? null
, theoraSupport ? true, libtheora ? null
, x264Support ? false, x264 ? null
, jackaudioSupport ? false, jackaudio ? null
, pulseSupport ? false, pulseaudio ? null
}:
assert alsaSupport -> alsaLib != null;
assert x11Support -> libX11 != null;
assert xvSupport -> (libXv != null && x11Support);
assert theoraSupport -> libtheora != null;
assert cacaSupport -> libcaca != null;
assert x11Support -> (libX11 != null && libXext != null && mesa != null);
assert xineramaSupport -> (libXinerama != null && x11Support);
assert randrSupport -> (libXrandr != null && x11Support);
assert dvdnavSupport -> libdvdnav != null;
assert cddaSupport -> cdparanoia != null;
assert jackaudioSupport -> jackaudio != null;
assert amrSupport -> (amrnb != null && amrwb != null);
assert xvSupport -> (libXv != null && x11Support);
assert alsaSupport -> alsaLib != null;
assert screenSaverSupport -> libXScrnSaver != null;
assert vdpauSupport -> libvdpau != null;
assert cddaSupport -> cdparanoia != null;
assert dvdnavSupport -> libdvdnav != null;
assert bluraySupport -> libbluray != null;
assert amrSupport -> (amrnb != null && amrwb != null);
assert cacaSupport -> libcaca != null;
assert lameSupport -> lame != null;
assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert x264Support -> x264 != null;
assert jackaudioSupport -> jackaudio != null;
assert pulseSupport -> pulseaudio != null;
let
@ -64,20 +69,12 @@ let
};
} else null;
ffmpegGit = fetchgit {
url = "git://git.videolan.org/ffmpeg.git";
rev = "9e53f62be1a171eaf9620958c225d42cf5142a30";
sha256 = "be0ef2a394c82a0eee0be66bc0b943d37efb90f74ce1030aa89606109434c943";
};
mplayerRev = "34586";
in
stdenv.mkDerivation rec {
name = "mplayer-${mplayerRev}";
name = "mplayer-1.1";
src = fetchsvn {
src = fetchurl {
# Old kind of URL:
# url = http://nixos.org/tarballs/mplayer-snapshot-20101227.tar.bz2;
# Snapshot I took on 20110423
@ -86,64 +83,72 @@ stdenv.mkDerivation rec {
#url = http://www.mplayerhq.hu/MPlayer/releases/mplayer-export-snapshot.tar.bz2;
#sha256 = "cc1b3fda75b172f02c3f46581cfb2c17f4090997fe9314ad046e464a76b858bb";
url = "svn://svn.mplayerhq.hu/mplayer/trunk";
rev = "${mplayerRev}";
sha256 = "5688add3256b5de8e0410194232aaaeb01531bb507459ffe4f07e69cb2d81bd7";
url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.1.tar.xz";
sha256 = "173cmsfz7ckzy1hay9mpnc5as51127cfnxl20b521d2jvgm4gjvn";
};
prePatch = ''
sed -i /^_install_strip/d configure
'';
buildInputs =
[ freetype zlib pkgconfig ]
++ stdenv.lib.optionals x11Support [ libX11 libXext mesa ]
++ stdenv.lib.optional alsaSupport alsaLib
++ stdenv.lib.optional xvSupport libXv
++ stdenv.lib.optional theoraSupport libtheora
++ stdenv.lib.optional cacaSupport libcaca
++ stdenv.lib.optional xineramaSupport libXinerama
++ stdenv.lib.optional randrSupport libXrandr
++ stdenv.lib.optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ stdenv.lib.optional cddaSupport cdparanoia
++ stdenv.lib.optional jackaudioSupport jackaudio
++ stdenv.lib.optionals amrSupport [ amrnb amrwb ]
++ stdenv.lib.optional x264Support x264
++ stdenv.lib.optional xvidSupport xvidcore
++ stdenv.lib.optional pulseSupport pulseaudio
++ stdenv.lib.optional screenSaverSupport libXScrnSaver
++ stdenv.lib.optional lameSupport lame
++ stdenv.lib.optional vdpauSupport libvdpau
++ stdenv.lib.optional speexSupport speex;
buildInputs = with stdenv.lib;
[ freetype pkgconfig ]
++ optionals x11Support [ libX11 libXext mesa ]
++ optional alsaSupport alsaLib
++ optional xvSupport libXv
++ optional theoraSupport libtheora
++ optional cacaSupport libcaca
++ optional xineramaSupport libXinerama
++ optional dvdnavSupport libdvdnav
++ optional bluraySupport libbluray
++ optional cddaSupport cdparanoia
++ optional jackaudioSupport jackaudio
++ optionals amrSupport [ amrnb amrwb ]
++ optional x264Support x264
++ optional pulseSupport pulseaudio
++ optional screenSaverSupport libXScrnSaver
++ optional lameSupport lame
++ optional vdpauSupport libvdpau
++ optional speexSupport speex;
buildNativeInputs = [ yasm ];
preConfigure = ''
cp -r ${ffmpegGit} ffmpeg
chmod u+w -R ffmpeg
sed -ie '1i#include "libavutil/intreadwrite.h"' ffmpeg/libavcodec/libmp3lame.c
'';
postConfigure = ''
echo CONFIG_MPEGAUDIODSP=yes >> config.mak
'';
configureFlags = ''
${if cacaSupport then "--enable-caca" else "--disable-caca"}
${if dvdnavSupport then "--enable-dvdnav --enable-dvdread --disable-dvdread-internal" else ""}
${if x264Support then "--enable-x264 --extra-libs=-lx264" else ""}
${if codecs != null then "--codecsdir=${codecs}" else ""}
${if (stdenv.isi686 || stdenv.isx86_64) then "--enable-runtime-cpudetection" else ""}
${if x11Support then "--enable-x11" else ""}
${stdenv.lib.optionalString speexSupport "--enable-speex"}
--disable-xanim
--disable-ivtv
--enable-vidix
--enable-fbdev
--disable-ossaudio
'';
configureFlags = with stdenv.lib;
''
${if x11Support then "--enable-x11 --enable-gl" else "--disable-x11 --disable-gl"}
${if xineramaSupport then "--enable-xinerama" else "--disable-xinerama"}
${if xvSupport then "--enable-xv" else "--disable-xv"}
${if alsaSupport then "--enable-alsa" else "--disable-alsa"}
${if screenSaverSupport then "--enable-xss" else "--disable-xss"}
${if vdpauSupport then "--enable-vdpau" else "--disable-vdpau"}
${if cddaSupport then "--enable-cdparanoia" else "--disable-cdparanoia"}
${if dvdnavSupport then "--enable-dvdnav" else "--disable-dvdnav"}
${if bluraySupport then "--enable-bluray" else "--disable-bluray"}
${if amrSupport then "--enable-libopencore_amrnb" else "--disable-libopencore_amrnb"}
${if cacaSupport then "--enable-caca" else "--disable-caca"}
${if lameSupport then "--enable-mp3lame --disable-mp3lame-lavc" else "--disable-mp3lame --enable-mp3lame-lavc"}
${if speexSupport then "--enable-speex" else "--disable-speex"}
${if theoraSupport then "--enable-theora" else "--disable-theora"}
${if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc"}
${if jackaudioSupport then "--enable-jack" else "--disable-jack"}
${if pulseSupport then "--enable-pulse" else "--disable-pulse"}
NIX_LDFLAGS = if x11Support then "-lX11 -lXext" else "";
${optionalString (codecs != null) "--codecsdir=${codecs}"}
${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"}
--enable-freetype
--disable-xanim
--disable-ivtv
--disable-xvid --disable-xvid-lavc
--enable-vidix
--enable-fbdev
--disable-ossaudio
'';
NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext";
# Provide a reasonable standard font. Maybe we should symlink here.
postInstall =
@ -155,7 +160,7 @@ stdenv.mkDerivation rec {
crossAttrs = {
dontSetConfigureCross = true;
# Some things (vidix) are nanonote specific. Once someone cares, we can make options from them.
preConfigure = preConfigure + ''
preConfigure = ''
configureFlags="`echo $configureFlags |
sed -e 's/--codecsdir[^ ]\+//' \
-e 's/--enable-runtime-cpudetection//' `"

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl}:
{stdenv, fetchurl, ...}:
stdenv.mkDerivation {
name = "openjdk6-b16-24_apr_2009-r1";

View file

@ -122,7 +122,6 @@ stdenv.mkDerivation rec {
"UNIXCOMMAND_PATH="
"BOOTDIR=${jdk}"
"DROPS_DIR=$(DROPS_PATH)"
"SKIP_BOOT_CYCLE=false"
];
configurePhase = ''

View file

@ -0,0 +1,44 @@
{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, async, cgi, fgl,
haskellSrc, html, network, parallel, parsec, primitive,
regexBase, regexCompat, regexPosix,
split, stm, syb, deepseq, text, transformers, mtl, vector, xhtml, zlib, random,
cabalInstall, alex, happy, haddock, ghc}:
# This is just a meta-package. Because upstream fails to provide proper versioned
# release tarballs that can be used for the purpose of verifying this package, we
# just create it on the fly from a simple Setup.hs file and a .cabal file that we
# store directly in the nixpkgs repository.
cabal.mkDerivation (self : {
pname = "haskell-platform";
version = "2012.4.0.0";
cabalFile = ./haskell-platform-2012.4.0.0.cabal;
setupFile = ./Setup.hs;
src = null;
propagatedBuildInputs = [
GLUT HTTP HUnit OpenGL QuickCheck async cgi fgl
haskellSrc html network parallel parsec primitive
regexBase regexCompat regexPosix
split stm syb deepseq text transformers mtl vector xhtml zlib random
cabalInstall alex happy ghc haddock
];
unpackPhase = ''
sourceRoot=haskell-platform
mkdir $sourceRoot
cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal
cp ${self.setupFile} $sourceRoot/Setup.hs
touch $sourceRoot/LICENSE
'';
noHaddock = true;
meta = {
homepage = "http://haskell.org/platform";
description = "Haskell Platform meta package";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

View file

@ -0,0 +1,96 @@
name: haskell-platform
version: 2012.4.0.0
homepage: http://haskell.org/platform
license: BSD3
license-file: LICENSE
author: libraries@haskell.org
maintainer: haskell-platform@projects.haskell.org
category: System
synopsis: The Haskell Platform
description:
The Haskell Platform (HP) is the blessed set of libraries and tools on
which to build further Haskell libraries and applications. It is
intended to provide a comprehensive, stable, and quality tested base for
Haskell projects to work from.
.
This version specifies the following additional developer tools be
installed, for a system to be in full compliance:
.
* cabal-install
* alex
* happy
* haddock
cabal-version: >= 1.8
build-type: Custom
tested-with: GHC ==7.4.2
library
build-depends:
-- ghc ==7.4.2,
-- Core libraries: provided by every ghc installation
-- We don't include "non-API" packages here.
-- array ==0.4.0.0,
-- base ==4.5.1.0,
-- bytestring ==0.9.2.1,
-- Cabal ==1.14.0,
-- containers ==0.4.2.1,
-- deepseq ==1.3.0.0,
-- directory ==1.1.0.2,
-- extensible-exceptions ==0.1.1.4,
-- filepath ==1.3.0.0,
-- haskell2010 ==1.1.0.1,
-- haskell98 ==2.0.0.1,
-- hpc ==0.5.1.1,
-- old-locale ==1.0.0.4,
-- old-time ==1.1.0.0,
-- pretty ==1.1.1.0,
-- process ==1.1.0.1,
-- template-haskell ==2.7.0.0,
-- time ==1.4,
-- unix ==2.5.1.1,
-- Win32 ==2.2.2.0,
-- Libraries in addition to what GHC provides:
-- Note: newer versions of cgi need monad-catchio.
async ==2.0.1.3,
cgi ==3001.1.7.4,
fgl ==5.4.2.4,
GLUT ==2.1.2.1,
haskell-src ==1.0.1.5,
html ==1.0.1.2,
HTTP ==4000.2.5,
HUnit ==1.2.5.1,
mtl ==2.1.2,
network ==2.3.1.0,
OpenGL ==2.2.3.1,
parallel ==3.2.0.3,
parsec ==3.1.3,
QuickCheck ==2.5.1.1,
random ==1.0.1.1,
regex-base ==0.93.2,
regex-compat ==0.95.1,
regex-posix ==0.95.2,
split ==0.2.1.1,
stm ==2.4,
syb ==0.3.7,
text ==0.11.2.3,
transformers ==0.3.0.0,
vector ==0.10,
xhtml ==3000.2.1,
zlib ==0.5.4.0,
-- Libraries that are needed to support the above,
-- though are not officially part of the platform
primitive ==0.5
-- Depending on programs does not work, they are not registered
-- We list them to help distro packaging.
build-tools:
cabal-install ==0.14.0,
alex ==3.0.2,
happy ==1.18.10
-- hscolour ==1.19 -- ???
-- haddock ==2.11.0 -- need to use the one shipped with ghc

View file

@ -0,0 +1,15 @@
{ cabal, parsec }:
cabal.mkDerivation (self: {
pname = "network";
version = "2.3.1.0";
sha256 = "1fp25wkl5cc4kx0jv5w02b7pzgqadjg1yrknzzwsqxc5s3cpyz6l";
buildDepends = [ parsec ];
meta = {
homepage = "http://github.com/haskell/network";
description = "Low-level networking interface";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View file

@ -0,0 +1,14 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "primitive";
version = "0.5";
sha256 = "0m2gv7lac7q24cy02bbc7hq41awjxzs8dcjc6j2nv8xiq14cp3mk";
meta = {
homepage = "http://code.haskell.org/primitive";
description = "Primitive memory-related operations";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View file

@ -0,0 +1,15 @@
{ cabal, deepseq, primitive }:
cabal.mkDerivation (self: {
pname = "vector";
version = "0.10";
sha256 = "0lwhsdg7wv6gwjswakf2d1h9w7lp4pznab0mz6xg5q48pgknrcig";
buildDepends = [ deepseq primitive ];
meta = {
homepage = "http://code.haskell.org/vector";
description = "Efficient Arrays";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View file

@ -0,0 +1,30 @@
{ stdenv, fetchgit, sqlite, pkgconfig
, buildllvmsparse ? true
, buildc2xml ? true
, llvm ? null, libxml2 ? null
}:
assert buildllvmsparse -> llvm != null;
assert buildc2xml -> libxml2 != null;
stdenv.mkDerivation {
name = "smatch";
src = fetchgit {
url = git://repo.or.cz/smatch.git;
rev = "23656e3e578b700cbf96d043f039e6341a3ba5b9";
sha256 = "09a44967d4cff026c67062f778e251d0b432af132e9d59a47b7d3167f379adfa";
};
buildInputs = [sqlite pkgconfig]
++ stdenv.lib.optional buildllvmsparse llvm
++ stdenv.lib.optional buildc2xml libxml2;
installFlags = "DESTDIR=$(out)";
meta = {
description = "A semantic analysis tool for C";
homepage = "http://smatch.sourceforge.net/";
license = "free"; /* OSL, see http://www.opensource.org */
};
}

View file

@ -155,6 +155,12 @@ rec {
# Return true iff string v1 denotes a version older than v2.
versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1;
# Get the version of the specified derivation, as specified in its
# name attribute.
getVersion = drv: (builtins.parseDrvName drv.name).version;
# Extract name with version from URL. Ask for separator which is
# supposed to start extension
nameFromURL = url: sep: let

View file

@ -232,6 +232,10 @@ let
# Devtmpfs support.
DEVTMPFS y
# Media support
MEDIA_CAMERA_SUPPORT? y
MEDIA_RC_SUPPORT? y
${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
${extraConfig}
'';

View file

@ -0,0 +1,17 @@
{stdenv, fetchgit}:
stdenv.mkDerivation rec {
version = "0.4";
name = "reptyr-${version}";
src = fetchgit {
url = "https://github.com/nelhage/reptyr.git";
rev = "refs/tags/${name}";
sha256 = "2d2814c210e4bde6f9bcf3aa20477287d7e4a5aa7ee09110b37d2eaaf7e5ecae";
};
makeFlags = ["PREFIX=$(out)"];
meta = {
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [raskin];
license = stdenv.lib.licenses.mit;
description = ''A Linux tool to change controlling pty of a process'';
};
}

View file

@ -1,19 +1,19 @@
{ stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod
, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, usbutils, pciutils
, glib, kbd, libxslt
, glib, kbd, libxslt, coreutils
}:
assert stdenv.gcc.libc or null != null;
stdenv.mkDerivation rec {
name = "systemd-193";
name = "systemd-194";
src = fetchurl {
url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz";
sha256 = "1k8fmii15127y4b2kc9id2vkmrjdsbq3kv6fi308k72azbhnpnxr";
sha256 = "0cgnnl6kqaz3als5y9g8jvsvbs4c8ccp0vl4s1g8rwk69w2cwxd2";
};
patches = [ ./reexec.patch ];
patches = [ ./reexec.patch ./ignore-duplicates.patch ];
buildInputs =
[ pkgconfig intltool gperf libcap dbus kmod xz pam acl
@ -75,7 +75,12 @@ stdenv.mkDerivation rec {
for i in init halt poweroff runlevel reboot shutdown; do
ln -s $out/bin/systemctl $out/sbin/$i
done
'';
# Fix reference to /bin/false in the D-Bus services.
for i in $out/share/dbus-1/system-services/*.service; do
substituteInPlace $i --replace /bin/false ${coreutils}/bin/false
done
''; # */
enableParallelBuilding = true;

View file

@ -0,0 +1,20 @@
Ignore duplicate paths in "systemctl start".
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index a4290c4..d3ac3ad 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -1596,8 +1596,11 @@ static int start_unit_one(
r = set_put(s, p);
if (r < 0) {
- log_error("Failed to add path to set.");
- return r;
+ free(p);
+ if (r != -EEXIST) {
+ log_error("Failed to add path %s to set.", p);
+ return r;
+ }
}
p = NULL;

View file

@ -2,16 +2,23 @@
# Note: zlib is not required; MySQL can use an internal zlib.
stdenv.mkDerivation {
name = "mysql-5.5.23";
stdenv.mkDerivation rec {
name = "mysql-${version}";
version = "5.5.28";
src = fetchurl {
url = ftp://ftp.inria.fr/pub/MySQL/Downloads/MySQL-5.5/mysql-5.5.23.tar.gz;
sha256 = "0sklcz6miff7nb6bi1pqncgjv819255y7if6jxcqgiqs50z319i0";
urls = [
"mirror://sourceforge/mysql.mirror/${name}.tar.gz"
"http://mysql.linux.cz/Downloads/MySQL-5.5/${name}.tar.gz"
"http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${name}.tar.gz"
];
sha256 = "13y7bhjmx4daidvyqjz88yffbswb6rc1khkmiqm896fx3lglkcpr";
};
buildInputs = [ cmake bison ncurses openssl readline zlib ];
enableParallelBuilding = true;
cmakeFlags = "-DWITH_SSL=yes -DWITH_READLINE=yes -DWITH_EMBEDDED_SERVER=yes -DWITH_ZLIB=yes -DINSTALL_SCRIPTDIR=bin -DHAVE_IPV6=yes";
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";

View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, zlib, ncurses, readline }:
let version = "8.3.20"; in
let version = "8.3.21"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "0qqic4wx59lgbyfmdfcgip9nrcpk10zdb91bw9b96wr1vijn2awj";
sha256 = "1y1lw83jr3v91920xdhd4ypaa5iazmdh4snl5qzq0yq6z3lnsjx6";
};
buildInputs = [ zlib ncurses readline ];

View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, zlib, ncurses, readline }:
let version = "8.4.13"; in
let version = "8.4.14"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "1fccqkni64vg1pi4zzcl67bm9g2brrlzjn1vh6qlyfpsld139p90";
sha256 = "0fhk3mmk95p5gwmg2skqv1rfi7ylk8gw195hx8rska7fbdryfwhi";
};
buildInputs = [ zlib ncurses readline ];

View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, zlib, readline }:
let version = "9.0.9"; in
let version = "9.0.10"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "12nslml1mg3lyvrhmdvv5g15n7vj5fk1blx1dfllylqg38c7shc7";
sha256 = "0af7in1fp4qxkvzbipz74gxm06x31a9n4z9g91mcis4r015ii523";
};
buildInputs = [ zlib readline ];

View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, zlib, readline }:
let version = "9.1.5"; in
let version = "9.1.6"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "0i6fssldjp65xfxz9dcmkhz6bk4rpw9g26zbqbc6iz164h9rr20b";
sha256 = "1rridkybr55xw4a1h0ppqwv2x2ffwvmpjai9yzsvk58scb56lfbf";
};
buildInputs = [ zlib readline ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, file }:
stdenv.mkDerivation rec {
name = "xdg-utils-1.0.2";
@ -7,6 +7,10 @@ stdenv.mkDerivation rec {
url = "http://portland.freedesktop.org/download/${name}.tgz";
sha256 = "1b019d3r1379b60p33d6z44kx589xjgga62ijz9vha95dg8vgbi1";
};
postInstall = ''
substituteInPlace $out/bin/xdg-mime --replace /usr/bin/file ${file}/bin/file
'';
meta = {
homepage = http://portland.freedesktop.org/wiki/;

View file

@ -1,10 +1,11 @@
{stdenv, fetchurl}:
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "cabextract-1.3";
name = "cabextract-1.4";
src = fetchurl {
url = meta.homepage + name + ".tar.gz";
sha256 = "00f0qcrz9f2gwvm98qglbrjpwrzwrfdgh0hck6im93dl6lx3hr6l";
url = "http://www.cabextract.org.uk/${name}.tar.gz";
sha256 = "07p49053a727nwnw7vnx1bpj4xqa43cvx8mads2146fpqai8pfpp";
};
meta = {

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "p7zip-9.13";
name = "p7zip-9.20.1";
src = fetchurl {
url = mirror://sourceforge/p7zip/p7zip_9.13_src_all.tar.bz2;
sha256 = "08yr0cfbjx60r1ia7vhphzvc3gax62xhgsn3vdm7sdmxxai0z77w";
url = mirror://sourceforge/p7zip/p7zip_9.20.1_src_all.tar.bz2;
sha256 = "10j7rc1nzdp7vvcpc3340yi3qw7abby4szv8zkwh10d0zizpwma9";
};
preConfigure =
@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
buildFlags=all3
'';
enableParallelBuilding = true;
meta = {
homepage = http://p7zip.sourceforge.net/;
description = "A port of the 7-zip archiver";

View file

@ -1,55 +1,65 @@
{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget }:
{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils, fakeroot }:
let
devices = fetchurl {
url = mirror://gentoo/distfiles/devices.tar.gz;
sha256 = "0j4yhajmlgvbksr2ij0dm7jy3q52j3wzhx2fs5lh05i1icygk4qd";
# USAGE like this: debootstrap sid /tmp/target-chroot-directory
# There is also cdebootstrap now. Is that easier to maintain?
makedev = stdenv.mkDerivation {
name = "makedev-for-debootstrap";
src = fetchurl {
url = mirror://debian/pool/main/m/makedev/makedev_2.3.1.orig.tar.gz;
sha256 = "1yhxlj2mhn1nqkx1f0sn0bl898nf28arxxa4lgp7hdrb5cpp36c5";
};
patches = [
(fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/m/makedev/makedev_2.3.1-89.diff.gz";
sha256 = "1zbifw2jkq6471fb67y893nq4lq009xbfbi57jbjwxnhqmrppcy9";
})
];
# TODO install man
installPhase = ''
ensureDir $out/sbin
ls -l
t=$out/sbin/MAKEDEV
cp MAKEDEV $t
chmod +x $t
'';
};
in
stdenv.mkDerivation {
name = "debootstrap-1.0.10lenny";
name = "debootstrap-1.0.42";
src = fetchurl {
# I'd like to use the source. However it's lacking the lanny script ?
url = mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.10lenny1_all.deb;
sha256 = "a70af8e3369408ce9d6314fb5219de73f9523b347b75a3b07ee17ea92c445051";
# git clone git://git.debian.org/d-i/debootstrap.git
# I'd like to use the source. However it's lacking the lanny script ? (still true?)
url = http://ftp.de.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.42.tar.gz;
sha256 = "0a5azl22wz1q92b2c91zlpz6krd7wqyi63yk87vyczp363ml0nz0";
};
buildInputs = [ dpkg gettext gawk perl ];
unpackPhase = ''
dpkg-deb --extract "$src" .
'';
buildPhase = ":";
patches = [
# replace /usr/* and /sbin/* executables by @executable@ so that they can be replaced by substitute
# Be careful not to replace code being run in the debian chroot !
./subst.patch
];
# from deb
# If you have to update the patch for functions a vim regex like this
# can help you identify which lines are used to write scripts on TARGET and
# which should /bin/ paths should be replaced:
# \<echo\>\|\/bin\/\|^\s*\<cat\>\|EOF\|END
installPhase = ''
cp -r . $out; cd $out
t=bin/debootstrap
mkdir -p bin man/man8
cat >> $t << EOF
#!/bin/sh
export DEBOOTSTRAP_DIR=$out/usr/share/debootstrap
# mount and other tools must be found in chroot. So add default debain paths!
# TODO only add paths which are required by the scripts!
export PATH=$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
$out/usr/sbin/debootstrap "\$@"
EOF
chmod +x $t
mv usr/share/man/man8/debootstrap.8.gz man/man8
set -x
for file in usr/share/debootstrap/functions usr/sbin/debootstrap; do
sed -i \
-e 's@/usr/bin/id@id@' \
-e 's@/usr/bin/dpkg@${dpkg}/bin/dpkg@' \
-e 's@/usr/bin/sha@${coreutils}/bin/sha@' \
-e 's@/bin/sha@${coreutils}/bin/sha@' \
debootstrap
for file in functions debootstrap; do
substituteInPlace "$file" \
--subst-var-by gunzip "$(type -p gunzip)" \
--subst-var-by bunzip "$(type -p bunzip)" \
@ -61,28 +71,36 @@ stdenv.mkDerivation {
--subst-var-by uname "$(type -p uname)" \
--subst-var-by wget "${wget}/bin/wget"
done
sed -i \
-e 's@\<wget\>@${wget}/bin/wget@' \
functions
d=$out/share/debootstrap
ensureDir $out/{share/debootstrap,bin}
${fakeroot}/bin/fakeroot -- make devices.tar.gz MAKEDEV=${makedev}/sbin/MAKEDEV
cp -r . $d
cat >> $out/bin/debootstrap << EOF
#!/bin/sh
export DEBOOTSTRAP_DIR="''${DEBOOTSTRAP_DIR:-$d}"
# mount and other tools must be found in chroot. So add default debain paths!
# TODO only add paths which are required by the scripts!
export PATH=$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
exec $d/debootstrap "\$@"
EOF
chmod +x $out/bin/debootstrap
ensureDir $out/man/man8
mv debootstrap.8 $out/man/man8
'';
/* build from source:
installPhase = ''
cp ${devices} devices.tar.gz
mkdir -p $out/{bin,man/man8};
cp debootstrap.8 $out/man/man8
sed -i \
-e 's@-o root@@' \
-e 's@-g root@@' \
-e 's@chown@true@' \
Makefile
make pkgdetails debootstrap-arch
make DESTDIR="''\${out}" install-arch
t=$out/bin/debootstrap
cat >> $t << EOF
#!/bin/sh
DEBOOTSTRAP_DIR=$out/usr/share/debootstrap $out/usr/sbin/debootstrap "\$@"
EOF
chmod +x $t
'';
*/
passthru = {
inherit makedev;
};
meta = {
description = "Tool to create a Debian system in a chroot";

View file

@ -1,13 +1,21 @@
{stdenv, fetchurl}:
{stdenv, fetchurl, utillinux}:
stdenv.mkDerivation {
name = "fakeroot-1.18.1";
stdenv.mkDerivation rec {
name = "fakeroot-1.18.4";
src = fetchurl {
url = http://ftp.de.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.18.1.orig.tar.bz2;
sha256 = "0h5jsw715a9hv32cb1m1bajy26l7xxrbgrk6qk1b6m91lxh6rnw9";
url = https://launchpad.net/ubuntu/+archive/primary/+files/fakeroot_1.18.4.orig.tar.bz2;
sha256 = "18mydrz49n7ic7147pikkpdb96x00s9wisdk6hrc75ll7vx9wd8a";
};
buildInputs = [ utillinux /* provides getopt */ ];
postUnpack = ''
for prog in getopt; do
sed -i "s@getopt@$(type -p getopt)@g" ${name}/scripts/fakeroot.in
done
'';
meta = {
homepage = http://fakeroot.alioth.debian.org/;
description = "Give a fake root environment through LD_PRELOAD";

View file

@ -1389,6 +1389,8 @@ let
replace = callPackage ../tools/text/replace { };
reptyr = callPackage ../os-specific/linux/reptyr {};
rdiff_backup = callPackage ../tools/backup/rdiff-backup { };
ripmime = callPackage ../tools/networking/ripmime {};
@ -2321,6 +2323,7 @@ let
haskellPackages_ghc741_profiling = recurseIntoAttrs (haskell.packages_ghc741.profiling);
haskellPackages_ghc741 = recurseIntoAttrs (haskell.packages_ghc741.highPrio);
haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742);
haskellPackages_ghc742_pedantic = haskell.packages_ghc742_pedantic;
haskellPackages_ghc761 = recurseIntoAttrs (haskell.packages_ghc761);
# Reasonably current HEAD snapshot.
haskellPackages_ghcHEAD = haskell.packages_ghcHEAD;
@ -2356,31 +2359,36 @@ let
openjdkBootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix {};
openjdkStage1 = callPackage ../development/compilers/openjdk {
jdk = pkgs.openjdkBootstrap;
ant = pkgs.ant.override { jdk = pkgs.openjdkBootstrap; };
};
openjdk =
if stdenv.isDarwin then
callPackage ../development/compilers/openjdk-darwin { }
else
callPackage ../development/compilers/openjdk {
jdk = pkgs.openjdkBootstrap;
ant = pkgs.ant.override { jdk = pkgs.openjdkBootstrap; };
jdk = pkgs.openjdkStage1;
ant = pkgs.ant.override { jdk = pkgs.openjdkStage1; };
};
openjre = callPackage ../development/compilers/openjdk {
openjre = pkgs.openjdk.override {
jreOnly = true;
};
jdk = if (stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
then openjdk
else jdkdistro true false;
then pkgs.openjdk
else pkgs.oraclejdk;
jre = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
then openjre
else jdkdistro false false;
then pkgs.openjre
else pkgs.oraclejre;
oraclejdk = jdkdistro true false;
oraclejdk = pkgs.jdkdistro true false;
oraclejre = jdkdistro false false;
oraclejre = pkgs.jdkdistro false false;
jrePlugin = lowPrio (jdkdistro false true);
jrePlugin = lowPrio (pkgs.jdkdistro false true);
supportsJDK =
system == "i686-linux" ||
@ -3196,6 +3204,11 @@ let
sloccount = callPackage ../development/tools/misc/sloccount { };
smatch = callPackage ../development/tools/analysis/smatch {
buildllvmsparse = false;
buildc2xml = false;
};
sparse = callPackage ../development/tools/analysis/sparse { };
spin = callPackage ../development/tools/analysis/spin { };
@ -3497,15 +3510,15 @@ let
fcgi = callPackage ../development/libraries/fcgi { };
ffmpeg = callPackage ../development/libraries/ffmpeg {
vpxSupport = if !stdenv.isMips then true else false;
vpxSupport = !stdenv.isMips;
};
ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix {
vpxSupport = if !stdenv.isMips then true else false;
vpxSupport = !stdenv.isMips;
};
ffmpeg_1_0 = callPackage ../development/libraries/ffmpeg/1.0.nix {
vpxSupport = if !stdenv.isMips then true else false;
vpxSupport = !stdenv.isMips;
};
fftw = callPackage ../development/libraries/fftw {
@ -6950,15 +6963,7 @@ let
flac = callPackage ../applications/audio/flac { };
flashplayer = flashplayer11;
flashplayer9 = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-9 { };
flashplayer10 = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-10 {
debug = config.flashplayer.debug or false;
};
flashplayer11 = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 {
flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 {
debug = config.flashplayer.debug or false;
# !!! Fix the dependency on two different builds of nss.
};
@ -7847,7 +7852,9 @@ let
inherit (xlibs) libX11;
};
vlc = callPackage ../applications/video/vlc { };
vlc = callPackage ../applications/video/vlc {
ffmpeg = ffmpeg_1_0;
};
vnstat = callPackage ../applications/networking/vnstat { };

View file

@ -20,9 +20,20 @@
haskellPlatform = null;
binary = null; # now a core package
extensibleExceptions = self.extensibleExceptions_0_1_1_4;
regexCompat = self.regexCompat_0_95_1.override { regexPosix = self.regexPosix_0_95_2; };
};
ghc742Prefs_pedantic =
self : self.haskellPlatformArgs_2012_4_0_0 self // {
haskellPlatform = self.haskellPlatform_2012_4_0_0;
binary = null; # now a core package
};
# until the Haskell Platform for 7.4.2 is released, this works fine/better;
# mainly because the Haskell Platform 2012.4.0.0 release candidate mandates
# vector 0.10 and primitive 0.5, which at this time aren't supported widely
# by other packages
ghc742Prefs = ghc741Prefs;
ghc741Prefs =
self : self.haskellPlatformArgs_2012_2_0_0 self // {
haskellPlatform = self.haskellPlatform_2012_2_0_0;
@ -259,9 +270,12 @@
packages_ghc742 =
packages { ghcPath = ../development/compilers/ghc/7.4.2.nix;
ghcBinary = ghc6121BinaryDarwin;
prefFun = ghc741Prefs;
prefFun = ghc742Prefs;
};
packages_ghc742_pedantic =
packages_ghc742.override { prefFun = ghc742Prefs_pedantic; };
packages_ghc761 =
packages { ghcPath = ../development/compilers/ghc/7.6.1.nix;
ghcBinary = ghc704Binary;

View file

@ -149,6 +149,45 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
happy = self.happy_1_18_10; # 7.6 ok
};
haskellPlatformArgs_2012_4_0_0 = self : {
inherit (self) cabal ghc;
async = self.async_2_0_1_3;
cgi = self.cgi_3001_1_7_4;
fgl = self.fgl_5_4_2_4;
GLUT = self.GLUT_2_1_2_1;
haskellSrc = self.haskellSrc_1_0_1_5;
html = self.html_1_0_1_2;
HTTP = self.HTTP_4000_2_5;
HUnit = self.HUnit_1_2_5_1;
mtl = self.mtl_2_1_2;
network = self.network_2_3_1_0;
OpenGL = self.OpenGL_2_2_3_1;
parallel = self.parallel_3_2_0_3;
parsec = self.parsec_3_1_3;
QuickCheck = self.QuickCheck_2_5_1_1;
random = self.random_1_0_1_1;
regexBase = self.regexBase_0_93_2;
regexCompat = self.regexCompat_0_95_1;
regexPosix = self.regexPosix_0_95_2;
split = self.split_0_2_1_1;
stm = self.stm_2_4;
syb = self.syb_0_3_7;
text = self.text_0_11_2_3;
transformers = self.transformers_0_3_0_0;
vector = self.vector_0_10;
xhtml = self.xhtml_3000_2_1;
zlib = self.zlib_0_5_4_0;
cabalInstall = self.cabalInstall_0_14_0;
alex = self.alex_3_0_2;
haddock = self.haddock_2_11_0;
happy = self.happy_1_18_10;
primitive = self.primitive_0_5; # semi-official, but specified
};
haskellPlatform_2012_4_0_0 =
callPackage ../development/libraries/haskell/haskell-platform/2012.4.0.0.nix
(self.haskellPlatformArgs_2012_4_0_0 self);
haskellPlatformArgs_2012_2_0_0 = self : {
inherit (self) cabal ghc;
cgi = self.cgi_3001_1_7_4; # 7.4.1 ok
@ -419,7 +458,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
AspectAG = callPackage ../development/libraries/haskell/AspectAG {};
async = callPackage ../development/libraries/haskell/async {};
async_2_0_1_3 = callPackage ../development/libraries/haskell/async/2.0.1.3.nix {};
async = self.async_2_0_1_3;
attempt = callPackage ../development/libraries/haskell/attempt {};
@ -1139,6 +1179,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {};
network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {};
network_2_3_0_13 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {};
network_2_3_1_0 = callPackage ../development/libraries/haskell/network/2.3.1.0.nix {};
network_2_4_0_1 = callPackage ../development/libraries/haskell/network/2.4.0.1.nix {};
network = self.network_2_4_0_1;
@ -1249,7 +1290,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
prettyShow = callPackage ../development/libraries/haskell/pretty-show {};
primitive = callPackage ../development/libraries/haskell/primitive {};
primitive_0_4_1 = callPackage ../development/libraries/haskell/primitive/0.4.1.nix {};
primitive_0_5 = callPackage ../development/libraries/haskell/primitive/0.5.nix {};
primitive = self.primitive_0_4_1;
processExtras = callPackage ../development/libraries/haskell/process-extras {};
@ -1315,9 +1358,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
regexCompat_0_71_0_1 = callPackage ../development/libraries/haskell/regex-compat/0.71.0.1.nix {};
regexCompat_0_92 = callPackage ../development/libraries/haskell/regex-compat/0.92.nix {};
regexCompat_0_93_1 = callPackage ../development/libraries/haskell/regex-compat/0.93.1.nix {};
regexCompat_0_95_1 = callPackage ../development/libraries/haskell/regex-compat/0.95.1.nix {
regexPosix = self.regexPosix_0_95_1;
};
regexCompat_0_95_1 = callPackage ../development/libraries/haskell/regex-compat/0.95.1.nix {};
regexCompat93 = self.regexCompat_0_93_1;
regexCompat = self.regexCompat_0_71_0_1;
@ -1325,12 +1366,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
regexPosix_0_94_1 = callPackage ../development/libraries/haskell/regex-posix/0.94.1.nix {};
regexPosix_0_94_2 = callPackage ../development/libraries/haskell/regex-posix/0.94.2.nix {};
regexPosix_0_94_4 = callPackage ../development/libraries/haskell/regex-posix/0.94.4.nix {};
regexPosix_0_95_1 = callPackage ../development/libraries/haskell/regex-posix/0.95.1.nix {
regexBase = self.regexBase_0_93_2;
};
regexPosix_0_95_2 = callPackage ../development/libraries/haskell/regex-posix/0.95.2.nix {
regexBase = self.regexBase_0_93_2;
};
regexPosix_0_95_1 = callPackage ../development/libraries/haskell/regex-posix/0.95.1.nix {};
regexPosix_0_95_2 = callPackage ../development/libraries/haskell/regex-posix/0.95.2.nix {};
regexPosix = self.regexPosix_0_95_2;
regexTDFA = callPackage ../development/libraries/haskell/regex-tdfa {};
@ -1453,7 +1490,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {};
split = callPackage ../development/libraries/haskell/split {};
split_0_2_1_1 = callPackage ../development/libraries/haskell/split/0.2.1.1.nix {};
split = self.split_0_2_1_1;
stbImage = callPackage ../development/libraries/haskell/stb-image {};
@ -1595,7 +1633,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
Vec = callPackage ../development/libraries/haskell/Vec {};
vector = callPackage ../development/libraries/haskell/vector {};
vector_0_9_1 = callPackage ../development/libraries/haskell/vector/0.9.1.nix {};
vector_0_10 = callPackage ../development/libraries/haskell/vector/0.10.nix {};
vector = self.vector_0_9_1;
vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {};

View file

@ -109,13 +109,13 @@ let self = {
];
};
"bson" = self."bson-0.1.3";
"bson" = self."bson-0.1.4";
"bson-0.1.3" = self.buildNodePackage rec {
name = "bson-0.1.3";
"bson-0.1.4" = self.buildNodePackage rec {
name = "bson-0.1.4";
src = fetchurl {
url = "http://registry.npmjs.org/bson/-/${name}.tgz";
sha256 = "86ed2b1465e30a4089c8c88dee3d97fafcd7deb60edc3819c00a0604c84d5040";
sha256 = "deb8d960c849d1cadbb692ce93a6f4678f5431f98965869806f8f26f3db81919";
};
flags = [ "mongodb:native" ];
deps = [
@ -536,16 +536,16 @@ let self = {
];
};
"mongodb" = self."mongodb-1.1.7";
"mongodb" = self."mongodb-1.1.8";
"mongodb-1.1.7" = self.buildNodePackage rec {
name = "mongodb-1.1.7";
"mongodb-1.1.8" = self.buildNodePackage rec {
name = "mongodb-1.1.8";
src = fetchurl {
url = "http://registry.npmjs.org/mongodb/-/${name}.tgz";
sha256 = "10ed2903b839907e854a4ae4508940207f260500bfaff028497e9df865ead475";
sha256 = "af99f0e13d5286b4335378c958cfc9773ada0732ef7242b25cb01aac288cbec1";
};
deps = [
self."bson-0.1.3"
self."bson-0.1.4"
];
};
@ -821,6 +821,21 @@ let self = {
];
};
"requirejs" = self."requirejs-0.26.0";
"requirejs-==0.26.0" = self."requirejs-0.26.0";
"requirejs-0.26.0" = self.buildNodePackage rec {
name = "requirejs-0.26.0";
src = fetchurl {
url = "http://registry.npmjs.org/requirejs/-/${name}.tgz";
sha256 = "5ec7264031784fd1b5844aba813ace9045918a0b004a52fafa6b52e9e9760407";
};
deps = [
];
};
"rimraf" = self."rimraf-2";
"rimraf-2" = self.buildNodePackage rec {
@ -922,6 +937,19 @@ let self = {
];
};
"source-map" = self."source-map-0.1.2";
"source-map-0.1.2" = self.buildNodePackage rec {
name = "source-map-0.1.2";
src = fetchurl {
url = "http://registry.npmjs.org/source-map/-/${name}.tgz";
sha256 = "4465bb3a293c0e86092affb7cbdd6d9356cad69231c56f6e73bba7750497035f";
};
deps = [
self."requirejs-==0.26.0"
];
};
"tar" = self."tar-~0.1.12";
"tar-~0.1.12" = self.buildNodePackage rec {

View file

@ -73,6 +73,7 @@ rec {
IP_NF_TARGET_LOG y
IP_NF_MANGLE y
IPV6 m
VLAN_8021Q m
CIFS y
CIFS_XATTR y
@ -80,6 +81,10 @@ rec {
CIFS_FSCACHE y
CIFS_ACL y
WATCHDOG y
WATCHDOG_CORE y
ORION_WATCHDOG m
ZRAM m
NETCONSOLE m

View file

@ -1650,6 +1650,25 @@ let pythonPackages = python.modules // rec {
};
polib = buildPythonPackage rec {
name = "polib-${version}";
version = "1.0.1";
src = fetchurl {
url = "http://bitbucket.org/izi/polib/downloads/${name}.tar.gz";
sha256 = "1sr2bb3g7rl7gr6156j5qv71kg06q1x01r1lbps9ksnyz37djn2q";
};
doCheck = false;
meta = {
description = "A library to manipulate gettext files (po and mo files)";
homepage = "http://bitbucket.org/izi/polib/";
license = pkgs.lib.licenses.mit;
};
};
prettytable = buildPythonPackage rec {
name = "prettytable-0.5";