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

Merge branch 'master' into imp_xfce4

Browse Source
This commit is contained in:
Eduard Carreras 2012-10-11 19:58:03 +02:00
commit 7924c7f0b8
69 changed files with 1161 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/audio/distrho/default.nix
View File

@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
patchPhase = ''
sed -e "s#xsltproc#${libxslt}/bin/xsltproc#" -i Makefile
sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile
sed -e "s#/etc/HybridReverb2#$out/etc/Hybridreverb2#" \
-i ports/hybridreverb2/source/SystemConfig.cpp
sed -e "s#/usr#$out#" -i ports/hybridreverb2/data/HybridReverb2.conf
'';
buildInputs = [
@ -38,6 +41,12 @@ stdenv.mkDerivation rec {
cp bin/standalone/* $out/bin/
mkdir -p $out/lib/lv2
cp -a bin/lv2/* $out/lib/lv2/
# HybridReverb2 data
mkdir -p $out/etc/HybridReverb2
cp ports/hybridreverb2/data/HybridReverb2.conf $out/etc/HybridReverb2/
mkdir -p $out/share
cp -a ports/hybridreverb2/data/HybridReverb2 $out/share/
'';
meta = with stdenv.lib; {

41
pkgs/applications/editors/netbeans/default.nix Normal file
View File

@ -0,0 +1,41 @@
{stdenv, fetchurl, jdk, unzip, which, makeWrapper, makeDesktopItem}:
let
desktopItem = makeDesktopItem {
name = "netbeans";
exec = "netbeans";
comment = "Integrated Development Environment";
desktopName = "Netbeans IDE";
genericName = "Integrated Development Environment";
categories = "Application;Development;";
};
in
stdenv.mkDerivation {
name = "netbeans-7.2";
src = fetchurl {
url = http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-ml.zip;
sha256 = "18ya1w291hdnc35vb12yqnai82wmqm7351wn82fax12kzha5fmci";
};
buildCommand = ''
# Unpack and copy the stuff
unzip $src
mkdir -p $out
cp -a netbeans $out
# Create a wrapper capable of starting it
mkdir -p $out/bin
makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \
--prefix PATH : ${jdk}/bin:${which}/bin
# Create desktop item, so we can pick it from the KDE/GNOME menu
mkdir -p $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications
'';
buildInputs = [ unzip makeWrapper ];
meta = {
description = "An integrated development environment for Java, C, C++ and PHP";
maintainers = [ stdenv.lib.maintainers.sander ];
};
}

8
pkgs/applications/graphics/darktable/default.nix
View File

@ -3,17 +3,17 @@
, libgnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb
, openexr, pixman, pkgconfig, sqlite }:
, openexr, pixman, pkgconfig, sqlite, bash }:
assert stdenv ? glibc;
stdenv.mkDerivation rec {
version = "1.0";
version = "1.0.5";
name = "darktable-${version}";
src = fetchurl {
url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz";
sha256 = "0wjv2x62kf25db61ivbn8y8xr9hr8hdlcjq6l1qxfqn2bn8a3qkm";
sha256 = "0c18530446d2f2459fe533a1ef6fc2711300efe7466f36c23168ec2230fb5fbd";
};
buildInputs =
@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ilmbase}/include/OpenEXR"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${openexr}/include/OpenEXR"
substituteInPlace tools/create_preferences.sh.in --replace '#!/usr/bin/env bash' '#!${bash}/bin/bash'
'';
cmakeFlags = [

35
pkgs/applications/misc/taskwarrior/default.nix
View File

@ -1,29 +1,22 @@
{ stdenv, fetchurl, cmake, lua5 }:
{stdenv, fetchurl, cmake}:
stdenv.mkDerivation {
name = "task-warrior-2.0.0";
src = fetchurl {
url = http://www.taskwarrior.org/download/task-2.0.0.tar.gz;
sha256 = "1gbmcynj2n2c9dcykxn27ffk034mvm0zri5hqhfdx593dhv1x5vq";
};
NIX_LDFLAGS = "-ldl";
buildNativeInputs = [ cmake ];
buildInputs = [ lua5 ];
crossAttrs = {
preConfigure = ''
export NIX_CROSS_LDFLAGS="$NIX_CROSS_LDFLAGS -ldl"
'';
};
name = "taskwarrior-2.1.2";
enableParallelBuilding = true;
src = fetchurl {
url = http://www.taskwarrior.org/download/task-2.1.2.tar.gz;
sha256 = "0diy72sgiyvfl6bdy7k3qwv3ijx2z1y477smkk6jsbbd9fsp2lfg";
};
buildInputs = [ cmake ];
meta = {
description = "Command-line todo list manager";
homepage = http://taskwarrior.org/;
license = "GPLv2+";
description = "GTD (getting things done) implementation";
homepage = http://taskwarrior.org;
license = stdenv.lib.licenses.mit;
maintainers = [stdenv.lib.maintainers.marcweber];
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -90,8 +90,8 @@ let
maybeBpfTemporaryFix = let
patch = fetchurl {
url = "https://chromiumcodereview.appspot.com/download/issue11032056_1_2.diff";
sha256 = "eb13dc627940ad56939837ad1093b2c388f6cf79f1f25cdc1b2e25e987c73d1c";
url = "https://chromiumcodereview.appspot.com/download/issue11073003_6001_7001.diff";
sha256 = "bf61871cdaa8fea27ce15482a17048f67b426a55813c3832f9bd39ec47a9eb06";
};
needPatch = !versionOlder sourceInfo.version "23.0.1271.0";
in optional needPatch patch;

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

@ -6,13 +6,13 @@
sha256 = "0lp3r4n3d71wy2ndzcfwvrp9vc1ii98pxip1c8hfinz994ca1ykx";
};
beta = {
version = "23.0.1271.17";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.17.tar.bz2";
sha256 = "1nyc2s378sx7ymmginipiphygg7s59iwg2kirlbgz60fl8wygzv2";
version = "23.0.1271.26";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.26.tar.bz2";
sha256 = "1iimpmm5lm5rvak49320lmmvwqr8xv4znp4h1pf65jzzx0apbgkh";
};
stable = {
version = "22.0.1229.79";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.79.tar.bz2";
sha256 = "0f7py2hd7fnx5z0xrg2vwf675xbg9xvamx79jjyzbpljh32b3jh6";
version = "22.0.1229.94";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.94.tar.bz2";
sha256 = "1bqwlgmn0dm1xvd6v52zf9gjmykgq4fnw7rancbplfpl3rl7xbx0";
};
}

180
pkgs/applications/networking/browsers/firefox/16.0.nix Normal file
View File

@ -0,0 +1,180 @@
{ 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, pysqlite
, # 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 = "16.0";
xulVersion = "16.0"; # this attribute is used by other packages
src = fetchurl {
url = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha1 = "8f79e4ccf28c57afd341b9fc258931b5f9e62064";
};
commonConfigureFlags =
[ "--enable-optimize"
"--enable-profiling"
"--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 pysqlite
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
];
configureFlags =
[ "--enable-application=xulrunner"
"--disable-javaxpcom"
] ++ commonConfigureFlags;
enableParallelBuilding = true;
preConfigure =
''
export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
mkdir ../objdir
cd ../objdir
configureScript=../mozilla-release/configure
''; # */
#installFlags = "SKIP_GRE_REGISTRATION=1";
postInstall = ''
# Fix run-mozilla.sh search
libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
echo libDir: $libDir
test -n "$libDir"
cd $out/bin
rm xulrunner
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/{plugin-container,xulrunner,xulrunner-stub}; 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 pysqlite
];
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";
makeFlags = [
"SYSTEM_LIBXUL=1"
];
# 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;
cd "$out/lib/"firefox-*
rm firefox
echo -e '#!${stdenv.shell}\n${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
chmod a+x firefox
''; # */
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;
};
};
}

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

@ -1,24 +1,16 @@
{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, mesa, lua5_0 }:
{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, mesa, lua5_1, automake, autoconf }:
let
name = "gravit-0.4.2";
in
stdenv.mkDerivation {
inherit name;
stdenv.mkDerivation rec {
name = "gravit-0.5.0";
src = fetchurl {
url = "http://gravit.slowchop.com/dist/${name}.tar.gz";
sha256 = "f37f3ac256a4acbf575f709addaae8cb01eda4f85537affa28c45f2df6fddb07";
url = "http://gravit.slowchop.com/media/downloads/${name}.tgz";
sha256 = "0lyw0skrkb04s16vgz7ggswjrdxk1h23v5s85s09gjxzjp1xd3xp";
};
buildInputs = [mesa SDL SDL_ttf SDL_image lua5_0];
buildInputs = [mesa SDL SDL_ttf SDL_image lua5_1 automake autoconf];
configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3";
postInstall = ''
mv $out/etc/gravit $out/share/gravit/sample-config
rmdir $out/etc
'';
preConfigure = "sh autogen.sh";
meta = {
homepage = "http://gravit.slowchop.com";

6
pkgs/development/compilers/go/default.nix
View File

@ -7,11 +7,11 @@ let
in
stdenv.mkDerivation {
name = "go-1.0.2";
name = "go-1.0.3";
src = fetchurl {
url = http://go.googlecode.com/files/go1.0.2.src.tar.gz;
sha256 = "1a4mpkb3bd9dwp0r3fgrfcyk5lgw0f0cfrbskg2lrhc7a12zpz3h";
url = http://go.googlecode.com/files/go1.0.3.src.tar.gz;
sha256 = "1pz31az3icwqfqfy3avms05jnqr0qrbrx9yqsclkdwbjs4rkbfkz";
};
buildInputs = [ bison glibc bash makeWrapper ];

29
pkgs/development/compilers/jhc/default.nix Normal file
View File

@ -0,0 +1,29 @@
{
stdenv, fetchurl, perl, ghc, binary, zlib, utf8String, readline, fgl,
regexCompat, HsSyck, random
}:
stdenv.mkDerivation rec {
name = "jhc-${version}";
version = "0.8.0";
src = fetchurl {
url = "http://repetae.net/dist/${name}.tar.gz";
sha256 = "0rbv0gpp7glhd9xqy7snbiaiizwnsfg9vzhvyywcvbmb35yivy2a";
};
buildInputs = [
perl ghc binary zlib utf8String readline fgl regexCompat HsSyck random
];
meta = {
description = ''
A Haskell compiler which aims to produce the most efficient programs
'';
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.aforemny ];
};
}

4
pkgs/development/compilers/ocaml/4.00.0.nix → pkgs/development/compilers/ocaml/4.00.1.nix
View File

@ -8,11 +8,11 @@ in
stdenv.mkDerivation rec {
name = "ocaml-4.00.0";
name = "ocaml-4.00.1";
src = fetchurl {
url = "http://caml.inria.fr/pub/distrib/ocaml-4.00/${name}.tar.bz2";
sha256 = "ec886d7bc587ce472fcbdf294feb4b1fa2d8e7ef78ab6a4e66551699435d5cd7";
sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951";
};
prefixKey = "-prefix ";

8
pkgs/development/compilers/openjdk/default.nix
View File

@ -17,6 +17,9 @@
, libXrender
, libXtst
, libXi
, libXinerama
, libXcursor
, fontconfig
, cpio
, jreOnly ? false
}:
@ -82,8 +85,13 @@ stdenv.mkDerivation rec {
libXrender
libXtst
libXi
libXinerama
libXcursor
fontconfig
];
NIX_LDFLAGS = "-lfontconfig -lXcursor -lXinerama";
postUnpack = ''
mkdir -p drops
cp ${jaxp_src} drops/${jaxp_src_name}

30
pkgs/development/interpreters/lua-5/5.1.nix Normal file
View File

@ -0,0 +1,30 @@
{ stdenv, fetchurl, readline}:
stdenv.mkDerivation rec {
name = "lua-5.1.5";
src = fetchurl {
url = "http://www.lua.org/ftp/${name}.tar.gz";
sha256 = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333";
};
buildInputs = [ readline ];
configurePhase = "makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux )";
meta = {
homepage = "http://www.lua.org";
description = "Lua is a powerful, fast, lightweight, embeddable scripting language.";
longDescription = ''
Lua combines simple procedural syntax with powerful data
description constructs based on associative arrays and extensible
semantics. Lua is dynamically typed, runs by interpreting bytecode
for a register-based virtual machine, and has automatic memory
management with incremental garbage collection, making it ideal
for configuration, scripting, and rapid prototyping.
'';
license = "MIT";
platforms = stdenv.lib.platforms.unix;
maintainers = [ ];
};
}

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

@ -1,15 +1,10 @@
{ cabal, convertible, csv, FerryCore, HaXml, HDBC, json, mtl
, Pathfinder, syb, text, xhtml
}:
{ cabal, csv, FerryCore, HaXml, HDBC, mtl, Pathfinder, text }:
cabal.mkDerivation (self: {
pname = "DSH";
version = "0.7.8.2";
sha256 = "1rs42c05q4s46a1a03srzdq0aijwalhilzifc8ryq4qwjgh7vkwz";
buildDepends = [
convertible csv FerryCore HaXml HDBC json mtl Pathfinder syb text
xhtml
];
version = "0.8.0.1";
sha256 = "08bwn7jpnkzvyj2dlpk6zx97iwsjb085vbnc8hwvxnhf9y8wl96s";
buildDepends = [ csv FerryCore HaXml HDBC mtl Pathfinder text ];
meta = {
description = "Database Supported Haskell";
license = self.stdenv.lib.licenses.bsd3;

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

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

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "criterion";
version = "0.6.1.1";
sha256 = "1w5yqcgnx2ij3hmvmz5g4ynj6n8wa3yyk1kfbbwxyh9j5kc2xwiw";
version = "0.6.2.0";
sha256 = "1xd90qb026niq2sn7ks8bn92ifb6255saic68bzg6kzj7ydwwdmx";
buildDepends = [
aeson deepseq filepath hastache mtl mwcRandom parsec statistics
time transformers vector vectorAlgorithms

4
pkgs/development/libraries/haskell/data-memocombinators/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "data-memocombinators";
version = "0.4.3";
sha256 = "0mzvjgccm23y7mfaz9iwdy64amf69d7i8yq9fc9mjx1nyzxdrgsc";
version = "0.4.4";
sha256 = "06x79rgxi6cxrpzjzzsjk7yj7i0ajmcgns0n12lxakz9vxbqxyn2";
buildDepends = [ dataInttrie ];
meta = {
homepage = "http://github.com/luqui/data-memocombinators";

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "ghc-mtl";
version = "1.0.1.1";
sha256 = "04lm1g27xwwph02k3d8b51nbhi2sw8jx7arqczcqc3rygak10fpn";
version = "1.0.1.2";
sha256 = "06m8ynqlbvvs37w211ikldwvlvg4ry27x9l7idnwa1m8w2jkbkva";
buildDepends = [ MonadCatchIOMtl mtl ];
meta = {
homepage = "http://darcsden.com/jcpetruzza/ghc-mtl";

10
pkgs/development/libraries/haskell/heist/default.nix
View File

@ -1,16 +1,16 @@
{ cabal, aeson, attoparsec, blazeBuilder, blazeHtml, directoryTree
, filepath, MonadCatchIOTransformers, mtl, random, text, time
, transformers, unorderedContainers, vector, xmlhtml
, unorderedContainers, vector, xmlhtml
}:
cabal.mkDerivation (self: {
pname = "heist";
version = "0.8.1.1";
sha256 = "0ad56izskafpc1dx2nq0a8w71ayppwx8dc7kdaw1by972kh3nflh";
version = "0.8.2";
sha256 = "0zamggvfq9054vxznbnfq1fihk110ih8q0dza1rmsjb1h2s88rkj";
buildDepends = [
aeson attoparsec blazeBuilder blazeHtml directoryTree filepath
MonadCatchIOTransformers mtl random text time transformers
unorderedContainers vector xmlhtml
MonadCatchIOTransformers mtl random text time unorderedContainers
vector xmlhtml
];
meta = {
homepage = "http://snapframework.com/";

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hint";
version = "0.3.3.4";
sha256 = "0pmvhlj9m0s1wvw8ppx1wx879lwzg38bcvhy1ma1d4wnrpq3bhiy";
version = "0.3.3.5";
sha256 = "09pd4b105c2ikf4ap96fz8091qra7hypq3k3ik0kay3bb532hmlq";
buildDepends = [
extensibleExceptions filepath ghcMtl ghcPaths haskellSrc
MonadCatchIOMtl mtl random utf8String

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

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

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

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

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "numbers";
version = "3000.0.0.0";
sha256 = "073xjrnbv6z16va2h3arlxq3z8kywb961dwh4jcm8g7w5m84b2xb";
version = "3000.1.0.0";
sha256 = "0iqpch8j2i2pnjq8waqb5y95jpmvbzx2r6zsvkja7sl4d578fgpn";
meta = {
homepage = "https://github.com/DanBurton/numbers";
description = "Various number types";

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "persistent";
version = "1.0.1.2";
sha256 = "0gw635mhbn6w8aswiw9j41rdpi7rhnnhay2qgvlc8103s0g5lp9j";
version = "1.0.1.3";
sha256 = "156iv1iv807wm39sr98z0f10sbw4q0ac3lafgai0mq3ph5xysi80";
buildDepends = [
aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
liftedBase monadControl monadLogger pathPieces poolConduit
@ -15,7 +15,6 @@ cabal.mkDerivation (self: {
unorderedContainers vector
];
extraLibraries = [ sqlite ];
jailbreak = true;
meta = {
homepage = "http://www.yesodweb.com/book/persistent";
description = "Type-safe, multi-backend data serialization";

14
pkgs/development/libraries/haskell/primitive/0.5.0.1.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "primitive";
version = "0.5.0.1";
sha256 = "04s33xqxz68ddppig5pjf7ki1y5y62xzzzmg3b5pkcxp0r6rsv2j";
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 ];
};
})

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

@ -4,12 +4,11 @@
cabal.mkDerivation (self: {
pname = "resourcet";
version = "0.4.0.1";
sha256 = "0idyb2xvjk9cbz9gy1gr6sw1mz6v9d8fgk0kw778n6k3h488dw9x";
version = "0.4.0.2";
sha256 = "0w4hm29dig6m4jm6y9zmyfnhwii7b88hqjqlvl6xmk5zxp1q7hc2";
buildDepends = [
liftedBase monadControl mtl transformers transformersBase
];
jailbreak = true;
meta = {
homepage = "http://github.com/snoyberg/conduit";
description = "Deterministic allocation and freeing of scarce resources";

12
pkgs/development/libraries/haskell/snap/core.nix
View File

@ -1,19 +1,19 @@
{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder
, blazeBuilderEnumerator, bytestringMmap, caseInsensitive, deepseq
, enumerator, filepath, HUnit, MonadCatchIOTransformers, mtl
, random, regexPosix, text, time, transformers, unixCompat
, unorderedContainers, vector, zlibEnum
, random, regexPosix, text, time, unixCompat, unorderedContainers
, vector, zlibEnum
}:
cabal.mkDerivation (self: {
pname = "snap-core";
version = "0.9.2.1";
sha256 = "18i0hfzc37q12nyp7g4sc87s4xcqz1crjwpnhh4y5fw66glzmq3q";
version = "0.9.2.2";
sha256 = "0svahih2piaj87xfysgjvqqh11gmwz9icrh2g819h68kzh10imlf";
buildDepends = [
attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
bytestringMmap caseInsensitive deepseq enumerator filepath HUnit
MonadCatchIOTransformers mtl random regexPosix text time
transformers unixCompat unorderedContainers vector zlibEnum
MonadCatchIOTransformers mtl random regexPosix text time unixCompat
unorderedContainers vector zlibEnum
];
meta = {
homepage = "http://snapframework.com/";

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

@ -1,20 +1,18 @@
{ cabal, attoparsec, attoparsecEnumerator, binary, blazeBuilder
, blazeBuilderEnumerator, caseInsensitive, directoryTree
, enumerator, filepath, MonadCatchIOTransformers, mtl, network
, snapCore, text, time, transformers, unixCompat
{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder
, blazeBuilderEnumerator, caseInsensitive, enumerator
, MonadCatchIOTransformers, mtl, network, snapCore, text, time
, unixCompat
}:
cabal.mkDerivation (self: {
pname = "snap-server";
version = "0.9.2.3";
sha256 = "0wl7clzwrd34d32sikd6vkj3pla9yni26mmdsnrjw1s3lq412yqd";
version = "0.9.2.4";
sha256 = "1kwmrlk9dr033h6q05afnr916wnw5wlxrr87z1myv0a6nzqmdhzl";
buildDepends = [
attoparsec attoparsecEnumerator binary blazeBuilder
blazeBuilderEnumerator caseInsensitive directoryTree enumerator
filepath MonadCatchIOTransformers mtl network snapCore text time
transformers unixCompat
attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
caseInsensitive enumerator MonadCatchIOTransformers mtl network
snapCore text time unixCompat
];
jailbreak = true;
meta = {
homepage = "http://snapframework.com/";
description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework";

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

@ -2,14 +2,14 @@
, dataLens, dataLensTemplate, directoryTree, filepath, hashable
, heist, logict, MonadCatchIOTransformers, mtl, mwcRandom
, pwstoreFast, snapCore, snapServer, stm, syb, text, time
, transformers, unorderedContainers, utf8String, vector
, vectorAlgorithms, xmlhtml
, transformers, unorderedContainers, vector, vectorAlgorithms
, xmlhtml
}:
cabal.mkDerivation (self: {
pname = "snap";
version = "0.9.2.1";
sha256 = "0gxnkr6icx2g16w3ab54cqy4x15xj6y9cs6qv8dg0xamm7kyyfhl";
version = "0.9.2.2";
sha256 = "1ql9c8b9arcd8zwlwsiipl4diah87sp339ljc5bc7yls1g4d9zsw";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -17,9 +17,8 @@ cabal.mkDerivation (self: {
dataLensTemplate directoryTree filepath hashable heist logict
MonadCatchIOTransformers mtl mwcRandom pwstoreFast snapCore
snapServer stm syb text time transformers unorderedContainers
utf8String vector vectorAlgorithms xmlhtml
vector vectorAlgorithms xmlhtml
];
jailbreak = true;
meta = {
homepage = "http://snapframework.com/";
description = "Top-level package for the Snap Web Framework";

15
pkgs/development/libraries/haskell/vector/0.10.0.1.nix Normal file
View File

@ -0,0 +1,15 @@
{ cabal, deepseq, primitive }:
cabal.mkDerivation (self: {
pname = "vector";
version = "0.10.0.1";
sha256 = "1bq8am8qnpnsla315i21f1kikikalyz9ps1izxgpr9q1ic2lbsgc";
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 ];
};
})

4
pkgs/development/libraries/haskell/wai-extra/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "wai-extra";
version = "1.3.0.2";
sha256 = "0w69wjfbzgg523n0rcs700qx0gsdhvlr0qjvqg1hppvi188llpwl";
version = "1.3.0.3";
sha256 = "0nfk24mwzf2v35vlvvhzb7a6ldr6pvw37m3ws3b3cv2m80jdd7kr";
buildDepends = [
ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
conduit dataDefault dateCache fastLogger httpTypes network

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

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

5
pkgs/development/libraries/haskell/yesod-auth/default.nix
View File

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "yesod-auth";
version = "1.1.1.1";
sha256 = "1ryq3jxcgb55ijjmcv0j234n9nay2ianifb59gz9akyv0sc3zcl9";
version = "1.1.1.2";
sha256 = "1agyazzkgwmp63vwx84bzalf9lwg14k5jshj6n97g1iagsiaxqa0";
buildDepends = [
aeson authenticate blazeHtml blazeMarkup hamlet httpConduit
liftedBase mimeMail persistent persistentTemplate pureMD5
@ -16,7 +16,6 @@ cabal.mkDerivation (self: {
unorderedContainers wai yesodCore yesodForm yesodJson
yesodPersistent
];
jailbreak = true;
meta = {
homepage = "http://www.yesodweb.com/";
description = "Authentication for Yesod";

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

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

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

@ -1,21 +0,0 @@
{ stdenv, fetchurl, gtk, libgnomecanvas, pkgconfig }:
stdenv.mkDerivation rec {
name = "phat-${version}";
version = "0.4.1";
src = fetchurl {
url = "http://download.berlios.de/phat/${name}.tar.gz";
sha256 = "1icncp2d8hbarzz8mmflkw13blg7blgwfic8q2wll7s6n01ii2av";
};
buildInputs = [ gtk libgnomecanvas pkgconfig ];
meta = with stdenv.lib; {
description = "GTK+ widgets geared toward pro-audio apps";
homepage = http://phat.berlios.de;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
};
}

9
pkgs/development/ocaml-modules/extlib/default.nix
View File

@ -4,11 +4,10 @@ stdenv.mkDerivation {
name = "ocaml-extlib-1.5.2";
src = fetchurl {
url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.2.tar.gz";
sha256 = "ca6d69adeba4242ce41c02a23746ba1e464c0bbec66e2d16b02c3c6e85dc10aa";
url = http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz;
sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021";
};
patches = [ ./hashtable-ocaml4-compat.patch ];
buildInputs = [ocaml findlib];
createFindlibDestdir = true;
@ -19,9 +18,9 @@ stdenv.mkDerivation {
'';
meta = {
homepage = "http://code.google.com/p/ocaml-extlib/";
homepage = http://code.google.com/p/ocaml-extlib/;
description = "Enhancements to the OCaml Standard Library modules";
license = "LGPL";
license = stdenv.lib.licenses.lgpl21;
platforms = ocaml.meta.platforms;
};
}

12
pkgs/development/ocaml-modules/extlib/hashtable-ocaml4-compat.patch
View File

@ -1,12 +0,0 @@
Revision 396 from the official extlib repository.
--- extlib/extHashtbl.ml (revision 395)
+++ extlib/extHashtbl.ml (working copy)
@@ -32,6 +32,7 @@
}
include Hashtbl
+ let create n = Hashtbl.create (* no seed *) n
external h_conv : ('a, 'b) t -> ('a, 'b) h_t = "%identity"
external h_make : ('a, 'b) h_t -> ('a, 'b) t = "%identity"

7
pkgs/development/ocaml-modules/ocamlnet/default.nix
View File

@ -2,15 +2,14 @@
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
version = "3.1";
in
stdenv.mkDerivation {
name = "ocamlnet-${version}";
name = "ocamlnet-3.6";
src = fetchurl {
url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz";
sha256 = "0kdc2540ad84j6haj9jxlwryz9cb8q8kjdr48f2wgvcaii38v9f5";
url = http://download.camlcity.org/download/ocamlnet-3.6.tar.gz;
sha256 = "306c20aee6512be3564c0f39872b70f929c06e1e893cfcf528ac47ae35cf7a69";
};
buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl];

8
pkgs/development/ocaml-modules/ounit/default.nix
View File

@ -5,11 +5,11 @@ let
in
stdenv.mkDerivation {
name = "ounit-1.1.0";
name = "ounit-1.1.2";
src = fetchurl {
url = http://forge.ocamlcore.org/frs/download.php/495/ounit-1.1.0.tar.gz;
sha256 = "12vybg9xlw5c8ip23p8cljfzhkdsm25482sf1yh46fcqq8p2jmqx";
url = http://forge.ocamlcore.org/frs/download.php/886/ounit-1.1.2.tar.gz;
sha256 = "e6bc1b0cdbb5b5552d85bee653e23aafe20bb97fd7cd229c867d01ff999888e3";
};
buildInputs = [ocaml findlib];
@ -25,7 +25,7 @@ stdenv.mkDerivation {
meta = {
homepage = http://www.xs4all.nl/~mmzeeman/ocaml/;
description = "Unit test framework for OCaml";
license = "MIT/X11";
license = stdenv.lib.licenses.mit;
platforms = ocaml.meta.platforms;
maintainers = [
stdenv.lib.maintainers.z77z

20
pkgs/development/tools/ocaml/camlp5/default.nix
View File

@ -2,28 +2,18 @@
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
pname = "camlp5";
version = "6.02.3";
webpage = http://pauillac.inria.fr/~ddr/camlp5/;
metafile = ./META;
in
stdenv.mkDerivation {
name = "${pname}${if transitional then "_transitional" else ""}-${version}";
name = "camlp5${if transitional then "_transitional" else ""}-6.06";
src = fetchurl {
url = "${webpage}/distrib/src/${pname}-${version}.tgz";
sha256 = "1z9bwh267117br0vlhirv9yy2niqp2n25zfnl14wg6kgg9bqx7rj";
url = http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-6.06.tgz;
sha256 = "763f89ee6cde4ca063a50708c3fe252d55ea9f8037e3ae9801690411ea6180c5";
};
patches = fetchurl {
url = "${webpage}/distrib/src/patch-${version}-1";
sha256 = "159qpvr07mnn72yqwx24c6mw7hs6bl77capsii7apg9dcxar8w7v";
};
patchFlags = "-p 0";
buildInputs = [ ocaml ];
prefixKey = "-prefix ";
@ -41,8 +31,8 @@ stdenv.mkDerivation {
Camlp5 is a preprocessor and pretty-printer for OCaml programs.
It also provides parsing and printing tools.
'';
homepage = "${webpage}";
license = "BSD";
homepage = http://pauillac.inria.fr/~ddr/camlp5/;
license = stdenv.lib.licenses.bsd3;
platforms = ocaml.meta.platforms;
maintainers = [
stdenv.lib.maintainers.z77z

32
pkgs/games/openttd/default.nix
View File

@ -1,22 +1,42 @@
{stdenv, fetchurl, SDL, libpng, zlib}:
{stdenv, fetchurl, pkgconfig, SDL, libpng, zlib, xz, freetype, fontconfig}:
stdenv.mkDerivation rec {
name = "openttd-${version}";
version = "0.6.0";
version = "1.2.2";
src = fetchurl {
url = "mirror://sf/openttd/${name}-source.tar.bz2";
md5 = "dcf63687c73ff56887049fedaf6c6019";
url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz";
sha256 = "158znfx389bhs9gd2hadnbc2a32z4ma1vz8704cmw9yh0fmhbcap";
};
buildInputs = [SDL libpng];
buildInputs = [SDL libpng pkgconfig xz zlib freetype fontconfig];
prefixKey = "--prefix-dir=";
configureFlags = "--with-zlib=${zlib}/lib/libz.a";
configureFlags = ''
--with-zlib=${zlib}/lib/libz.a
--without-liblzo2
'';
makeFlags = "INSTALL_PERSONAL_DIR=";
postInstall = ''
mv $out/games/ $out/bin
'';
meta = {
description = ''OpenTTD is an open source clone of the Microprose game "Transport Tycoon Deluxe".'';
longDescription = ''
OpenTTD is a transportation economics simulator. In single player mode,
players controll a transportation business, and use rail, road, sea, and air
transport to move goods and people around the simulated world.
In multiplayer networked mode, players may:
- play competitively as different businesses
- play cooperatively controling the same business
- observe as spectators
'';
homepage = http://www.openttd.org/;
license = "GPLv2";
maintainers = with stdenv.lib.maintainers; [ jcumming ];
};
}

31
pkgs/games/rili/default.nix Normal file
View File

@ -0,0 +1,31 @@
{stdenv, fetchurl, SDL_mixer, SDL, autoconf, automake}:
stdenv.mkDerivation {
name = "ri_li-2.0.1";
src = fetchurl {
url = mirror://sourceforge/ri-li/Ri-li-2.0.1.tar.bz2;
sha256 = "f71ccc20c37c601358d963e087ac0d524de8c68e96df09c3aac1ae65edd38dbd";
};
patches = [ ./moderinze_cpp.patch ];
preConfigure = ''
export CPPFLAGS="-I${SDL}/include -I${SDL}/include/SDL -I${SDL_mixer}/include"
autoreconf -i
'';
buildInputs = [SDL SDL_mixer autoconf automake];
meta = {
homepage = http://ri-li.sourceforge.net;
license = "GPL2+";
description = "A children's train game";
longDescription = ''
Ri-li is an arcade game licensed under the GPL (General Public License).
You drive a toy wood engine in many levels and you must collect all the coaches
to win.
'';
maintainers = with stdenv.lib.maintainers; [ jcumming ];
};
}

391
pkgs/games/rili/moderinze_cpp.patch Normal file
View File

@ -0,0 +1,391 @@
diff -r -u Ri-li-2.0.1.orig/src/audio.cc Ri-li-2.0.1/src/audio.cc
--- Ri-li-2.0.1.orig/src/audio.cc 2012-01-22 00:40:56.928609371 -0800
+++ Ri-li-2.0.1/src/audio.cc 2012-01-22 00:28:33.360636539 -0800
@@ -22,8 +22,8 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include <stdlib.h>
-#include <iostream.h>
-#include <string.h>
+#include <iostream>
+#include <string>
#include "audio.h"
#include "utils.h"
@@ -57,7 +57,7 @@
char PathFile[512];
if(Mix_OpenAudio(22050,AUDIO_S16,1,1024)) {
- cerr <<"Enable to init Sound card ! "<<SDL_GetError()<<endl;
+ std::cerr <<"Enable to init Sound card ! "<<SDL_GetError()<<std::endl;
return false;
}
diff -r -u Ri-li-2.0.1.orig/src/ecran.cc Ri-li-2.0.1/src/ecran.cc
--- Ri-li-2.0.1.orig/src/ecran.cc 2007-11-02 04:48:16.000000000 -0700
+++ Ri-li-2.0.1/src/ecran.cc 2012-01-22 00:13:54.422798653 -0800
@@ -21,7 +21,7 @@
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
diff -r -u Ri-li-2.0.1.orig/src/editeur.cc Ri-li-2.0.1/src/editeur.cc
--- Ri-li-2.0.1.orig/src/editeur.cc 2007-11-02 04:48:17.000000000 -0700
+++ Ri-li-2.0.1/src/editeur.cc 2012-01-22 00:28:59.632635579 -0800
@@ -25,10 +25,10 @@
#include <windows.h>
#endif
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
+#include <string>
#include <math.h>
#include <SDL/SDL.h>
@@ -374,7 +374,7 @@
// Sauve le niveau
if(Niveau.Save()==false) {
- cerr <<"ERREUR Saving levels!"<<endl;
+ std::cerr <<"ERREUR Saving levels!"<<std::endl;
exit(-1);
}
diff -r -u Ri-li-2.0.1.orig/src/jeux.cc Ri-li-2.0.1/src/jeux.cc
--- Ri-li-2.0.1.orig/src/jeux.cc 2007-11-02 04:48:17.000000000 -0700
+++ Ri-li-2.0.1/src/jeux.cc 2012-01-22 00:14:08.422798143 -0800
@@ -25,10 +25,10 @@
#include <windows.h>
#endif
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
+#include <string>
#include <math.h>
#include <SDL/SDL.h>
diff -r -u Ri-li-2.0.1.orig/src/loco.cc Ri-li-2.0.1/src/loco.cc
--- Ri-li-2.0.1.orig/src/loco.cc 2007-11-02 04:48:18.000000000 -0700
+++ Ri-li-2.0.1/src/loco.cc 2012-01-22 00:14:17.878797797 -0800
@@ -21,10 +21,10 @@
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
+#include <string>
#include <math.h>
#include "preference.h"
#include "loco.h"
diff -r -u Ri-li-2.0.1.orig/src/main.cc Ri-li-2.0.1/src/main.cc
--- Ri-li-2.0.1.orig/src/main.cc 2007-11-02 04:48:19.000000000 -0700
+++ Ri-li-2.0.1/src/main.cc 2012-01-22 00:29:40.080634136 -0800
@@ -23,8 +23,8 @@
#include <stdio.h>
#include <stdlib.h>
-#include <iostream.h>
-#include <string.h>
+#include <iostream>
+#include <string>
#include <SDL/SDL.h>
#include <SDL/SDL_mixer.h>
@@ -115,7 +115,7 @@
// Initilise SDL
if( SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_AUDIO|SDL_INIT_NOPARACHUTE) < 0 ) {
- cerr <<"Impossible d'initialiser SDL:"<<SDL_GetError()<<endl;
+ std::cerr <<"Impossible d'initialiser SDL:"<<SDL_GetError()<<std::endl;
exit(-1);
}
// Ferme le programme correctement quant quit
@@ -125,7 +125,7 @@
sdlVideoInfo=(SDL_VideoInfo*)SDL_GetVideoInfo();
if(sdlVideoInfo->vfmt->BitsPerPixel==8) {
- cerr <<"Impossible d'utiliser 8bits pour la vidéo !"<<endl;
+ std::cerr <<"Impossible d'utiliser 8bits pour la vidéo !"<<std::endl;
exit(-1);
}
@@ -145,7 +145,7 @@
sdlVideo=SDL_SetVideoMode(800,600,sdlVideoInfo->vfmt->BitsPerPixel,vOption);
if(sdlVideo==NULL) {
- cerr <<"Impossible de passer dans le mode vidéo 800x600 !"<<endl;
+ std::cerr <<"Impossible de passer dans le mode vidéo 800x600 !"<<std::endl;
exit(-1);
}
// Change le nom de la fenetre
diff -r -u Ri-li-2.0.1.orig/src/menu.cc Ri-li-2.0.1/src/menu.cc
--- Ri-li-2.0.1.orig/src/menu.cc 2007-11-02 04:48:19.000000000 -0700
+++ Ri-li-2.0.1/src/menu.cc 2012-01-22 00:30:04.752633198 -0800
@@ -21,10 +21,10 @@
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
+#include <string>
#include "preference.h"
#include "menu.h"
#include "sprite.h"
@@ -92,7 +92,7 @@
// Teste la resolution video
sdlVideoInfo=(SDL_VideoInfo*)SDL_GetVideoInfo();
if(sdlVideoInfo->vfmt->BitsPerPixel==8) {
- cerr <<"Impossible d'utiliser 8bits pour la vidéo !"<<endl;
+ std::cerr <<"Impossible d'utiliser 8bits pour la vidéo !"<<std::endl;
exit(-1);
}
@@ -112,7 +112,7 @@
if(Pref.FullScreen) vOption|=SDL_FULLSCREEN;
sdlVideo=SDL_SetVideoMode(800,600,sdlVideoInfo->vfmt->BitsPerPixel,vOption);
if(sdlVideo==NULL) {
- cerr <<"Impossible de passer dans le mode vidéo 800x600 !"<<endl;
+ std::cerr <<"Impossible de passer dans le mode vidéo 800x600 !"<<std::endl;
exit(-1);
}
diff -r -u Ri-li-2.0.1.orig/src/mouse.cc Ri-li-2.0.1/src/mouse.cc
--- Ri-li-2.0.1.orig/src/mouse.cc 2007-11-02 04:48:20.000000000 -0700
+++ Ri-li-2.0.1/src/mouse.cc 2012-01-22 00:14:36.438797120 -0800
@@ -21,7 +21,7 @@
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include "mouse.h"
#include "preference.h"
diff -r -u Ri-li-2.0.1.orig/src/sprite.cc Ri-li-2.0.1/src/sprite.cc
--- Ri-li-2.0.1.orig/src/sprite.cc 2007-11-02 04:48:20.000000000 -0700
+++ Ri-li-2.0.1/src/sprite.cc 2012-01-22 00:30:43.640631779 -0800
@@ -21,10 +21,10 @@
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
+#include <string>
#include <math.h>
#include "sprite.h"
#include "preference.h"
@@ -84,7 +84,7 @@
strcpy(PathFile,Langue[Pref.Langue]);
GetPath(PathFile);
if(FileExiste(PathFile)==false) {
- cerr <<"Impossible de trouver "<<Langue[Pref.Langue]<<endl;
+ std::cerr <<"Impossible de trouver "<<Langue[Pref.Langue]<<std::endl;
return false;
}
L=ChargeFichier(PathFile,Buf);
@@ -128,7 +128,7 @@
// *** Charge le fichier des langues ***
// *************************************
if(FileExiste(PathFile)==false) {
- cerr <<"Impossible de trouver 'language.dat'"<<endl;
+ std::cerr <<"Impossible de trouver 'language.dat'"<<std::endl;
return false;
}
L=ChargeFichier(PathFile,Buf);
@@ -163,7 +163,7 @@
strcpy(PathFile,"sprites.dat");
GetPath(PathFile);
if(FileExiste(PathFile)==false) {
- cerr <<"Impossible de trouver 'sprites.dat'"<<endl;
+ std::cerr <<"Impossible de trouver 'sprites.dat'"<<std::endl;
return false;
}
L=ChargeFichier(PathFile,Buf);
@@ -352,7 +352,7 @@
Image[i]=SDL_CreateRGBSurface((Dim[i].bpp-3)*SDL_SRCALPHA,Dim[i].L,Dim[i].H,Dim[i].bpp*8,
0xff,0xff00,0xff0000,0xff000000*(Dim[i].bpp-3));
if(Image[i]<=NULL) {
- cerr <<"Impossible de créer une Surface SDL!"<<endl;
+ std::cerr <<"Impossible de créer une Surface SDL!"<<std::endl;
return false;
}
@@ -486,7 +486,7 @@
Image[0]=SDL_CreateRGBSurface((Dim[0].bpp-3)*SDL_SRCALPHA,Dim[0].L,Dim[0].H,Dim[0].bpp*8,
0xff,0xff00,0xff0000,0xff000000*(Dim[0].bpp-3));
if(Image[0]<=NULL) {
- cerr <<"Impossible de créer une Surface SDL!"<<endl;
+ std::cerr <<"Impossible de créer une Surface SDL!"<<std::endl;
return false;
}
return true;
diff -r -u Ri-li-2.0.1.orig/src/tableau.cc Ri-li-2.0.1/src/tableau.cc
--- Ri-li-2.0.1.orig/src/tableau.cc 2007-11-02 04:48:21.000000000 -0700
+++ Ri-li-2.0.1/src/tableau.cc 2012-01-22 00:14:50.710796598 -0800
@@ -21,7 +21,7 @@
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
#include "preference.h"
diff -r -u Ri-li-2.0.1.orig/src/utils.cc Ri-li-2.0.1/src/utils.cc
--- Ri-li-2.0.1.orig/src/utils.cc 2007-11-02 04:48:22.000000000 -0700
+++ Ri-li-2.0.1/src/utils.cc 2012-01-22 00:31:30.944630051 -0800
@@ -21,10 +21,10 @@
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
+#include <string>
#ifdef WINDOWS
#include <windows.h>
@@ -77,7 +77,7 @@
file=fopen(Path,"r");
if(!file) {
- cerr <<"ERREUR: Impossible d'ouvrir '"<<Path<<"'"<<endl;
+ std::cerr <<"ERREUR: Impossible d'ouvrir '"<<Path<<"'"<<std::endl;
perror("fopen");
return -1;
}
@@ -93,7 +93,7 @@
Buf=new unsigned char [L+1];
if(Buf==NULL) {
- cerr <<"ERREUR: Memoire insuffisante!"<<endl;
+ std::cerr <<"ERREUR: Memoire insuffisante!"<<std::endl;
fclose(file);
return -1;
}
@@ -104,7 +104,7 @@
while(Compt>1024) {
AfficheChargeur();
if( fread(Po,1,1024,file) != 1024 ) {
- cerr <<"ERREUR de lecture du fichier '"<<Path<<"'"<<endl;
+ std::cerr <<"ERREUR de lecture du fichier '"<<Path<<"'"<<std::endl;
perror("fread");
fclose(file);
delete [] Buf;
@@ -131,13 +131,13 @@
file=_lopen(Path,OF_READ);
if(file==-1) {
- cerr <<"Impossible d'ouvrir "<<Path<<endl;
+ std::cerr <<"Impossible d'ouvrir "<<Path<<std::endl;
exit(-1);
}
long L=(long)_llseek(file,0,SEEK_END);
if(L==-1) {
- cerr <<"Impossible de trouver la longueur du fichier"<<endl;
+ std::cerr <<"Impossible de trouver la longueur du fichier"<<std::endl;
perror("lseek");
_lclose(file);
return -1;
@@ -146,7 +146,7 @@
Buf=new unsigned char [L+1];
if(Buf==NULL) {
- cerr <<"ERREUR: Memoire insuffisante!"<<endl;
+ std::cerr <<"ERREUR: Memoire insuffisante!"<<std::endl;
_lclose(file);
return -1;
}
@@ -169,14 +169,14 @@
file=fopen(Path,"w");
if(!file) {
- cerr <<"ERREUR: Impossible d'ouvrir '"<<Path<<"'"<<endl;
+ std::cerr <<"ERREUR: Impossible d'ouvrir '"<<Path<<"'"<<std::endl;
perror("fopen");
return false;
}
while(L>512) {
if( fwrite(Buf,1,512,file) != 512 ) {
- cerr <<"ERREUR d'ecriture du fichier '"<<Path<<"'"<<endl;
+ std::cerr <<"ERREUR d'ecriture du fichier '"<<Path<<"'"<<std::endl;
perror("fwrite");
fclose(file);
return false;
@@ -187,7 +187,7 @@
if(L>0) {
if( fwrite(Buf,1,(size_t)L,file) != (size_t)L ) {
- cerr <<"ERREUR d'ecriture du fichier '"<<Path<<"'"<<endl;
+ std::cerr <<"ERREUR d'ecriture du fichier '"<<Path<<"'"<<std::endl;
perror("fwrite");
fclose(file);
return false;
@@ -208,7 +208,7 @@
file=_lcreat(Path,0);
if(!file) {
- cerr <<"ERREUR: Impossible de créer le fichier '"<<Path<<"'"<<endl;
+ std::cerr <<"ERREUR: Impossible de créer le fichier '"<<Path<<"'"<<std::endl;
return false;
}
@@ -216,7 +216,7 @@
_lclose(file);
if(Lec!=L) {
- cerr <<"Problème d'ecriture du fichier '"<<Path<<"' ecris="<<Lec<<" au lieux de ="<<L<<endl;
+ std::cerr <<"Problème d'ecriture du fichier '"<<Path<<"' ecris="<<Lec<<" au lieux de ="<<L<<std::endl;
return false;
}
@@ -250,7 +250,7 @@
sprintf(Path,"/usr/share/games/Ri-li/%s",Provi);
if(FileExiste(Path)) return;
- cerr <<"Impossible de trouver le fichier '"<<Provi<<endl;
+ std::cerr <<"Impossible de trouver le fichier '"<<Provi<<std::endl;
exit(-1);
}
#endif
@@ -266,7 +266,7 @@
sprintf(Path,"PROGDIR:%s",Provi);
if(FileExiste(Path)) return;
- cerr <<"Impossible de trouver le fichier '"<<Path<<endl;
+ std::cerr <<"Impossible de trouver le fichier '"<<Path<<std::endl;
exit(-1);
}
#endif
@@ -282,7 +282,7 @@
sprintf(Path,"Ri-li.app/Contents/Resources/%s",Provi);
if(FileExiste(Path)) return;
- cerr <<"Impossible de trouver le fichier '"<<Path<<endl;
+ std::cerr <<"Impossible de trouver le fichier '"<<Path<<std::endl;
exit(-1);
}
#endif

78
pkgs/games/uqm/default.nix Normal file
View File

@ -0,0 +1,78 @@
{stdenv, fetchurl
, pkgconfig, mesa
, SDL, SDL_image, libpng, zlib, libvorbis, libogg, libmikmod, unzip
}:
stdenv.mkDerivation rec {
name = "uqm-${version}";
version = "0.7.0";
src = fetchurl {
url = "mirror://sf/sc2/uqm-${version}-source.tgz";
sha256 = "a3695c5f7f0be7ec9c0f80ec569907b382023a1fee6e635532bd53b7b53bb221";
};
content = fetchurl {
url = "mirror://sf/sc2/uqm-${version}-content.uqm";
sha256 = "b8f6db8ba29f0628fb1d5c233830896b19f441aee3744bda671ea264b44da3bf";
};
voice = fetchurl {
url = "mirror://sf/sc2/uqm-${version}-voice.uqm";
sha256 = "bcccf801b4ba37594ff6217b292744ea586ee2d447e927804842ccae8b73c979";
};
music = fetchurl {
url = "mirror://sf/sc2/uqm-${version}-3domusic.uqm";
sha256 = "c57085e64dad4bddf8a679a9aa2adf63f2156d5f6cbabe63af80519033dbcb82";
};
/* uses pthread_cancel(), which requires libgcc_s.so.1 to be
loadable at run-time. Adding the flag below ensures that the
library can be found. Obviously, though, this is a hack. */
NIX_LDFLAGS="-lgcc_s";
buildInputs = [SDL SDL_image libpng libvorbis libogg libmikmod unzip pkgconfig mesa];
postUnpack = ''
mkdir -p uqm-${version}/content/packages
mkdir -p uqm-${version}/content/addons
cp $content uqm-${version}/content/packages/uqm-0.7.0-content.uqm
cp $music uqm-${version}/content/addons/uqm-0.7.0-3domusic.uqm
cp $voice uqm-${version}/content/addons/uqm-0.7.0-voice.uqm
'';
/* uqm has a 'unique' build system with a root script incidentally called
* 'build.sh'. */
configurePhase = ''
echo "INPUT_install_prefix_VALUE='$out'" >> config.state
echo "INPUT_install_bindir_VALUE='$out/bin'" >> config.state
echo "INPUT_install_libdir_VALUE='$out/lib'" >> config.state
echo "INPUT_install_sharedir_VALUE='$out/share'" >> config.state
PREFIX=$out ./build.sh uqm config
'';
buildPhase = ''
./build.sh uqm
'';
installPhase = ''
./build.sh uqm install
sed -i $out/bin/uqm -e "s%/usr/local/games/%$out%g"
'';
meta = {
description = "Remake of Star Control II";
longDescription = ''
The goals for the The Ur-Quan Masters project are:
- to bring Star Control II to modern platforms, thereby making a lot of people happy
- to make game translations easy, thereby making even more people happy
- to adapt the code so that people can more easily make their own spin-offs, thereby making zillions more people happy!
'';
homepage = http://sc2.sourceforge.net/;
license = "GPLv2";
maintainers = with stdenv.lib.maintainers; [ jcumming ];
};
}

11
pkgs/games/widelands/boost_and_cmake_die_die_die.patch Normal file
View File

@ -0,0 +1,11 @@
--- widelands-build17-src.old/CMakeLists.txt 2012-04-23 02:46:49.000000000 -0700
+++ widelands-build17-src/CMakeLists.txt 2012-07-14 19:49:14.000000000 -0700
@@ -140,8 +140,6 @@
else (WL_UNIT_TESTS)
message(STATUS "Disabled Unit Tests")
set (Boost_FIND_COMPONENTS signals)
- set (Boost_USE_STATIC_LIBS ON)
- set (Boost_USE_MULTITHREADED ON)
set (Boost_DETAILED_FAILURE_MSG ON)
find_package(Boost 1.35.0 COMPONENTS signals REQUIRED)
endif (WL_UNIT_TESTS)

18
pkgs/games/widelands/default.nix
View File

@ -13,11 +13,11 @@ let
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="widelands";
version="build16";
version="build17";
name="${baseName}-${version}";
project="${baseName}";
url="http://launchpad.net/${project}/${version}/${version}/+download/${name}-src.tar.bz2";
hash="0pb2d73c6hynhp1x54rcfbibrrri7lyxjybd1hicn503qcakrnyq";
url="https://launchpadlibrarian.net/102893896/widelands-build17-src.tar.bz2";
hash="be48b3b8f342a537b39a3aec2f7702250a6a47e427188ba3bece67d7d90f3cc5";
};
in
rec {
@ -30,7 +30,9 @@ rec {
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["killBuildDir" "doCmake" "doMakeInstall" "createScript"];
phaseNames = ["killBuildDir" "doPatch" "doCmake" "doMakeInstall" "createScript"];
patches = [ ./boost_and_cmake_die_die_die.patch ];
killBuildDir = a.fullDepEntry ''
rm -r build
@ -38,6 +40,7 @@ rec {
cmakeFlags = [
"-DLUA_LIBRARIES=-llua"
"-DWL_PORTABLE=true"
];
createScript = a.fullDepEntry ''
@ -50,9 +53,16 @@ rec {
meta = {
description = "Widelands RTS with multiple-goods economy";
longDescription = ''
Widelands is a real time strategy game based on "The Settlers" and "The
Settlers II". It has a single player campaign mode, as well as a networked
multiplayer mode.
'';
maintainers = with a.lib.maintainers;
[
raskin
jcumming
];
platforms = with a.lib.platforms;
linux;

1
pkgs/lib/maintainers.nix
View File

@ -18,6 +18,7 @@
garbas = "Rok Garbas <rok@garbas.si>";
goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
guibert = "David Guibert <david.guibert@gmail.com>";
jcumming = "Jack Cummings <jack@mudshark.org>";
kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
ludo = "Ludovic Courtès <ludo@gnu.org>";
marcweber = "Marc Weber <marco-oweber@gmx.de>";

6
pkgs/misc/screensavers/xscreensaver/default.nix
View File

@ -4,12 +4,12 @@
}:
stdenv.mkDerivation rec {
version = "5.18";
version = "5.19";
name = "xscreensaver-${version}";
src = fetchurl {
url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
sha256 = "3d70edb8f46511f5427f21b4ba4d8323f336888f60268d16731f5231c6883db9";
sha256 = "fd62ea0f996abe1bea3770dd7141681454521b49302f9bced8af9c2ee428c0e0";
};
buildInputs =
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
''
# Fix build error in version 5.18. Remove this patch when updating
# to a later version.
sed -i -e '/AF_LINK/d' hacks/glx/sonar-icmp.c
#sed -i -e '/AF_LINK/d' hacks/glx/sonar-icmp.c
# Fix path to GTK.
sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
-i driver/Makefile.in po/Makefile.in.in

35
pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
View File

@ -6,25 +6,26 @@
{ stdenv, fetchurl, buildEnv, dpkg }:
let
version = "0.35";
version = "0.36";
packages = [
{ name = "linux-nonfree"; sha256 = "8c0701500e5252e3e05ad0e5403cc5295899ccb2d6d731380b5f4c2d90003ed1"; }
{ name = "atheros"; sha256 = "df411d76e3d55cb256b0974df16cf18f316c1325f33670fbc9e36abba5aa46c0"; }
{ name = "bnx2"; sha256 = "124e74aa6ce477f7b6a0b5eff3870b0104fd885b4bdfb9977175e75bdb9a7525"; }
{ name = "bnx2x"; sha256 = "4cbcf3422a9aaa6e31704770c724179765dceabd2e6867e24cf47039925e6545"; }
{ name = "brcm80211"; sha256 = "eefba7ba31c018d514ea15878cfd7bca36a65b0df3e9024fc3875a990678a684"; }
{ name = "intelwimax"; sha256 = "436a3bd128224f43988630318aa3e74abfbe838916e1e10a602ddc468b75d843"; }
{ name = "ipw2x00"; sha256 = "9c214e3a9f7f7d710b5cb30282d5ca2b2ccafc3bb208dfe7e18de16d3aadc7a3"; }
{ name = "ivtv"; sha256 = "ced47d8b87ff8ff70a8c32492cc4fb5818860ef018b5c04a4415ab26c9b16300"; }
{ name = "iwlwifi"; sha256 = "5d9615ec128b59cc5834e0261ea74127c0bc64bafabdaef1028a8f1acf611568"; }
{ name = "libertas"; sha256 = "b109fb5c392928ac5495f8ce1d0f41d123b193031f8b548e8b68e9563db37016"; }
{ name = "linux"; sha256 = "8e87f75c120904f2ca5fd9017e4503c23d8705b9ccaeb570374d1747163620ab"; }
{ name = "myricom"; sha256 = "4c9e19d8b2cea97eb05f9d577537dba81aa36ac06c6da9bbed0bfa20434b7acc"; }
{ name = "netxen"; sha256 = "3bd129229cf548a533c79cb55deefa7e4919e09fcc1f655773f4fa5078d81b9b"; }
{ name = "qlogic"; sha256 = "213d098435c657115d2754ef5ead52e64f5fa05be4dcbcb0d5d3ca745376959c"; }
{ name = "ralink"; sha256 = "51f3001ed15ca72bb088297b9e6e4a821ba6250f0ccc8886d77d2f5386a21836"; }
{ name = "realtek"; sha256 = "a6338f5cd8bbe9627fa994016ebb0a91b40914021bec280ddc8f8a56eab22287"; }
{ name = "linux-nonfree"; sha256 = "668d262dfcf18ffef2fe2a0b853b81bf5855f49fd2133203cbda097b1507c953"; }
{ name = "atheros"; sha256 = "27cbd2099ce28c742f42833b09a61bdc7fb5b2ebcf5b35a52e750160ea1001b6"; }
{ name = "bnx2"; sha256 = "32730fdeb0fb15a36e0ca046bde69e1a6fece8561af57afc7d9f1cf978fd25ab"; }
{ name = "bnx2x"; sha256 = "22f23f4abb4aa2dac22718f12cf3bbd3fd2d63870b13e81c8401e6f841a719e8"; }
{ name = "brcm80211"; sha256 = "17055c4199cc7e2aaa7d1d76dd5e718d24dbebb84020bb2d95ffab03bcfc7e8a"; }
{ name = "intelwimax"; sha256 = "cc1b894990d3074e93b3f79b2b617614aab554b5e832d34993b5a16f64bdb84a"; }
{ name = "ipw2x00"; sha256 = "2ef0810e2e037f7d536b24cc35527c456ff13b7aa5fd2df607b7035227553c9d"; }
{ name = "ivtv"; sha256 = "7bf30e142679d53ad376002f29026bbe28de51e1cb71bcc3ec5c5f5f119a7118"; }
{ name = "iwlwifi"; sha256 = "46ce0915583674ec10bfde3840b66ff450237edf604804ff51b9872fe767c1bb"; }
{ name = "libertas"; sha256 = "c5d370d244f1c3a42f0a0280ed0cab067dbf36fa2926d387c9d10cf4ccd1b000"; }
{ name = "linux"; sha256 = "e19bedc2cacf2cd7a1fc38e25820effe9e58fdc56608e9f7c320c85b80cba6ea"; }
{ name = "myricom"; sha256 = "038bd618c00e852206a8a1443ba47ea644c04052bd8f10af9392c716ebf16b3c"; }
{ name = "netxen"; sha256 = "29e3c1707dab6439f391318a223e5d4b6508d493c8d8bad799aef4f35b4704e7"; }
{ name = "qlogic"; sha256 = "cc43c6016f2b7661d39e1d678ac0e8ca70081be8a0c76c2ec4d2e71493afa7d8"; }
{ name = "ralink"; sha256 = "4db8dc6b98821c59f008c8bf7464317443b031cebf6d7e56c06f0824e69e3922"; }
{ name = "realtek"; sha256 = "c39e65e5a589325ceb365d11b9ea10b0244134b7e5b3b05fd91fe6ad66b2f093"; }
];
fetchPackage =

4
pkgs/os-specific/linux/kernel/linux-3.0.nix
View File

@ -230,7 +230,7 @@ in
import ./generic.nix (
rec {
version = "3.0.43";
version = "3.0.45";
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@ -238,7 +238,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "1mrsdqsphkixvd5x97nz465r490hr679rq6f98jbyr0g5m4fyc29";
sha256 = "0mgv6iqnfam16v2s8hdxpf2imx49sjhndjc80646lk9053l5rh0d";
};
config = configWithPlatform stdenv.platform;

4
pkgs/os-specific/linux/kernel/linux-3.2.nix
View File

@ -237,7 +237,7 @@ in
import ./generic.nix (
rec {
version = "3.2.30";
version = "3.2.31";
testing = false;
modDirVersion = version;
@ -248,7 +248,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "1yg353alkk7vddd8b2d7dlgpwaxjigk8i9qq1xifln3i842zinvw";
sha256 = "0b2yklmgxv1sk847701f1wgh2kg2jxqqp7bg1279p7fj8vnmbmrq";
};
config = configWithPlatform stdenv.platform;

4
pkgs/os-specific/linux/kernel/linux-3.4.nix
View File

@ -239,7 +239,7 @@ in
import ./generic.nix (
rec {
version = "3.4.11";
version = "3.4.13";
testing = false;
preConfigure = ''
@ -248,7 +248,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0fda9z5dxvn8sbgr1c143ly8ixm0grymwm4r94nryby9i03s03a2";
sha256 = "16wpnqnjxcrm2aszjdkrn4vlcdm9j35ixnq7myvc432w7pkdqk11";
};
config = configWithPlatform stdenv.platform;

4
pkgs/os-specific/linux/kernel/linux-3.5.nix
View File

@ -240,7 +240,7 @@ in
import ./generic.nix (
rec {
version = "3.5.4";
version = "3.5.6";
testing = false;
preConfigure = ''
@ -249,7 +249,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "09pi00sk55rpl4mbhd27mnfajgy22bm0zwcgi68iyilc5wir1m12";
sha256 = "0z6hklmpm33d1cjwzsny5s03kajp9zmdgxhfrd0aky98x36202gf";
};
config = configWithPlatform stdenv.platform;

5
pkgs/os-specific/linux/kernel/linux-3.6.nix
View File

@ -244,8 +244,7 @@ in
import ./generic.nix (
rec {
version = "3.6";
modDirVersion = "3.6.0";
version = "3.6.1";
testing = false;
preConfigure = ''
@ -254,7 +253,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0kvqj6bhzcq581aav8mjzzxisz7s5vwng7b5kwzp2d8p3kpsdfaa";
sha256 = "0jpjhnp0pnly2nvfhb5z2wqaw66yzr9pd477rsdmx1wi9gsp07mz";
};
config = configWithPlatform stdenv.platform;

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

@ -189,6 +189,21 @@ rec {
features.aufs3 = true;
};
# not officially released yet, but 3.x seems to work fine
aufs3_6 = rec {
name = "aufs3.6";
version = "3.x.20120827";
utilRev = "91af15f977d12e02165759620005f6ce1a4d7602";
utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996";
patch = makeAufs3StandalonePatch {
inherit version;
rev = "46660ad144289fa1f0aca59bd00d592b560d0dbb";
sha256 = "823b7b4c011c103d63711900b3213008de3c9e408b909e0cc2b8697c1e82b67d";
};
features.aufsBase = true;
features.aufs3 = true;
};
# Increase the timeout on CIFS requests from 15 to 120 seconds to
# make CIFS more resilient to high load on the CIFS server.
cifs_timeout_2_6_15 =
@ -226,6 +241,7 @@ rec {
patch = ./dell-rfkill.patch;
};
# seems no longer necessary on 3.6
perf3_5 =
{ name = "perf-3.5";
patch = ./perf-3.5.patch;

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod
, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, usbutils, pciutils
, glib, kbd, libxslt, coreutils
, glib, kbd, libxslt, coreutils, libgcrypt
}:
assert stdenv.gcc.libc or null != null;
@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
sha256 = "0cgnnl6kqaz3als5y9g8jvsvbs4c8ccp0vl4s1g8rwk69w2cwxd2";
};
patches = [ ./reexec.patch ./ignore-duplicates.patch ];
patches = [ ./reexec.patch ./ignore-duplicates.patch ./fix-device-aliases.patch ];
buildInputs =
[ pkgconfig intltool gperf libcap dbus kmod xz pam acl
/* cryptsetup */ libuuid m4 usbutils pciutils glib libxslt
/* cryptsetup */ libuuid m4 usbutils pciutils glib libxslt libgcrypt
];
configureFlags =
@ -56,6 +56,9 @@ stdenv.mkDerivation rec {
# lead to a cyclic dependency.
"-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\""
"-fno-stack-protector"
# Work around our kernel headers being too old. FIXME: remove
# this after the next stdenv update.
"-DFS_NOCOW_FL=0x00800000"
];
makeFlags = "CPPFLAGS=-I${stdenv.gcc.libc}/include";

14
pkgs/os-specific/linux/systemd/fix-device-aliases.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/src/core/device.c b/src/core/device.c
index 5307341..7bbe99a 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -255,8 +255,7 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p
if (!is_path(alias))
log_warning("SYSTEMD_ALIAS for %s is not a path, ignoring: %s", sysfs, alias);
else {
- if ((r = device_add_escaped_name(u, alias)) < 0)
- goto fail;
+ device_update_unit(m, dev, alias, false);
}
}

18
pkgs/servers/http/nginx/default.nix
View File

@ -1,10 +1,13 @@
{ stdenv, fetchurl, openssl, zlib, pcre, libxml2, libxslt }:
stdenv.mkDerivation rec {
name = "nginx-1.1.7";
name = "nginx-1.2.4";
src = fetchurl {
url = "http://nginx.org/download/${name}.tar.gz";
sha256 = "1y0bzmrgnyqw8ghc508nipy5k46byrxc2sycqp35fdx0jmjz3h51";
sha256 = "0hvcv4lgfcrsl40azkd3rxhf73l05jzzgflclpkdvjd95xgw51y5";
};
buildInputs = [ openssl zlib pcre libxml2 libxslt ];
configureFlags = [
@ -15,7 +18,7 @@ stdenv.mkDerivation rec {
"--with-http_gzip_static_module"
"--with-http_secure_link_module"
# Install destination problems
# "--with-http_perl_module"
# "--with-http_perl_module"
];
preConfigure = ''
@ -27,11 +30,8 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "nginx - 'engine x' - reverse proxy and lightweight webserver";
maintainers = [
stdenv.lib.maintainers.raskin
];
platforms = with stdenv.lib.platforms;
all;
description = "A reverse proxy and lightweight webserver";
maintainers = [ stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.all;
};
}

8
pkgs/servers/samba/default.nix
View File

@ -18,11 +18,11 @@
assert useKerberos -> kerberos != null;
stdenv.mkDerivation rec {
name = "samba-3.6.7";
name = "samba-3.6.8";
src = fetchurl {
url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz";
sha256 = "1jnl9v6axz30ymh6in1fwan7zjy9n5n7x70vi1afazxs27qa0n5q";
sha256 = "1phl6mmrc72jyvbyrw6cv6b92cxq3v2pbn1fh97nnb4hild1fnjg";
};
patches =
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
postPatch =
# XXX: Awful hack to allow cross-compilation.
'' sed -i source3/configure \
-e 's/^as_fn_error \("cannot run test program while cross compiling\)/$as_echo \1/g'
-e 's/^as_fn_error .. \("cannot run test program while cross compiling\)/$as_echo \1/g'
''; # "
preConfigure =
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
''
mkdir -p $out
mv $TMPDIR/inst/$out/* $out/
mkdir -pv $out/lib/cups/backend
ln -sv ../../../bin/smbspool $out/lib/cups/backend/smb
mkdir -pv $out/etc/openldap/schema

6
pkgs/servers/sql/mysql/jdbc/default.nix
View File

@ -1,12 +1,12 @@
{stdenv, fetchurl, ant, unzip}:
stdenv.mkDerivation {
name = "mysql-connector-java-5.1.17";
name = "mysql-connector-java-5.1.22";
builder = ./builder.sh;
src = fetchurl {
url = ftp://mirror.leaseweb.com/mysql/Downloads/Connector-J/mysql-connector-java-5.1.17.zip;
sha256 = "1c4hsx0qwb3rp66a1dllnah2zi9gqqnr4aqm9p59yrqj5jr22ldp";
url = http://cdn.mysql.com/Downloads/Connector-J/mysql-connector-java-5.1.22.zip;
sha256 = "0hfx1znq0iqclkc8visca7x67lvlk3cswni69ghi2c5cpa2d4ijm";
};
buildInputs = [ unzip ant ];

20
pkgs/servers/sql/postgresql/psqlodbc/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ stdenv, fetchurl, libiodbc, postgresql, openssl }:
stdenv.mkDerivation rec {
name = "psqlodbc-09.01.0200";
src = fetchurl {
url = "http://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz";
sha256 = "0b4w1ahfpp34jpscfk2kv9050lh3xl9pvcysqvaigkcd0vsk1hl9";
};
buildInputs = [ libiodbc postgresql openssl ];
configureFlags = "--with-iodbc=${libiodbc}";
meta = {
homepage = http://psqlodbc.projects.postgresql.org/;
description = "ODBC driver for PostgreSQL";
license = "LGPL";
};
}

6
pkgs/tools/filesystems/btrfsprogs/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchgit, zlib, libuuid, acl, attr, e2fsprogs }:
let version = "0.19-20120328"; in
let version = "0.20pre20121005"; in
stdenv.mkDerivation {
name = "btrfs-progs-${version}";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git";
rev = "1957076ab4fefa47b6efed3da541bc974c83eed7";
sha256 = "566d863c5500652e999d0d6b823365fb06f2f8f9523e65e69eaa3e993e9b26e1";
rev = "91d9eec1ff044394f2b98ee7fcb76713dd33b994";
sha256 = "72d4cd4fb23d876a17146d6231ad40a2151fa47c648485c54cf7478239b43764";
};
buildInputs = [ zlib libuuid acl attr e2fsprogs ];

8
pkgs/tools/graphics/asymptote/src-for-default.nix
View File

@ -1,7 +1,7 @@
rec {
version="2.18";
name="asymptote-2.18";
hash="0i7jm12lzj983gvpa95a85wxb4v4ksk3cxb0cq359x2kka0b6g5m";
version="2.20";
name="asymptote-2.20";
hash="0ji45v0d9jps8clsl86pvmr22acci3f0ciicmyzak6dbczqyrj80";
url="http://downloads.sourceforge.net/project/asymptote/${version}/asymptote-${version}.src.tgz";
advertisedUrl="http://downloads.sourceforge.net/project/asymptote/2.18/asymptote-2.18.src.tgz";
advertisedUrl="http://downloads.sourceforge.net/project/asymptote/2.20/asymptote-2.20.src.tgz";
}

1
pkgs/tools/misc/debian-devscripts/default.nix
View File

@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
sed -re "s@/etc( |$|/)@$out/etc\\1@" -i Makefile* */Makefile*
'';
postInstall = ''
sed -re 's@(^|[ !`"])/bin/bash@\1${stdenv.shell}@g' -i "$out/bin"/*
for i in "$out/bin"/*; do
wrapProgram "$i" \
--prefix PERL5LIB : "$PERL5LIB" \

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

@ -4,10 +4,10 @@ stdenv.mkDerivation rec {
name = "plowshare-${version}";
version = "git20120916";
version = "20120916";
src = fetchurl {
url = "http://plowshare.googlecode.com/files/plowshare-snapshot-${version}.tar.gz";
url = "http://plowshare.googlecode.com/files/plowshare-snapshot-git${version}.tar.gz";
sha256 = "eccdb28d49ac47782abc8614202b3a88426cd587371641ecf2ec008880dc6067";
};

6
pkgs/tools/system/smartmontools/default.nix
View File

@ -7,14 +7,14 @@ let
};
in
stdenv.mkDerivation rec {
name = "smartmontools-5.43";
name = "smartmontools-6.0";
src = fetchurl {
url = "mirror://sourceforge/smartmontools/${name}.tar.gz";
sha256 = "d845187d1500b87ef8d2c43772bd0218a59114fe58474a903c56777c9175351e";
sha256 = "9fe4ff2b7bcd00fde19db82bba168f5462ed6e857d3ef439495e304e3231d3a6";
};
patchPhase = "cp ${driverdb} drivedb.h";
# patchPhase = "cp ${driverdb} drivedb.h";
meta = {
description = "Tools for monitoring the health of hard drivers";

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

@ -2286,6 +2286,11 @@ let
};
};
jhc = callPackage ../development/compilers/jhc {
inherit (haskellPackages_ghc6123) ghc binary zlib utf8String readline fgl
regexCompat HsSyck random;
};
# Haskell and GHC
# Import Haskell infrastructure.
@ -2442,7 +2447,7 @@ let
ocaml_3_12_1 = callPackage ../development/compilers/ocaml/3.12.1.nix { };
ocaml_4_00_0 = callPackage ../development/compilers/ocaml/4.00.0.nix { };
ocaml_4_00_1 = callPackage ../development/compilers/ocaml/4.00.1.nix { };
metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { };
@ -2541,7 +2546,7 @@ let
ocamlPackages_3_10_0 = mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0;
ocamlPackages_3_11_2 = mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2;
ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1;
ocamlPackages_4_00_0 = mkOcamlPackages ocaml_4_00_0 pkgs.ocamlPackages_4_00_0;
ocamlPackages_4_00_1 = mkOcamlPackages ocaml_4_00_1 pkgs.ocamlPackages_4_00_1;
ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { };
@ -2716,10 +2721,9 @@ let
love = callPackage ../development/interpreters/love {};
lua4 = callPackage ../development/interpreters/lua-4 { };
lua5 = callPackage ../development/interpreters/lua-5 { };
lua5_0 = callPackage ../development/interpreters/lua-5/5.0.3.nix { };
lua5_1 = callPackage ../development/interpreters/lua-5/5.1.nix { };
maude = callPackage ../development/interpreters/maude { };
@ -5431,6 +5435,10 @@ let
postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc {
postgresql = postgresql91;
};
pyIRCt = builderDefsPackage (import ../servers/xmpp/pyIRCt) {
inherit xmpppy pythonIRClib python makeWrapper;
};
@ -5870,8 +5878,7 @@ let
kernelPatches =
[
kernelPatches.sec_perm_2_6_24
# kernelPatches.aufs3_5
# kernelPatches.perf3_5
kernelPatches.aufs3_6
] ++ lib.optionals (platform.kernelArch == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
@ -6122,10 +6129,6 @@ let
config = config.pcmciaUtils.config or null;
};
phat = callPackage ../development/libraries/phat {
inherit (gnome) libgnomecanvas;
};
pmount = callPackage ../os-specific/linux/pmount { };
pmutils = callPackage ../os-specific/linux/pm-utils { };
@ -6969,6 +6972,13 @@ let
firefox15Wrapper = lowPrio (wrapFirefox { browser = firefox15Pkgs.firefox; });
firefox16Pkgs = callPackage ../applications/networking/browsers/firefox/16.0.nix {
inherit (gnome) libIDL;
inherit (pythonPackages) pysqlite;
};
firefox16Wrapper = lowPrio (wrapFirefox { browser = firefox16Pkgs.firefox; });
flac = callPackage ../applications/audio/flac { };
flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 {
@ -7450,6 +7460,8 @@ let
navit = callPackage ../applications/misc/navit { };
netbeans = callPackage ../applications/editors/netbeans { };
ncdu = callPackage ../tools/misc/ncdu { };
nedit = callPackage ../applications/editors/nedit {
@ -8186,6 +8198,8 @@ let
mygui = myguiSvn;
};
rili = callPackage ../games/rili { };
rogue = callPackage ../games/rogue { };
sauerbraten = callPackage ../games/sauerbraten {};
@ -8266,6 +8280,8 @@ let
lua = lua5;
};
uqm = callPackage ../games/uqm { };
urbanterror = callPackage ../games/urbanterror { };
ut2004demo = callPackage ../games/ut2004demo { };

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

@ -1292,7 +1292,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
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;
primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {};
primitive = self.primitive_0_5_0_1;
processExtras = callPackage ../development/libraries/haskell/process-extras {};
@ -1634,8 +1635,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
Vec = callPackage ../development/libraries/haskell/Vec {};
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;
vector_0_10 = callPackage ../development/libraries/haskell/vector/0.10.nix {};
vector_0_10_0_1 = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix {};
vector = self.vector_0_10_0_1;
vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {};

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

@ -187,14 +187,15 @@ let pythonPackages = python.modules // rec {
});
astng = buildPythonPackage rec {
name = "logilab-astng-0.21.1";
logilab_astng = buildPythonPackage rec {
name = "logilab-astng-0.24.1";
src = fetchurl {
url = "ftp://ftp.logilab.org/pub/astng/${name}.tar.gz";
sha256 = "0rqp2vwrnv6gkzdd96j078h1sz26plh49cmnyswy2wb6l4wans67";
url = "http://download.logilab.org/pub/astng/${name}.tar.gz";
sha256 = "00qxaxsax80sknwv25xl1r49lc4gbhkxs1kjywji4ad8y1npax0s";
};
propagatedBuildInputs = [logilabCommon];
propagatedBuildInputs = [ logilab_common ];
};
beautifulsoup = buildPythonPackage (rec {
@ -1053,14 +1054,15 @@ let pythonPackages = python.modules // rec {
};
};
logilabCommon = buildPythonPackage rec {
name = "logilab-common-0.56.0";
logilab_common = buildPythonPackage rec {
name = "logilab-common-0.58.2";
src = fetchurl {
url = "ftp://ftp.logilab.org/pub/common/${name}.tar.gz";
sha256 = "14p557nqypbd10d8k7qs6jlm58pksiwh86wvvl0axyki00hj6971";
url = "http://download.logilab.org/pub/common/${name}.tar.gz";
sha256 = "0qfdyj2is0scpnkgpnqm12lh4yl27617l0irlilhk25cpgbbfbf9";
};
propagatedBuildInputs = [unittest2];
propagatedBuildInputs = [ unittest2 ];
};
lxml = buildPythonPackage ( rec {
@ -1976,13 +1978,20 @@ let pythonPackages = python.modules // rec {
pylint = buildPythonPackage rec {
name = "pylint-0.23.0";
name = "pylint-0.26.0";
namePrefix = "";
src = fetchurl {
url = "ftp://ftp.logilab.org/pub/pylint/${name}.tar.gz";
sha256 = "07091avcc2b374i5f3blszmawjcin8xssjfryz91qbxybb8r7c6d";
sha256 = "1mg1ywpj0klklv63s2hwn5xwxi3wfwgnyz9d4pz32hzb53azq835";
};
propagatedBuildInputs = [ logilab_astng ];
meta = {
homepage = http://www.logilab.org/project/pylint;
description = "A bug and style checker for Python";
};
propagatedBuildInputs = [astng];
};
@ -2584,11 +2593,11 @@ let pythonPackages = python.modules // rec {
});
sphinx = buildPythonPackage (rec {
name = "Sphinx-1.0.7";
name = "Sphinx-1.1.3";
src = fetchurl {
url = "http://pypi.python.org/packages/source/S/Sphinx/${name}.tar.gz";
md5 = "42c722d48e52d4888193965dd473adb5";
md5 = "8f55a6d4f87fc6d528120c5d1f983e98";
};
propagatedBuildInputs = [docutils jinja2 pygments];