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

Merge remote-tracking branch 'upstream/master' into stdenv-updates

Browse Source
This commit is contained in:
Shea Levy 2012-07-02 11:27:25 -04:00
commit 015e7594d0
91 changed files with 1104 additions and 319 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/leksah/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "leksah";
version = "0.12.1.2";
sha256 = "01gang44cdm9xg1dx1273prkhcniidagm2r90qh4v5mrdq8139v0";
version = "0.12.1.3";
sha256 = "1w61wnd0nq9iqh0pwn9dz3m4qn3m0zasv0m3ki4k7plcdrmkqb3y";
isLibrary = true;
isExecutable = true;
buildDepends = [

34
pkgs/applications/graphics/mcomix/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ stdenv, fetchurl, buildPythonPackage, pygtk, pil }:
buildPythonPackage rec {
namePrefix = "";
name = "mcomix-0.98";
src = fetchurl {
url = "mirror://sourceforge/mcomix/${name}.tar.bz2";
sha256 = "93805b6c8540bd673ac4a6ef6e952f00f8fc10e59a63c7e163324a64db2a6b03";
};
doCheck = false;
pythonPath = [ pygtk pil ];
meta = {
description = "Image viewer designed to handle comic books";
longDescription = ''
MComix is an user-friendly, customizable image viewer. It is specifically
designed to handle comic books, but also serves as a generic viewer.
It reads images in ZIP, RAR, 7Zip or tar archives as well as plain image
files. It is written in Python and uses GTK+ through the PyGTK bindings,
and runs on both Linux and Windows.
MComix is a fork of the Comix project, and aims to add bug fixes and
stability improvements after Comix development came to a halt in late 2009.
'';
homepage = http://mcomix.sourceforge.net/;
license = "GPLv2";
};
}

29
pkgs/applications/graphics/mirage/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv, fetchurl, buildPythonPackage, python, pygtk, pil, libX11, gettext }:
buildPythonPackage rec {
namePrefix = "";
name = "mirage-0.9.5.2";
src = fetchurl {
url = "http://download.berlios.de/mirageiv/${name}.tar.bz2";
sha256 = "d214a1b6d99d1d1e83da5848a2cef181f6781e0990e93f7ebff5880b0c43f43c";
};
postInstall = ''
mv $out/lib/${python.libPrefix}/site-packages/*.egg/share $out
'';
doCheck = false;
buildInputs = [ stdenv libX11 gettext ];
pythonPath = [ pygtk pil ];
meta = {
description = "Simple image viewer written in PyGTK";
homepage = http://mirageiv.berlios.de/;
license = "GPLv2";
};
}

18
pkgs/applications/misc/bitcoin/default.nix
View File

@ -1,12 +1,12 @@
{ fetchurl, stdenv, openssl, db4, boost, zlib, miniupnpc, qt4 }:
stdenv.mkDerivation rec {
version = "0.6.2";
version = "0.6.3";
name = "bitcoin-${version}";
src = fetchurl {
url = "mirror://sourceforge/bitcoin/bitcoin-0.6.2-linux.tar.gz";
sha256 = "0yhgqz98hmmn6ljk23rd48jsjfvzdii27370vazhbgvjwj8giais";
url = "mirror://sourceforge/bitcoin/${name}-linux.tar.gz";
sha256 = "722d4209ff4a951a9eb5cae26a33ad62770fdcb5dfb5acf0b5c6a8f6f3a8a0ef";
};
buildInputs = [ openssl db4 boost zlib miniupnpc qt4 ];
@ -21,13 +21,13 @@ stdenv.mkDerivation rec {
cp bitcoin-qt $out/bin
'';
meta = {
meta = {
description = "Bitcoin is a peer-to-peer currency";
longDescription=''
Bitcoin is a free open source peer-to-peer electronic cash system that is
completely decentralized, without the need for a central server or trusted
parties. Users hold the crypto keys to their own money and transact directly
with each other, with the help of a P2P network to check for double-spending.
longDescription= ''
Bitcoin is a free open source peer-to-peer electronic cash system that is
completely decentralized, without the need for a central server or trusted
parties. Users hold the crypto keys to their own money and transact directly
with each other, with the help of a P2P network to check for double-spending.
'';
homepage = "http://www.bitcoin.org/";
maintainers = [ stdenv.lib.maintainers.roconnor ];

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

@ -1,13 +1,26 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, cmake, lua5 }:
stdenv.mkDerivation {
name = "task-warrior-1.9.4";
name = "task-warrior-2.0.0";
src = fetchurl {
url = http://www.taskwarrior.org/download/task-1.9.4.tar.gz;
sha256 = "0jnk30k1b2j3nx39il70jmj6p49wxp6cl4awd8hw71gqkcf6480h";
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"
'';
};
enableParallelBuilding = true;
meta = {
description = "Command-line todo list manager";
homepage = http://taskwarrior.org/;

27
pkgs/applications/misc/taskwarrior/unstable.nix
View File

@ -1,27 +0,0 @@
{ stdenv, fetchurl, cmake, lua5 }:
stdenv.mkDerivation {
name = "task-warrior-2.0.0.beta4";
src = fetchurl {
url = http://www.taskwarrior.org/download/task-2.0.0.beta4.tar.gz;
sha256 = "1c9n6b5ly3m5kminnsvqgmjxdkb68w4av9kdnh47dw4sj3gwrn1w";
};
NIX_LDFLAGS = "-ldl";
buildNativeInputs = [ cmake ];
buildInputs = [ lua5 ];
crossAttrs = {
preConfigure = ''
export NIX_CROSS_LDFLAGS="$NIX_CROSS_LDFLAGS -ldl"
'';
};
meta = {
description = "Command-line todo list manager";
homepage = http://taskwarrior.org/;
license = "MIT";
};
}

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

@ -189,5 +189,6 @@ in stdenv.mkDerivation rec {
homepage = http://www.chromium.org/;
maintainers = with stdenv.lib.maintainers; [ goibhniu chaoflow ];
license = licenses.bsd3;
platforms = with stdenv.lib.platforms; linux;
};
}

2
pkgs/applications/networking/browsers/firefox/12.0.nix
View File

@ -21,7 +21,7 @@ rec {
src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
url = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha1 = "0177185e54b7d63dc36bd5bd5c80ba6afd52e199";
};

2
pkgs/applications/networking/browsers/links2/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optionals enableX11 [ libX11 libXau libXt ]
++ stdenv.lib.optional enableDirectFB [ directfb ];
buildNativeInputs = [ pkgconfig ];
buildNativeInputs = [ pkgconfig bzip2 ];
configureFlags = [ "--with-ssl" ]
++ stdenv.lib.optional (enableX11 || enableFB || enableDirectFB) "--enable-graphics"

15
pkgs/applications/networking/offrss/default.nix
View File

@ -1,7 +1,7 @@
{stdenv, fetchurl, curl, libmrss}:
{ stdenv, fetchurl, curl, libmrss, podofo, libiconv }:
stdenv.mkDerivation {
name = "offrss-1.1";
name = "offrss-1.3";
installPhase = ''
mkdir -p $out/bin
@ -12,11 +12,16 @@ stdenv.mkDerivation {
makeFlags = "CC=${stdenv.cross.config}-gcc";
};
buildInputs = [ curl libmrss ];
buildInputs = [ curl libmrss podofo ]
++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
configurePhase = stdenv.lib.optionalString (!stdenv.isLinux) ''
sed 's/#EXTRA/EXTRA/' -i Makefile
'';
src = fetchurl {
url = http://vicerveza.homeunix.net/~viric/soft/offrss/offrss-1.1.tar.gz;
sha256 = "1l8c5sw368zbrcfq4wf963fbh29q9lqgsn0lbsiwz3vpybc8plp2";
url = http://vicerveza.homeunix.net/~viric/soft/offrss/offrss-1.3.tar.gz;
sha256 = "1akw1x84jj2m9z60cvlvmz21qwlaywmw18pl7lgp3bj5nw6250p6";
};
meta = {

17
pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix Normal file
View File

@ -0,0 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, json_glib, curl }:
stdenv.mkDerivation rec {
name = "transmission-remote-gtk-1.0.1";
src = fetchurl {
url = "http://transmission-remote-gtk.googlecode.com/files/${name}.tar.gz";
sha256 = "b1ae032dd52b2d7975656913e4fe39e7f74d29ef8138292d8b82318ff9afed6f";
};
buildInputs = [ pkgconfig intltool gtk json_glib curl ];
meta = {
description = "GTK remote control for the Transmission BitTorrent client";
};
}

2
pkgs/applications/networking/remote/freerdp/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-${version}.tar.gz";
sha256 = "1h7b2ykgsp1b04p67syb3p2xgpsb45i6zl1jvm09h0dr5an85awd";
sha256 = "df9f5f3275436f3e413824ca40f1e41733a95121f45e1ed41ab410701c5764cc";
};
buildInputs = [

31
pkgs/applications/networking/remote/remmina/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ stdenv, fetchurl, cmake, pkgconfig, makeWrapper
, glib, gtk, gettext, libxkbfile, libgnome_keyring, libX11
, freerdp, libssh, libgcrypt, gnutls }:
let version = "1.0.0"; in
stdenv.mkDerivation {
name = "remmina-${version}";
src = fetchurl {
url = "https://github.com/downloads/FreeRDP/Remmina/Remmina-${version}.tar.gz";
sha256 = "7cd0d2d6adbd96c7139da8c4bfc4cf4821e1fa97242bb9cc9db32a53df289731";
};
buildInputs = [ cmake pkgconfig makeWrapper
glib gtk gettext libxkbfile libgnome_keyring libX11
freerdp libssh libgcrypt gnutls ];
cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF";
postInstall = ''
wrapProgram $out/bin/remmina --prefix LD_LIBRARY_PATH : "${libX11}/lib"
'';
meta = {
license = "GPLv2";
homepage = "http://remmina.sourceforge.net/";
description = "Remmina is a remote desktop client written in GTK+";
maintainers = [];
};
}

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

@ -46,7 +46,7 @@ rec {
inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils openssh;
inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc
HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl IfElse
QuickCheck bloomfilter editDistance;
QuickCheck bloomfilter editDistance stm hinotify;
};
qgit = import ./qgit {

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

@ -1,18 +1,18 @@
{ stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt
, ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl
, QuickCheck, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils
, IfElse, bloomfilter, editDistance, openssh
, IfElse, bloomfilter, editDistance, openssh, stm, hinotify
}:
let
version = "3.20120614";
version = "3.20120629";
in
stdenv.mkDerivation {
name = "git-annex-${version}";
src = fetchurl {
url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}";
sha256 = "ecb3b144a75a2eeb27061c46f3300c5117a5df260dddb36349eb8e75b6eebb16";
sha256 = "0dajcmx1sn3rqlba5b66lkiwji849gxzcb5d8666in21g7lc1ccs";
name = "git-annex-${version}.tar.gz";
};
@ -20,7 +20,7 @@ stdenv.mkDerivation {
curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json
libuuid MissingH monadControl mtl network pcreLight perl QuickCheck
rsync SHA testpack utf8String which liftedBase IfElse bloomfilter
editDistance openssh
editDistance openssh stm hinotify
];
checkTarget = "test";

21
pkgs/applications/video/ogmtools/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchurl, libogg, libvorbis, libdvdread }:
stdenv.mkDerivation rec {
name = "ogmtools-1.5";
src = fetchurl {
url = "http://www.bunkus.org/videotools/ogmtools/${name}.tar.bz2";
sha256 = "1spx81p5wf59ksl3r3gvf78d77sh7gj8a6lw773iv67bphfivmn8";
};
buildInputs = [libogg libvorbis libdvdread];
meta = {
description = "Tools for modifying and inspecting OGG media streams. Includes dvdxchap tool for extracting chapter information from DVD.";
longDescription = "These tools allow information about (ogminfo) or extraction from (ogmdemux) or creation of (ogmmerge) OGG media streams.";
homepage = http://www.bunkus.org/videotools/ogmtools/;
license = "GPLv2";
platforms = stdenv.lib.platforms.all;
};
}

4
pkgs/desktops/gnome-2/default.nix
View File

@ -33,6 +33,8 @@
GConf = callPackage ./platform/GConf { };
gconfmm = callPackage ./platform/gconfmm { };
libgnomecanvas = callPackage ./platform/libgnomecanvas { };
libgnomecanvasmm = callPackage ./platform/libgnomecanvasmm { };
@ -67,6 +69,8 @@
gtkglext = callPackage ./platform/gtkglext { };
gtkglextmm = callPackage ./platform/gtkglextmm { };
#### DESKTOP
gnome_keyring = callPackage ./desktop/gnome-keyring { };

23
pkgs/desktops/gnome-2/platform/gconfmm/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ stdenv, fetchurl_gnome, pkgconfig, GConf, gtkmm, glibmm }:
stdenv.mkDerivation rec {
name = src.pkgname;
src = fetchurl_gnome {
project = "gconfmm";
major = "2"; minor = "28"; patchlevel = "3"; extension = "bz2";
sha256 = "a5e0092bb73371a3ca76b2ecae794778f3a9409056fee9b28ec1db072d8e6108";
};
buildNativeInputs = [pkgconfig];
propagatedBuildInputs = [ GConf gtkmm glibmm ];
meta = {
description = "C++ wrappers for GConf";
license = "LGPLv2+";
platforms = stdenv.lib.platforms.linux;
};
}

25
pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ stdenv, fetchurl_gnome, pkgconfig, gtkglext, gtkmm, gtk, mesa, gdk_pixbuf }:
stdenv.mkDerivation rec {
name = src.pkgname;
src = fetchurl_gnome {
project = "gtkglextmm";
major = "1"; minor = "2"; patchlevel = "0"; extension = "bz2";
sha256 = "6cd4bd2a240e5eb1e3a24c5a3ebbf7ed905b522b888439778043fdeb58771fea";
};
patches = [ ./gdk.patch ];
buildNativeInputs = [pkgconfig];
propagatedBuildInputs = [ gtkglext gtkmm gtk mesa gdk_pixbuf ];
meta = {
description = "C++ wrappers for GtkGLExt";
license = "LGPLv2+";
platforms = stdenv.lib.platforms.linux;
};
}

15
pkgs/desktops/gnome-2/platform/gtkglextmm/gdk.patch Normal file
View File

@ -0,0 +1,15 @@
# fixes: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=621976
# reference: http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg250570.html
--- gtkglextmm-1.2.0-orig/gtkglext/gtkmm/gl/widget.cc 2004-05-18 03:01:50.000000000 -0300
+++ gtkglextmm-1.2.0/gtkglext/gtkmm/gl/widget.cc 2011-06-12 17:57:13.075541070 -0300
@@ -17,9 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include <gtk/gtkglwidget.h>
-
#include "widget.h"
+#include <gtk/gtkglwidget.h>
namespace Gtk
{

11
pkgs/development/libraries/SDL_net/default.nix
View File

@ -13,7 +13,16 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [SDL];
postInstall = "ln -s $out/include/SDL/SDL_net.h $out/include/";
postInstall = ''
sed -i -e 's,"SDL.h",<SDL/SDL.h>,' \
-e 's,"SDL_endian.h",<SDL/SDL_endian.h>,' \
-e 's,"SDL_version.h",<SDL/SDL_version.h>,' \
-e 's,"begin_code.h",<SDL/begin_code.h>,' \
-e 's,"close_code.h",<SDL/close_code.h>,' \
$out/include/SDL/SDL_net.h
ln -sv $out/include/SDL/SDL_net.h $out/include/
'';
meta = {
description = "SDL networking library";

80
pkgs/development/libraries/boost/1.42.nix
View File

@ -1,80 +0,0 @@
{ stdenv, fetchurl, icu, expat, zlib, bzip2, python
, enableRelease ? true
, enableDebug ? false
, enableSingleThreaded ? false
, enableMultiThreaded ? true
, enableShared ? true
, enableStatic ? false
, enablePIC ? false
}:
let
variant = stdenv.lib.concatStringsSep ","
(stdenv.lib.optional enableRelease "release" ++
stdenv.lib.optional enableDebug "debug");
threading = stdenv.lib.concatStringsSep ","
(stdenv.lib.optional enableSingleThreaded "single" ++
stdenv.lib.optional enableMultiThreaded "multi");
link = stdenv.lib.concatStringsSep ","
(stdenv.lib.optional enableShared "shared" ++
stdenv.lib.optional enableStatic "static");
# To avoid library name collisions
finalLayout = if ((enableRelease && enableDebug) ||
(enableSingleThreaded && enableMultiThreaded) ||
(enableShared && enableStatic)) then
"tagged" else "system";
cflags = if (enablePIC) then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" else "";
in
stdenv.mkDerivation {
name = "boost-1.42.0";
meta = {
homepage = "http://boost.org/";
description = "Boost C++ Library Collection";
license = "boost-license";
maintainers = [ stdenv.lib.maintainers.simons ];
};
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_42_0.tar.bz2";
sha256 = "02g6m6f7m11ig93p5sx7sfq75c15y9kn2pa3csn1bkjhs9dvj7jb";
};
enableParallelBuilding = true;
buildInputs = [icu expat zlib bzip2 python];
configureScript = "./bootstrap.sh";
configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python";
buildPhase = "./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
installPhase = ":";
crossAttrs = rec {
buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ];
# all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
# override them.
propagatedBuildInputs = buildInputs;
# We want to substitute the contents of configureFlags, removing thus the
# usual --build and --host added on cross building.
preConfigure = ''
export configureFlags="--prefix=$out --without-icu"
'';
buildPhase = ''
set -x
cat << EOF > user-config.jam
using gcc : cross : $crossConfig-g++ ;
EOF
./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
'';
};
}

26
pkgs/development/libraries/boost/1.50-headers.nix Normal file
View File

@ -0,0 +1,26 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "boost-1.50.0-headers";
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_50_0.tar.bz2";
sha256 = "0ac5b82g6b5pdhzypgddql0i3i9vvrwf9iqp3lyp19hzr2wf5b69";
};
phases = [ "installPhase" ];
installPhase = ''
mkdir -p $out/include
tar xvf $src -C $out/include --strip-components=1 boost_1_50_0/boost
'';
meta = {
homepage = "http://boost.org/";
description = "Boost C++ Library Collection";
license = "boost-license";
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.viric stdenv.lib.maintainers.simons ];
};
}

9
pkgs/development/libraries/boost/1.48.nix → pkgs/development/libraries/boost/1.50.nix
View File

@ -40,7 +40,7 @@ let
in
stdenv.mkDerivation {
name = "boost-1.48.0";
name = "boost-1.50.0";
meta = {
homepage = "http://boost.org/";
@ -52,13 +52,10 @@ stdenv.mkDerivation {
};
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_48_0.tar.bz2";
sha256 = "1njsircy5xfj5rws10w8vq2s0603z2i31p9wgbawr4wkssr59whv";
url = "mirror://sourceforge/boost/boost_1_50_0.tar.bz2";
sha256 = "0ac5b82g6b5pdhzypgddql0i3i9vvrwf9iqp3lyp19hzr2wf5b69";
};
# See <http://svn.boost.org/trac/boost/ticket/4688>.
patches = [ ./boost_filesystem.patch ];
enableParallelBuilding = true;
buildInputs = [icu expat zlib bzip2 python];

4
pkgs/development/libraries/ffmpeg/0.6.90.nix
View File

@ -6,6 +6,7 @@
, vpxSupport ? false, libvpx ? null
, x264Support ? true, x264 ? null
, xvidSupport ? true, xvidcore ? null
, vdpauSupport ? true, libvdpau ? null
, faacSupport ? false, faac ? null
}:
@ -15,6 +16,7 @@ assert vorbisSupport -> libvorbis != null;
assert vpxSupport -> libvpx != null;
assert x264Support -> x264 != null;
assert xvidSupport -> xvidcore != null;
assert vdpauSupport -> libvdpau != null;
assert faacSupport -> faac != null;
stdenv.mkDerivation rec {
@ -44,6 +46,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional vpxSupport "--enable-libvpx"
++ stdenv.lib.optional x264Support "--enable-libx264"
++ stdenv.lib.optional xvidSupport "--enable-libxvid"
++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree";
buildInputs = [ pkgconfig lame yasm ]
@ -54,6 +57,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional vpxSupport libvpx
++ stdenv.lib.optional x264Support x264
++ stdenv.lib.optional xvidSupport xvidcore
++ stdenv.lib.optional vdpauSupport libvdpau
++ stdenv.lib.optional faacSupport faac;
crossAttrs = {

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

@ -6,6 +6,7 @@
, vpxSupport ? false, libvpx ? null
, x264Support ? true, x264 ? null
, xvidSupport ? true, xvidcore ? null
, vdpauSupport ? true, libvdpau ? null
, faacSupport ? false, faac ? null
}:
@ -15,6 +16,7 @@ assert vorbisSupport -> libvorbis != null;
assert vpxSupport -> libvpx != null;
assert x264Support -> x264 != null;
assert xvidSupport -> xvidcore != null;
assert vdpauSupport -> libvdpau != null;
assert faacSupport -> faac != null;
stdenv.mkDerivation rec {
@ -44,6 +46,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional vpxSupport "--enable-libvpx"
++ stdenv.lib.optional x264Support "--enable-libx264"
++ stdenv.lib.optional xvidSupport "--enable-libxvid"
++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree";
buildInputs = [ pkgconfig lame yasm zlib bzip2 ]
@ -54,6 +57,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional vpxSupport libvpx
++ stdenv.lib.optional x264Support x264
++ stdenv.lib.optional xvidSupport xvidcore
++ stdenv.lib.optional vdpauSupport libvdpau
++ stdenv.lib.optional faacSupport faac;
enableParallelBuilding = true;

24
pkgs/development/libraries/gtkdatabox/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, gtk }:
stdenv.mkDerivation rec {
name = "gtkdatabox-0.9.1.3";
src = fetchurl {
url = "mirror://sourceforge/gtkdatabox/${name}.tar.gz";
sha256 = "90ff9fc20ea1541dfe75ae04ff98e02c3aa7ad1735d8f0e3b3352910a3f7427c";
};
patches = [ ./deprecated_GTK.patch ];
buildInputs = [ pkgconfig gtk ];
propagatedBuildInputs = [ gtk ];
meta = {
description = "Gtk+ widget for displaying large amounts of numerical data";
license = "LGPLv2";
platforms = stdenv.lib.platforms.linux;
};
}

194
pkgs/development/libraries/gtkdatabox/deprecated_GTK.patch Normal file
View File

@ -0,0 +1,194 @@
# Fixes compilation errors. Stolen from Debian.
Index: libgtkdatabox-0.9.1.1/examples/addremove.c
===================================================================
--- libgtkdatabox-0.9.1.1.orig/examples/addremove.c 2011-05-21 12:39:01.703594722 +0200
+++ libgtkdatabox-0.9.1.1/examples/addremove.c 2011-05-21 12:36:16.739594810 +0200
@@ -203,7 +203,7 @@
g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked",
G_CALLBACK (gtk_main_quit), GTK_OBJECT (box));
gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0);
- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT);
gtk_widget_grab_default (close_button);
gtk_widget_show_all (window);
Index: libgtkdatabox-0.9.1.1/examples/basics.c
===================================================================
--- libgtkdatabox-0.9.1.1.orig/examples/basics.c 2011-05-21 12:39:02.075594722 +0200
+++ libgtkdatabox-0.9.1.1/examples/basics.c 2011-05-21 12:36:16.759594820 +0200
@@ -113,7 +113,7 @@
g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked",
G_CALLBACK (gtk_main_quit), GTK_OBJECT (box));
gtk_box_pack_start (GTK_BOX (vbox), close_button, FALSE, FALSE, 0);
- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT);
gtk_widget_grab_default (close_button);
gtk_widget_grab_focus (close_button);
Index: libgtkdatabox-0.9.1.1/examples/basics2.c
===================================================================
--- libgtkdatabox-0.9.1.1.orig/examples/basics2.c 2011-05-21 12:39:01.911594722 +0200
+++ libgtkdatabox-0.9.1.1/examples/basics2.c 2011-05-21 12:36:16.747594818 +0200
@@ -225,7 +225,7 @@
g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked",
G_CALLBACK (gtk_main_quit), GTK_OBJECT (box));
gtk_box_pack_start (GTK_BOX (vbox), close_button, FALSE, FALSE, 0);
- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT);
gtk_widget_grab_default (close_button);
gtk_widget_grab_focus (close_button);
Index: libgtkdatabox-0.9.1.1/examples/colors.c
===================================================================
--- libgtkdatabox-0.9.1.1.orig/examples/colors.c 2011-05-21 12:39:02.115594722 +0200
+++ libgtkdatabox-0.9.1.1/examples/colors.c 2011-05-21 12:36:16.763594819 +0200
@@ -194,7 +194,7 @@
g_signal_connect (G_OBJECT (close_button), "clicked",
G_CALLBACK (gtk_main_quit), (gpointer) NULL);
gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0);
- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT);
gtk_widget_grab_default (close_button);
Index: libgtkdatabox-0.9.1.1/examples/enable_disable.c
===================================================================
--- libgtkdatabox-0.9.1.1.orig/examples/enable_disable.c 2011-05-21 12:39:01.787594722 +0200
+++ libgtkdatabox-0.9.1.1/examples/enable_disable.c 2011-05-21 12:36:16.743594812 +0200
@@ -145,7 +145,7 @@
g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked",
G_CALLBACK (gtk_main_quit), GTK_OBJECT (box));
gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0);
- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT);
for (i = 0; i < noEnableSets; ++i)
{
GtkWidget *vbox = gtk_vbox_new (FALSE, 10);
Index: libgtkdatabox-0.9.1.1/examples/grid.c
===================================================================
--- libgtkdatabox-0.9.1.1.orig/examples/grid.c 2011-05-21 12:39:01.995594722 +0200
+++ libgtkdatabox-0.9.1.1/examples/grid.c 2011-05-21 12:36:16.755594821 +0200
@@ -133,7 +133,7 @@
G_CALLBACK (gtk_main_quit),
GTK_OBJECT (box));
gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0);
- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT);
gtk_widget_grab_default (close_button);
gtk_widget_show_all (window);
Index: libgtkdatabox-0.9.1.1/examples/grid_array.c
===================================================================
--- libgtkdatabox-0.9.1.1.orig/examples/grid_array.c 2011-05-21 12:39:01.951594722 +0200
+++ libgtkdatabox-0.9.1.1/examples/grid_array.c 2011-05-21 12:36:16.751594821 +0200
@@ -134,7 +134,7 @@
G_CALLBACK (gtk_main_quit),
GTK_OBJECT (box));
gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0);
- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT);
gtk_widget_grab_default (close_button);
gtk_widget_show_all (window);
Index: libgtkdatabox-0.9.1.1/examples/keycontrol.c
===================================================================
--- libgtkdatabox-0.9.1.1.orig/examples/keycontrol.c 2011-05-21 12:39:02.155594722 +0200
+++ libgtkdatabox-0.9.1.1/examples/keycontrol.c 2011-05-21 12:37:15.211595055 +0200
@@ -133,7 +133,8 @@
gtk_databox_create_box_with_scrollbars_and_rulers (&box, &table,
TRUE, TRUE, TRUE, TRUE);
gtk_widget_add_events (box, GDK_KEY_PRESS_MASK);
- GTK_WIDGET_SET_FLAGS (box, GTK_CAN_FOCUS | GTK_CAN_DEFAULT);
+ gtk_widget_set_can_focus(box, GTK_CAN_FOCUS);
+ gtk_widget_set_can_default(box, GTK_CAN_DEFAULT);
gtk_box_pack_start (GTK_BOX (box1), table, TRUE, TRUE, 0);
Index: libgtkdatabox-0.9.1.1/examples/lissajous.c
===================================================================
--- libgtkdatabox-0.9.1.1.orig/examples/lissajous.c 2011-05-21 12:39:02.035594722 +0200
+++ libgtkdatabox-0.9.1.1/examples/lissajous.c 2011-05-21 12:36:16.759594820 +0200
@@ -154,7 +154,7 @@
G_CALLBACK (gtk_main_quit), G_OBJECT (box));
gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0);
- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT);
gtk_widget_grab_default (close_button);
lissajous_idle = g_idle_add ((GSourceFunc) lissajous_idle_func, box);
Index: libgtkdatabox-0.9.1.1/examples/logarithmic.c
===================================================================
--- libgtkdatabox-0.9.1.1.orig/examples/logarithmic.c 2011-05-21 12:39:01.827594722 +0200
+++ libgtkdatabox-0.9.1.1/examples/logarithmic.c 2011-05-21 12:36:16.743594812 +0200
@@ -207,7 +207,7 @@
g_signal_connect (GTK_OBJECT (close_button), "clicked",
G_CALLBACK (gtk_main_quit), NULL);
gtk_box_pack_start (GTK_BOX (vbox), close_button, FALSE, FALSE, 0);
- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT);
gtk_widget_grab_default (close_button);
gtk_widget_grab_focus (close_button);
Index: libgtkdatabox-0.9.1.1/examples/markers.c
===================================================================
--- libgtkdatabox-0.9.1.1.orig/examples/markers.c 2011-05-21 12:39:01.871594722 +0200
+++ libgtkdatabox-0.9.1.1/examples/markers.c 2011-05-21 12:36:16.747594818 +0200
@@ -220,7 +220,7 @@
g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked",
G_CALLBACK (gtk_main_quit), GTK_OBJECT (box));
gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0);
- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT);
gtk_widget_grab_default (close_button);
gtk_widget_show_all (window);
Index: libgtkdatabox-0.9.1.1/examples/signals.c
===================================================================
--- libgtkdatabox-0.9.1.1.orig/examples/signals.c 2011-05-21 12:39:01.751594722 +0200
+++ libgtkdatabox-0.9.1.1/examples/signals.c 2011-05-21 12:36:16.743594812 +0200
@@ -287,7 +287,7 @@
g_signal_connect_swapped (G_OBJECT (close_button), "clicked",
G_CALLBACK (gtk_main_quit), G_OBJECT (box));
gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0);
- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT);
gtk_widget_grab_default (close_button);
g_signal_connect (G_OBJECT (box), "zoomed",
Index: libgtkdatabox-0.9.1.1/gtk/gtkdatabox.c
===================================================================
--- libgtkdatabox-0.9.1.1.orig/gtk/gtkdatabox.c 2011-05-21 12:39:01.583594722 +0200
+++ libgtkdatabox-0.9.1.1/gtk/gtkdatabox.c 2011-05-21 12:38:43.523595004 +0200
@@ -453,7 +453,8 @@
gint width;
gint height;
- gdk_drawable_get_size (widget->window, &width, &height);
+ width = gdk_window_get_width(widget->window);
+ height = gdk_window_get_height(widget->window);
x = MAX (0, MIN (width - 1, x));
y = MAX (0, MIN (height - 1, y));
@@ -587,7 +588,7 @@
gint attributes_mask;
box = GTK_DATABOX (widget);
- GTK_WIDGET_SET_FLAGS (box, GTK_REALIZED);
+ gtk_widget_set_realized(box, GTK_REALIZED);
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x;
Index: libgtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c
===================================================================
--- libgtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_ruler.c 2011-05-21 12:39:01.631594722 +0200
+++ libgtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c 2011-05-21 12:38:59.963594710 +0200
@@ -842,7 +842,7 @@
gint attributes_mask;
ruler = GTK_DATABOX_RULER (widget);
- GTK_WIDGET_SET_FLAGS (ruler, GTK_REALIZED);
+ gtk_widget_set_realized(ruler, GTK_REALIZED);
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x;

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "derive";
version = "2.5.8";
sha256 = "0l11pscya7mrn0502q8ndqn551k5aygbm7pihhs0nz8wwzr82xdv";
version = "2.5.9";
sha256 = "1rws401dpdck7c9jxfv9h46r06vn730lw1fsxvvidnf3hlr0yyk5";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "ghc-mod";
version = "1.10.18";
sha256 = "1kpy0mjxag3xs8zs5kbl1arkd3341g1xr52qvzryks2ivax1zi9s";
version = "1.11.0";
sha256 = "19cx6jhciww2xgad3q35h3jlwiv9s9b6na2qi1cbga7p77swarsv";
isLibrary = false;
isExecutable = true;
buildDepends = [

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hamlet";
version = "1.0.1.3";
sha256 = "0pdnq8kvln6jr5gwzd1fj0knd2ph1a76ra1njwaccliqig1s7j3n";
version = "1.0.1.4";
sha256 = "0rvsp54wrhaz5pnn136w1xlny9dkwv48ihyhq02yg5gg510v08v7";
buildDepends = [
blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
];

14
pkgs/development/libraries/haskell/hinotify/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "hinotify";
version = "0.3.2";
sha256 = "0gr9rv1af6w7g2hbjhz1livi5zfhzdswjyapvjz3d7cga906bj48";
meta = {
homepage = "http://code.haskell.org/hinotify/README.html";
description = "Haskell binding to INotify";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

8
pkgs/development/libraries/haskell/hledger-lib/default.nix
View File

@ -1,14 +1,14 @@
{ cabal, cmdargs, csv, filepath, HUnit, mtl, parsec, regexpr, safe
, shakespeareText, split, time, utf8String
, shakespeareText, split, time, transformers, utf8String
}:
cabal.mkDerivation (self: {
pname = "hledger-lib";
version = "0.18";
sha256 = "17dd8pbn5ly8rxy8yp8fz1j8m2zad9s190jzcpx9pdaw6vf2jskc";
version = "0.18.1";
sha256 = "0dv5q20n5almxxl0n68lv1172x61z2q16nvwydzrc7qp1j31d8my";
buildDepends = [
cmdargs csv filepath HUnit mtl parsec regexpr safe shakespeareText
split time utf8String
split time transformers utf8String
];
meta = {
homepage = "http://hledger.org";

4
pkgs/development/libraries/haskell/hledger-web/default.nix
View File

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "hledger-web";
version = "0.18";
sha256 = "1cxlyw9rs1pg0ympig9svkfi9fikpbvfzm6jc7hijkg215l617np";
version = "0.18.1";
sha256 = "1khjqqjjcwcymyh395rfc39wzybacw5n64wmj2sixyw0p1l4mwg7";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "hledger";
version = "0.18";
sha256 = "15jbfq9a1lydn0m998vzrx4nlpfkbv5ddvj6h03hljp562f2s0wi";
version = "0.18.1";
sha256 = "0nrs9qawvny6dl0pj3f183sgwmam9dsb2dfhp8hqnxx48g1p01lk";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "1.4.1.9";
sha256 = "0c0dnk3iqkx85453spry6qsw66pg3pjvqah0c1m64qqmv869bwbn";
version = "1.4.1.10";
sha256 = "0a2014bzh4vvm3qx5yarxgirzlngzy2xrwpi3bvnz1h3q0hggq01";
buildDepends = [
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
blazeBuilderConduit caseInsensitive certificate conduit cookie

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "lifted-base";
version = "0.1.1";
sha256 = "148631zwax809nzm01fqymmgvkscyv1kii36a12phkmg7sx014vm";
version = "0.1.1.1";
sha256 = "1cfk3n12qhyrrfvw410gfydbgmb7r9y65fsjp2r3c4ilcyd5li70";
buildDepends = [
baseUnicodeSymbols monadControl transformersBase
];

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "mmap";
version = "0.5.7";
sha256 = "0f08x9kmv3a03kz5a6dpxr30nks55cs9sp55qpn2jnw31qx6hg6p";
version = "0.5.8";
sha256 = "17zsb95ynyrqj51h4jxi9glsih4vq33hbxycgw13z5fivv261m7y";
isLibrary = true;
isExecutable = true;
meta = {

4
pkgs/development/libraries/haskell/monad-control/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "monad-control";
version = "0.3.1.3";
sha256 = "0sx0jr8hccqh519sgn428y4xfk6m5jpwfm9201vn8zj1cxlppjv9";
version = "0.3.1.4";
sha256 = "0mvcj6rljh2drkpf29zavwsqpzd9lw7s0n4inxm82i2017xdazy1";
buildDepends = [
baseUnicodeSymbols transformers transformersBase
];

15
pkgs/development/libraries/haskell/mtl/2.1.2.nix Normal file
View File

@ -0,0 +1,15 @@
{ cabal, transformers }:
cabal.mkDerivation (self: {
pname = "mtl";
version = "2.1.2";
sha256 = "1vwb98ci3jnjpndym012amia41h3cjdwpy9330ws881l6dj5fxwc";
buildDepends = [ transformers ];
meta = {
homepage = "http://github.com/ekmett/mtl";
description = "Monad classes, using functional dependencies";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

8
pkgs/development/libraries/haskell/multiarg/default.nix
View File

@ -1,10 +1,10 @@
{ cabal, explicitException, text, transformers, utf8String }:
{ cabal, explicitException, utf8String }:
cabal.mkDerivation (self: {
pname = "multiarg";
version = "0.2.0.0";
sha256 = "1jmhlh4ngmkddrkcafx0qcmzwbmi5crkmd6p8b07cfjpaq2pc6yx";
buildDepends = [ explicitException text transformers utf8String ];
version = "0.4.0.0";
sha256 = "04m4ynf6x8rlnlmnl6a7jj42fszjc1bly4h3jyjxxsqjdynrv81q";
buildDepends = [ explicitException utf8String ];
meta = {
homepage = "https://github.com/massysett/multiarg";
description = "Combinators to build command line parsers";

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "pandoc";
version = "1.9.4.1";
sha256 = "0n3jfk7b1vn8b1ryys6lm1drdx469q26gi0chzlf0wss1ss07x78";
version = "1.9.4.2";
sha256 = "1zr2qx6bimyhzia5maqpb454hgdwjvgs234mcki4f1z3dgbq0lsk";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/prolog-graph-lib/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "prolog-graph-lib";
version = "0.1";
sha256 = "1gryhk0jd8bvmjbjkz6n7sfnsa6iwzkckpgi51xsj5f2nwdxbl6g";
version = "0.2.0.1";
sha256 = "02xa4hqmhmsv7vkdy3m3dr1w3z88kc8ly0jjn7q6pba5yarci7nr";
buildDepends = [ fgl graphviz mtl prolog text ];
meta = {
homepage = "https://github.com/Erdwolf/prolog";

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "prolog";
version = "0.1";
sha256 = "00791fb1f84wq42wvacnjl290fbn28x9hknxsic3ksi3f7psladm";
version = "0.2.0.1";
sha256 = "073sd3rhcfqw9csm0qsbc57ix57dv3k5yjr9hcc33b9zq5y10sp0";
buildDepends = [ mtl parsec syb thLift transformers ];
meta = {
homepage = "https://github.com/Erdwolf/prolog";

4
pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "reactive-banana-wx";
version = "0.6.0.0";
sha256 = "1pxcymh6xpmbkbc8i2hvjbki9s81mx69wrp8nl1i0y4pppzi8ihp";
version = "0.6.0.1";
sha256 = "1i674jy8fwirq267vwwdyqa4whxfx3r689rxjbrh9hyicqwcrl24";
isLibrary = true;
isExecutable = true;
buildDepends = [ cabalMacosx reactiveBanana wx wxcore ];

18
pkgs/development/libraries/haskell/remote/default.nix Normal file
View File

@ -0,0 +1,18 @@
{ cabal, binary, filepath, mtl, network, pureMD5, stm, syb, time
, utf8String
}:
cabal.mkDerivation (self: {
pname = "remote";
version = "0.1.1";
sha256 = "14awzhpc21pp4iq53vz4ib81ygxsnlnfppv723zy77z6jja08gf0";
buildDepends = [
binary filepath mtl network pureMD5 stm syb time utf8String
];
meta = {
description = "Cloud Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

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

@ -1,12 +1,13 @@
{ cabal, liftedBase, monadControl, transformers, transformersBase
{ cabal, liftedBase, monadControl, mtl, transformers
, transformersBase
}:
cabal.mkDerivation (self: {
pname = "resourcet";
version = "0.3.2.2";
sha256 = "0smff49b8sbxkvzlw59qgk5mdd4lp3605mcy4amjyz9fhcn3cky2";
version = "0.3.3.1";
sha256 = "164r2p08j3im4wz5jkadl5pvb0qj02k4f2s3v08lm39a51kygjdl";
buildDepends = [
liftedBase monadControl transformers transformersBase
liftedBase monadControl mtl transformers transformersBase
];
meta = {
homepage = "http://github.com/snoyberg/conduit";

18
pkgs/development/libraries/haskell/shelly/default.nix Normal file
View File

@ -0,0 +1,18 @@
{ cabal, mtl, systemFileio, systemFilepath, text, time, unixCompat
}:
cabal.mkDerivation (self: {
pname = "shelly";
version = "0.12.2";
sha256 = "0nhycisk6jc3mqd2xqcxxgfqsqm8vp5k4g45gdljalb87rqvqkkv";
buildDepends = [
mtl systemFileio systemFilepath text time unixCompat
];
meta = {
homepage = "https://github.com/yesodweb/Shelly.hs";
description = "shell-like (systems) programming in Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "simple-sendfile";
version = "0.2.3";
sha256 = "1i3jx90kwq504fdl2qbhz25psjvq9ldvwgx5cij82ajjqi61pfrv";
version = "0.2.4";
sha256 = "1c7imvkb5aq5mlg6a1r36fp9klniicbj56n32yvzj4qqf1zy2pbx";
buildDepends = [ network ];
meta = {
description = "Cross platform library for the sendfile system call";

14
pkgs/development/libraries/haskell/syb/0.3.6.2.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "syb";
version = "0.3.6.2";
sha256 = "0n1h0zlq2ygwkh7s914gfy4rg4b5kg6msd65id84c5412sri3mk4";
meta = {
homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
description = "Scrap Your Boilerplate";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

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

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "wai-app-static";
version = "1.2.0.3";
sha256 = "1hn4k28aa15vwvvay62rvi796fma7p3j31z6bfa9im0dxdy7sf9l";
version = "1.2.0.4";
sha256 = "06j9k93kzzzqznp61kwclvnnfas77jry4x93r5jn5n22198szcyi";
buildDepends = [
base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed
httpDate httpTypes text time transformers unixCompat wai

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "wai";
version = "1.2.0.2";
sha256 = "07h0znwlnfpikw9zxk7cxnyvsgqyix7lv8rylxzj259ylwfpk9fp";
version = "1.2.0.3";
sha256 = "0pl6zc29z58vpvsn37siiyr89mxc4khsnmzv2408i5vhlv2ks01p";
buildDepends = [
blazeBuilder conduit httpTypes network text transformers vault
];

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

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "warp";
version = "1.2.1.1";
sha256 = "1bgdvqa6c2ccxmgdsg5hjvc3mss8zgjj4xzqr5r5jdl338857xzg";
version = "1.2.2";
sha256 = "0jja9fjjd0f54awbx2p865w1mxj75qxy17skj1sc83i5ck32n6f0";
buildDepends = [
blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes
liftedBase network networkConduit simpleSendfile transformers

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "xml-types";
version = "0.3.1";
sha256 = "0ffmmidb9a1hqfbmvjxjvij2wfrqqlyjc7m7n81czrcrrsmyc1kc";
version = "0.3.2";
sha256 = "1aihs1n6hxq6frvxdqjqxsfwi2w2c2qx4bjypimjpjxf6d6n1396";
buildDepends = [ text ];
meta = {
homepage = "https://john-millikin.com/software/haskell-xml/";

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "zlib-conduit";
version = "0.4.0.1";
sha256 = "07x0fgzxnwaaw5yg1ks2w9dc66biqbg50x79h84jpgb6d9pw2d7z";
version = "0.4.0.2";
sha256 = "1pwgyawc308rm1xcvzfz96ar11mngx79any7lragffj6f132qlm7";
buildDepends = [ conduit transformers zlibBindings ];
meta = {
homepage = "http://github.com/snoyberg/conduit";

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

@ -16,7 +16,9 @@ stdenv.mkDerivation rec {
preConfigure = stdenv.lib.optionalString stdenv.isDarwin
"echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
configureFlags = [ "--enable-nouveau-experimental-api" "--enable-udev" ]
configureFlags = [ "--enable-nouveau-experimental-api"
"--enable-radeon-experimental-api"
"--enable-udev" ]
++ stdenv.lib.optional stdenv.isDarwin "-C";
crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ];

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "libebml-1.0.0";
name = "libebml-1.2.2";
src = fetchurl {
url = "http://dl.matroska.org/downloads/libebml/${name}.tar.bz2";
sha256 = "0y5ip30nr96wjlh1pzw35ia1axyib158dhz8r5dxzmbcfgn0sj3j";
sha256 = "19dp8m97xaj46iv6ahb5v0fb9sawjiy8wy1ylljc15ka8g30hss7";
};
configurePhase = "cd make/linux";

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, libebml }:
stdenv.mkDerivation rec {
name = "libmatroska-1.0.0";
name = "libmatroska-1.3.0";
src = fetchurl {
url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.bz2";
sha256 = "123v2dhvv6yijqxc30spabzznjf5lbcv4iv4mmz4b3jhvwiha06w";
sha256 = "0scfs5lc1nvdfv7ipgg02h7wzxks48hc5lvgk9qmwdkihnayqcaj";
};
configurePhase = "cd make/linux";

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, xlibs }:
{ stdenv, fetchurl, pkgconfig, libX11 }:
stdenv.mkDerivation rec {
name = "libvdpau-0.4.1";
@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "16zmmbawfnvrxjqvgfwxjfd1wh3vyz2cmvxza6cgf4j9qs36y6q6";
};
buildInputs = [ pkgconfig xlibs.libX11 ];
buildInputs = [ pkgconfig libX11 ];
propagatedBuildInputs = [ libX11 ];
meta = {
homepage = http://people.freedesktop.org/~aplattner/vdpau/;

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cabal2nix";
version = "1.34";
sha256 = "0iz9a91hp6frrkshjhyi3sacqlb547bjs2mqlzfjxiyhkfb3mc40";
version = "1.37";
sha256 = "0gd20nzr3bqscd4pn0j3vsmnhxiypbv5ppncmi0ck5n4ii8c6m94";
isLibrary = false;
isExecutable = true;
buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];

23
pkgs/development/tools/misc/cgdb/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ stdenv, fetchurl, ncurses, readline }:
stdenv.mkDerivation rec {
name = "cgdb-0.6.6";
src = fetchurl {
url = "mirror://sourceforge/cgdb/${name}.tar.gz";
sha256 = "0iap84ikpk1h58wy14zzi1kwszv1hsnvpvnz14swkz54yrh9z7ng";
};
buildInputs = [ ncurses readline ];
meta = {
description = "A curses interface to gdb";
homepage = http://cgdb.sourceforge.net/;
license = "GPLv2+";
platforms = with stdenv.lib.platforms; linux ++ cygwin;
maintainers = with stdenv.lib.maintainers; [ viric ];
};
}

2
pkgs/development/tools/misc/gdb/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchgit, stdenv, ncurses, readline, gmp, mpfr, expat, texinfo
{ fetchurl, stdenv, ncurses, readline, gmp, mpfr, expat, texinfo
, dejagnu, python, target ? null
# Additional dependencies for GNU/Hurd.

3
pkgs/development/tools/misc/gnum4/default.nix
View File

@ -9,7 +9,8 @@ stdenv.mkDerivation {
};
doCheck = !stdenv.isDarwin
&& !stdenv.isCygwin; # XXX: `test-dup2' fails on Cygwin
&& !stdenv.isCygwin # XXX: `test-dup2' fails on Cygwin
&& !stdenv.isSunOS; # XXX: `test-setlocale2.sh' fails
# Upstream is aware of it; it may be in the next release.
patches = [ ./s_isdir.patch ./readlink-EINVAL.patch ];

20
pkgs/games/klavaro/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, intltool, curl, gtk, gtkdatabox }:
stdenv.mkDerivation rec {
name = "klavaro-1.9.5";
src = fetchurl {
url = "mirror://sourceforge/klavaro/${name}.tar.bz2";
sha256 = "06c35247866fb74f7c1a52a2350b352fdb44dace7216fdbebc1fa54990d14fc9";
};
buildInputs = [ pkgconfig intltool curl gtk gtkdatabox ];
meta = {
description = "Just another free touch typing tutor program";
license = "GPLv3+";
platforms = stdenv.lib.platforms.linux;
};
}

8
pkgs/misc/emulators/wine/default.nix
View File

@ -7,16 +7,16 @@ assert stdenv.isLinux;
assert stdenv.gcc.gcc != null;
stdenv.mkDerivation rec {
name = "wine-1.3.32";
name = "wine-1.5.5";
src = fetchurl {
url = "mirror://sourceforge/wine/${name}.tar.bz2";
sha256 = "fe1691ef8e9c5c4afeb345ad0f0b364d055cfe67a7e64b0a4a44da4d85cfa8b6";
sha256 = "e7d5ba716d2ac47193fa31eff66cc179145ddcb453c6923eaea70596a82b084e";
};
gecko = fetchurl {
url = "mirror://sourceforge/wine/wine_gecko-1.3-x86.msi";
sha256 = "1bmm826dhq82jzxdld4x9cyg8mgzg8llkki59n9fvxggi7l5jxab";
url = "mirror://sourceforge/wine/wine_gecko-1.5-x86.msi";
sha256 = "2e372a1b87ff2a22ad5127400ece4b09e55591d9f84e00bb562d294898a49b5c";
};
buildInputs = [

11
pkgs/misc/trac/builder.sh
View File

@ -1,11 +0,0 @@
source $stdenv/setup
unpackPhase
mkdir -p $out
cd $name
$python/bin/python setup.py install --prefix=$out
for i in $(cd $out/bin && ls); do
wrapProgram $out/bin/$i \
--prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $out):$(toPythonPath $pysqlite):$subversion/lib/svn-python:$clearsilver/site-packages"
done

14
pkgs/misc/trac/default.nix
View File

@ -1,14 +0,0 @@
{stdenv, fetchurl, python, clearsilver, subversion, sqlite, pysqlite, makeWrapper}:
assert stdenv.system == "i686-linux";
stdenv.mkDerivation {
name = "trac-0.9.5";
src = fetchurl {
url = "http://ftp.edgewall.com/pub/trac/trac-0.9.5.tar.gz";
md5 = "3b7d708eaf905cc6ba2b6b10a09a8cf4";
};
builder = ./builder.sh;
buildInputs = [makeWrapper];
inherit stdenv python subversion clearsilver sqlite pysqlite;
}

2
pkgs/os-specific/linux/ati-drivers/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
inherit libXxf86vm xf86vidmodeproto;
src = fetchurl {
url = https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-10-11-x86.x86_64.run;
url = https://www2.ati.com/drivers/linux/ati-driver-installer-10-11-x86.x86_64.run;
sha256 = "1z33w831ayx1j5lm9d1xv6whkmzsz9v8li3s8c96hwnwki6zpimr";
};

4
pkgs/misc/busybox/default.nix → pkgs/os-specific/linux/busybox/default.nix
View File

@ -37,11 +37,11 @@ let
in
stdenv.mkDerivation rec {
name = "busybox-1.19.4";
name = "busybox-1.20.1";
src = fetchurl {
url = "http://busybox.net/downloads/${name}.tar.bz2";
sha256 = "1vhh6xa71w4wzby0f4x357fv6zxvkklmyjc8njgbbzv1v83391cv";
sha256 = "1jb8xh9a0mc73nmnjz7g5k7ym39vrg7grp7zmgmq71gxps55sl9y";
};
configurePhase = ''

22
pkgs/os-specific/linux/firmware/amd-ucode/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "amd-ucode-2012-01-17";
src = fetchurl {
url = "http://www.amd64.org/pub/microcode/${name}.tar";
sha256 = "0mqnbs87khv6p874cbyf9nb8i4gc592ws67lyzhc4chmwvc9ln47";
};
installPhase = ''
mkdir -p $out/amd-ucode
mv microcode_amd_fam15h.bin microcode_amd.bin $out/amd-ucode/
'';
meta = {
description = "AMD Processor Microcode Patch";
homepage = "http://www.amd64.org/support/microcode.html";
license = "non-free";
};
}

85
pkgs/os-specific/linux/kernel/no-xsave.patch Normal file
View File

@ -0,0 +1,85 @@
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -168,21 +168,23 @@ static void __init xen_banner(void)
xen_feature(XENFEAT_mmu_pt_update_preserve_ad) ? " (preserve-AD)" : "");
}
+static __read_mostly unsigned int cpuid_leaf1_edx_mask = ~0;
+static __read_mostly unsigned int cpuid_leaf1_ecx_mask = ~0;
+
static void xen_cpuid(unsigned int *ax, unsigned int *bx,
unsigned int *cx, unsigned int *dx)
{
+ unsigned maskecx = ~0;
unsigned maskedx = ~0;
/*
* Mask out inconvenient features, to try and disable as many
* unsupported kernel subsystems as possible.
*/
- if (*ax == 1)
- maskedx = ~((1 << X86_FEATURE_APIC) | /* disable APIC */
- (1 << X86_FEATURE_ACPI) | /* disable ACPI */
- (1 << X86_FEATURE_MCE) | /* disable MCE */
- (1 << X86_FEATURE_MCA) | /* disable MCA */
- (1 << X86_FEATURE_ACC)); /* thermal monitoring */
+ if (*ax == 1) {
+ maskecx = cpuid_leaf1_ecx_mask;
+ maskedx = cpuid_leaf1_edx_mask;
+ }
asm(XEN_EMULATE_PREFIX "cpuid"
: "=a" (*ax),
@@ -190,9 +192,43 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,
"=c" (*cx),
"=d" (*dx)
: "0" (*ax), "2" (*cx));
+
+ *cx &= maskecx;
*dx &= maskedx;
}
+static __init void xen_init_cpuid_mask(void)
+{
+ unsigned int ax, bx, cx, dx;
+
+ cpuid_leaf1_edx_mask =
+ ~((1 << X86_FEATURE_MCE) | /* disable MCE */
+ (1 << X86_FEATURE_MCA) | /* disable MCA */
+ (1 << X86_FEATURE_ACC)); /* thermal monitoring */
+
+ if (!xen_initial_domain())
+ cpuid_leaf1_edx_mask &=
+ ~((1 << X86_FEATURE_APIC) | /* disable local APIC */
+ (1 << X86_FEATURE_ACPI)); /* disable ACPI */
+
+ ax = 1;
+ xen_cpuid(&ax, &bx, &cx, &dx);
+
+ /* cpuid claims we support xsave; try enabling it to see what happens */
+ if (cx & (1 << (X86_FEATURE_XSAVE % 32))) {
+ unsigned long cr4;
+
+ set_in_cr4(X86_CR4_OSXSAVE);
+
+ cr4 = read_cr4();
+
+ if ((cr4 & X86_CR4_OSXSAVE) == 0)
+ cpuid_leaf1_ecx_mask &= ~(1 << (X86_FEATURE_XSAVE % 32));
+
+ clear_in_cr4(X86_CR4_OSXSAVE);
+ }
+}
+
static void xen_set_debugreg(int reg, unsigned long val)
{
HYPERVISOR_set_debugreg(reg, val);
@@ -903,6 +939,8 @@ asmlinkage void __init xen_start_kernel(void)
xen_init_irq_ops();
+ xen_init_cpuid_mask();
+
#ifdef CONFIG_X86_LOCAL_APIC
/*
* set up the basic apic ops.

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

@ -203,11 +203,7 @@ rec {
no_xsave =
{ name = "no-xsave";
patch = fetchurl {
url = "http://kernel.ubuntu.com/git?p=rtg/ubuntu-maverick.git;a=blobdiff_plain;f=arch/x86/xen/enlighten.c;h=f7ff4c7d22954ab5eda464320241300bd5a32ee5;hp=1ea06f842a921557e958110e22941d53a2822f3c;hb=1a30f99;hpb=8f2ff69dce18ed856a8d1b93176f768b47eeed86";
name = "no-xsave.patch";
sha256 = "18732s3vmav5rpg6zqpiw2i0ll83pcc4gw266h6545pmbh9p7hky";
};
patch = ./no-xsave.patch;
features.noXsave = true;
};

8
pkgs/os-specific/linux/kernel/perf.nix
View File

@ -1,5 +1,8 @@
{ stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto
, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison }:
, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig
, withGtk ? false, gtk ? null }:
assert withGtk -> gtk != null;
stdenv.mkDerivation {
name = "perf-linux-${kernel.version}";
@ -14,7 +17,8 @@ stdenv.mkDerivation {
# perf refers both to newt and slang
buildNativeInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt flex bison ];
buildInputs = [ elfutils python perl newt slang ];
buildInputs = [ elfutils python perl newt slang pkgconfig] ++
stdenv.lib.optional withGtk gtk;
installFlags = "install install-man ASCIIDOC8=1";

4
pkgs/os-specific/linux/psmisc/default.nix
View File

@ -3,11 +3,11 @@
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "psmisc-22.13";
name = "psmisc-22.19";
src = fetchurl {
url = "mirror://sourceforge/psmisc/${name}.tar.gz";
sha256 = "06d25e8ebb4722dbcede98a787c39a9ed341f8e58fde10c0b2d6b35990b35daa";
sha256 = "e112ccadd4694c98f5ea4a02cd6944fdc5a2a1985f20e2b3f74f4dbca83a2a31";
};
buildInputs = [ncurses];

4
pkgs/tools/archivers/dar/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, zlib, bzip2, openssl, attr, lzo, libgcrypt, e2fsprogs }:
stdenv.mkDerivation rec {
name = "dar-2.4.2";
name = "dar-2.4.6";
src = fetchurl {
url = "mirror://sourceforge/dar/${name}.tar.gz";
sha256 = "0cvcy9xccg4wmvbpxyacwppapbq03m3pwjk8b3xmdn2h8lr1pziq";
sha256 = "1r83ad32wbdrwxifkw1gdki7z534ggm9hfbmc6jf5lgr5mgkrqbq";
};
buildInputs = [ zlib bzip2 openssl attr lzo libgcrypt e2fsprogs ];

10
pkgs/tools/archivers/gnutar/default.nix
View File

@ -37,4 +37,14 @@ stdenv.mkDerivation (rec {
# cannot be used as a login shell for now.
// stdenv.lib.optionalAttrs (stdenv.system == "armv7l-linux") {
FORCE_UNSAFE_CONFIGURE = 1;
}
//
{
crossAttrs =
# XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs.
(stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") {
patches = [ ./gets-undeclared.patch ];
});
})

26
pkgs/tools/archivers/gnutar/gets-undeclared.patch Normal file
View File

@ -0,0 +1,26 @@
This patch is needed to allow builds with newer versions of
the GNU libc (2.16+).
This is a backport of this patch:
commit 66712c23388e93e5c518ebc8515140fa0c807348
Author: Eric Blake <eblake@redhat.com>
Date: Thu Mar 29 13:30:41 2012 -0600
stdio: don't assume gets any more
--- tar-1.26/gnu/stdio.in.h 2012-07-02 14:28:45.000000000 +0200
+++ tar-1.26/gnu/stdio.in.h 2012-07-02 14:28:50.000000000 +0200
@@ -160,12 +160,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not
"use gnulib module fflush for portable POSIX compliance");
#endif
-/* It is very rare that the developer ever has full control of stdin,
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
-#undef gets
-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-
#if @GNULIB_FOPEN@
# if @REPLACE_FOPEN@
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)

12
pkgs/tools/compression/gzip/default.nix
View File

@ -1,6 +1,6 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (rec {
name = "gzip-1.4";
src = fetchurl {
@ -31,3 +31,13 @@ stdenv.mkDerivation rec {
maintainers = [ stdenv.lib.maintainers.ludo ];
};
}
//
{
crossAttrs =
# XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs.
(stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") {
patches = [ ./gets-undeclared.patch ];
});
})

26
pkgs/tools/compression/gzip/gets-undeclared.patch Normal file
View File

@ -0,0 +1,26 @@
This patch is needed to allow builds with newer versions of
the GNU libc (2.16+).
This is a backport of this patch:
commit 66712c23388e93e5c518ebc8515140fa0c807348
Author: Eric Blake <eblake@redhat.com>
Date: Thu Mar 29 13:30:41 2012 -0600
stdio: don't assume gets any more
--- gzip/lib/stdio.in.h 2012-07-02 14:28:45.000000000 +0200
+++ gzip/lib/stdio.in.h 2012-07-02 14:28:50.000000000 +0200
@@ -160,12 +160,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not
"use gnulib module fflush for portable POSIX compliance");
#endif
-/* It is very rare that the developer ever has full control of stdin,
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
-#undef gets
-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-
#if @GNULIB_FOPEN@
# if @REPLACE_FOPEN@
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)

4
pkgs/tools/filesystems/e2fsprogs/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libuuid }:
stdenv.mkDerivation rec {
name = "e2fsprogs-1.42.2";
name = "e2fsprogs-1.42.4";
src = fetchurl {
url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
sha256 = "1gmq3h4hp4hz1zh8yznx9nb0p7yaykb52f7zkpsqbhjawg2zwdhx";
sha256 = "0plhvcjynyy5ifih5jr8p2fjymqyl8fj6vj74cmqjyrahi3z6iir";
};
buildInputs = [ pkgconfig libuuid ];

21
pkgs/tools/filesystems/grive/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchgit, cmake, libgcrypt, json_c, curl, expat, boost, binutils }:
stdenv.mkDerivation rec {
name = "grive-0.2.0";
src = fetchgit {
url = "https://github.com/Grive/grive.git";
rev = "34cb3705288aa83283b370118776ac89393ae5fc";
sha256 = "a30ea886bdc159e1004d1207fcac30c277f1177a3b846bdd82326eebff7a0bbe";
};
buildInputs = [cmake libgcrypt json_c curl expat stdenv binutils boost];
meta = {
description = "an open source (experimental) Linux client for Google Drive";
homepage = https://github.com/Grive/grive;
license = "GPLv2";
platforms = stdenv.lib.platforms.all;
};
}

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

@ -1,9 +1,7 @@
rec {
version="2.15";
name="asymptote-2.15";
hash="11y8w2r51g48znqvl1wwrg0wsrwz3194r70aq1mlgq1g0xzln0w9";
url="http://downloads.sourceforge.net/project/asymptote/asymptote/${version}/asymptote-${version}.src.tgz";
advertisedUrl="http://downloads.sourceforge.net/project/asymptote/asymptote/2.15/asymptote-2.15.src.tgz";
version="2.16";
name="asymptote-2.16";
hash="1yj8dx320s1ypqbpb2116y4kkc8lwg5q4d49n992ds3g59w98djj";
url="http://downloads.sourceforge.net/project/asymptote/${version}/asymptote-${version}.src.tgz";
advertisedUrl="http://downloads.sourceforge.net/project/asymptote/2.16/asymptote-2.16.src.tgz";
}

11
pkgs/tools/misc/coreutils/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional selinuxSupport libselinux
++ stdenv.lib.optional selinuxSupport libsepol;
crossAttrs = {
crossAttrs = ({
buildInputs = [ gmp ]
++ stdenv.lib.optional aclSupport acl.hostDrv
++ stdenv.lib.optional selinuxSupport libselinux.hostDrv
@ -32,7 +32,14 @@ stdenv.mkDerivation rec {
# I don't know why it is not properly detected cross building with glibc.
configureFlags = [ "fu_cv_sys_stat_statfs2_bsize=yes" ];
doCheck = false;
};
}
//
# XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs.
(stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") {
patches = [ ./gets-undeclared.patch ];
}));
# The tests are known broken on Cygwin
# (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),

71
pkgs/tools/misc/coreutils/gets-undeclared.patch Normal file
View File

@ -0,0 +1,71 @@
This patch is needed to allow builds with newer versions of
the GNU libc (2.16+).
commit 66712c23388e93e5c518ebc8515140fa0c807348
Author: Eric Blake <eblake@redhat.com>
Date: Thu Mar 29 13:30:41 2012 -0600
stdio: don't assume gets any more
Gnulib intentionally does not have a gets module, and now that C11
and glibc have dropped it, we should be more proactive about warning
any user on a platform that still has a declaration of this dangerous
interface.
* m4/stdio_h.m4 (gl_STDIO_H, gl_STDIO_H_DEFAULTS): Drop gets
support.
* modules/stdio (Makefile.am): Likewise.
* lib/stdio-read.c (gets): Likewise.
* tests/test-stdio-c++.cc: Likewise.
* m4/warn-on-use.m4 (gl_WARN_ON_USE_PREPARE): Fix comment.
* lib/stdio.in.h (gets): Make warning occur in more places.
* doc/posix-functions/gets.texi (gets): Update documentation.
Reported by Christer Solskogen.
Signed-off-by: Eric Blake <eblake@redhat.com>
diff --git a/lib/stdio.in.h b/lib/stdio.in.h
index aa7b599..c377b6e 100644
--- a/lib/stdio.in.h
+++ b/lib/stdio.in.h
@@ -698,22 +698,11 @@ _GL_WARN_ON_USE (getline, "getline is unportable - "
# endif
#endif
-#if @GNULIB_GETS@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-# undef gets
-# define gets rpl_gets
-# endif
-_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (gets, char *, (char *s));
-# else
-_GL_CXXALIAS_SYS (gets, char *, (char *s));
-# undef gets
-# endif
-_GL_CXXALIASWARN (gets);
/* It is very rare that the developer ever has full control of stdin,
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
+ so any use of gets warrants an unconditional warning; besides, C11
+ removed it. */
+#undef gets
+#if HAVE_RAW_DECL_GETS
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
#endif
@@ -1053,9 +1042,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - "
# endif
#endif
-/* Some people would argue that sprintf should be handled like gets
- (for example, OpenBSD issues a link warning for both functions),
- since both can cause security holes due to buffer overruns.
+/* Some people would argue that all sprintf uses should be warned about
+ (for example, OpenBSD issues a link warning for it),
+ since it can cause security holes due to buffer overruns.
However, we believe that sprintf can be used safely, and is more
efficient than snprintf in those safe cases; and as proof of our
belief, we use sprintf in several gnulib modules. So this header

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

@ -10,11 +10,11 @@ assert sslSupport -> openssl != null;
assert scpSupport -> libssh2 != null;
stdenv.mkDerivation rec {
name = "curl-7.22.0";
name = "curl-7.26.0";
src = fetchurl {
url = "http://curl.haxx.se/download/${name}.tar.bz2";
sha256 = "04ji7v06f33y6plvikwj283ad6fxxxjpm7as9xw25c924f3dm85x";
sha256 = "0snj41knvy4xbfirr88l9gq5zjzz0mwlmq0mxbfgqszb2qpjdvgw";
};
# Zlib and OpenSSL must be propagated because `libcurl.la' contains

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

@ -1,19 +1,18 @@
{stdenv, fetchurl}:
{ stdenv, fetchurl }:
let
name = "smartmontools-5.42";
in
stdenv.mkDerivation {
inherit name;
stdenv.mkDerivation rec {
name = "smartmontools-5.43";
src = fetchurl {
url = "mirror://sourceforge/smartmontools/${name}.tar.gz";
sha256 = "b664d11e814e114ce3a32a4fa918c9e649c684e2897c007b2a8b92574decc374";
sha256 = "d845187d1500b87ef8d2c43772bd0218a59114fe58474a903c56777c9175351e";
};
meta = {
description = "Tools for monitoring the health of hard drivers";
homepage = http://smartmontools.sourceforge.net/;
license = "GPL";
homepage = "http://smartmontools.sourceforge.net/";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}

12
pkgs/tools/text/diffutils/default.nix
View File

@ -1,6 +1,6 @@
{stdenv, fetchurl, coreutils ? null}:
stdenv.mkDerivation {
stdenv.mkDerivation ({
name = "diffutils-3.2";
src = fetchurl {
@ -16,3 +16,13 @@ stdenv.mkDerivation {
description = "Commands for showing the differences between files (diff, cmp, etc.)";
};
}
//
{
crossAttrs =
# XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs.
(stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") {
patches = [ ../../misc/coreutils/gets-undeclared.patch ];
});
})

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

@ -811,6 +811,8 @@ let
*/
graphviz_2_0 = callPackage ../tools/graphics/graphviz/2.0.nix { };
grive = callPackage ../tools/filesystems/grive { };
groff = callPackage ../tools/text/groff {
ghostscript = null;
};
@ -831,6 +833,8 @@ let
gt5 = callPackage ../tools/system/gt5 { };
gtkdatabox = callPackage ../development/libraries/gtkdatabox {};
gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { };
gtkvnc = callPackage ../tools/admin/gtk-vnc {};
@ -948,6 +952,8 @@ let
less = callPackage ../tools/misc/less { };
klavaro = callPackage ../games/klavaro {};
minidlna = callPackage ../tools/networking/minidlna { };
most = callPackage ../tools/misc/most { };
@ -1339,6 +1345,8 @@ let
remind = callPackage ../tools/misc/remind { };
remmina = callPackage ../applications/networking/remote/remmina {};
replace = callPackage ../tools/text/replace { };
rdiff_backup = callPackage ../tools/backup/rdiff-backup { };
@ -2897,6 +2905,8 @@ let
wrapGCC (ccache.links extraConfig)) {};
ccacheStdenv = overrideGCC stdenv ccacheWrapper;
cgdb = callPackage ../development/tools/misc/cgdb { };
complexity = callPackage ../development/tools/misc/complexity { };
ctags = callPackage ../development/tools/misc/ctags { };
@ -3208,16 +3218,16 @@ let
boolstuff = callPackage ../development/libraries/boolstuff { };
boost142 = callPackage ../development/libraries/boost/1.42.nix { };
boost144 = callPackage ../development/libraries/boost/1.44.nix { };
boost146 = callPackage ../development/libraries/boost/1.46.nix { };
boost147 = callPackage ../development/libraries/boost/1.47.nix { };
boost148 = callPackage ../development/libraries/boost/1.48.nix { };
boost149 = callPackage ../development/libraries/boost/1.49.nix { };
boost = boost149;
boost150 = callPackage ../development/libraries/boost/1.50.nix { };
boost = boost150;
boostHeaders149 = callPackage ../development/libraries/boost/1.49-headers.nix { };
boostHeaders = boostHeaders149;
boostHeaders150 = callPackage ../development/libraries/boost/1.50-headers.nix { };
boostHeaders = boostHeaders150;
# A Boost build with all library variants enabled. Very large (about 250 MB).
boostFull = appendToName "full" (boost.override {
@ -4233,7 +4243,7 @@ let
libva = callPackage ../development/libraries/libva { };
libvdpau = callPackage ../development/libraries/libvdpau { };
libvdpau = callPackage ../development/libraries/libvdpau { inherit (xlibs) libX11; };
libvirt = callPackage ../development/libraries/libvirt { };
@ -5190,7 +5200,10 @@ let
monetdb = callPackage ../servers/sql/monetdb { };
mongodb = callPackage ../servers/nosql/mongodb { useV8 = (getConfig ["mongodb" "useV8"] false); };
mongodb = callPackage ../servers/nosql/mongodb {
boost = boost147;
useV8 = (getConfig ["mongodb" "useV8"] false);
};
mysql4 = import ../servers/sql/mysql {
inherit fetchurl stdenv ncurses zlib perl;
@ -5315,6 +5328,8 @@ let
afuse = callPackage ../os-specific/linux/afuse { };
amdUcode = callPackage ../os-specific/linux/firmware/amd-ucode { };
autofs5 = callPackage ../os-specific/linux/autofs/autofs-v5.nix { };
_915resolution = callPackage ../os-specific/linux/915resolution { };
@ -5353,6 +5368,8 @@ let
bridge_utils = callPackage ../os-specific/linux/bridge-utils { };
busybox = callPackage ../os-specific/linux/busybox { };
checkpolicy = callPackage ../os-specific/linux/checkpolicy { };
cifs_utils = callPackage ../os-specific/linux/cifs-utils { };
@ -6267,6 +6284,7 @@ let
ardour3 = lowPrio (callPackage ../applications/audio/ardour/ardour3.nix {
inherit (gnome) libgnomecanvas libgnomecanvasmm;
boost = boost149;
});
arora = callPackage ../applications/networking/browsers/arora { };
@ -6307,7 +6325,6 @@ let
bibletime = callPackage ../applications/misc/bibletime { };
bitcoin = callPackage ../applications/misc/bitcoin {
boost = boost144;
db4 = db48;
};
@ -7019,6 +7036,8 @@ let
pygtk = pyGtkGlade;
};
mcomix = callPackage ../applications/graphics/mcomix { };
mercurial = callPackage ../applications/version-management/mercurial {
inherit (pythonPackages) curses;
guiSupport = false; # use mercurialFull to get hgk GUI
@ -7053,6 +7072,8 @@ let
minidjvu = callPackage ../applications/graphics/minidjvu { };
mirage = callPackage ../applications/graphics/mirage {};
mmex = callPackage ../applications/office/mmex { };
monodevelop = callPackage ../applications/editors/monodevelop {
@ -7161,6 +7182,8 @@ let
offrss = callPackage ../applications/networking/offrss { };
ogmtools = callPackage ../applications/video/ogmtools { };
oneteam = callPackage ../applications/networking/instant-messengers/oneteam {};
openbox = callPackage ../applications/window-managers/openbox { };
@ -7422,8 +7445,6 @@ let
taskwarrior = callPackage ../applications/misc/taskwarrior { };
taskwarrior_unstable = callPackage ../applications/misc/taskwarrior/unstable.nix { };
telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble {
inherit (pkgs.gnome) libsoup;
};
@ -7458,6 +7479,8 @@ let
transmission = callPackage ../applications/networking/p2p/transmission { };
transmission_remote_gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {};
trayer = callPackage ../applications/window-managers/trayer { };
tree = callPackage ../tools/system/tree { };
@ -8345,8 +8368,6 @@ let
auctex = callPackage ../tools/typesetting/tex/auctex { };
busybox = callPackage ../misc/busybox { };
cups = callPackage ../misc/cups { };
cups_pdf_filter = callPackage ../misc/cups/pdf-filter.nix { };
@ -8600,10 +8621,6 @@ let
inherit texLive unzip;
};
trac = callPackage ../misc/trac {
inherit (pythonPackages) pysqlite;
};
vice = callPackage ../misc/emulators/vice { };
vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 {

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

@ -116,37 +116,37 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
# GHC version, change the "preferences function" for that GHC version
# in haskell-defaults.nix.
# NOTE: 2011.4.0.0 is the current default.
# NOTE: 2012.2.0.0 is the current default.
haskellPlatformArgs_future = self : {
inherit (self) cabal ghc;
cgi = self.cgi_3001_1_7_4; # 7.4.2 ok
fgl = self.fgl_5_4_2_4; # 7.4.2 ok
GLUT = self.GLUT_2_1_2_1; # 7.4.2 ok
haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.2 ok
html = self.html_1_0_1_2; # 7.4.2 ok
HTTP = self.HTTP_4000_2_3; # 7.4.2 ok
HUnit = self.HUnit_1_2_4_3; # 7.4.2 ok
mtl = self.mtl_2_1_1; # 7.4.2 ok
network = self.network_2_3_0_14; # 7.4.2 ok
OpenGL = self.OpenGL_2_2_3_1; # 7.4.2 ok
parallel = self.parallel_3_2_0_2; # 7.4.2 ok
parsec = self.parsec_3_1_3; # 7.4.2 ok
QuickCheck = self.QuickCheck_2_5; # 7.4.2 ok
random = self.random_1_0_1_1; # 7.4.2 ok
regexBase = self.regexBase_0_93_2; # 7.4.2 ok
regexCompat = self.regexCompat_0_95_1; # 7.4.2 ok
regexPosix = self.regexPosix_0_95_1; # 7.4.2 ok
stm = self.stm_2_3; # 7.4.2 ok
syb = self.syb_0_3_6_1; # 7.4.2 ok
text = self.text_0_11_2_2; # 7.4.2 ok
transformers = self.transformers_0_3_0_0; # 7.4.2 ok
xhtml = self.xhtml_3000_2_1; # 7.4.2 ok
zlib = self.zlib_0_5_3_3; # 7.4.2 ok
cabalInstall = self.cabalInstall_0_14_0; # 7.4.2 ok
alex = self.alex_3_0_1; # 7.4.2 ok
haddock = self.haddock_2_10_0; # 7.4.2 ok
happy = self.happy_1_18_9; # 7.4.2 ok
cgi = self.cgi_3001_1_7_4; # 7.5 fail
fgl = self.fgl_5_4_2_4; # 7.5 ok
GLUT = self.GLUT_2_1_2_1; # 7.5 fail
haskellSrc = self.haskellSrc_1_0_1_5; # 7.5 ok
html = self.html_1_0_1_2; # 7.5 ok
HTTP = self.HTTP_4000_2_3; # 7.5 ok
HUnit = self.HUnit_1_2_4_3; # 7.5 ok
mtl = self.mtl_2_1_2; # 7.5 ok
network = self.network_2_3_0_14; # 7.5 ok
OpenGL = self.OpenGL_2_2_3_1; # 7.5 fail
parallel = self.parallel_3_2_0_2; # 7.5 fail
parsec = self.parsec_3_1_3; # 7.5 ok
QuickCheck = self.QuickCheck_2_5; # 7.5 fail
random = self.random_1_0_1_1; # 7.5 ok
regexBase = self.regexBase_0_93_2; # 7.5 ok
regexCompat = self.regexCompat_0_95_1; # 7.5 fail
regexPosix = self.regexPosix_0_95_1; # 7.5 fail
stm = self.stm_2_3; # 7.5 ok
syb = self.syb_0_3_6_2; # 7.5 ok
text = self.text_0_11_2_2; # 7.5 ok
transformers = self.transformers_0_3_0_0; # 7.5 ok
xhtml = self.xhtml_3000_2_1; # 7.5 ok
zlib = self.zlib_0_5_3_3; # 7.5 fail
cabalInstall = self.cabalInstall_0_14_0; # 7.5 ok
alex = self.alex_3_0_1; # 7.5 ok
haddock = self.haddock_2_10_0; # 7.5 ok
happy = self.happy_1_18_9; # 7.5 ok
};
haskellPlatformArgs_2012_2_0_0 = self : {
@ -839,6 +839,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
highlightingKate = callPackage ../development/libraries/haskell/highlighting-kate {};
hinotify = callPackage ../development/libraries/haskell/hinotify {};
hint = callPackage ../development/libraries/haskell/hint {};
Hipmunk = callPackage ../development/libraries/haskell/Hipmunk {};
@ -1025,9 +1027,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
mtl_2_1_1 = callPackage ../development/libraries/haskell/mtl/2.1.1.nix {
transformers = self.transformers_0_3_0_0;
};
mtl1 = self.mtl_1_1_1_1;
mtl2 = self.mtl_2_1_1;
mtl = self.mtl2;
mtl_2_1_2 = callPackage ../development/libraries/haskell/mtl/2.1.2.nix {
transformers = self.transformers_0_3_0_0;
};
mtl = self.mtl_2_1_2;
mtlparse = callPackage ../development/libraries/haskell/mtlparse {};
@ -1230,6 +1233,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
regular = callPackage ../development/libraries/haskell/regular {};
remote = callPackage ../development/libraries/haskell/remote {};
repa = callPackage ../development/libraries/haskell/repa {};
repaAlgorithms = callPackage ../development/libraries/haskell/repa-algorithms {};
repaExamples = callPackage ../development/libraries/haskell/repa-examples {};
@ -1251,6 +1256,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
semigroups = callPackage ../development/libraries/haskell/semigroups {};
shelly = callPackage ../development/libraries/haskell/shelly {};
simpleSendfile = callPackage ../development/libraries/haskell/simple-sendfile {};
skein = callPackage ../development/libraries/haskell/skein {};
@ -1283,6 +1290,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {};
syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {};
syb_0_3_6_1 = callPackage ../development/libraries/haskell/syb/0.3.6.1.nix {};
syb_0_3_6_2 = callPackage ../development/libraries/haskell/syb/0.3.6.2.nix {};
syb = null; # by default, we assume that syb ships with GHC, which is
# true for the older GHC versions

6
pkgs/top-level/perl-packages.nix
View File

@ -2825,10 +2825,10 @@ rec {
};
PerlMagick = buildPerlPackage {
name = "PerlMagick-6.74";
name = "PerlMagick-6.77";
src = fetchurl {
url = mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-6.74.tar.gz;
sha256 = "6f2fbd3398610f2f02d5670eb5e0f5cb58079fba0e6b9d26519f469c104b969a";
url = mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-6.77.tar.gz;
sha256 = "0axbj3n5avjxvlxradjs9zxiv84i00drmnjsb7hq9sjn9fzggngg";
};
buildInputs = [pkgs.imagemagick];
preConfigure =

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

@ -727,6 +727,9 @@ let pythonPackages = python.modules // rec {
sha256 = "0jrajyppdzb3swcxv3w1mpp88vcy7400gy1v2h2gm3pq0dmggaij";
};
# two tests fail on x86_64 at least. I don't know why.
doCheck = false;
buildInputs = [ pkgs.setuptools ];
meta = {