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

svn merge ^/nixpkgs/trunk

Browse Source 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33111
This commit is contained in:
Yury G. Kudryashov 2012-03-15 15:09:36 +00:00
commit 785d18e02b
197 changed files with 2600 additions and 1236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
maintainers/scripts/copy-tarball.sh Executable file
View File

@ -0,0 +1,45 @@
#! /bin/sh -e
distDir=/data/webserver/tarballs
url="$1"
file="$2"
if [ -z "$url" ]; then echo "syntax: $0 URL"; exit 0; fi
base="$(basename "$url")"
if [ -z "$base" ]; then echo "bad URL"; exit 1; fi
dstPath="$distDir/$base"
if [ -e "$dstPath" ]; then echo "$dstPath already exists"; exit 0; fi
if [ -z "$file" ]; then
echo "downloading $url to $dstPath"
if [ -n "$dryRun" ]; then exit 0; fi
declare -a res
if ! res=($(PRINT_PATH=1 nix-prefetch-url "$url")); then
continue
fi
storePath=${res[1]}
else
storePath="$file"
fi
cp $storePath "$dstPath.tmp.$$"
mv -f "$dstPath.tmp.$$" "$dstPath"
echo "hashing $dstPath"
md5=$(nix-hash --flat --type md5 "$dstPath")
ln -sfn "../$base" $distDir/md5/$md5
sha1=$(nix-hash --flat --type sha1 "$dstPath")
ln -sfn "../$base" $distDir/sha1/$sha1
sha256=$(nix-hash --flat --type sha256 "$dstPath")
ln -sfn "../$base" $distDir/sha256/$sha256
ln -sfn "../$base" $distDir/sha256/$(nix-hash --type sha256 --to-base32 "$sha256")

48
maintainers/scripts/copy-tarballs.sh
View File

@ -1,57 +1,15 @@
#! /bin/sh -e
distDir=/data/webserver/tarballs
urls=$(nix-instantiate --eval-only --xml --strict ./eval-release.nix \
urls=$(nix-instantiate --eval-only --xml --strict '<nixpkgs/maintainers/scripts/eval-release.nix>' \
| grep -A2 'name="urls"' \
| grep '<string value=' \
| sed 's/.*"\(.*\)".*/\1/' \
| sort | uniq)
for url in $urls; do
if echo "$url" | grep -q -E "www.cs.uu.nl|nixos.org|.stratego-language.org|java.sun.com|ut2004|linuxq3a|RealPlayer|Adbe|belastingdienst|microsoft|armijn/.nix|sun.com|archive.eclipse.org"; then continue; fi
base="$(basename "$url")"
newPath="$distDir/$base"
if ! test -e "$newPath"; then
#if echo $url | grep -q 'mirror://'; then
# echo "$fn: skipping mirrored $url"
# continue
#fi
echo "downloading $url to $newPath"
if test -n "$doCopy"; then
declare -a res
if ! res=($(PRINT_PATH=1 nix-prefetch-url "$url")); then
continue
fi
storePath=${res[1]}
cp $storePath "$newPath.tmp.$$"
mv -f "$newPath.tmp.$$" "$newPath"
fi
fi
if test -n "$doCopy" -a -e "$newPath"; then
echo "hashing $newPath"
md5=$(nix-hash --flat --type md5 "$newPath")
ln -sfn "../$base" $distDir/md5/$md5
sha1=$(nix-hash --flat --type sha1 "$newPath")
ln -sfn "../$base" $distDir/sha1/$sha1
sha256=$(nix-hash --flat --type sha256 "$newPath")
ln -sfn "../$base" $distDir/sha256/$sha256
ln -sfn "../$base" $distDir/sha256/$(nix-hash --type sha256 --to-base32 "$sha256")
fi
if ! echo "$url" | grep -q -E "\-.*[0-9].*"; then echo "skipping $url"; continue; fi
$(dirname $0)/copy-tarball.sh "$url"
done
echo DONE

13
pkgs/applications/audio/GStreamer/default.nix
View File

@ -1,13 +0,0 @@
{stdenv, fetchurl, perl
, bison, flex, glib
, pkgconfig, libxml2}:
stdenv.mkDerivation {
name = "GStreamer-0.10.10";
src = fetchurl {
url = http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.10.tar.bz2;
md5 = "6875bf0bd3cf38b9ae1362b9e644e6fc";
};
buildInputs = [perl bison flex glib pkgconfig libxml2];
}

4
pkgs/applications/editors/emacs-24/default.nix
View File

@ -9,13 +9,13 @@ assert (libXft != null) -> libpng != null; # probably a bug
assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise
stdenv.mkDerivation rec {
name = "emacs-24.0.93";
name = "emacs-24.0.94";
builder = ./builder.sh;
src = fetchurl {
url = "http://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.gz";
sha256 = "4a100accb2f76231aed4dddb32d3725dec131280ad3bdf1b39b52ce337a210fe";
sha256 = "1dgy53dxpnwrn6h3i3z8fpcyasms0wlvhqfyih4cwkz712var393";
};
buildInputs =

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

@ -1,18 +1,20 @@
{ cabal, binary, binaryShared, Cabal, deepseq, filepath, glib, gtk
, gtksourceview2, hslogger, leksahServer, ltk, mtl, network, parsec
, processLeksah, regexBase, regexTdfa, strict, time, utf8String
{ cabal, binary, binaryShared, Cabal, deepseq, enumerator, filepath
, gio, glib, gtk, gtksourceview2, hslogger, leksahServer, ltk, mtl
, network, parsec, QuickCheck, regexBase, regexTdfa, strict, text
, time, transformers, utf8String
}:
cabal.mkDerivation (self: {
pname = "leksah";
version = "0.10.0.4";
sha256 = "1g12w1kl63fxzz1c2x237yrqkaja9awiqyyipkdms5iql0ini7bw";
version = "0.12.0.3";
sha256 = "1374ffwban58kabnynacl0fyzs6756kd5q1lcfya46mp26l7syrd";
isLibrary = true;
isExecutable = true;
buildDepends = [
binary binaryShared Cabal deepseq filepath glib gtk gtksourceview2
hslogger leksahServer ltk mtl network parsec processLeksah
regexBase regexTdfa strict time utf8String
binary binaryShared Cabal deepseq enumerator filepath gio glib gtk
gtksourceview2 hslogger leksahServer ltk mtl network parsec
QuickCheck regexBase regexTdfa strict text time transformers
utf8String
];
noHaddock = true;
meta = {

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl
, GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib
, gnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
, libgnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb
, openexr, pixman, pkgconfig, sqlite }:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ GConf atk cairo cmake curl dbus_glib exiv2 glib gnome_keyring gtk
[ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk
ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
librsvg libtiff libxcb openexr pixman pkgconfig sqlite

3
pkgs/applications/graphics/gimp/plugins/default.nix
View File

@ -5,8 +5,7 @@
{ pkgs, gimp }:
let
inherit (pkgs) stdenv fetchurl pkgconfig gtkLibs;
inherit (gtkLibs) glib;
inherit (pkgs) stdenv fetchurl pkgconfig glib;
targetPluginDir = "$out/${gimp.name}-plugins";
targetScriptDir = "$out/${gimp.name}-scripts";
prefix = "plugin-gimp-";

14
pkgs/applications/graphics/k3d/debian-patches.nix Normal file
View File

@ -0,0 +1,14 @@
# Generated by debian-patches.sh from debian-patches.txt
let
prefix = "http://patch-tracker.debian.org/patch/series/dl/k3d/0.8.0.2-15";
in
[
{
url = "${prefix}/disable_mutable_in_boost_gil.patch";
sha256 = "037l86h2hszqgw8arqpzprz5qvngsb61i7lpww617mkvqrc4hiq3";
}
{
url = "${prefix}/k3d_gtkmm224.patch";
sha256 = "0a81fg96zby6kidqwj6n8mhbrh0j5fpnmfh7lr6havz5r2is9ks5";
}
]

3
pkgs/applications/graphics/k3d/debian-patches.txt Normal file
View File

@ -0,0 +1,3 @@
k3d/0.8.0.2-15
disable_mutable_in_boost_gil.patch
k3d_gtkmm224.patch

28
pkgs/applications/graphics/k3d/default.nix
View File

@ -1,32 +1,32 @@
{stdenv, fetchurl, gtkLibs, gnome
, cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
, libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff
, gettext, intltool, perl
}:
{stdenv, fetchurl
, cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
, libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff
, gettext, intltool, perl, gtkmm, glibmm, gtkglext
}:
stdenv.mkDerivation rec {
version = "0.8.0.2";
name = "k3d-${version}";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/k3d/K-3D%20Source/K-3D%200.8.0.2/k3d-source-0.8.0.2.tar.bz2";
url = "mirror://sourceforge/k3d/k3d-source-0.8.0.2.tar.bz2";
sha256 = "01fd2qb0zddif3wz1a2wdmwyzn81cf73678qp2gjs8iikmdz6w7x";
};
patches = [ (fetchurl {
url = "http://patch-tracker.debian.org/patch/series/dl/k3d/0.8.0.2-15/k3d_gtkmm224.patch";
sha256 = "0a81fg96zby6kidqwj6n8mhbrh0j5fpnmfh7lr6havz5r2is9ks5";
})
];
patches = map fetchurl ((import ./debian-patches.nix) ++
[ {
url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch;
sha256 = "1vl7dbvxg9b54ay0n8dd2v2k3j001h8h1bpr1cbm3vrzv31lnwzx";
} ]);
preConfigure = ''
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib"
'';
buildInputs = with gtkLibs; with gnome; [
buildInputs = [
cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng
boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext
intltool perl
gtkmm glibmm gtkglext
gtkmm glibmm gtkglext
];
doCheck = false;
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
homepage = "http://k-3d.org/";
platforms = with stdenv.lib.platforms;
linux;
maintainers = with stdenv.lib.maintainers;
maintainers = with stdenv.lib.maintainers;
[raskin];
};
}

6
pkgs/applications/graphics/paraview/default.nix
View File

@ -7,10 +7,10 @@
}:
stdenv.mkDerivation rec {
name = "paraview-3.12.0";
name = "paraview-3.14.0";
src = fetchurl {
url = "http://www.paraview.org/files/v3.12/ParaView-3.12.0.tar.gz";
sha256 = "0n0n0hrv02rd9rb63z4baalf40m8v870027mr47b93scgp18qyim";
url = "http://www.paraview.org/files/v3.14/ParaView-3.14.0-Source.tar.gz";
sha256 = "168v8zk64pxcd392kb4zqnkbw540d52bx6fs35aqz88i5jc0x9xv";
};
# [ 5%] Generating vtkGLSLShaderLibrary.h

11
pkgs/applications/misc/adobe-reader/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, libX11, cups, gtkLibs, zlib, libxml2 }:
{ stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk, glib
, gdk_pixbuf }:
assert stdenv.system == "i686-linux";
@ -17,13 +18,7 @@ stdenv.mkDerivation {
# versions.
libPath = stdenv.lib.makeLibraryPath
[ stdenv.gcc.gcc libX11 zlib libxml2 cups
gtkLibs.pango
gtkLibs.atk
gtkLibs.gtk
gtkLibs.glib
gtkLibs.gdk_pixbuf
];
[ stdenv.gcc.gcc libX11 zlib libxml2 cups pango atk gtk glib gdk_pixbuf ];
meta = {
description = "Adobe Reader, a viewer for PDF documents";

4
pkgs/applications/misc/evince/default.nix
View File

@ -1,7 +1,7 @@
{ fetchurl, stdenv, perl, perlXMLParser, gettext, intltool
, pkgconfig, glib, gtk, gnomedocutils, gnomeicontheme
, libgnome, libgnomeui, scrollkeeper, libxslt
, libglade, gnome_keyring, dbus, dbus_glib
, libglade, libgnome_keyring, dbus, dbus_glib
, poppler, libspectre, djvulibre, shared_mime_info
, makeWrapper, which, ghostscript
, recentListSize ? null # 5 is not enough, allow passing a different number
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [
perl perlXMLParser gettext intltool pkgconfig glib gtk
gnomedocutils gnomeicontheme libgnome libgnomeui libglade
scrollkeeper gnome_keyring
scrollkeeper libgnome_keyring
libxslt # for `xsltproc'
dbus dbus_glib poppler libspectre djvulibre makeWrapper which
ghostscript

5
pkgs/applications/misc/mysql-workbench/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, makeWrapper, boost, file, gettext
, glib, glibc, gnome_keyring, gtk, gtkmm, intltool, libctemplate, libglade
, glib, glibc, libgnome_keyring, gnome_keyring, gtk, gtkmm, intltool
, libctemplate, libglade
, libgnome, libsigcxx, libtool, libuuid, libxml2, libzip, lua, mesa, mysql
, pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite
}:
@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "1b5ijaccy2k7if4pld8ihz1wa1wr1f9gj2m5xa4kf7v05zcx93c6";
};
buildInputs = [ boost file gettext glib glibc gnome_keyring gtk gtkmm intltool
buildInputs = [ boost file gettext glib glibc libgnome_keyring gtk gtkmm intltool
libctemplate libglade libgnome libsigcxx libtool libuuid libxml2 libzip lua makeWrapper mesa
mysql paramiko pcre pexpect pkgconfig pycrypto python sqlite ];

6
pkgs/applications/misc/truecrypt/default.nix
View File

@ -45,12 +45,12 @@ library, use the 'NOGUI' parameter:
}:
stdenv.mkDerivation {
name = "truecrypt-7.1";
name = "truecrypt-7.1a";
builder = ./builder.sh;
src = fetchurl {
url = http://fossies.org/unix/misc/TrueCrypt-7.1-Source.tar.gz;
sha256 = "1x6rdxcvklb3zpmgfc3mg5h71gzki1q55ljkzjab2vzkf9n5v0cl";
url = http://fossies.org/unix/misc/TrueCrypt-7.1a-Source.tar.gz;
sha1 = "d43e0dbe05c04e316447d87413c4f74c68f5de24";
};
pkcs11h = fetchurl {

4
pkgs/applications/misc/xneur/0.8.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pcre, GStreamer, glib, libxml2, aspell
{ stdenv, fetchurl, pkgconfig, pcre, gstreamer, glib, libxml2, aspell
, imlib2, xorg, xosd }:
stdenv.mkDerivation {
@ -10,7 +10,7 @@ stdenv.mkDerivation {
};
buildInputs =
[ xorg.libX11 pkgconfig pcre GStreamer glib libxml2 aspell
[ xorg.libX11 pkgconfig pcre gstreamer glib libxml2 aspell
xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext
];

4
pkgs/applications/misc/xneur/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, xorg, pcre, GStreamer, glib, libxml2
{ stdenv, fetchurl, pkgconfig, xorg, pcre, gstreamer, glib, libxml2
, aspell, cairo, imlib2, xosd, libnotify, gtk, pango, atk, enchant,
gdk_pixbuf}:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ xorg.libX11 pkgconfig pcre GStreamer glib libxml2 aspell cairo
[ xorg.libX11 pkgconfig pcre gstreamer glib libxml2 aspell cairo
xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext xorg.libXi libnotify
gtk pango enchant gdk_pixbuf
];

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

@ -1,5 +1,6 @@
{ GConf, alsaLib, bzip2, cairo, cups, dbus, dbus_glib, expat
, fetchurl, ffmpeg, fontconfig, freetype, gtkLibs, libX11, libXfixes
, fetchurl, ffmpeg, fontconfig, freetype, libX11, libXfixes
, glib, gtk, gdk_pixbuf, pango
, libXScrnSaver, libXdamage, libXext, libXrender, libXt, libXtst
, libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, patchelf
, stdenv, unzip, zlib, pam, pcre }:
@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
ffmpeg fontconfig freetype libX11 libXScrnSaver libXfixes
libXdamage libXext libXrender libXt libXtst libgcrypt libjpeg
libpng nspr stdenv.gcc.gcc zlib stdenv.gcc.libc
gtkLibs.glib gtkLibs.gtk gtkLibs.gdk_pixbuf gtkLibs.pango
glib gtk gdk_pixbuf pango
pam
];

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

@ -21,9 +21,9 @@ let
];
rpath32 = makeLibraryPath
[ pkgsi686Linux.gtkLibs.gdk_pixbuf
pkgsi686Linux.gtkLibs.glib
pkgsi686Linux.gtkLibs.gtk
[ pkgsi686Linux.gdk_pixbuf
pkgsi686Linux.glib
pkgsi686Linux.gtk
pkgsi686Linux.xorg.libX11
pkgsi686Linux.xorg.libXcomposite
pkgsi686Linux.xorg.libXfixes

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

@ -77,9 +77,9 @@ rec {
browser = import ./netsurf.nix {
inherit fetchurl sourceFromHead stdenv lib pkgconfig
libnsbmp libnsgif libsvgtiny libwapcaplet hubub libParserUtils
libpng libxml2 libCSS lcms curl libmng;
libpng libxml2 libCSS lcms curl libmng glib gtk;
libharu = netsurfHaru;
inherit (gnome) glib gtk libglade;
inherit (gnome) libglade;
};

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libXt
, freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp
, libuuid, cups, xz
, gstreamer, gstPluginsBase, libxml2
, gstreamer, gst_plugins_base, libxml2
, gtkSupport ? true, glib, gtk, pango, gdk_pixbuf, cairo, atk
, kdeSupport ? false, qt4, kdelibs
}:
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ stdenv.gcc.gcc stdenv.gcc.libc zlib libX11 libXt libXext libSM libICE
libXft freetype fontconfig libXrender libuuid expat
gstreamer libxml2 gstPluginsBase
gstreamer libxml2 gst_plugins_base
]
++ stdenv.lib.optionals gtkSupport [ glib gtk pango gdk_pixbuf cairo atk ]
++ stdenv.lib.optionals kdeSupport [ kdelibs qt4 ];

6
pkgs/applications/networking/browsers/uzbl/default.nix
View File

@ -26,9 +26,9 @@ rec {
doWrap = a.makeManyWrappers "$out/bin/uzbl-core"
''
--prefix GST_PLUGIN_PATH : ${a.webkit.gstreamer}/lib/gstreamer-* \
--prefix GST_PLUGIN_PATH : ${a.webkit.gstPluginsBase}/lib/gstreamer-* \
--prefix GST_PLUGIN_PATH : ${a.webkit.gstPluginsGood}/lib/gstreamer-* \
--prefix GST_PLUGIN_PATH : ${a.webkit.gstFfmpeg}/lib/gstreamer-* \
--prefix GST_PLUGIN_PATH : ${a.webkit.gst_plugins_base}/lib/gstreamer-* \
--prefix GST_PLUGIN_PATH : ${a.webkit.gst_plugins_good}/lib/gstreamer-* \
--prefix GST_PLUGIN_PATH : ${a.webkit.gst_ffmpeg}/lib/gstreamer-* \
--prefix GIO_EXTRA_MODULES : ${a.glib_networking}/lib/gio/modules
'';

9
pkgs/applications/networking/dropbox/default.nix
View File

@ -1,6 +1,8 @@
{ stdenv, fetchurl, makeDesktopItem
, xlibs, gtkLibs, gnome
, libSM, libX11, libXext, libXcomposite, libXcursor, libXdamage
, libXfixes, libXi, libXinerama, libXrandr, libXrender
, dbus, dbus_glib, fontconfig, gcc, patchelf
, atk, glib, gdk_pixbuf, gtk, pango
}:
# this package contains the daemon version of dropbox
@ -28,8 +30,7 @@ let
# Libraries referenced by dropbox binary.
# Be aware that future versions of the dropbox binary may refer
# to different versions than are currently in these packages.
ldpath = with xlibs; with gtkLibs; with gnome;
stdenv.lib.makeSearchPath "lib" [
ldpath = stdenv.lib.makeSearchPath "lib" [
libSM libX11 libXext libXcomposite libXcursor libXdamage
libXfixes libXi libXinerama libXrandr libXrender
atk dbus dbus_glib glib fontconfig gcc gdk_pixbuf
@ -83,4 +84,4 @@ in stdenv.mkDerivation {
description = "Online stored folders (daemon version)";
homepage = http://www.dropbox.com;
};
}
}

2
pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
View File

@ -14,7 +14,7 @@ rec {
};
buildInputs = [gtkspell aspell
GStreamer startupnotification
gstreamer startupnotification
libxml2 openssl nss
libXScrnSaver ncurses scrnsaverproto
libX11 xproto kbproto GConf avahi

2
pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
View File

@ -14,7 +14,7 @@ rec {
};
buildInputs = [gtkspell aspell
GStreamer startupnotification
gstreamer startupnotification
libxml2 openssl nss
libXScrnSaver ncurses scrnsaverproto
libX11 xproto kbproto GConf avahi

0
pkgs/applications/networking/ekiga/default.nix → pkgs/applications/networking/instant-messengers/ekiga/default.nix
View File

0
pkgs/applications/networking/kphone/default.nix → pkgs/applications/networking/instant-messengers/kphone/default.nix
View File

0
pkgs/applications/networking/linphone/default.nix → pkgs/applications/networking/instant-messengers/linphone/default.nix
View File

6
pkgs/applications/networking/instant-messengers/oneteam/default.nix
View File

@ -1,16 +1,16 @@
x@{builderDefsPackage
, fetchgit, perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig
, pulseaudio, gtkLibs, pixman, nspr, nss, libXScrnSaver, scrnsaverproto
, pulseaudio, glib, gtk, pixman, nspr, nss, libXScrnSaver, scrnsaverproto
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
["fetchgit" "perlPackages" "gtkLibs"];
["fetchgit" "perlPackages"];
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames)) ++ [
a.perlPackages.SubName a.gtkLibs.gtk a.gtkLibs.glib
a.perlPackages.SubName a.gtk a.glib
];
sourceInfo = rec {
baseName="oneteam";

4
pkgs/applications/networking/instant-messengers/pidgin/default.nix
View File

@ -11,7 +11,7 @@
* - doxygen
*/
{ stdenv, fetchurl, pkgconfig, gtk, gtkspell, aspell,
GStreamer, gstPluginsBase, startupnotification, gettext,
gstreamer, gst_plugins_base, startupnotification, gettext,
perl, perlXMLParser, libxml2, nss, nspr, farsight2,
libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn
, lib, python
@ -30,7 +30,7 @@ stdenv.mkDerivation {
inherit nss ncurses;
buildInputs = [
gtkspell aspell
GStreamer gstPluginsBase startupnotification
gstreamer gst_plugins_base startupnotification
libxml2]
++ (lib.optional (openssl != null) openssl)
++ (lib.optional (gnutls != null) gnutls)

6
pkgs/applications/networking/instant-messengers/psi/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM,
libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, gst_all, which, glib }:
libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, callPackage, which, glib }:
stdenv.mkDerivation rec {
name = "psi-0.14";
@ -21,9 +21,7 @@ stdenv.mkDerivation rec {
" --disable-bundled-qca"
];
psiMedia = (import ./psimedia.nix) {
inherit stdenv fetchurl qt4 speex gst_all liboil which glib pkgconfig;
};
psiMedia = callPackage ./psimedia.nix { };
postInstall = ''
PSI_PLUGINS="$out/lib/psi/plugins"

5
pkgs/applications/networking/instant-messengers/psi/psimedia.nix
View File

@ -1,4 +1,5 @@
{stdenv, fetchurl, qt4, gst_all, liboil, speex, which, glib, pkgconfig}:
{stdenv, fetchurl, qt4, gstreamer, gst_plugins_base, liboil, speex, which
, glib, pkgconfig}:
stdenv.mkDerivation rec {
name = "psimedia";
@ -8,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0fxjdz8afh75gfx2msysb1gss6zx578l3224jvc9jhm99w1ii781";
};
buildInputs = [qt4 gst_all.gstreamer gst_all.gstPluginsBase liboil speex which glib pkgconfig];
buildInputs = [qt4 gstreamer gst_plugins_base liboil speex which glib pkgconfig];
configurePhase = ''./configure'';

0
pkgs/applications/networking/skype/default.nix → pkgs/applications/networking/instant-messengers/skype/default.nix
View File

20
pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib
, sqlite, libsoup, libnice, gnutls }:
stdenv.mkDerivation rec {
name = "telepathy-gabble-0.15.4";
src = fetchurl {
url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz";
sha256 = "0rgqxsdcxds0ljcc01f9ifav26y80p4my37wqzkicr9hmv54h98s";
};
buildNativeInputs = [pkgconfig libxslt];
buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ];
configureFlags = "--with-ca-certificates=/etc/ca-bundle.crt";
meta = {
homepage = http://telepathy.freedesktop.org;
};
}

13
pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.0.nix Normal file
View File

@ -0,0 +1,13 @@
[
{name="ktp-accounts-kcm";key="accounts_kcm";sha256="0i4x4z6w4l9ngx0j258p2vjmsnsdn8hckq7cfld1iliq6fxb1vwv";}
{name="ktp-approver";key="approver";sha256="0nj89jsina8b736sygxia8jmz6l81n6j0ffin8cpqbp9mczzpv9f";}
{name="ktp-auth-handler";key="auth_handler";sha256="1fggj8aa56m7ycwi4q44kfzlx6gfigk0zaq8lhms4wdhm6736fhs";}
{name="ktp-common-internals";key="common_internals";sha256="196f6gkfb3w11qdbamwvkq6hxk2zbdc3js53mh352yhmdyf3cya6";}
{name="ktp-contact-applet";key="contact_applet";sha256="1vhv78qcyna1r4lmzpixb2a0p973ywjyi1izy8jf1vfhy3kk28dw";}
{name="ktp-contact-list";key="contact_list";sha256="15gnm09j4g6ip7vgisayd3ixv2sryjazakzkfksxfkdxl3mgfzg3";}
{name="ktp-filetransfer-handler";key="filetransfer_handler";sha256="1mq48clrlqwbg08211pr7hm24kagjzd8zs287mk9xl2wbv70jgc1";}
{name="ktp-kded-integration-module";key="kded_integration_module";sha256="1p47dks5cvda4i8xhij01z1qmcv2vw27az0la15rhzqlf8kh4sam";}
{name="ktp-presence-applet";key="presence_applet";sha256="1npr59g42yxb67dnplingqa2paaxdw60p99kilbvw15chfbrh47r";}
{name="ktp-send-file";key="send_file";sha256="1961zh4b1bamjyqw3wkm2aclx5sbfbr84i3x7lvfr74vw6cky8mc";}
{name="ktp-text-ui";key="text_ui";sha256="184zyw6l779nkgpc5dx9lcmh543kmr4ay8cvm8vsnrsknn6p0dgp";}
]

24
pkgs/applications/networking/instant-messengers/telepathy/kde/contact-applet-po.patch Normal file
View File

@ -0,0 +1,24 @@
commit eaf09e1242408ac8652ba3ffd1d698326e4b2360
Author: Rohan Garg <rohangarg@kubuntu.org>
Date: Wed Feb 8 00:19:19 2012 +0530
Do not use CMake 2.8 just yet
CMake 2.8 has some scope issues which cause the pofile target to
interfere while building translations in the tarball releases.
Not requiring CMake 2.8 fixes the build issue.
BUGS: 292593 293030
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b34038..50e94f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,5 @@
project(ktp-contact-applet)
-cmake_minimum_required(VERSION 2.8)
-
set(CMAKE_MODULE_PATH
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
${CMAKE_MODULE_PATH}

53
pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix Normal file
View File

@ -0,0 +1,53 @@
{ stdenv, fetchurl, fetchgit, telepathy_qt, kdelibs, gettext, pkgconfig
, qt_gstreamer }:
let
version = "0.3.0";
manifest = import (./. + "/${version}.nix");
overrides = {
presence_applet = x : (x // { patches = [ ./presence-applet-po.patch ]; });
contact_applet = x: (x // { patches = [ ./contact-applet-po.patch ]; });
};
ktpFun = { name, key, sha256 }:
{
name = key;
value = stdenv.mkDerivation (
(if builtins.hasAttr key overrides then builtins.getAttr key overrides else (x: x))
{
name = "${name}-${version}";
src = fetchurl {
url = "mirror://kde/unstable/kde-telepathy/${version}/src/${name}-${version}.tar.bz2";
inherit sha256;
};
buildNativeInputs = [ gettext pkgconfig ];
buildInputs = [ kdelibs telepathy_qt ]
++ stdenv.lib.optional (name != "ktp-common-internals") common_internals;
}
);
};
stable = builtins.listToAttrs (map ktpFun manifest);
unstable = {
call_ui = stdenv.mkDerivation {
name = "ktp-call-ui-20120314";
src = fetchgit {
url = git://anongit.kde.org/ktp-call-ui;
rev = "3587166d1ace83b115e113853514a7acc04d9d86";
sha256 = "0yv386rqy4vkwmd38wvvsrbam59sbv5k2lwimv96kf93xgkp5g0l";
};
buildInputs = [ kdelibs telepathy_qt common_internals qt_gstreamer ];
buildNativeInputs = [ gettext pkgconfig ];
};
};
common_internals = pkgs.common_internals;
pkgs = unstable // stable;
in
pkgs // {
inherit version;
recurseForDerivations = true;
full = stdenv.lib.attrValues pkgs;
}

24
pkgs/applications/networking/instant-messengers/telepathy/kde/presence-applet-po.patch Normal file
View File

@ -0,0 +1,24 @@
commit bf59d0488708eb57ca91a9b6d0ce8951b99ba778
Author: Rohan Garg <rohangarg@kubuntu.org>
Date: Wed Feb 8 01:19:42 2012 +0530
Do not use CMake 2.8 just yet
CMake 2.8 has some scope issues which cause the pofile target to
interfere while building translations in the tarball releases.
Not requiring CMake 2.8 fixes the build issue.
BUG: 292593
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e2c1de..80add26 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,5 @@
project(ktp-presence-applet)
-cmake_minimum_required(VERSION 2.8)
-
set(CMAKE_MODULE_PATH
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
${CMAKE_MODULE_PATH}

38
pkgs/applications/networking/instant-messengers/telepathy/kde/update.sh Executable file
View File

@ -0,0 +1,38 @@
#!/bin/sh
usage() {
echo "$0 version|directory"
}
download() {
URL=ftp://ftp.kde.org/pub/kde/unstable/kde-telepathy/$1/src
destdir=$2
if test -n "$KDE_FULL_SESSION"; then
kioclient copy $URL $destdir
else
mkdir $destdir
lftp -c "open $URL; lcd $destdir; mget -c *"
fi
}
if [[ -d $1 ]]; then
directory=$1
version=$(ls $directory/* | head -n1 |
sed -e "s,$directory/[^0-9.]*\\([0-9.]\\+\\)\\.tar.*,\\1,")
echo "Version $version"
else
version=$1
directory=src-$version
download $version $directory
fi
packages=$(ls $directory/* | sed -e "s,$directory/ktp-\\(.*\\)-$version.*,\\1,")
echo $packages
exec >$version.nix
echo "["
for pkg in $packages; do
hash=$(nix-hash --flat --type sha256 --base32 $directory/ktp-$pkg-$version.*)
echo "{name=\"ktp-${pkg}\";key=\"${pkg//-/_}\";sha256=\"${hash}\";}"
done
echo "]"

15
pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix Normal file
View File

@ -0,0 +1,15 @@
{ stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt }:
stdenv.mkDerivation rec {
name = "${pname}-5.11.0";
pname = "telepathy-mission-control";
src = fetchurl {
url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
sha256 = "19fz1lrsvrm0p58wkxhjn7xyickz8bgzks4mkhlvgp692ypvvppm";
};
buildInputs = [ telepathy_glib ];
buildNativeInputs = [ pkgconfig libxslt ];
}

0
pkgs/applications/networking/twinkle/default.nix → pkgs/applications/networking/instant-messengers/twinkle/default.nix
View File

4
pkgs/applications/networking/p2p/retroshare/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, qt, libupnp, gpgme, gnome_keyring, glib}:
{stdenv, fetchurl, qt, libupnp, gpgme, libgnome_keyring, glib}:
throw "still fails to build"
@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "15971wxx8djwcxn170jyn0mlh7cfzqsf031aa849wr9z234gwrcn";
};
buildInputs = [ qt libupnp gpgme gnome_keyring glib ];
buildInputs = [ qt libupnp gpgme libgnome_keyring glib ];
buildPhase = ''
cd libbitdht/src

6
pkgs/applications/networking/p2p/tribler/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchsvn, pythonPackages, makeWrapper, nettools
, enablePlayer ? false, vlc ? null }:
let rev = "24912"; in
let rev = "25411"; in
stdenv.mkDerivation {
name = "tribler-5.5.13-pre${rev}";
name = "tribler-5.5.21-pre${rev}";
src = fetchsvn {
url = http://svn.tribler.org/abc/branches/release-5.5.x;
inherit rev;
sha256 = "1x4rf83gsxif7fwx7p4crfji52i5y8rp54qfv1lbyxr8dfqjx83g";
sha256 = "17c9svy4zjchzihk6mf0kh4lnvaxjfmgfmimyby5w0d3cwbw49zx";
};
buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper ];

20
pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh
View File

@ -1,25 +1,17 @@
#!/bin/sh
#!/var/run/current-system/bin/bash
VERSIONBASE=3.4.5
VERSION=3.4.5.2
if [ $# -gt 2 ]; then
VERSIONBASE=$1
VERSION=$2
fi
# Take the list of files from the main package, ooo.lst.in
echo '{fetchurl} : ['
for a in artwork base bootstrap calc components extensions extras filters \
help impress libs-core libs-extern libs-extern-sys libs-gui postprocess \
translations ure writer sdk testing; do
while read a; do
URL=http://download.documentfoundation.org/libreoffice/src/$VERSIONBASE/libreoffice-$a-$VERSION.tar.bz2
URL=http://dev-www.libreoffice.org/src/$a
MD5=${a::32}
echo '(fetchurl {'
echo " url = \"$URL\";"
echo " sha256 = \"`nix-prefetch-url $URL`\";"
echo " md5 = \"$MD5\";"
echo '})'
done

368
pkgs/applications/office/openoffice/libreoffice-srcs.nix
View File

@ -1,78 +1,370 @@
{fetchurl} : [
(fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-artwork-3.4.5.2.tar.bz2";
sha256 = "01vi1njw0agpvxi0141k2arzhgq1kjbda7sj1l0l304qj9n78b1q";
url = "http://dev-www.libreoffice.org/src/48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz";
md5 = "48a9f787f43a09c0a9b7b00cd1fddbbf";
})
(fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-base-3.4.5.2.tar.bz2";
sha256 = "0f5rsyrn33iz0sny3wxsghv7c7yrbhas42yarb5rq958i3kpm6wz";
url = "http://dev-www.libreoffice.org/src/63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz";
md5 = "63ddc5116488985e820075e65fbe6aa4";
})
(fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-calc-3.4.5.2.tar.bz2";
sha256 = "1l00y0qj1s9m31jmqg7q7bczxa5xsng388nqc9zc3vd6zjf4xy9i";
url = "http://dev-www.libreoffice.org/src/db5ffcd50064421176e8afb7b85fd1a7-pixman-0.24.0.tar.bz2";
md5 = "db5ffcd50064421176e8afb7b85fd1a7";
})
(fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-components-3.4.5.2.tar.bz2";
sha256 = "1sq6yl06x006wxj1i89lv75sskb1bkxws82rcj1gvih6r8czih52";
url = "http://dev-www.libreoffice.org/src/0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt";
md5 = "0b49ede71c21c0599b0cc19b353a6cb3";
})
(fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-extensions-3.4.5.2.tar.bz2";
sha256 = "18xhk9h9vl9qhwlgv8ks3xi6hls2vgnkygnz1yhpf4p2g2y6nv7z";
url = "http://dev-www.libreoffice.org/src/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2";
md5 = "e1c178b18f130b40494561f02bc1a948";
})
(fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-extras-3.4.5.2.tar.bz2";
sha256 = "0zxm30na6hzpjfasi1g890magf63kmg39y6y56wz9hv2z9p5q8jv";
url = "http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip";
md5 = "17410483b5b5f267aa18b7e00b65e6e0";
})
(fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-filters-3.4.5.2.tar.bz2";
sha256 = "002qxqav39530csraq16ga4fnvw8v9wqbvp88b6lzi2m5yqpbl46";
url = "http://dev-www.libreoffice.org/src/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz";
md5 = "1756c4fa6c616ae15973c104cd8cb256";
})
(fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-help-3.4.5.2.tar.bz2";
sha256 = "1agsqzz73dmsy2jsw63qq1ljx4h0ppz7zwqllc7617yiak0rqsqq";
url = "http://dev-www.libreoffice.org/src/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz";
md5 = "18f577b374d60b3c760a3a3350407632";
})
(fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-impress-3.4.5.2.tar.bz2";
sha256 = "0ivabx4wl7dkfalr0z4gqm5976phc6mkidnv1i580ixrf0zdz483";
url = "http://dev-www.libreoffice.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz";
md5 = "1f24ab1d39f4a51faf22244c94a6203f";
})
(fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-libs-core-3.4.5.2.tar.bz2";
sha256 = "0blwd58hf51iixikrjrlqdm6n40wv5k2c9c8krfzxfcvk20mvv4b";
url = "http://dev-www.libreoffice.org/src/24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html";
md5 = "24be19595acad0a2cae931af77a0148a";
})
(fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-libs-extern-3.4.5.2.tar.bz2";
sha256 = "01cm3fjfj08a7b8i6iszml2ly1wa2hnkqqq1irvjb0wb1fjjxq3s";
url = "http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz";
md5 = "26b3e95ddf3d9c077c480ea45874b3b8";
})
(fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-libs-extern-sys-3.4.5.2.tar.bz2";
sha256 = "1528n6mnlhpdhi9zfvqziwr6knsak212ghjww0jlfh31ky3whlh0";
url = "http://dev-www.libreoffice.org/src/284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz";
md5 = "284e768eeda0e2898b0d5bf7e26a016e";
})
(fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-libs-gui-3.4.5.2.tar.bz2";
sha256 = "0win8si2yjkbfrwx46dw6as82iw7x4wd53cirncsrwvzksdqphcr";
url = "http://dev-www.libreoffice.org/src/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz";
md5 = "2a177023f9ea8ec8bd00837605c5df1b";
})
(fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-postprocess-3.4.5.2.tar.bz2";
sha256 = "1rspqy1drfvj3rdfx8d7wbwn17vw08n26qmb98xwkgf5najdpfnp";
url = "http://dev-www.libreoffice.org/src/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz";
md5 = "2ae988b339daec234019a7066f96733e";
})
(fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-translations-3.4.5.2.tar.bz2";
sha256 = "0ngynrskq6h58gybswcpklj49cyvh0igksngbr0gz6n1yq3471iz";
url = "http://dev-www.libreoffice.org/src/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz";
md5 = "2c9b0f83ed5890af02c0df1c1776f39b";
})
(fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-ure-3.4.5.2.tar.bz2";
sha256 = "0wg06gbaq3ynqzaxaaqgxkjssxnggw6xqgfm63rmn9c1cd4q0mzy";
url = "http://dev-www.libreoffice.org/src/0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz";
md5 = "0be45d54cc5e1c2e3102e32b8c190346";
})
(fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-writer-3.4.5.2.tar.bz2";
sha256 = "0k7xf94abavdzpns1z13phl3vjz0xkfv2h5sn7rgpr3dy184klxh";
url = "http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip";
md5 = "35c94d2df8893241173de1d16b6034c0";
})
(fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-sdk-3.4.5.2.tar.bz2";
sha256 = "1f9iv875aw9sic4gl45ik1vx24gpq9iarjl673wz6l0wxr6hgrgw";
url = "http://dev-www.libreoffice.org/src/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip";
md5 = "35efabc239af896dfb79be7ebdd6e6b9";
})
(fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-testing-3.4.5.2.tar.bz2";
sha256 = "05sk3li5jgmjv722ncsr2i7arhmsvkkvmh4qw7xl70p8dpxhla8q";
url = "http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip";
md5 = "39bb3fcea1514f1369fcfc87542390fd";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz";
md5 = "3ade8cfe7e59ca8e65052644fed9fca4";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz";
md5 = "3c219630e4302863a9a83d0efde889db";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt";
md5 = "48470d662650c3c074e1c3fabbc67bbd";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz";
md5 = "48d8169acc35f97e05d8dcdfd45be7f2";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz";
md5 = "4a660ce8466c9df01f19036435425c3a";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz";
md5 = "f101a9e88b783337b20b2e26dfd26d5f";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz";
md5 = "599dc4cc65a07ee868cf92a667a913d2";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz";
md5 = "7740a8ec23878a2f50120e1faa2730f2";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz";
md5 = "7376930b0d3f3d77a685d94c4a3acda8";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip";
md5 = "798b2ffdc8bcfe7bca2cf92b62caf685";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz";
md5 = "ecb2e37e45c9933e2a963cabe03670ab";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar";
md5 = "8294d6c42e3553229af9934c5c0ed997";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz";
md5 = "bd30e9cf5523cdfc019b94f5e1d7fd19";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz";
md5 = "a169ab152209200a7bad29a275cb0333";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html";
md5 = "a4d9b30810a434a3ed39fc0003bbd637";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip";
md5 = "a7983f859eafb2677d7ff386a023bc40";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip";
md5 = "ada24d37d8d638b3d8a9985e80bc2978";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz";
md5 = "af3c3acf618de6108d65fcdc92b492e1";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1";
md5 = "bc702168a2af16869201dbe91e46ae48";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz";
md5 = "c441926f3a552ed3e5b274b62e86af16";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz";
md5 = "ca66e26082cab8bb817185a116db809b";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip";
md5 = "d4c4d91ab3a8e52a2e69d48d34ef4df4";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz";
md5 = "d70951c80dabecc2892c919ff5d07172";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt";
md5 = "e0707ff896045731ff99e99799606441";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2";
md5 = "e81c2f0953aa60f8062c05a4673f2be0";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz";
md5 = "e61d0364a30146aaa3001296f853b2b9";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz";
md5 = "ea570af93c284aa9e5621cd563f54f4d";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz";
md5 = "ea91f2fb4212a21d708aced277e6e85a";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/ee8b492592568805593f81f8cdf2a04c-expat-2.0.1.tar.gz";
md5 = "ee8b492592568805593f81f8cdf2a04c";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt";
md5 = "fb7ba5c2182be4e73748859967455455";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz";
md5 = "fca8706f2c4619e2fa3f8f42f8fc1e9d";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz";
md5 = "fdb27bfe2dbe2e7b57ae194d9bf36bab";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip";
md5 = "f872f4ac066433d8ff92f5e316b36ff9";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz";
md5 = "0981bda6548a8c8233ffce2b6e4b2a23";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2";
md5 = "061a9f17323117c9358ed60f33ecff78";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz";
md5 = "067201ea8b126597670b5eff72e1f66c";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip";
md5 = "3404ab6b1792ae5f16bbd603bd1e1d03";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip";
md5 = "3bdf40c0d199af31923e900d082ca2dd";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip";
md5 = "8ce2fcd72becf06c41f7201d15373ed9";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip";
md5 = "97b2d4dba862397f446b217e2b623e71";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip";
md5 = "ace6ab49184e329db254e454a010f56d";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip";
md5 = "d8bd5eed178db6e2b18eeed243f85aa8";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip";
md5 = "db60e4fde8dd6d6807523deb71ee34dc";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip";
md5 = "eeb2c7ddf0d302fba4bfc6e97eac9624";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip";
md5 = "f94d9870737518e3b597f9265f4e9803";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip";
md5 = "ba2930200c9f019c2d93a8c88c651a0f";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz";
md5 = "ff369e69ef0f0143beb5626164e87ae2";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/3dd55b952826d2b32f51308f2f91aa89-gettext-0.18.1.1.tar.gz";
md5 = "3dd55b952826d2b32f51308f2f91aa89";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/9f6e85e1e38490c3956f4415bcd33e6e-glib-2.28.1.tar.gz";
md5 = "9f6e85e1e38490c3956f4415bcd33e6e";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz";
md5 = "a7d6c5f2fe2d481149ed3ba807b5c043";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/3a84ac2da37cae5bf7ce616228c6fbde-libgsf-1.14.19.tar.gz";
md5 = "3a84ac2da37cae5bf7ce616228c6fbde";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/22ad1c8d3fda7e73b0798035f3dd96bc-pango-1.28.3.tar.gz";
md5 = "22ad1c8d3fda7e73b0798035f3dd96bc";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/0611e099e807210cf738dcb41425d104-libcroco-0.6.2.tar.gz";
md5 = "0611e099e807210cf738dcb41425d104";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz";
md5 = "d7a242ca43e33e1b63d3073f9d46a6a8";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/220035f111ea045a51e290906025e8b5-libpng-1.5.1.tar.gz";
md5 = "220035f111ea045a51e290906025e8b5";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz";
md5 = "a2c10c04f396a9ce72894beb18b4e1f9";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz";
md5 = "c735eab2d659a96e5a594c9e8541ad63";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/314e582264c36b3735466c522899aa07-icu4c-4_4_2-src.tgz";
md5 = "314e582264c36b3735466c522899aa07";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt";
md5 = "451ccf439a36a568653b024534669971";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/b99fb620b1324b4ce79ee6998b507146-JLanguageTool-1.4.0.tar.bz2";
md5 = "b99fb620b1324b4ce79ee6998b507146";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz";
md5 = "debc62758716a169df9f62e6ab2bc634";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz";
md5 = "0f63ee487fda8f21fafa767b3c447ac9";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz";
md5 = "71474203939fafbe271e1263e61d083e";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2";
md5 = "9d283e02441d8cebdcd1e5d9df227d67";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2";
md5 = "c01351d7db2b205de755d58769288224";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/34dd7951abbda99b7a75a09993a37965-libwps-0.2.4.tar.bz2";
md5 = "34dd7951abbda99b7a75a09993a37965";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2";
md5 = "0ff7d225d087793c8c2c680d77aac3e7";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2";
md5 = "f02578f5218f217a9f20e9c30e119c6a";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz";
md5 = "3121aaf3e13e5d88dfff13fb4a5f1ab8";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz";
md5 = "3bf481ca95109b14435125c0dd1f2217";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/776ad69a63ac1e99abed176e54ce25d9-libvisio-0.0.14.tar.bz2";
md5 = "776ad69a63ac1e99abed176e54ce25d9";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip";
md5 = "e7a384790b13c29113e22e596ade9687";
})
(fetchurl {
url = "http://dev-www.libreoffice.org/src/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz";
md5 = "7c2549f6b0a8bb604e6c4c729ffdcfe6";
})
]

103
pkgs/applications/office/openoffice/libreoffice.nix
View File

@ -3,34 +3,63 @@
, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups
, libXinerama, openssl, gperf, cppunit, GConf, ORBit2
, autoconf, openldap, postgresql, bash
, langs ? [ "en-US" "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ]
, force ? false
, libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler
, librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa
, autoconf, automake, openldap, bash
, fontsConf
, langs ? [ "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ]
}:
if !force then
throw ''The expression for libreoffice is still not ready.
Set config.libreoffice.force = true; if you want to try it anyway.''
else
let
langsSpaces = stdenv.lib.concatStringsSep " " langs;
in
stdenv.mkDerivation rec {
name = "libreoffice-3.4.5.2";
name = "libreoffice-3.5.0.3";
srcs_download = import ./libreoffice-srcs.nix { inherit fetchurl; };
src = fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/3.4.5/libreoffice-bootstrap-3.4.5.2.tar.bz2";
sha256 = "05xz6ykddrm6mrgl9jssr2xpg2ir0x6c1c3n1cph0mvd0hiz58x9";
src_translation = fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/3.5.0/libreoffice-translations-3.5.0.3.tar.xz";
sha256 = "0kk1jb4axjvkmg22yhxx4p9522zix6rr5cs0c5rxzlkm63qw6h8w";
};
src_help = fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/3.5.0/libreoffice-help-3.5.0.3.tar.xz";
sha256 = "0wvlh2r4cy14rs0svr4yb4fidp2g9wbj8vxx2a5swnjf2fdf8qda";
};
src = fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/3.5.0/libreoffice-core-3.5.0.3.tar.xz";
sha256 = "04hvlj6wzbj3zjpfjq975mgdmf902ywyf94nxcv067asg83qfcvr";
};
configureScript = "./autogen.sh";
preConfigure = ''
sed -i 's,/usr/bin/env bash,${bash}/bin/bash,' Makefile.in bin/unpack-sources
tar xf $src_translation
# Libreoffice expects by default the translations in ./translations
mv libreoffice-translations-3.5.0.3/translations .
tar xf $src_help
# Libreoffice expects by default the help in ./helpcontent2
mv libreoffice-help-3.5.0.3/helpcontent2 .
sed -i 's,/bin/bash,${bash}/bin/bash,' sysui/desktop/share/makefile.mk solenv/bin/localize
sed -i 's,/usr/bin/env bash,${bash}/bin/bash,' bin/unpack-sources \
solenv/bin/install-gdb-printers solenv/bin/striplanguagetags.sh
sed -i 's,/usr/bin/env perl,${perl}/bin/perl,' solenv/bin/concat-deps.pl solenv/bin/ooinstall
sed -i 's,ANT_OPTS+="\(.*\)",ANT_OPTS+=\1,' apache-commons/java/*/makefile.mk
# Needed to find genccode
PATH=$PATH:${icu}/sbin
configureFlagsArray=("--with-lang=${langsSpaces}")
'';
buildPhase = ''
# This is required as some cppunittests require fontconfig configured
export FONTCONFIG_FILE=${fontsConf}
mkdir src
for a in $srcs_download; do
FILE=$(basename $a)
# take out the hash
@ -41,14 +70,8 @@ stdenv.mkDerivation rec {
sed '/wget nor curl/{n;d}' -i download
./download
# Fix svtools: hardcoded jpeg path
sed -i -e 's,^JPEG3RDLIB=.*,JPEG3RDLIB=${libjpeg}/lib/libjpeg.so,' solenv/inc/libs.mk
# Fix sysui: wants to create a tar for root
sed -i -e 's,--own.*root,,' sysui/desktop/slackware/makefile.mk
# Fix libtextcat: wants to set rpath to /usr/local/lib
sed -i -e 's,^CONFIGURE_FLAGS.*,& --prefix='$TMPDIR, libtextcat/makefile.mk
# Fix hunspell: the checks fail due to /bin/bash missing, and I find this fix easier
sed -i -e 's,make && make check,make,' hunspell/makefile.mk
# Fix redland: wants to set rpath to /usr/local/lib
sed -i -e 's,^CONFIGURE_FLAGS.*,& --prefix='$TMPDIR, redland/redland/makefile.mk \
redland/raptor/makefile.mk redland/rasqal/makefile.mk
@ -61,55 +84,46 @@ stdenv.mkDerivation rec {
make
'';
configureFlags = [
# Helpful, while testing the expression
# "--with-num-cpus=4"
# It installs only things to $out/lib/libreoffice
postInstall = ''
mkdir -p $out/bin
for a in sbase scalc sdraw smath swriter spadmin simpress soffice; do
ln -s $out/lib/libreoffice/program/$a $out/bin/$a
done
'';
configureFlags = [
"--enable-verbose"
# Without these, configure does not finish
"--disable-gnome-vfs"
"--disable-gstreamer"
"--disable-opengl"
"--without-junit"
"--without-system-mythes"
# Without this, it wants to download
"--with-cairo"
"--with-system-cairo"
"--with-system-libs"
"--with-system-python"
"--enable-python=system"
"--with-system-boost"
"--with-system-db"
# I imagine this helps. Copied from go-oo.
"--disable-epm"
"--disable-fontooo"
"--disable-gnome-vfs"
"--disable-gnome-vfs"
"--disable-mathmldtd"
"--disable-mozilla"
"--disable-odk"
"--disable-pasf"
"--disable-dbus"
"--disable-kde"
"--disable-kde4"
"--disable-mono"
"--disable-postgresql-sdbc"
"--with-package-format=native"
"--with-jdk-home=${jdk}"
"--with-ant-home=${ant}"
"--without-afms"
"--without-dict"
"--without-fonts"
"--without-myspell-dicts"
"--without-nas"
"--without-ppds"
"--without-system-agg"
"--without-system-beanshell"
"--without-system-hsqldb"
"--without-system-xalan"
"--without-system-xerces"
"--without-system-xml-apis"
"--without-system-xt"
"--without-system-jars"
"--without-system-hunspell"
"--without-system-altlinuxhyph"
@ -119,15 +133,20 @@ stdenv.mkDerivation rec {
"--without-system-libwps"
"--without-system-libwpg"
"--without-system-redland"
"--without-system-libvisio"
"--without-system-libcmis"
"--without-system-nss"
"--without-system-sampleicc"
"--without-system-libexttextcat"
];
buildInputs = [
pam python tcsh libxslt perl ArchiveZip CompressZlib zlib
libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl
libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack
getopt file jdk cairo which icu boost libXext libX11 libXtst libXi
cups libXinerama openssl gperf GConf ORBit2
ant autoconf openldap postgresql cppunit
getopt file jdk cairo which icu boost libXext libX11 libXtst libXi mesa
cups libXinerama openssl gperf GConf ORBit2 gnome_vfs gstreamer gst_plugins_base
ant autoconf openldap cppunit poppler librsvg automake
];
meta = {

37
pkgs/applications/taxes/aangifte-2011/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
stdenv.mkDerivation {
name = "aangifte2011-1";
src = fetchurl {
url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2011_linux.tar.gz;
sha256 = "0br9cfy3ibykzbhc1mkm7plxrs251vakpd5gai0m13bwgc04jrd2";
};
dontStrip = true;
dontPatchELF = true;
buildInputs = [ makeWrapper ];
buildPhase =
''
for i in bin/*; do
patchelf \
--set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \
$i
done
'';
installPhase =
''
mkdir -p $out
cp -prvd * $out/
wrapProgram $out/bin/ib2011ux --prefix PATH : ${xdg_utils}/bin
'';
meta = {
description = "Elektronische aangifte IB 2011 (Dutch Tax Return Program)";
url = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
};
}

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

@ -4,14 +4,14 @@
}:
let
version = "3.20120230";
version = "3.20120309";
in
stdenv.mkDerivation {
name = "git-annex-${version}";
src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz";
sha256 = "2406fd1405bcdc30cb57ba0455919b5bad2be64bcfe6b6f921cd6ea1797a66fa";
sha256 = "54b2d6a9660a700cbe914e8613c1a4bc265f912cf157be774e2b5ea5775a4502";
};
buildInputs = [
@ -27,7 +27,7 @@ stdenv.mkDerivation {
preConfigure = ''
makeFlagsArray=( PREFIX=$out )
sed -i -e 's|#!/usr/bin/perl|#!${perl}/bin/perl|' mdwn2man
sed -i -e 's|"cp |"${coreutils}/bin/cp |' -e 's|"rm -f |"${coreutils}/bin/rm -f |' -e 's|, test_addurl||' test.hs
sed -i -e 's|"cp |"${coreutils}/bin/cp |' -e 's|"rm -f |"${coreutils}/bin/rm -f |' test.hs
'';
meta = {

4
pkgs/applications/version-management/subversion/default.nix
View File

@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport;
stdenv.mkDerivation rec {
version = "1.7.3";
version = "1.7.4";
name = "subversion-${version}";
src = fetchurl {
url = "mirror://apache/subversion//${name}.tar.bz2";
sha1 = "624d4070361c0e8d7cf4f5c667629e72459b122d";
sha1 = "57a3cd351c1dbedddd020e7a1952df6cd2674527";
};
buildInputs = [ zlib apr aprutil sqlite ]

4
pkgs/applications/video/cinelerra/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchgit, sourceFromHead, autoconf, automake, libtool
, pkgconfig, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394
, libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg
, libtiff, freetype, mjpegtools, x264, gettext, openexr, esound
, libtiff, freetype, mjpegtools, x264, gettext, openexr
, libXext, libXxf86vm, libXv, libXi, libX11, xextproto, libtheora, libpng
, libdv, libuuid, file, nasm, perl }:
@ -33,7 +33,7 @@ stdenv.mkDerivation {
faad2 faac
a52dec alsaLib fftw lame libavc1394 libiec61883
libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype
mjpegtools x264 gettext openexr esound
mjpegtools x264 gettext openexr
libXext libXxf86vm libXv libXi libX11 xextproto
libtheora libpng libdv libuuid
nasm

16
pkgs/applications/video/gnash/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl
, SDL, SDL_mixer, gstreamer, gstPluginsBase, gstPluginsGood
, gstFfmpeg, speex
, SDL, SDL_mixer, gstreamer, gst_plugins_base, gst_plugins_good
, gst_ffmpeg, speex
, libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool
, boost, freetype, agg, dbus, curl, pkgconfig, gettext
, glib, gtk, gtkglext, x11, ming, dejagnu, python, perl
@ -44,8 +44,8 @@ stdenv.mkDerivation rec {
# XXX: KDE is supported as well so we could make it available optionally.
buildInputs = [
gettext x11 SDL SDL_mixer gstreamer gstPluginsBase gstPluginsGood
gstFfmpeg speex libtool
gettext x11 SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good
gst_ffmpeg speex libtool
libogg libxml2 libjpeg mesa libpng libungif boost freetype agg
dbus curl pkgconfig glib gtk gtkglext
xulrunner
@ -63,10 +63,10 @@ stdenv.mkDerivation rec {
--enable-media=gst \
--enable-gui=gtk"
# In `libmedia', Gnash compiles with "-I$gstPluginsBase/include",
# whereas it really needs "-I$gstPluginsBase/include/gstreamer-0.10".
# In `libmedia', Gnash compiles with "-I$gst_plugins_base/include",
# whereas it really needs "-I$gst_plugins_base/include/gstreamer-0.10".
# Work around this using GCC's $CPATH variable.
export CPATH="${gstPluginsBase}/include/gstreamer-0.10:${gstPluginsGood}/include/gstreamer-0.10"
export CPATH="${gst_plugins_base}/include/gstreamer-0.10:${gst_plugins_good}/include/gstreamer-0.10"
echo "\$CPATH set to \`$CPATH'"
echo "\$GST_PLUGIN_PATH set to \`$GST_PLUGIN_PATH'"
@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
do
wrapProgram "$prog" --prefix \
GST_PLUGIN_PATH ":" \
"${gstPluginsBase}/lib/gstreamer-0.10:${gstPluginsGood}/lib/gstreamer-0.10:${gstFfmpeg}/lib/gstreamer-0.10"
"${gst_plugins_base}/lib/gstreamer-0.10:${gst_plugins_good}/lib/gstreamer-0.10:${gst_ffmpeg}/lib/gstreamer-0.10"
done
'';

64
pkgs/applications/video/tvtime/default.nix Normal file
View File

@ -0,0 +1,64 @@
{stdenv, fetchurl, xlibs, libX11, libXtst, libSM, libXext, libXv, libXxf86vm, libXau,
libXdmcp, zlib, libpng, libxml2, freetype, libICE, intltool, libXinerama, gettext,
pkgconfig, kernel, file, libXi}:
stdenv.mkDerivation rec {
name = "tvtime-1.0.2";
src = fetchurl {
url = "mirror://sourceforge/tvtime/${name}.tar.gz";
sha256 = "aef2a4bab084df252428d66cabec61b4c63fab32cdfc0cc6599d82efd77f0523";
};
# many of these patches were copied from gentoo's portage team (maybe all?!)
patchPhase = ''
# to avoid this error message:
# ...-glibc-2.12.2/include/xlocale.h:43:20: note: previous declaration of 'locale_t' was here
patch -p1 < ${ ./tvtime-1.0.2-glibc-2.10.patch}
# to avoid this error message:
# videodev2.h:19:46: fatal error: linux/compiler.h: No such file or directory
sed -i -e "s/videodev.h/linux\/videodev.h/" src/videoinput.c
sed -i -e "s/videodev2.h/linux\/videodev2.h/" src/videoinput.c
# to avoid this error message:
# 1 out of 2 hunks FAILED -- saving rejects to file src/Makefile.am.rej
patch -p1 < ${ ./tvtime-1.0.2-libsupc++.patch }
# to avoid this error message:
# ../plugins/greedyh.asm:21:6: error: extra qualification 'DScalerFilterGreedyH::' on member 'filterDScaler_SSE'
patch -p1 < ${ ./tvtime-1.0.2-gcc41.patch }
# compiles without this patch
patch -p1 < ${ ./tvtime-pic.patch }
# compiles without this patch
patch -p1 < ${ ./tvtime-1.0.2-autotools.patch }
# compiles without this patch
patch -p1 < ${ ./tvtime-1.0.2-xinerama.patch }
# libpng 1.5 patch (gentoo)
patch -p1 < ${ ./tvtime-libpng-1.5.patch }
# /usr/bin/file - ltmain.sh configure aclocal.m4
sed -i -e "s%/usr/bin/file%/nix/store/f92pyxmbi274q7fzrfnlc2xiy6d3cyi1-file-5.04/bi/file%g" ltmain.sh
sed -i -e "s%/usr/bin/file%/nix/store/f92pyxmbi274q7fzrfnlc2xiy6d3cyi1-file-5.04/bin/file%g" configure
sed -i -e "s%/usr/bin/file%/nix/store/f92pyxmbi274q7fzrfnlc2xiy6d3cyi1-file-5.04/bin/file%g" aclocal.m4
'';
configureFlags = ''
--x-includes=${xlibs.libX11}/include
--x-libraries=${xlibs.libX11}/lib
'';
buildInputs = [ libX11 libXtst libSM libXext libXv libXxf86vm libXau libXdmcp zlib libpng libxml2 freetype libICE intltool libXinerama gettext pkgconfig file libXi ];
meta = {
description = "High quality television application for use with video capture cards";
homepage = lhttp://tvtime.sourceforge.net/;
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [qknight];
platforms = with stdenv.lib.platforms; linux;
};
}

15
pkgs/applications/video/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch Normal file
View File

@ -0,0 +1,15 @@
Index: tvtime-1.0.2/src/videoinput.c
===================================================================
--- tvtime-1.0.2.orig/src/videoinput.c
+++ tvtime-1.0.2/src/videoinput.c
@@ -35,8 +35,8 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include "videodev.h"
-#include "videodev2.h"
+#include <linux/videodev.h>
+#include <linux/videodev2.h>
#include "videoinput.h"
#include "mixer.h"

73
pkgs/applications/video/tvtime/tvtime-1.0.2-autotools.patch Normal file
View File

@ -0,0 +1,73 @@
Index: tvtime-1.0.2/src/Makefile.am
===================================================================
--- tvtime-1.0.2.orig/src/Makefile.am
+++ tvtime-1.0.2/src/Makefile.am
@@ -19,9 +19,6 @@ pkgsysconfdir = $(sysconfdir)/@PACKAGE@
tmpdir = /tmp
localedir = $(datadir)/locale
-TTF_CFLAGS = `$(FREETYPE_CONFIG) --cflags`
-TTF_LIBS = `$(FREETYPE_CONFIG) --libs`
-
# Set the following if you want to specify an additional font directory
# FONT_CFLAGS = -DFONTDIR='/usr/share/fonts/truetype/freefont/'
@@ -76,20 +73,20 @@ tvtime_SOURCES = $(COMMON_SRCS) $(OUTPUT
tvtime_CFLAGS = $(TTF_CFLAGS) $(PNG_CFLAGS) $(OPT_CFLAGS) \
$(PLUGIN_CFLAGS) $(X11_CFLAGS) $(XML2_FLAG) \
$(FONT_CFLAGS) $(AM_CFLAGS)
-tvtime_LDFLAGS = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \
+tvtime_LDADD = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \
$(X11_LIBS) $(XML2_LIBS) -lm -lsupc++
tvtime_command_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
tvtime-command.c
tvtime_command_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
-tvtime_command_LDFLAGS = $(ZLIB_LIBS) $(XML2_LIBS)
+tvtime_command_LDADD = $(ZLIB_LIBS) $(XML2_LIBS)
tvtime_configure_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
tvtime-configure.c
tvtime_configure_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
-tvtime_configure_LDFLAGS = $(ZLIB_LIBS) $(XML2_LIBS)
+tvtime_configure_LDADD = $(ZLIB_LIBS) $(XML2_LIBS)
tvtime_scanner_SOURCES = utils.h utils.c videoinput.h videoinput.c \
tvtimeconf.h tvtimeconf.c station.h station.c tvtime-scanner.c \
mixer.h mixer.c
tvtime_scanner_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
-tvtime_scanner_LDFLAGS = $(ZLIB_LIBS) $(XML2_LIBS)
+tvtime_scanner_LDADD = $(ZLIB_LIBS) $(XML2_LIBS)
Index: tvtime-1.0.2/configure.ac
===================================================================
--- tvtime-1.0.2.orig/configure.ac
+++ tvtime-1.0.2/configure.ac
@@ -10,6 +10,7 @@ if test x"$host_alias" = x""; then host_
# Check for compilers.
AC_PROG_CC
+AM_PROG_CC_C_O
AC_CHECK_PROG(found_cc, "$CC", yes, no)
test "x$found_cc" = "xyes" || exit 1
@@ -17,9 +18,6 @@ AC_PROG_CXX
AC_CHECK_PROG(found_cxx, "$CXX", yes, no)
test "x$found_cxx" = "xyes" || exit 1
-# Check for libtool.
-AC_PROG_LIBTOOL
-
# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([ctype.h dirent.h errno.h fcntl.h getopt.h langinfo.h math.h netinet/in.h pwd.h signal.h stdint.h stdio.h stdlib.h string.h sys/ioctl.h sys/mman.h sys/resource.h sys/stat.h sys/time.h sys/wait.h sys/types.h unistd.h wordexp.h locale.h])
@@ -65,10 +63,7 @@ dnl ------------------------------------
dnl freetype
dnl ---------------------------------------------
dnl Test for freetype
-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
-if test "$FREETYPE_CONFIG" = "no" ; then
- AC_MSG_ERROR(freetype2 needed and freetype-config not found)
-fi
+PKG_CHECK_MODULES([TTF], [freetype2])
dnl ---------------------------------------------
dnl libxml2

57
pkgs/applications/video/tvtime/tvtime-1.0.2-gcc41.patch Normal file
View File

@ -0,0 +1,57 @@
diff -Naur tvtime-1.0.1/plugins/greedyh.asm tvtime-1.0.1-gcc41/plugins/greedyh.asm
--- tvtime-1.0.1/plugins/greedyh.asm 2005-08-14 18:16:43.000000000 +0200
+++ tvtime-1.0.1-gcc41/plugins/greedyh.asm 2005-11-28 17:53:09.210774544 +0100
@@ -18,7 +18,7 @@
#include "x86-64_macros.inc"
-void DScalerFilterGreedyH::FUNCT_NAME(TDeinterlaceInfo* pInfo)
+void FUNCT_NAME(TDeinterlaceInfo* pInfo)
{
int64_t i;
bool InfoIsOdd = (pInfo->PictureHistory[0]->Flags & PICTURE_INTERLACED_ODD) ? 1 : 0;
diff -Naur tvtime-1.0.1/plugins/tomsmocomp/TomsMoCompAll2.inc tvtime-1.0.1-gcc41/plugins/tomsmocomp/TomsMoCompAll2.inc
--- tvtime-1.0.1/plugins/tomsmocomp/TomsMoCompAll2.inc 2004-10-20 17:31:05.000000000 +0200
+++ tvtime-1.0.1-gcc41/plugins/tomsmocomp/TomsMoCompAll2.inc 2005-11-28 17:53:33.251119856 +0100
@@ -5,9 +5,9 @@
#endif
#ifdef USE_STRANGE_BOB
-#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n##_SB)
+#define SEARCH_EFFORT_FUNC(n) SEFUNC(n##_SB)
#else
-#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n)
+#define SEARCH_EFFORT_FUNC(n) SEFUNC(n)
#endif
int SEARCH_EFFORT_FUNC(0) // we don't try at all ;-)
diff -Naur tvtime-1.0.1/plugins/tomsmocomp.cpp tvtime-1.0.1-gcc41/plugins/tomsmocomp.cpp
--- tvtime-1.0.1/plugins/tomsmocomp.cpp 2004-10-20 19:38:04.000000000 +0200
+++ tvtime-1.0.1-gcc41/plugins/tomsmocomp.cpp 2005-11-28 17:52:53.862107896 +0100
@@ -31,7 +31,7 @@
#define IS_MMX
#define SSE_TYPE MMX
-#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_MMX
+#define FUNCT_NAME filterDScaler_MMX
#include "tomsmocomp/TomsMoCompAll.inc"
#undef IS_MMX
#undef SSE_TYPE
@@ -39,7 +39,7 @@
#define IS_3DNOW
#define SSE_TYPE 3DNOW
-#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_3DNOW
+#define FUNCT_NAME filterDScaler_3DNOW
#include "tomsmocomp/TomsMoCompAll.inc"
#undef IS_3DNOW
#undef SSE_TYPE
@@ -47,7 +47,7 @@
#define IS_SSE
#define SSE_TYPE SSE
-#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_SSE
+#define FUNCT_NAME filterDScaler_SSE
#include "tomsmocomp/TomsMoCompAll.inc"
#undef IS_SSE
#undef SSE_TYPE

24
pkgs/applications/video/tvtime/tvtime-1.0.2-glibc-2.10.patch Normal file
View File

@ -0,0 +1,24 @@
diff -Naur tvtime-1.0.2.org/src/xmltv.c tvtime-1.0.2/src/xmltv.c
--- tvtime-1.0.2.org/src/xmltv.c 2009-07-02 21:48:49.426191088 +0200
+++ tvtime-1.0.2/src/xmltv.c 2009-07-02 21:50:20.842066085 +0200
@@ -118,9 +118,9 @@
typedef struct {
const char *code;
const char *name;
-} locale_t;
+} tvtime_locale_t;
-static locale_t locale_table[] = {
+static tvtime_locale_t locale_table[] = {
{"AA", "Afar"}, {"AB", "Abkhazian"}, {"AF", "Afrikaans"},
{"AM", "Amharic"}, {"AR", "Arabic"}, {"AS", "Assamese"},
{"AY", "Aymara"}, {"AZ", "Azerbaijani"}, {"BA", "Bashkir"},
@@ -168,7 +168,7 @@
{"XH", "Xhosa"}, {"YO", "Yoruba"}, {"ZH", "Chinese"},
{"ZU", "Zulu"} };
-const int num_locales = sizeof( locale_table ) / sizeof( locale_t );
+const int num_locales = sizeof( locale_table ) / sizeof( tvtime_locale_t );
/**
* Timezone parsing code based loosely on the algorithm in

16
pkgs/applications/video/tvtime/tvtime-1.0.2-libsupc++.patch Normal file
View File

@ -0,0 +1,16 @@
Link to libsupc++ instead of bringing in libstdc++ just because tomsocomp
is written in C++. It does not use STL so it needs not the whole standard
library.
Index: tvtime-1.0.2/src/Makefile.am
===================================================================
--- tvtime-1.0.2.orig/src/Makefile.am
+++ tvtime-1.0.2/src/Makefile.am
@@ -77,7 +77,7 @@ tvtime_CFLAGS = $(TTF_CFLAGS) $(PNG_CFLA
$(PLUGIN_CFLAGS) $(X11_CFLAGS) $(XML2_FLAG) \
$(FONT_CFLAGS) $(AM_CFLAGS)
tvtime_LDFLAGS = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \
- $(X11_LIBS) $(XML2_LIBS) -lm -lstdc++
+ $(X11_LIBS) $(XML2_LIBS) -lm -lsupc++
tvtime_command_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
tvtime-command.c

32
pkgs/applications/video/tvtime/tvtime-1.0.2-xinerama.patch Normal file
View File

@ -0,0 +1,32 @@
Index: tvtime-1.0.2/configure.ac
===================================================================
--- tvtime-1.0.2.orig/configure.ac
+++ tvtime-1.0.2/configure.ac
@@ -99,6 +99,8 @@ dnl ------------------------------------
dnl check for X11, Xv and XF86VidModeExtension
dnl ---------------------------------------------
AC_PATH_XTRA
+AC_ARG_WITH([xinerama],
+ [AS_HELP_STRING([--without-xinerama], [Disable Xinerama extension support (default: check)])])
if test x"$no_x" != x"yes"; then
dnl check for Xshm
AC_CHECK_LIB([Xext],[XShmCreateImage],
@@ -112,11 +114,13 @@ if test x"$no_x" != x"yes"; then
X11_LIBS="$X11_LIBS -lXv"],,
[$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lXext])
- dnl check for Xinerama
- AC_CHECK_LIB([Xinerama],[XineramaQueryScreens],
- [AC_DEFINE([HAVE_XINERAMA],,[Xinerama support])
- X11_LIBS="$X11_LIBS -lXinerama"],,
- [$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lXext])
+ if test "x$with_xinerama" != "xno"; then
+ dnl check for Xinerama
+ AC_CHECK_LIB([Xinerama],[XineramaQueryScreens],
+ [AC_DEFINE([HAVE_XINERAMA],,[Xinerama support])
+ X11_LIBS="$X11_LIBS -lXinerama"],,
+ [$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lXext])
+ fi
dnl check for XTest
AC_CHECK_LIB([Xtst],[XTestFakeKeyEvent],

14
pkgs/applications/video/tvtime/tvtime-libpng-1.5.patch Normal file
View File

@ -0,0 +1,14 @@
Include zlib.h which is no longer implicitly included with libpng-1.5
Bug 369663
diff -ru tvtime-111b28cca42d.orig/src/pngoutput.c tvtime-111b28cca42d/src/pngoutput.c
--- tvtime-111b28cca42d.orig/src/pngoutput.c 2011-02-01 02:35:26.000000000 +0100
+++ tvtime-111b28cca42d/src/pngoutput.c 2011-06-02 13:36:55.965999463 +0200
@@ -18,6 +18,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <zlib.h>
#include <png.h>
#include "pngoutput.h"

11
pkgs/applications/video/tvtime/tvtime-pic.patch Normal file
View File

@ -0,0 +1,11 @@
--- tvtime/src/cpu_accel.c
+++ tvtime/src/cpu_accel.c
@@ -35,7 +35,7 @@
int AMD;
uint32_t caps;
-#ifndef PIC
+#if !defined(__PIC__) || defined(__x86_64__)
#define cpuid(op,eax,ebx,ecx,edx) \
__asm__ ("cpuid" \
: "=a" (eax), \

38
pkgs/applications/video/zapping/0.10.nix
View File

@ -1,38 +0,0 @@
{ teletextSupport ? true
, jpegSupport ? true
, pngSupport ? true
, recordingSupport ? true
# !!! libXext shouldn't be necessary (it's in x11); but the builder needs it.
, stdenv, fetchurl, pkgconfig, perl, python, x11
, libXv, libXmu, libXext, libgnomeui
, libglade, scrollkeeper, esound, gettext, perlXMLParser
, zvbi ? null, libjpeg ? null, libpng ? null, rte ? null }:
assert teletextSupport -> zvbi != null && zvbi.pngSupport
/* !!! && pngSupport && zvbi.libpng == libpng */;
assert jpegSupport -> libjpeg != null;
assert pngSupport -> libpng != null;
assert recordingSupport -> rte != null;
stdenv.mkDerivation {
name = "zapping-0.10cvs6";
builder = ./builder.sh;
src = fetchurl {
url = http://nixos.org/tarballs/zapping-0.10cvs6.tar.bz2;
md5 = "6aa7614ac3fd5d39c89c2198598ad27b";
};
inherit teletextSupport jpegSupport pngSupport libXext;
buildInputs = [
pkgconfig perl perlXMLParser python x11 libXv libXmu libgnomeui
libglade scrollkeeper esound gettext
(if teletextSupport then zvbi else null)
(if jpegSupport then libjpeg else null)
(if pngSupport then libpng else null)
(if recordingSupport then rte else null)
];
}

9
pkgs/applications/video/zapping/builder.sh
View File

@ -1,9 +0,0 @@
source $stdenv/setup
# !!! hack
NIX_LDFLAGS="$NIX_LDFLAGS -rpath $libXext/lib"
# !!! hack - `make install' tries to setuid to root
installFlags="ZSFB_OWNER=`id -u` ZSFB_GROUP=`id -g`"
genericBuild

39
pkgs/applications/video/zapping/default.nix
View File

@ -1,39 +0,0 @@
{ teletextSupport ? true
, jpegSupport ? true
, pngSupport ? true
, recordingSupport ? true
# !!! libXext shouldn't be necessary (it's in x11); but the builder needs it.
, stdenv, fetchurl, pkgconfig, perl, python, x11
, libXv, libXmu, libXext, libgnomeui
, libglade, scrollkeeper, esound, gettext, perlXMLParser
, zvbi ? null, libjpeg ? null, libpng ? null, rte ? null }:
assert teletextSupport -> zvbi != null && zvbi.pngSupport
/* !!! && pngSupport && zvbi.libpng == libpng */;
assert jpegSupport -> libjpeg != null;
assert pngSupport -> libpng != null;
assert recordingSupport -> rte != null;
stdenv.mkDerivation {
name = "zapping-0.9.6";
builder = ./builder.sh;
src = fetchurl {
url = mirror://sourceforge/zapping/zapping-0.9.6.tar.bz2;
md5 = "8306775c6a11de4d72345b5eee970ea6";
};
inherit teletextSupport jpegSupport pngSupport libXext;
buildInputs = [
pkgconfig perl perlXMLParser python x11 libXv libXmu libgnomeui
libglade scrollkeeper esound gettext
(if teletextSupport then zvbi else null)
(if jpegSupport then libjpeg else null)
(if pngSupport then libpng else null)
(if recordingSupport then rte else null)
];
}

32
pkgs/applications/virtualization/OVMF/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ stdenv, edk2 }:
let
targetArch = if stdenv.isi686 then
"Ia32"
else if stdenv.isx86_64 then
"X64"
else
throw "Unsupported architecture";
in
stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
name = "OVMF-2012-03-13";
unpackPhase = ''
for file in \
"${edk2.src}"/{OvmfPkg,UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg};
do
ln -sv "$file" .
done
'';
meta = {
description = "Sample UEFI firmware for QEMU and KVM";
homepage = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF;
license = "BSD";
maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = ["x86_64-linux" "i686-linux"];
};
})

21
pkgs/build-support/gcc-cross-wrapper/default.nix
View File

@ -20,13 +20,20 @@ let
phases = [ "installPhase" ];
installPhase = ''
echo $out
mkdir -p $out
cp -Rd ${gcc}/${cross.config}/lib $out/lib
chmod -R +w $out/lib
for a in $out/lib/*.la; do
sed -i -e s,${gcc}/${cross.config}/lib,$out/lib,g $a
done
rm -f $out/lib/*.py
mkdir -p "$out"
if [ -d "${gcc}/${cross.config}/lib" ]
then
cp -Rd "${gcc}/${cross.config}/lib" "$out/lib"
chmod -R +w "$out/lib"
for a in "$out/lib/"*.la; do
sed -i -e "s,${gcc}/${cross.config}/lib,$out/lib,g" $a
done
rm -f "$out/lib/"*.py
else
# The MinGW cross-compiler falls into this category.
mkdir "$out/lib"
fi
'';
};
in

14
pkgs/build-support/vm/default.nix
View File

@ -403,6 +403,7 @@ rec {
qemuCommandGeneric = ''
PATH="${samba}/sbin:$PATH" \
${kvm}/bin/qemu-system-x86_64 \
-nographic -no-reboot \
-smb $(pwd) -hda $diskImage \
@ -428,7 +429,6 @@ rec {
- Power-off or reboot the machine.
*/
runInGenericVM = drv: lib.overrideDerivation drv (attrs: {
system = "i686-linux";
requiredSystemFeatures = [ "kvm" ];
builder = "${bash}/bin/sh";
args = ["-e" (vmRunCommand qemuCommandGeneric)];
@ -1248,22 +1248,22 @@ rec {
};
debian50i386 = {
name = "debian-5.0.9-lenny-i386";
fullName = "Debian 5.0.9 Lenny (i386)";
name = "debian-5.0.10-lenny-i386";
fullName = "Debian 5.0.10 Lenny (i386)";
packagesList = fetchurl {
url = mirror://debian/dists/lenny/main/binary-i386/Packages.bz2;
sha256 = "07f54775e2b54e201c7020cd65212fbb44288b1071a73f630f58b68b2d08b2af";
sha256 = "fb390cf043a5b6bac50879ce1c0827882abdb560050313a6a326a03a4fc761d6";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
};
debian50x86_64 = {
name = "debian-5.0.9-lenny-amd64";
fullName = "Debian 5.0.9 Lenny (amd64)";
name = "debian-5.0.10-lenny-amd64";
fullName = "Debian 5.0.10 Lenny (amd64)";
packagesList = fetchurl {
url = mirror://debian/dists/lenny/main/binary-amd64/Packages.bz2;
sha256 = "1jqb3rr5q5y7yyhrymwa51djsydm92zbbmg4vbif65i7sp9ggky0";
sha256 = "1y4bb3n770fgwsrw8qiwsgf17k0ws2d6jmcfvqv07lj77dyj53wc";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;

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

@ -11,10 +11,6 @@
#### PLATFORM
audiofile = callPackage ./platform/audiofile { };
esound = callPackage ./platform/esound { };
libIDL = callPackage ./platform/libIDL {
gettext = if stdenv.isDarwin then gettext else null;
};

12
pkgs/desktops/gnome-2/platform/audiofile/default.nix
View File

@ -1,12 +0,0 @@
{stdenv, fetchurl, alsaLib}:
stdenv.mkDerivation {
name = "audiofile-0.3.2";
src = fetchurl {
url = mirror://gnome/sources/audiofile/0.3/audiofile-0.3.2.tar.xz;
sha256 = "185j69j6b0vp6h6bb4j4ipvcyysxf63ghxnvdhh8kbc7ixm71hgs";
};
buildInputs = [ alsaLib ];
}

13
pkgs/desktops/gnome-2/platform/esound/default.nix
View File

@ -1,13 +0,0 @@
{stdenv, fetchurl, pkgconfig, alsaLib, audiofile}:
stdenv.mkDerivation {
name = "esound-0.2.41";
src = fetchurl {
url = mirror://gnome/sources/esound/0.2/esound-0.2.41.tar.bz2;
sha256 = "04a9ldy7hsvry1xmfhzg5is2dabsp8m6a82vkai64d2blqlxvday";
};
buildInputs = [ pkgconfig ];
propagatedBuildInputs = [ alsaLib audiofile ];
}

9
pkgs/desktops/kde-4.8/kde-runtime.nix
View File

@ -1,5 +1,5 @@
{ kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica
, libcanberra, virtuoso, samba, ntrack, libjpeg
, libcanberra, virtuoso, samba, ntrack, libjpeg, fetchurl
}:
kde {
@ -10,6 +10,13 @@ kde {
passthru.propagatedUserEnvPackages = [ virtuoso ];
patches = map fetchurl [{
# See https://bugs.kde.org/show_bug.cgi?id=289932
url = "http://bugsfiles.kde.org/attachment.cgi?id=69386";
name = "resourceidentifier.patch";
sha256 = "1fpjg1yc191i6ga9sz6r530q9zwh790m3qahsp0i6kzajwpi7jwz";
}];
meta = {
license = "LGPL";
};

10
pkgs/desktops/kde-4.8/kdebindings/smokekde.nix
View File

@ -1,10 +0,0 @@
{ kde, kdelibs, smokeqt }:
kde {
propagatedBuildInputs = [ kdelibs smokeqt ];
meta = {
description = "C++ parser used to generate language bindings for Qt/KDE";
license = "GPLv2";
};
}

7
pkgs/desktops/kde-4.8/kdepim-runtime.nix
View File

@ -5,13 +5,6 @@ kde {
buildInputs = [ kdepimlibs akonadi boost shared_desktop_ontologies libxml2
libxslt ];
patches = map fetchurl [ {
# See https://bugs.kde.org/show_bug.cgi?id=289932
url = "http://bugsfiles.kde.org/attachment.cgi?id=68763";
name = "delays-in-nepomuk-indexing.patch";
sha256 = "0j3ndqwvi4bg789jb0wqsh2zpwi1gwdyng9gdmng189dx409jf85";
} ];
meta = {
description = "KDE PIM runtime";
license = "GPL";

29
pkgs/desktops/kde-4.8/kipi-plugins.nix
View File

@ -1,29 +0,0 @@
{ stdenv, fetchurl, cmake, kdelibs, qt4, automoc4, phonon, libkexiv2
, libkdcraw, libkipi, gettext, libxml2, libxslt, qjson, qca2
, kdepimlibs }:
stdenv.mkDerivation rec {
name = "kipi-plugins-1.9.0";
src = fetchurl {
url = "mirror://sourceforge/kipi/${name}.tar.bz2";
sha256 = "0k4k9v1rj7129n0s0i5pvv4rabx0prxqs6sca642fj95cxc6c96m";
};
buildInputs =
# Some dependencies are missing because they are very big (OpenCV,
# GTK).
[ cmake kdelibs qt4 automoc4 phonon libkexiv2 libkdcraw libkipi
gettext libxml2 libxslt qjson qca2 kdepimlibs
];
enableParallelBuilding = true;
meta = {
description = "Photo Management Program";
license = "GPL";
homepage = http://www.kipi-plugins.org;
inherit (kdelibs.meta) platforms;
maintainers = with stdenv.lib.maintainers; [ viric urkud ];
};
}

10
pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, gst_all, gtk
, libxfce4util, libxfcegui4, xfce4panel, xfconf, makeWrapper }:
{ stdenv, fetchurl, pkgconfig, intltool, glib, gstreamer, gst_plugins_base
, gtk, libxfce4util, libxfcegui4, xfce4panel, xfconf, makeWrapper }:
let
# The usual Gstreamer plugins package has a zillion dependencies
# that we don't need for a simple mixer, so build a minimal package.
gstPluginsBase = gst_all.gstPluginsBase.override {
gst_plugins_minimal = gst_plugins_base.override {
minimalDeps = true;
};
@ -20,14 +20,14 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ pkgconfig intltool glib gst_all.gstreamer gstPluginsBase gtk
[ pkgconfig intltool glib gstreamer gst_plugins_minimal gtk
libxfce4util libxfcegui4 xfce4panel xfconf makeWrapper
];
postInstall =
''
mkdir -p $out/nix-support
echo ${gstPluginsBase} > $out/nix-support/propagated-user-env-packages
echo ${gst_plugins_minimal} > $out/nix-support/propagated-user-env-packages
'';
meta = {

2
pkgs/desktops/xfce-4.6/default.nix
View File

@ -1,7 +1,7 @@
{ callPackage, pkgs }:
rec {
inherit (pkgs.gtkLibs) gtk glib;
inherit (pkgs) gtk glib;
#### CORE

10
pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, gst_all, gtk
, libxfce4util, libxfce4ui, xfce4panel, xfconf }:
{ stdenv, fetchurl, pkgconfig, intltool, glib, gstreamer, gst_plugins_base
, gtk, libxfce4util, libxfce4ui, xfce4panel, xfconf }:
let
# The usual Gstreamer plugins package has a zillion dependencies
# that we don't need for a simple mixer, so build a minimal package.
gstPluginsBase = gst_all.gstPluginsBase.override {
gst_plugins_minimal = gst_plugins_base.override {
minimalDeps = true;
};
@ -20,14 +20,14 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ pkgconfig intltool glib gst_all.gstreamer gstPluginsBase gtk
[ pkgconfig intltool glib gstreamer gst_plugins_minimal gtk
libxfce4util libxfce4ui xfce4panel xfconf
];
postInstall =
''
mkdir -p $out/nix-support
echo ${gstPluginsBase} > $out/nix-support/propagated-user-env-packages
echo ${gst_plugins_minimal} > $out/nix-support/propagated-user-env-packages
'';
meta = {

2
pkgs/desktops/xfce-4.8/default.nix
View File

@ -1,7 +1,7 @@
{ callPackage, pkgs }:
rec {
inherit (pkgs.gtkLibs) gtk glib;
inherit (pkgs) gtk glib;
#### SUPPORT

4
pkgs/development/compilers/Agda-executable/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "Agda-executable";
version = "2.3.0";
sha256 = "1n1ak6z2vh356k9mk0zkiv6dqp9dvx97a7r21b0xnhwkmh3f8p5p";
version = "2.3.0.1";
sha256 = "156nzvpmqi7yizjr4yym2ybc0iv4nqfp84qrpdxcha682k298ib1";
isLibrary = false;
isExecutable = true;
buildDepends = [ Agda ];

74
pkgs/development/compilers/edk2/default.nix Normal file
View File

@ -0,0 +1,74 @@
{ stdenv, fetchsvn, libuuid, pythonFull, iasl }:
let
targetArch = if stdenv.isi686 then
"IA32"
else if stdenv.isx86_64 then
"X64"
else
throw "Unsupported architecture";
edk2 = stdenv.mkDerivation {
name = "edk2-2012-03-13";
src = fetchsvn {
url = https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2;
rev = "13094";
sha256 = "1qfpal0y4sas204ydg3pg3634dm25q1vr94mpgmbdh6yqcviah3h";
};
buildInputs = [ libuuid pythonFull ];
buildPhase = ''
make -C BaseTools
'';
installPhase = ''
mkdir -vp $out
mv -v BaseTools $out
mv -v EdkCompatibilityPkg $out
mv -v edksetup.sh $out
'';
meta = {
description = "Intel EFI development kit";
homepage = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=EDK2;
license = "BSD";
maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = ["x86_64-linux" "i686-linux"];
};
passthru = {
setup = projectDscPath: attrs: {
buildInputs = [ pythonFull ] ++
stdenv.lib.optionals (attrs ? buildInputs) attrs.buildInputs;
configurePhase = ''
mkdir -v Conf
sed -e 's|Nt32Pkg/Nt32Pkg.dsc|${projectDscPath}|' -e \
's|MYTOOLS|GCC46|' -e 's|IA32|${targetArch}|' -e 's|DEBUG|RELEASE|'\
< ${edk2}/BaseTools/Conf/target.template > Conf/target.txt
sed -e 's|DEFINE GCC46_IA32_PREFIX = /usr/bin/|DEFINE GCC46_IA32_PREFIX = ""|' \
-e 's|DEFINE GCC46_X64_PREFIX = /usr/bin/|DEFINE GCC46_X64_PREFIX = ""|' \
-e 's|DEFINE UNIX_IASL_BIN = /usr/bin/iasl|DEFINE UNIX_IASL_BIN = ${iasl}/bin/iasl|' \
< ${edk2}/BaseTools/Conf/tools_def.template > Conf/tools_def.txt
export WORKSPACE="$PWD"
export EFI_SOURCE="$PWD/EdkCompatibilityPkg"
ln -sv ${edk2}/BaseTools BaseTools
ln -sv ${edk2}/EdkCompatibilityPkg EdkCompatibilityPkg
. ${edk2}/edksetup.sh BaseTools
'';
buildPhase = "
build
";
installPhase = "mv -v Build/*/* $out";
} // (removeAttrs attrs [ "buildInputs" ] );
};
};
in
edk2

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

@ -1,14 +1,14 @@
{stdenv, fetchurl, bison, flex}:
stdenv.mkDerivation {
name = "iasl-20090123";
name = "iasl-20120215";
src = fetchurl {
url = http://www.acpica.org/download/acpica-unix-20090123.tar.gz;
md5 = "4ca6484acbf16cf67fd4ba91d32fd0a0";
url = http://www.acpica.org/download/acpica-unix-20120215.tar.gz;
sha256 = "13avirbqdnp7whl6ji8ixkhzdwf1cadl5fg8ggzbxp99bx0rgd5j";
};
buildPhase = "
cd compiler
cd source/compiler
make
cd ..
";

19
pkgs/development/libraries/farsight2/default.nix
View File

@ -1,24 +1,19 @@
{stdenv, fetchurl, libnice, pkgconfig, python, glib, gstreamer, gstPluginsBase,
pygobject, gst_python}:
{ stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst_plugins_base
, pygobject, gst_python, gupnp_igd }:
stdenv.mkDerivation rec {
name = "farsight2-0.0.22";
name = "farsight2-0.0.31";
src = fetchurl {
url = "http://farsight.freedesktop.org/releases/farsight2/${name}.tar.gz";
sha256 = "07yjndkx1p7ij1ifxsnbqbr8943wmq768x4812khka7dx6ii1sv9";
sha256 = "16qz4x14rdycm4nrn5wx6k2y22fzrazsbmihrxdwafx9cyf23kjm";
};
buildInputs = [ libnice pkgconfig python glib gstreamer gstPluginsBase
pygobject gst_python ];
buildInputs = [ libnice python pygobject gst_python gupnp_igd ];
preBuild = ''
sed -e '/^[[] -z/d' -i python/Makefile
find . -name Makefile -execdir sed -e '/^[.]NOEXPORT:/d' -i '{}' ';'
find . -name Makefile -execdir sed -r -e 's/^ {8,8}/\t/' -i '{}' ';'
'';
buildNativeInputs = [ pkgconfig ];
patches = [./makefile.patch];
propagatedBuildInputs = [ gstreamer gst_plugins_base ];
meta = {
homepage = http://farsight.freedesktop.org/wiki/;

37
pkgs/development/libraries/farsight2/makefile.patch
View File

@ -1,37 +0,0 @@
diff -ru farsight2-0.0.16/gst/rtcpfilter/Makefile.am farsight2-0.0.16.new/gst/rtcpfilter/Makefile.am
--- farsight2-0.0.16/gst/rtcpfilter/Makefile.am 2009-05-08 23:34:14.000000000 +0200
+++ farsight2-0.0.16.new/gst/rtcpfilter/Makefile.am 2009-12-27 16:17:32.000000000 +0100
@@ -7,12 +7,14 @@
libfsrtcpfilter_la_CFLAGS = \
$(FS2_CFLAGS) \
$(GST_BASE_CFLAGS) \
+ $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_CFLAGS)
libfsrtcpfilter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libfsrtcpfilter_la_LIBADD = \
$(FS2_LIBS) \
-lgstrtp-@GST_MAJORMINOR@ \
$(GST_BASE_LIBS) \
+ $(GST_PLUGINS_BASE_LIBS) \
$(GST_LIBS)
diff -ru farsight2-0.0.16/gst/rtcpfilter/Makefile.in farsight2-0.0.16.new/gst/rtcpfilter/Makefile.in
--- farsight2-0.0.16/gst/rtcpfilter/Makefile.in 2009-10-06 20:24:00.000000000 +0200
+++ farsight2-0.0.16.new/gst/rtcpfilter/Makefile.in 2009-12-27 16:23:36.000000000 +0100
@@ -314,13 +314,14 @@
libfsrtcpfilter_la_CFLAGS = \
$(FS2_CFLAGS) \
$(GST_BASE_CFLAGS) \
+ $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_CFLAGS)
libfsrtcpfilter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libfsrtcpfilter_la_LIBADD = \
$(FS2_LIBS) \
-lgstrtp-@GST_MAJORMINOR@ \
- $(GST_BASE_LIBS) \
+ $(GST_PLUGINS_BASE_LIBS) \
$(GST_LIBS)
glib_enum_define = FS_RTCP_FILTER

40
pkgs/development/libraries/gnu-efi/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ stdenv
, fetchurl
}:
stdenv.mkDerivation {
name = "gnu-efi-3.0p";
src = fetchurl {
url = "mirror://sourceforge/gnu-efi/gnu-efi_3.0p.orig.tar.gz";
sha256 = "1pm4wk1gma7mb8z19js7kb5y31a0zk308mkafmq6gb0b2a0i39cn";
};
meta = {
description = "GNU EFI development toolchain";
homepage = http://sourceforge.net/projects/gnu-efi/;
license = "GPL";
maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = ["x86_64-linux" "i686-linux"];
};
buildFlags = [
"CC=cc"
"AS=as"
"LD=ld"
"AR=ar"
"RANLIB=ranlib"
"OBJCOPY=objcopy"
];
buildPhase = ''
make $buildFlags
make $buildFlags -C apps clean all
'';
installPhase = ''
make INSTALLROOT="$out" install
mkdir -pv $out/share/gnu-efi
install -D -m644 apps/*.efi $out/share/gnu-efi
'';
}

8
pkgs/development/libraries/gssdp/default.nix
View File

@ -1,10 +1,11 @@
{stdenv, fetchurl, pkgconfig, libsoup, glib, libxml2}:
stdenv.mkDerivation {
name = "gssdp-0.6.1";
name = "gssdp-0.12.1";
src = fetchurl {
url = http://www.gupnp.org/sources/gssdp/gssdp-0.6.1.tar.gz;
sha256 = "1mla3s0p4vabrn4m7il02f1d1ily3712fjw4k9l3x89rqyi2qh7f";
url = mirror://gnome/sources/gssdp/0.12/gssdp-0.12.1.tar.xz;
sha256 = "0irkbzaj9raais6zdnbj3ysjkmdqhmdvfn0p1sz6x0s9ab6b9b0n";
};
buildInputs = [pkgconfig libsoup glib libxml2];
@ -13,5 +14,6 @@ stdenv.mkDerivation {
description = "A GObject-based API for handling resource discovery and announcement over SSDP.";
homepage = http://www.gupnp.org/;
license = "LGPL v2";
platforms = stdenv.lib.platforms.all;
};
}

22
pkgs/development/libraries/gstreamer/default.nix
View File

@ -1,22 +0,0 @@
{ callPackage }:
rec {
gstreamer = callPackage ./gstreamer { };
gstPluginsBase = callPackage ./gst-plugins-base { };
gstPluginsGood = callPackage ./gst-plugins-good { };
gstPluginsUgly = callPackage ./gst-plugins-ugly { };
gstPluginsBad = callPackage ./gst-plugins-bad { };
gstFfmpeg = callPackage ./gst-ffmpeg { };
gnonlin = callPackage ./gnonlin { };
gst_python = callPackage ./gst-python {};
# Header files are in include/${prefix}/
prefix = "gstreamer-0.10";
}

4
pkgs/development/libraries/gstreamer/gnonlin/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gstPluginsBase, gstreamer }:
{ stdenv, fetchurl, pkgconfig, gst_plugins_base, gstreamer }:
stdenv.mkDerivation rec {
name = "gnonlin-0.10.15";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1yz0i3vzpadz5axwdb310bypl4rm1xy2n6mgajja0w2z6afnrfv0";
};
buildInputs = [ gstPluginsBase gstreamer pkgconfig ];
buildInputs = [ gst_plugins_base gstreamer pkgconfig ];
meta = {
homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html";

4
pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, gstPluginsBase, bzip2, yasm
{ fetchurl, stdenv, pkgconfig, gst_plugins_base, bzip2, yasm
, useInternalFfmpeg ? false, ffmpeg ? null }:
stdenv.mkDerivation rec {
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
configureFlags = stdenv.lib.optionalString (!useInternalFfmpeg) "--with-system-ffmpeg";
buildInputs =
[ pkgconfig bzip2 gstPluginsBase ]
[ pkgconfig bzip2 gst_plugins_base ]
++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]);
meta = {

4
pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gstPluginsBase
{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
, libdvdnav, libdvdread }:
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ pkgconfig glib gstreamer gstPluginsBase libdvdnav libdvdread ];
[ pkgconfig glib gstreamer gst_plugins_base libdvdnav libdvdread ];
enableParallelBuilding = true;

4
pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, gstPluginsBase, aalib, cairo
{ fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo
, flac, libjpeg, zlib, speex, libpng, libdv, libcaca
, libiec61883, libavc1394, taglib, pulseaudio
, glib, gstreamer, bzip2
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
configureFlags = "--disable-oss";
buildInputs =
[ pkgconfig glib gstreamer gstPluginsBase libavc1394 libiec61883
[ pkgconfig glib gstreamer gst_plugins_base libavc1394 libiec61883
aalib libcaca cairo libdv flac libjpeg libpng pulseaudio speex
taglib bzip2
];

4
pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gstPluginsBase
{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
, libmad, libdvdread, libmpeg2, libcdio, a52dec }:
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ pkgconfig glib gstreamer gstPluginsBase libmad libdvdread a52dec ];
[ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec ];
enableParallelBuilding = true;

4
pkgs/development/libraries/gstreamer/gst-python/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, python, gstreamer
, gstPluginsBase, pygtk
, gst_plugins_base, pygtk
}:
stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ pkgconfig gstPluginsBase pygtk ]
[ pkgconfig gst_plugins_base pygtk ]
;
propagatedBuildInputs = [ gstreamer python ];

49
pkgs/development/libraries/gstreamer/qt-gstreamer/boost1.48.patch Normal file
View File

@ -0,0 +1,49 @@
Description: Work around moc limitations
Some parts of Boost, introduced in Boost 1.48 are not
understood by the limited C++ parser of moc. This
patch defines header guards that prevent the troublesome boost
headers from being processed.
Bug-Debian: #653796
Author: Tobias Frost <tobi@coldtobi.de>
Reviewed-By: Steve Robbins <smr@debian.org>
--- a/src/QGlib/connect.h
+++ b/src/QGlib/connect.h
@@ -19,6 +19,11 @@
#ifndef QGLIB_CONNECT_H
#define QGLIB_CONNECT_H
+#ifdef Q_MOC_RUN
+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
+#endif
+
+
#include "global.h"
#include "quark.h"
#include <QtCore/QObject>
--- a/src/QGst/bin.h
+++ b/src/QGst/bin.h
@@ -19,6 +19,10 @@
#ifndef QGST_BIN_H
#define QGST_BIN_H
+#ifdef Q_MOC_RUN
+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
+#endif
+
#include "element.h"
#include "childproxy.h"
--- a/src/QGst/Ui/videowidget.h
+++ b/src/QGst/Ui/videowidget.h
@@ -19,6 +19,10 @@
#ifndef QGST_UI_VIDEOWIDGET_H
#define QGST_UI_VIDEOWIDGET_H
+#ifdef Q_MOC_RUN
+#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
+#endif
+
#include "global.h"
#include "../element.h"
#include <QtGui/QWidget>

18
pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix Normal file
View File

@ -0,0 +1,18 @@
{ stdenv, fetchurl, gstreamer, gst_plugins_base, boost, glib, qt4, cmake
, automoc4, flex, bison, pkgconfig }:
stdenv.mkDerivation rec {
name = "${pname}-0.10.1";
pname = "qt-gstreamer";
src = fetchurl {
url = "http://gstreamer.freedesktop.org/src/${pname}/${name}.tar.bz2";
sha256 = "0g377jlzlwgywgk7nbv9fd0aimv8wpzrymwzdiaffczxv5xvip5h";
};
buildInputs = [ gstreamer gst_plugins_base glib qt4 ];
propagatedBuildInputs = [ boost ];
buildNativeInputs = [ cmake automoc4 flex bison pkgconfig ];
patches = [ ./boost1.48.patch ];
}

21
pkgs/development/libraries/gupnp-igd/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchurl, pkgconfig, glib, gupnp, python, pygobject }:
stdenv.mkDerivation rec {
name = "gupnp-igd-0.2.1";
src = fetchurl {
url = "http://www.gupnp.org/sites/all/files/sources/${name}.tar.gz";
sha256 = "18ia8l24hbylz3dnbg2jf848bmbx0hjkq4fkwzzfn57z021f0fh2";
};
propagatedBuildInputs = [ gupnp ];
buildInputs = [ glib python pygobject ];
buildNativeInputs = [ pkgconfig ];
meta = {
homepage = http://www.gupnp.org/;
};
}

17
pkgs/development/libraries/gupnp/default.nix
View File

@ -1,12 +1,19 @@
{ stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, e2fsprogs }:
{ stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, libuuid }:
stdenv.mkDerivation {
name = "gupnp-0.12";
name = "gupnp-0.18.1";
src = fetchurl {
url = http://www.gupnp.org/sources/gupnp/gupnp-0.12.tar.gz;
sha256 = "1sm1rqvx752nb3j1yl7h30kx2ymndkji8m73fxshjssmc6z40ayg";
url = mirror://gnome/sources/gupnp/0.18/gupnp-0.18.1.tar.xz;
sha256 = "1bn98mw4zicg0a7a2xjr4j93ksnpwkhccii8y8zy08g7x2jg3dhk";
};
buildInputs = [ pkgconfig glib libxml2 gssdp libsoup e2fsprogs ];
propagatedBuildInputs = [ libxml2 libsoup gssdp ];
buildInputs = [ glib libuuid ];
buildNativeInputs = [ pkgconfig ];
meta = {
homepage = http://www.gupnp.org/;
};
}

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "Agda";
version = "2.3.0";
sha256 = "1p0cwf3d146z73gp49cm8fmk33hcbjsvyijbakm1871ssc5i73k0";
version = "2.3.0.1";
sha256 = "0f2kc3by2z01g8bqc446hyzx9sidx6qi0p7h5bcpjf8iryk1dh2w";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "Hipmunk";
version = "5.2.0.6";
sha256 = "16yh7v6v05nksspcfz8h054piyhmrfbpaada36562rjxcywyfnfj";
version = "5.2.0.7";
sha256 = "1cinxhz4qb8xcbygifx85q4zf6pmjwi90v01vqwyvwlfxmbk0j7k";
buildDepends = [ StateVar transformers ];
noHaddock = true;
meta = {

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cairo";
version = "0.12.2";
sha256 = "1sa0xfx14y4imq3bd9l0rqrmxls3l9yga249a31zfhcinnr1j9db";
version = "0.12.3";
sha256 = "0kgy6907vs41ws51dwqv6lwvfnvmgd1mns12cxzsifmli1jglswd";
buildDepends = [ mtl ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ cairo libc pkgconfig zlib ];

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "digest";
version = "0.0.1.0";
sha256 = "1p2fk950ivdj7pvc624y0fx48rdh0ax3rw9606926n60mxi9fca0";
version = "0.0.1.1";
sha256 = "1m04szf9yabmm6mkjq2x7a57bjdf2i611wm2k99wdcygb5cvif3v";
extraLibraries = [ zlib ];
meta = {
description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now";

20
pkgs/development/libraries/haskell/gio/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ cabal, glib, gtk2hsBuildtools, mtl }:
cabal.mkDerivation (self: {
pname = "gio";
version = "0.12.3";
sha256 = "0kmqldlgxwj8sh0b5k5gicc5z2n6mc9h3fmdby4wx1l4ska7rajn";
buildDepends = [ glib mtl ];
buildTools = [ gtk2hsBuildtools ];
pkgconfigDepends = [ glib ];
meta = {
homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the GIO";
license = self.stdenv.lib.licenses.lgpl21;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

Some files were not shown because too many files have changed in this diff Show More