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

Merge branch 'master' of https://github.com/NixOS/nixpkgs

Browse Source
This commit is contained in:
System administrator 2012-07-04 12:22:50 +02:00
commit fb4fad68f0
68 changed files with 844 additions and 457 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/graphics/cinepaint/default.nix
View File

@ -2,7 +2,7 @@
flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11,
perlXMLParser, python, pygtk, gettext, intltool, babl, gegl,
glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr,
mesa, libXext, libXpm, libXxf86vm, pixman, libpthreadstubs } :
mesa, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } :
stdenv.mkDerivation rec {
name = "cinepaint-1.0";
@ -12,15 +12,19 @@ stdenv.mkDerivation rec {
sha256 = "02mbpsykd7sfr9h6c6gxld6i3bdwnsgvm70b5yff01gwi69w2wi7";
};
buildInputs = [ gtk freetype fontconfig lcms flex libtiff libjpeg libpng
buildInputs = [ libpng gtk freetype fontconfig lcms flex libtiff libjpeg
libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl
gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr mesa
libXext libXpm libXxf86vm pixman libpthreadstubs
libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk
];
patches = [ ./install.patch ];
buildNativeInputs = [ cmake pkgconfig ];
NIX_CFLAGS_COMPILE = "-I.";
NIX_LDFLAGS = "-llcms -ljpeg";
# NIX_CFLAGS_COMPILE = "-I.";
meta = {
homepage = http://www.cinepaint.org/;

24
pkgs/applications/graphics/cinepaint/install.patch Normal file
View File

@ -0,0 +1,24 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dfb182f..5adaaa5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,7 +138,7 @@ STRING(REPLACE "/" "\\/" ESCAPEDPREFIX ${PREFIX})
# Note that for MacOS this needs to be revised
# for the @OSX_ICC...@ variables
ADD_CUSTOM_COMMAND(
- OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/gimprc
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/gimprc
COMMAND sed -e s/\@platform\@//g
-e s/\@prefix\@/${ESCAPEDPREFIX}/g
-e s/\@exec_prefix\@/\${prefix}/g
@@ -155,8 +155,8 @@ ADD_CUSTOM_COMMAND(
ADD_CUSTOM_TARGET(RCFile ALL echo
""
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/user_install
- ${CMAKE_CURRENT_SOURCE_DIR}/gimprc
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/user_install
+ ${CMAKE_CURRENT_BINARY_DIR}/gimprc
)

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";
};
}

30
pkgs/applications/graphics/rawtherapee/default.nix
View File

@ -1,35 +1,23 @@
{ stdenv, fetchsvn, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau,
libXdmcp, lcms, libiptcdata
{ stdenv, fetchurl, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau
, libXdmcp, lcms2, libiptcdata
, mercurial # Not really needed for anything, but it fails if it does not find 'hg'
}:
stdenv.mkDerivation rec {
name = "rawtherapee-svn-25";
name = "rawtherapee-4.0.9";
src = fetchsvn {
url = "http://rawtherapee.googlecode.com/svn/trunk";
rev = 25;
sha256 = "09jg47rs09lly70x1zlrb3qcwi2rry1m7gjzs39iqzp53hi9j9mh";
src = fetchurl {
url = http://rawtherapee.googlecode.com/files/rawtherapee-4.0.9.tar.xz;
sha256 = "1ll7n7gzxs00jpw3gp9xfr90lbwqafkgqpps3j5ig6mf79frpm2a";
};
buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp
lcms libiptcdata ];
# Rawtherapee died if the default setting for the icc directory pointed to a
# non existant place
patchPhase = ''
sed -i s,/usr/share/color/icc,/tmp/, rtgui/options.cc
'';
lcms2 libiptcdata mercurial ];
# Disable the use of the RAWZOR propietary libraries
cmakeFlags = [ "-DWITH_RAWZOR=OFF" ];
installPhase = ''
mkdir -p $out/bin $out/lib
cp rtgui/rt $out/bin
# Weird kind of path reference
cp -r ../release/* $out/bin
cp rtengine/*.so $out/lib
'';
enableParallelBuilding = true;
meta = {
description = "RAW converter and digital photo processing software";

11
pkgs/applications/misc/eaglemode/default.nix
View File

@ -2,11 +2,11 @@
librsvg, glib, gtk, libXext, libXxf86vm, poppler }:
stdenv.mkDerivation {
name = "eaglemode-0.83.0";
name = "eaglemode-0.84.0";
src = fetchurl {
url = mirror://sourceforge/eaglemode/eaglemode-0.83.0.tar.bz2;
sha256 = "0rlvi9ljf3ml2l4ydkcgjjja8wk9c7h5qlpdr4x4ghh6sqq0q2x3";
url = mirror://sourceforge/eaglemode/eaglemode-0.84.0.tar.bz2;
sha256 = "0n20b419j0l7h7jr4s3f3n09ka0ysg9nqs8mcwsrx24rcq7nv0cs";
};
buildInputs = [ perl libX11 xineLib libjpeg libpng libtiff pkgconfig
@ -14,9 +14,12 @@ stdenv.mkDerivation {
# The program tries to dlopen both Xxf86vm and Xext, so we use the
# trick on NIX_LDFLAGS and dontPatchELF to make it find them.
# I use 'yes y' to skip a build error linking with xineLib,
# because xine stopped exporting "_x_vo_new_port"
# http://sourceforge.net/projects/eaglemode/forums/forum/808824/topic/5115261
buildPhase = ''
export NIX_LDFLAGS="$NIX_LDFLAGS -lXxf86vm -lXext"
yes n | perl make.pl build
yes y | perl make.pl build
'';
dontPatchELF = true;

26
pkgs/applications/misc/viking/default.nix
View File

@ -1,19 +1,27 @@
{ fetchurl, stdenv, pkgconfig, intltool, gettext, gtk, expat, curl
, gpsd, bc, file }:
, gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper
, docbook_xml_dtd_412 }:
stdenv.mkDerivation rec {
name = "viking-0.9.8";
let version = "1.3"; in
stdenv.mkDerivation {
name = "viking-${version}";
src = fetchurl {
url = "mirror://sourceforge/viking/${name}.tar.gz";
sha256 = "1is8g6ld5pd13iiv9qm8526q1cblg01pqyakg52sd6k7fys7dz2d";
url = "mirror://sourceforge/viking/viking/${version}/viking-${version}.tar.gz";
sha256 = "1psgy1myx9xn7zgpvqrpricsv041sz41mm82hj5i28k72fq47p2l";
};
patches = [
./test-bc.patch ./gpsdclient.patch ./implicit-declaration.patch
];
buildInputs =
[ pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils
libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412
];
buildInputs = [ pkgconfig intltool gettext gtk expat curl gpsd bc file ];
configureFlags = [ "--disable-scrollkeeper" ];
preBuild =
'' sed -i help/Makefile \
-e 's|--noout|--noout --nonet --path "${scrollkeeper}/share/xml/scrollkeeper/dtds"|g'
'';
doCheck = true;

51
pkgs/applications/misc/viking/gpsdclient.patch
View File

@ -1,51 +0,0 @@
Debian patch that allows compilation with libgps (from `gpsd').
Failing to apply this patch, we get the following error:
vikgpslayer.c:237: error: field 'realtime_gpsd_unit' has incomplete type
vikgpslayer.c: In function 'vik_gps_layer_new':
vikgpslayer.c:473: warning: implicit declaration of function 'gpsd_units'
vikgpslayer.c: In function 'rt_gpsd_try_connect':
vikgpslayer.c:1321: warning: passing argument 2 of 'gps_set_raw_hook' from incompatible pointer type
diff -urNad trunk~/src/gpsdclient.h trunk/src/gpsdclient.h
--- trunk~/src/gpsdclient.h 1970-01-01 01:00:00.000000000 +0100
+++ trunk/src/gpsdclient.h 2009-04-15 14:30:22.000000000 +0200
@@ -0,0 +1,25 @@
+/* $Id: gpsdclient.h 5330 2009-03-03 04:05:42Z ckuethe $ */
+/* gpsdclient.h -- common functions for GPSD clients */
+
+#ifndef _GPSD_GPSDCLIENT_H_
+#define _GPSD_GPSDCLIENT_H_
+struct fixsource_t
+/* describe a data source */
+{
+ char *spec; /* pointer to actual storage */
+ char *server;
+ char *port;
+ char *device;
+};
+
+enum unit {unspecified, imperial, nautical, metric};
+enum unit gpsd_units(void);
+enum deg_str_type { deg_dd, deg_ddmm, deg_ddmmss };
+
+extern /*@observer@*/ char *deg_to_str( enum deg_str_type type, double f);
+
+extern void gpsd_source_spec(/*@null@*/const char *fromstring,
+ /*@out@*/struct fixsource_t *source);
+
+#endif /* _GPSDCLIENT_H_ */
+/* gpsdclient.h ends here */
diff -urNad trunk~/src/vikgpslayer.c trunk/src/vikgpslayer.c
--- trunk~/src/vikgpslayer.c 2009-02-08 14:47:01.000000000 +0100
+++ trunk/src/vikgpslayer.c 2009-04-15 14:30:55.000000000 +0200
@@ -39,6 +39,9 @@
#include <glib/gi18n.h>
#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING
#include <gps.h>
+#ifndef gpsd_units
+#include "gpsdclient.h"
+#endif
#endif
#if ! GLIB_CHECK_VERSION(2,14,0)

13
pkgs/applications/misc/viking/implicit-declaration.patch
View File

@ -1,13 +0,0 @@
Debian patch that fixes an implicat declaration.
diff -urNad trunk~/src/util.c trunk/src/util.c
--- trunk~/src/util.c 2009-02-08 14:47:01.000000000 +0100
+++ trunk/src/util.c 2009-04-15 17:23:44.000000000 +0200
@@ -26,6 +26,7 @@
#endif
#include <glib/gi18n.h>
+#include <glib/gprintf.h>
#include "dialog.h"

22
pkgs/applications/misc/viking/test-bc.patch
View File

@ -1,22 +0,0 @@
For some reason, `bc -l' yields no output.
--- viking-0.9.8/test/check_degrees_conversions.sh 2008-03-15 23:01:48.000000000 +0100
+++ viking-0.9.8/test/check_degrees_conversions.sh 2009-05-30 23:23:27.000000000 +0200
@@ -7,7 +7,7 @@ function check_success()
for value in "$@"
do
result=`./degrees_converter "$value" | cut -d' ' -f3`
- diff=`echo "$result - $expected" | bc -l`
+ diff=`echo "$result - $expected" | bc`
if [ $diff != 0 ]
then
echo "$value -> $result != $expected"
@@ -23,7 +23,7 @@ function check_failure()
for value in "$@"
do
result=`./degrees_converter "$value" | cut -d' ' -f3`
- diff=`echo "$result - $expected" | bc -l`
+ diff=`echo "$result - $expected" | bc`
if [ $diff = 0 ]
then
echo "$value -> $result = $expected"

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";
};

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 = [];
};
}

10
pkgs/applications/video/xine-ui/default.nix
View File

@ -1,18 +1,18 @@
{stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng12, readline, ncurses, curl
, lirc, shared_mime_info }:
{stdenv, fetchurl, pkgconfig, xlibs, libpng, xineLib, readline, ncurses, curl
, lirc, shared_mime_info, libjpeg }:
stdenv.mkDerivation rec {
name = "xine-ui-0.99.6";
name = "xine-ui-0.99.7";
src = fetchurl {
url = "mirror://sourceforge/xine/${name}.tar.xz";
sha256 = "1wwylnckm5kfq5fi154w8jqf5cwvp7c1ani15q7sgfrfdkmy7caf";
sha256 = "1i3byriqav06b55kwzs4dkzrjw7mmmcv0rc7jzb52hn8qp8xz34x";
};
buildNativeInputs = [ pkgconfig shared_mime_info ];
buildInputs =
[ xineLib libpng12 readline ncurses curl lirc
[ xineLib libpng readline ncurses curl lirc libjpeg
xlibs.xlibs xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto
xlibs.libXinerama xlibs.libXi xlibs.libXft
];

4
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -8,7 +8,7 @@
with stdenv.lib;
let version = "4.1.16"; in
let version = "4.1.18"; in
stdenv.mkDerivation {
name = "virtualbox-${version}-${kernel.version}";
@ -17,7 +17,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
sha256 = "0kl21wqz822qgdcilfail5qqgsbhgzixwbbwpkmsh6670jc4jw5n";
sha256 = "e650e4fdc23581b9edc0e5d5705cc596c76796851ebf65ccda0edb8e413fa3b7";
};
buildInputs =

4
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}:
let version = "4.1.16"; in
let version = "4.1.18"; in
stdenv.mkDerivation {
name = "VirtualBox-GuestAdditions-${version}";
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
sha256 = "1f2p26cg005xc6vi9dbim0macv60d8k8nq20rk7awrbghfib5imm";
sha256 = "1zsjh4q71ny10s2zaxnaw4w3bs961c21xv6dd6zpwhnbimlhlrqb";
};
KERN_DIR = "${kernel}/lib/modules/*/build";
buildInputs = [ patchelf cdrkit makeWrapper ];

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
{

4
pkgs/development/interpreters/octave/default.nix
View File

@ -15,7 +15,9 @@ stdenv.mkDerivation rec {
doCheck = true;
enableParallelBuilding = true;
/* The build failed with a missing libranlib.la in hydra,
but worked on my computer. I think they have concurrency problems */
enableParallelBuilding = false;
configureFlags = [ "--enable-readline" "--enable-dl" ];

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
'';
};
}

91
pkgs/development/libraries/boost/1.48.nix
View File

@ -1,91 +0,0 @@
{ stdenv, fetchurl, icu, expat, zlib, bzip2, python
, enableRelease ? true
, enableDebug ? false
, enableSingleThreaded ? false
, enableMultiThreaded ? true
, enableShared ? true
, enableStatic ? false
, enablePIC ? false
, enableExceptions ? 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 && enableExceptions) then
"cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC"
else if (enablePIC) then
"cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC"
else if (enableExceptions) then
"cflags=-fexceptions"
else
"";
in
stdenv.mkDerivation {
name = "boost-1.48.0";
meta = {
homepage = "http://boost.org/";
description = "Boost C++ Library Collection";
license = "boost-license";
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.simons ];
};
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_48_0.tar.bz2";
sha256 = "1njsircy5xfj5rws10w8vq2s0603z2i31p9wgbawr4wkssr59whv";
};
# See <http://svn.boost.org/trac/boost/ticket/4688>.
patches = [ ./boost_filesystem.patch ];
enableParallelBuilding = true;
buildInputs = [icu expat zlib bzip2 python];
configureScript = "./bootstrap.sh";
configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python";
buildPhase = "./b2 -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
./b2 -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
'';
};
}

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;

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

@ -4,11 +4,11 @@
let inherit (composableDerivation) edf; in
composableDerivation.composableDerivation {} rec {
name = "fltk-2.0.x-alpha-r8550";
name = "fltk-2.0.x-alpha-r9296";
src = fetchurl {
url = "ftp://ftp.easysw.com/pub/fltk/snapshots/${name}.tar.bz2";
sha256 = "0y9fazsv61j8dkg9aiinnw4nd68h7zxmvapmygrl4rq5ywqygng7";
sha256 = "0353ngb7gpyklc9mdz8629big2na3c73akfwhis8fhqp7jkbs9ih";
};
propagatedBuildInputs = [ x11 inputproto libXi freeglut ];

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;

1
pkgs/development/libraries/haskell/hinotify/default.nix
View File

@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
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/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/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
];

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 = [

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 ];
};
})

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

@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "shelly";
version = "0.12.1";
sha256 = "11nbmymrwc76934b4vd444dzpzc33l5977wvd53wzqrsinv80c5v";
version = "0.12.2";
sha256 = "0nhycisk6jc3mqd2xqcxxgfqsqm8vp5k4g45gdljalb87rqvqkkv";
buildDepends = [
mtl systemFileio systemFilepath text time unixCompat
];

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" ];

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/;

8
pkgs/development/libraries/opencv/2.1.nix
View File

@ -9,11 +9,17 @@ stdenv.mkDerivation rec {
sha256 = "26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f";
};
buildInputs = [ cmake gtk glib libjpeg libpng libtiff jasper ffmpeg pkgconfig
# The order is important; libpng should go before X libs, because they
# propagate the libpng 1.5 (and opencv wants libpng 1.2)
buildInputs = [ cmake libpng gtk glib libjpeg libtiff jasper ffmpeg pkgconfig
xineLib gstreamer ];
enableParallelBuilding = true;
patchPhase = ''
sed -i 's/ptrdiff_t/std::ptrdiff_t/' include/opencv/*
'';
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS "
'';

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

@ -1,14 +1,14 @@
{ stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg
, pkgconfig, gstreamer, xineLib, glib }:
let v = "2.3.1a"; in
let v = "2.4.1"; in
stdenv.mkDerivation rec {
name = "opencv-${v}";
src = fetchurl {
url = "mirror://sourceforge/opencvlibrary/OpenCV-${v}.tar.bz2";
sha256 = "0325s7pa2npcw2gc06pr6q5ik4xdyf08rvkfc0myn10w20lzb8m9";
sha256 = "1wxijbz1jfsg4695fls83825ppiacxfn5x07al0qkkx5rm7spdi9";
};
buildInputs = [ gtk glib libjpeg libpng libtiff jasper ffmpeg xineLib gstreamer ];

14
pkgs/development/libraries/xine-lib/default.nix
View File

@ -5,21 +5,13 @@
}:
stdenv.mkDerivation rec {
name = "xine-lib-1.2.0";
name = "xine-lib-1.2.2";
src = fetchurl {
url = "mirror://sourceforge/xine/${name}.tar.bz2";
sha256 = "1yss9cxxkcb6dzrv78xvi845ls6lhhbv6g8yfm6zjjl07v7jbm6c";
url = "mirror://sourceforge/xine/${name}.tar.xz";
sha256 = "1mjk686h1qzqj51h4xs4xvagfgnnhm8czbzzjvr5w034pr8n8rg1";
};
patches = [ ./zlib126.patch ];
# patches =
# [ (fetchurl {
# url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/xine-lib/files/xine-lib-1.1.19-ffmpeg.patch?revision=1.1";
# sha256 = "0dqr0kc829djfn0wvk4jg84v61pxynqbp4s4phvywd7x9caf092b";
# })
# ];
buildNativeInputs = [ pkgconfig perl ];
buildInputs = [

52
pkgs/development/libraries/xine-lib/zlib126.patch
View File

@ -1,52 +0,0 @@
http://anonscm.debian.org/hg/xine-lib/xine-lib/rev/24d09421ed09
# HG changeset patch
# User Ulrich Müller <ulm@gentoo.org>
# Date 1327945720 0
# Node ID 24d09421ed09d3a78efeab5c9b8ab31daaaba4fd
# Parent da296856c52e654cf599248de3a01bb754363c79
Compile failure in osd.c with sys-libs/zlib-1.2.6
diff -r da296856c52e -r 24d09421ed09 misc/xine-fontconv.c
--- a/misc/xine-fontconv.c Wed Jan 18 22:01:28 2012 +0000
+++ b/misc/xine-fontconv.c Mon Jan 30 17:48:40 2012 +0000
@@ -109,7 +109,7 @@
osd_font_t font;
-static int gzwrite_i16(gzFile *fp, uint16_t number) {
+static int gzwrite_i16(gzFile fp, uint16_t number) {
return gzputc(fp, number & 0xFF) != -1 &&
gzputc(fp, (number >> 8) & 0xFF) != -1;
}
@@ -341,7 +341,7 @@
char filename[1024];
FT_Bitmap *out_bitmap;
- gzFile *fp;
+ gzFile fp;
int error;
int error_counter;
int glyph_index;
diff -r da296856c52e -r 24d09421ed09 src/xine-engine/osd.c
--- a/src/xine-engine/osd.c Wed Jan 18 22:01:28 2012 +0000
+++ b/src/xine-engine/osd.c Mon Jan 30 17:48:40 2012 +0000
@@ -650,7 +650,7 @@
osd->display_y = y;
}
-static uint16_t gzread_i16(gzFile *fp) {
+static uint16_t gzread_i16(gzFile fp) {
uint16_t ret;
ret = gzgetc(fp);
ret |= (gzgetc(fp)<<8);
@@ -663,7 +663,7 @@
static int osd_renderer_load_font(osd_renderer_t *this, char *filename) {
- gzFile *fp;
+ gzFile fp;
osd_font_t *font = NULL;
int i, ret = 0;

5
pkgs/development/python-modules/pyqt/default.nix
View File

@ -4,7 +4,10 @@ stdenv.mkDerivation rec {
name = "PyQt-x11-gpl-4.9.1";
src = fetchurl {
url = "http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz";
urls = [
"http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz"
"http://pkgs.fedoraproject.org/lookaside/pkgs/PyQt4/PyQt-x11-gpl-4.9.1.tar.gz/7f495dc49f71e3bfb64bf942e0d8bb3c/PyQt-x11-gpl-4.9.1.tar.gz"
];
sha256 = "1ccvc80z8a0k0drvba9ngivsnv2k2nn5317yf86w1zwh45zmb0zj";
};

1
pkgs/games/blackshadeselite/default.nix
View File

@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
};
NIX_LDFLAGS = "-lSDL_image";
NIX_CFLAGS_COMPILE = "-fpermissive";
buildInputs = [ SDL SDL_image mesa openal libvorbis freealut popt ];

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;
};
}

7
pkgs/games/speed-dreams/default.nix
View File

@ -16,9 +16,10 @@ stdenv.mkDerivation rec {
cd */
'';
buildInputs = [ mesa freeglut libX11 plib openal freealut libXrandr xproto
libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib bash
p7zip SDL enet libjpeg cmake];
# Order important; it wants libpng12 and some x libs propagate libpng15
buildInputs = [ libpng mesa freeglut libX11 plib openal freealut libXrandr xproto
libXext libSM libICE libXi libXt libXrender libXxf86vm zlib bash
p7zip SDL enet libjpeg cmake ];
installTargets = "install";

3
pkgs/games/ufoai/default.nix
View File

@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
# for the xvidcore static lib
NIX_CFLAGS_COMPILE = "-pthread -lm";
buildInputs = [ SDL mesa SDL_image SDL_ttf SDL_mixer libpng libjpeg zlib curl libvorbis
# Order is important, x libs include a libpng version that fails for ufoai
buildInputs = [ libpng SDL mesa SDL_image SDL_ttf SDL_mixer libjpeg zlib curl libvorbis
libtheora xvidcore pkgconfig glib gtk gtkglext gtksourceview libxml2 openal gettext
p7zip ];

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 = [

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";
};

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;
};

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];

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

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

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)

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";
}

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 ];
});
})

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

@ -654,7 +654,9 @@ let
efibootmgr = callPackage ../tools/system/efibootmgr { };
enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { };
enblendenfuse = callPackage ../tools/graphics/enblend-enfuse {
boost = boost149;
};
encfs = callPackage ../tools/filesystems/encfs { };
@ -834,6 +836,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 {};
@ -951,6 +955,8 @@ let
less = callPackage ../tools/misc/less { };
klavaro = callPackage ../games/klavaro {};
minidlna = callPackage ../tools/networking/minidlna { };
most = callPackage ../tools/misc/most { };
@ -1342,6 +1348,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 { };
@ -1525,7 +1533,9 @@ let
vifm = callPackage ../applications/misc/vifm {};
viking = callPackage ../applications/misc/viking { };
viking = callPackage ../applications/misc/viking {
inherit (gnome) scrollkeeper;
};
vncrec = builderDefsPackage ../tools/video/vncrec {
inherit (xlibs) imake libX11 xproto gccmakedep libXt
@ -3213,11 +3223,9 @@ 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 { };
boost150 = callPackage ../development/libraries/boost/1.50.nix { };
boost = boost150;
@ -4240,7 +4248,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 { };
@ -6281,6 +6289,7 @@ let
ardour3 = lowPrio (callPackage ../applications/audio/ardour/ardour3.nix {
inherit (gnome) libgnomecanvas libgnomecanvasmm;
boost = boost149;
});
arora = callPackage ../applications/networking/browsers/arora { };
@ -6395,7 +6404,10 @@ let
compiz_plugins_extra = callPackage ../applications/window-managers/compiz/plugins-extra.nix { };
cinepaint = callPackage ../applications/graphics/cinepaint { };
cinepaint = callPackage ../applications/graphics/cinepaint {
fltk = fltk13;
libpng = libpng12;
};
codeville = builderDefsPackage (import ../applications/version-management/codeville/0.8.0.nix) {
inherit makeWrapper;
@ -6989,6 +7001,7 @@ let
inherit (perlPackages) ArchiveZip CompressZlib;
inherit (gnome) GConf ORBit2 gnome_vfs;
zip = zip.override { enableNLS = false; };
boost = boost149;
fontsConf = makeFontsConf {
fontDirectories = [
freefont_ttf xorg.fontmiscmisc xorg.fontbhttf
@ -7032,6 +7045,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
@ -7066,6 +7081,8 @@ let
minidjvu = callPackage ../applications/graphics/minidjvu { };
mirage = callPackage ../applications/graphics/mirage {};
mmex = callPackage ../applications/office/mmex { };
monodevelop = callPackage ../applications/editors/monodevelop {
@ -7471,6 +7488,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 { };
@ -7913,6 +7932,7 @@ let
# Torcs wants to make shared libraries linked with plib libraries (it provides static).
# i686 is the only platform I know than can do that linking without plib built with -fPIC
plib = plib.override { enablePIC = if stdenv.isi686 then false else true; };
libpng = libpng12;
};
torcs = callPackage ../games/torcs {
@ -7925,6 +7945,7 @@ let
ufoai = callPackage ../games/ufoai {
inherit (gnome) gtksourceview gtkglext;
libpng = libpng12;
};
ultimatestunts = callPackage ../games/ultimatestunts { };

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

@ -1233,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 {};

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

@ -525,6 +525,23 @@ let pythonPackages = python.modules // rec {
};
django_1_3_1 = buildPythonPackage rec {
name = "Django-1.3.1";
src = fetchurl {
url = "http://www.djangoproject.com/m/releases/1.3/${name}.tar.gz";
sha256 = "0sqmvqy3y5h76pa3zjcnyiy5x01bzzy03afdp2qdwqx0x321i4dg";
};
doCheck = false;
meta = {
description = "A high-level Python Web framework";
homepage = https://www.djangoproject.com/;
};
};
django_evolution = buildPythonPackage rec {
name = "django_evolution-0.6.7";
@ -533,7 +550,7 @@ let pythonPackages = python.modules // rec {
md5 = "24b8373916f53f74d701b99a6cf41409";
};
propagatedBuildInputs = [ django ];
propagatedBuildInputs = [ django_1_3_1 ];
meta = {
description = "A database schema evolution tool for the Django web framework";
@ -543,14 +560,14 @@ let pythonPackages = python.modules // rec {
djblets = buildPythonPackage rec {
name = "Djblets-0.6.16";
name = "Djblets-0.6.19";
src = fetchurl {
url = "http://downloads.reviewboard.org/releases/Djblets/0.6/Djblets-0.6.16.tar.gz";
sha256 = "1793jy0y5w79p8395lvvdlmvdybgwvc5lvgzmk1csf08ba772vc4";
url = "http://downloads.reviewboard.org/releases/Djblets/0.6/${name}.tar.gz";
sha256 = "1hhvpi81yknvlaazq1cpgamp9vf3x1fcr0ba64q3j2yz1kgin1i8";
};
propagatedBuildInputs = [ pkgs.pil django ];
propagatedBuildInputs = [ pkgs.pil django_1_3_1 ];
meta = {
description = "A collection of useful extensions for Django";
@ -1986,17 +2003,17 @@ let pythonPackages = python.modules // rec {
reviewboard = buildPythonPackage rec {
name = "ReviewBoard-1.6.6";
name = "ReviewBoard-1.6.9";
src = fetchurl {
url = "http://downloads.reviewboard.org/releases/ReviewBoard/1.6/${name}.tar.gz";
sha256 = "de965f48c9e63198d3c7c2bb2e8404170868e8c0ee4d6ab796abb9b1ccda6c1d";
sha256 = "06pwbmqwsb0g2y8zg5hk5ibaivsl1af7v0vnkqranimf4yaa10mc";
};
propagatedBuildInputs =
[ recaptcha_client pytz memcached dateutil paramiko flup pygments
djblets django django_evolution pkgs.pycrypto python.modules.sqlite3
pysvn pkgs.pil
djblets django_1_3_1 django_evolution pkgs.pycrypto python.modules.sqlite3
pysvn pkgs.pil psycopg2
];
};