nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 16:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/x-updates' into wayland

Browse Source 
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/wayland/default.nix
This commit is contained in:
Carles Pagès 2013-02-18 20:15:59 +01:00
commit d32a973fc9
472 changed files with 16370 additions and 6035 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
maintainers/scripts/generate-cpan-package Executable file
View File

@ -0,0 +1,122 @@
#! /bin/sh -e
export PERL5LIB=/nix/var/nix/profiles/per-user/eelco/cpan-generator/lib/perl5/site_perl
name="$1"
[ -n "$name" ] || { echo "no name"; exit 1; }
cpan -D "$name" > cpan-info
url="$(echo $(cat cpan-info | sed '6!d'))"
[ -n "$url" ] || { echo "no URL"; exit 1; }
url="mirror://cpan/authors/id/$url"
echo "URL = $url" >&2
version=$(cat cpan-info | grep 'CPAN: ' | awk '{ print $2 }')
echo "VERSION = $version"
declare -a xs=($(PRINT_PATH=1 nix-prefetch-url "$url"))
hash=${xs[0]}
path=${xs[1]}
echo "HASH = $hash" >&2
namedash="$(echo $name | sed s/::/-/g)-$version"
attr=$(echo $name | sed s/:://g)
rm -rf cpan_tmp
mkdir cpan_tmp
tar xf "$path" -C cpan_tmp
shopt -s nullglob
meta=$(echo cpan_tmp/*/META.json)
if [ -z "$meta" ]; then
yaml=$(echo cpan_tmp/*/META.yml)
[ -n "$yaml" ] || { echo "no meta file"; exit 1; }
meta=$(echo $yaml | sed s/\.yml$/.json/)
perl -e '
use YAML;
use JSON;
local $/;
$x = YAML::Load(<>);
print encode_json $x;
' < $yaml > $meta
fi
description="$(json abstract < $meta | perl -e '$x = <>; print uc(substr($x, 0, 1)), substr($x, 1);')"
homepage="$(json resources.homepage < $meta)"
if [ -z "$homepage" ]; then
#homepage="$(json meta-spec.url < $meta)"
true
fi
license="$(json license < $meta | json -a 2> /dev/null || true)"
if [ -z "$license" ]; then
license="$(json -a license < $meta)"
fi
license="$(echo $license | sed s/perl_5/perl5/)"
f() {
local type="$1"
perl -e '
use JSON;
local $/;
$x = decode_json <>;
if (defined $x->{prereqs}) {
$x2 = $x->{prereqs}->{'$type'}->{requires};
} elsif ("'$type'" eq "runtime") {
$x2 = $x->{requires};
} elsif ("'$type'" eq "configure") {
$x2 = $x->{configure_requires};
} elsif ("'$type'" eq "build") {
$x2 = $x->{build_requires};
}
foreach my $y (keys %{$x2}) {
next if $y eq "perl";
eval "use $y;";
if (!$@) {
print STDERR "skipping Perl-builtin module $y\n";
next;
}
print $y, "\n";
};
' < $meta | sed s/:://g
}
confdeps=$(f configure)
builddeps=$(f build)
testdeps=$(f test)
runtimedeps=$(f runtime)
buildInputs=$(echo $(for i in $confdeps $builddeps $testdeps; do echo $i; done | sort | uniq))
propagatedBuildInputs=$(echo $(for i in $runtimedeps; do echo $i; done | sort | uniq))
echo "===" >&2
cat <<EOF
$attr = buildPerlPackage {
name = "$namedash";
src = fetchurl {
url = $url;
sha256 = "$hash";
};
EOF
if [ -n "$buildInputs" ]; then
cat <<EOF
buildInputs = [ $buildInputs ];
EOF
fi
if [ -n "$propagatedBuildInputs" ]; then
cat <<EOF
propagatedBuildInputs = [ $propagatedBuildInputs ];
EOF
fi
cat <<EOF
meta = {
homepage = $homepage;
description = "$description";
license = "$license";
};
};
EOF

53
pkgs/applications/audio/guitarix/default.nix Normal file
View File

@ -0,0 +1,53 @@
{ stdenv, fetchurl, python, gettext, intltool, pkgconfig, jackaudio, libsndfile
, glib, gtk, glibmm, gtkmm, fftw, librdf, ladspaH, boost }:
stdenv.mkDerivation rec {
name = "guitarix-${version}";
version = "0.25.2";
src = fetchurl {
url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2";
sha256 = "1wcg3yc2iy72hj6z9l88393f00by0iwhhn8xrc3q55p4rj0mnrga";
};
buildInputs =
[ python gettext intltool pkgconfig jackaudio libsndfile glib gtk glibmm
gtkmm fftw librdf ladspaH boost
];
configurePhase = "python waf configure --prefix=$out";
buildPhase = "python waf build";
installPhase = "python waf install";
meta = {
description = "A virtual guitar amplifier for Linux running with JACK";
longDescription = ''
guitarix is a virtual guitar amplifier for Linux running with
JACK (Jack Audio Connection Kit). It is free as in speech and
free as in beer. Its free sourcecode allows to build it for
other UNIX-like systems also, namely for BSD and for MacOSX.
It takes the signal from your guitar as any real amp would do:
as a mono-signal from your sound card. Your tone is processed by
a main amp and a rack-section. Both can be routed separately and
deliver a processed stereo-signal via JACK. You may fill the
rack with effects from more than 25 built-in modules spanning
from a simple noise-gate to brain-slashing modulation-fx like
flanger, phaser or auto-wah. Your signal is processed with
minimum latency. On any properly set-up Linux-system you do not
need to wait for more than 10 milli-seconds for your playing to
be delivered, processed by guitarix.
guitarix offers the range of sounds you would expect from a
full-featured universal guitar-amp. You can get crisp
clean-sounds, nice overdrive, fat distortion and a diversity of
crazy sounds never heard before.
'';
homepage = http://guitarix.sourceforge.net/;
license = stdenv.lib.licenses.gpl3Plus;
maintainers = [ stdenv.lib.maintainers.astsmtl ];
platforms = stdenv.lib.platforms.linux;
};
}

3
pkgs/applications/audio/hydrogen/default.nix
View File

@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
postPatch = ''
sed -e 's#/usr/lib/ladspa#${ladspaPlugins}/lib/ladspa#' -i libs/hydrogen/src/preferences.cpp
sed '/\/usr/d' -i libs/hydrogen/src/preferences.cpp
'';
sed "s#pkg_ver.rstrip().split('.')#pkg_ver.rstrip().split('.')[:3]#" -i Sconstruct
'';
# why doesn't scons find librdf?
buildPhase = ''

8
pkgs/applications/audio/qjackctl/default.nix
View File

@ -1,20 +1,22 @@
{ stdenv, fetchurl, qt4, alsaLib, jackaudio, dbus }:
stdenv.mkDerivation rec {
version = "0.3.8";
version = "0.3.9";
name = "qjackctl-${version}";
# some dependencies such as killall have to be installed additionally
src = fetchurl {
url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
sha256 = "1rbipbknq7f8qfma33vwfv2ar3vxkz1p1ykp5mx6nirmcn1nj247";
sha256 = "0a4s7lwd5b67qbwv1yck8bw6zz8ffx1gza5fwflfqrfcfl3dds2y";
};
buildInputs = [ qt4 alsaLib jackaudio dbus ];
configureFlags = "--enable-jack-version";
meta = {
description = "qt jackd control gui tool";
description = "A Qt application to control the JACK sound server daemon";
homepage = http://qjackctl.sourceforge.net/;
license = "GPL";
};

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

@ -8,12 +8,12 @@
assert stdenv ? glibc;
stdenv.mkDerivation rec {
version = "1.1.1";
version = "1.1.2";
name = "darktable-${version}";
src = fetchurl {
url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz";
sha256 = "0k1m7nd42yn4c2jr1ps1g96fqk9pq20cxjp7dmlza61pj2j9nads";
sha256 = "225ebf1bd2ca4cf06aa609f2eda55cb0894ae69bdf4db25fd97b2503c28e1765";
};
buildInputs =

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

@ -4,14 +4,14 @@
, gsl, python, pyxml, lxml, poppler, imagemagick, libwpg }:
stdenv.mkDerivation rec {
name = "inkscape-0.48.3.1";
name = "inkscape-0.48.4";
src = fetchurl {
url = "mirror://sourceforge/inkscape/${name}.tar.bz2";
sha256 = "126vfsafkfj6z65i5vp6g5dg9hvp3dd1zppjhms78257ns2zafq7";
sha256 = "17aiibgdwjqpjc38f0yr2sdlgwngg5ac9srlybjcx9aspf6ashc7";
};
patches = [ ./configure-python-libs.patch ./libpng-1.5.patch ];
patches = [ ./configure-python-libs.patch ];
propagatedBuildInputs = [
# Python is used at run-time to execute scripts, e.g., those from

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

@ -1,4 +1,4 @@
{stdenv, fetchurl, qt, bzip2, lib3ds, levmar, muparser, unzip}:
{stdenv, fetchurl, qt4, bzip2, lib3ds, levmar, muparser, unzip}:
stdenv.mkDerivation rec {
name = "meshlab-1.3.2";
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
sourceRoot = ".";
buildInputs = [ qt unzip ];
buildInputs = [ qt4 unzip ];
meta = {
description = "System for the processing and editing of unstructured 3D triangular meshes";

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau
, libXdmcp, lcms2, libiptcdata
, libXdmcp, lcms2, libiptcdata, expat
, mercurial # Not really needed for anything, but it fails if it does not find 'hg'
}:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp
lcms2 libiptcdata mercurial ];
lcms2 libiptcdata expat mercurial ];
# Disable the use of the RAWZOR propietary libraries
cmakeFlags = [ "-DWITH_RAWZOR=OFF" ];

14
pkgs/applications/graphics/xfig/default.nix
View File

@ -20,20 +20,20 @@ stdenv.mkDerivation {
patches =
let
debPrefix = "http://patch-tracker.debian.org/patch/series/dl/xfig/1:3.2.5.b-2";
debPrefix = "http://patch-tracker.debian.org/patch/series/dl/xfig/1:3.2.5.b-3";
in
[
(fetchurl {
url = "${debPrefix}/35_CVE-2010-4262.dpatch";
sha256 = "18741b3dbipgr55fyp5x0296za3336ylln639jw8yjcyd1call22";
url = "${debPrefix}/35_CVE-2010-4262.patch";
sha256 = "1pj669sz49wzjvvm96gwbnani7wqi0ijh21imqdzqw47qxdv7zp5";
})
(fetchurl {
url = "${debPrefix}/13_remove_extra_libs.dpatch";
sha256 = "0v3k30ib7xq5wfhd3yacnal4gbih7nqw0z0aycvc0hafffl97i46";
url = "${debPrefix}/13_remove_extra_libs.patch";
sha256 = "1qb14ay0c8xrjzhi21jl7sl8mdzxardldzpnflkzml774bbpn8av";
})
(fetchurl {
url = "${debPrefix}/36_libpng15.dpatch";
sha256 = "0ssmvlcpjn3iqj3l38db8j8qpqbzixlwpczq01m49r5w9l3viy8k";
url = "${debPrefix}/36_libpng15.patch";
sha256 = "0jd5bqj7sj9bbnxg2d0y6zmv4ka4qif2x4zc84ngdqga5433anvn";
})
];

20
pkgs/applications/misc/blender/default.nix
View File

@ -1,26 +1,32 @@
{ stdenv, fetchurl, SDL, cmake, gettext, ilmbase, libXi, libjpeg,
libpng, libsamplerate, libtiff, mesa, openal, openexr, openjpeg,
python, zlib, boost }:
python, zlib, boost, glew, xlibs }:
stdenv.mkDerivation rec {
name = "blender-2.63a";
name = "blender-2.65a";
src = fetchurl {
url = "http://download.blender.org/source/${name}.tar.gz";
sha256 = "c479b1abfe5fd8a1a5d04b8d21fdbc0fc960d7855b24785b888c09792bca4c1a";
sha256 = "1p7nszbqsn48s6jrj0bqav7q52gj82rpv1w5lhh64v092m3v9jpq";
};
buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal
SDL openexr libsamplerate libXi libtiff ilmbase openjpeg boost ];
SDL openexr libsamplerate libXi libtiff ilmbase openjpeg boost glew xlibs.libXxf86vm ];
patches = [ ./fix-include.patch ];
cmakeFlags = [
"-DOPENEXR_INC=${openexr}/include/OpenEXR"
"-DWITH_OPENCOLLADA=OFF"
"-DWITH_INSTALL_PORTABLE=OFF"
"-DPYTHON_LIBPATH=${python}/lib"
];
"-DPYTHON_LIBRARY=${python}/lib"
"-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}"
"-DOPENJPEG_INCLUDE_DIR=${openjpeg}/include"
"-DWITH_CYCLES=0" # would need openimageio
]; # ToDo?: more options available
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}";
NIX_CFLAGS_COMPILE = "-I${openjpeg}/include/${openjpeg.incDir} -I${ilmbase}/include/OpenEXR";
NIX_CFLAGS_LINK = "-lpython3";
enableParallelBuilding = true;

12
pkgs/applications/misc/blender/fix-include.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/intern/smoke/intern/WAVELET_NOISE.h b/intern/smoke/intern/WAVELET_NOISE.h
index fce901b..1f73c5e 100644
--- a/intern/smoke/intern/WAVELET_NOISE.h
+++ b/intern/smoke/intern/WAVELET_NOISE.h
@@ -43,6 +43,7 @@
#ifndef WAVELET_NOISE_H
#define WAVELET_NOISE_H
+#include <string.h>
#include <MERSENNETWISTER.h>
#ifdef WIN32

14
pkgs/applications/misc/calibre/default.nix
View File

@ -1,17 +1,15 @@
{ stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
, imagemagick, libjpeg, fontconfig, podofo, qt4, icu, sqlite
, pil, makeWrapper, unrar, chmlib, pythonPackages, xz
, pil, makeWrapper, unrar, chmlib, pythonPackages, xz, udisks, libusb1, libmtp
}:
stdenv.mkDerivation rec {
name = "calibre-0.8.51";
name = "calibre-0.8.70";
# 0.9.* versions won't build: https://bugs.launchpad.net/calibre/+bug/1094719
src = fetchurl {
urls = [
"http://calibre-ebook.googlecode.com/files/${name}.tar.xz"
"mirror://sourceforge/calibre/${name}.tar.xz"
];
sha256 = "1grcc0k9qpfpwp863x52rl9wj4wz61hcz67l8h2jmli0wxiq44z1";
url = "mirror://sourceforge/calibre/${name}.tar.xz";
sha256 = "12avwp8r6cnrw6c32gmd2hksa9rszdb76zs6fcmr3n8r1wkwa71g";
};
inherit python;
@ -23,7 +21,7 @@ stdenv.mkDerivation rec {
fontconfig podofo qt4 pil chmlib icu
pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
pythonPackages.cssutils pythonPackages.beautifulsoup
pythonPackages.sqlite3 sqlite
pythonPackages.sqlite3 sqlite udisks libusb1 libmtp
];
installPhase = ''

10
pkgs/applications/misc/djvulibre/default.nix
View File

@ -1,16 +1,14 @@
{ stdenv, fetchurl, libjpeg, libtiff, libpng, ghostscript, libungif, zlib }:
{ stdenv, fetchurl, libjpeg, libtiff, librsvg }:
stdenv.mkDerivation rec {
name = "djvulibre-3.5.24";
name = "djvulibre-3.5.25.3";
src = fetchurl {
url = "mirror://sourceforge/djvu/${name}.tar.gz";
sha256 = "0d1592cmc7scg2jzah47mnvbqldhxb1x9vxm7y64a3iasa0lqwy0";
sha256 = "1q5i5ha4zmj2ahjfhi8cv1rah80vm43m9ads46ji38rgvpb7x3c9";
};
buildInputs = [ libjpeg libtiff libpng ghostscript zlib libungif ];
patches = [ ./gcc-4.6.patch ];
buildInputs = [ libjpeg libtiff librsvg ];
meta = {
description = "A library and viewer for the DJVU file format for scanned images";

658
pkgs/applications/misc/djvulibre/gcc-4.6.patch
View File

@ -1,658 +0,0 @@
commit 3341545edba359b292a8ef6db1b7d342caf3dcf1
Author: Leon Bottou <leon@bottou.org>
Date: Wed May 4 21:25:35 2011 -0700
Added include <stddef.h> for gcc-4.6
diff --git a/libdjvu/BSByteStream.cpp b/libdjvu/BSByteStream.cpp
index b762ccf..d662ab0 100644
--- a/libdjvu/BSByteStream.cpp
+++ b/libdjvu/BSByteStream.cpp
@@ -62,6 +62,7 @@
// - Author: Leon Bottou, 07/1998
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/libdjvu/BSEncodeByteStream.cpp b/libdjvu/BSEncodeByteStream.cpp
index 5d80e51..68bc3e3 100644
--- a/libdjvu/BSEncodeByteStream.cpp
+++ b/libdjvu/BSEncodeByteStream.cpp
@@ -71,6 +71,7 @@
#include "GOS.h"
#endif
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/libdjvu/ByteStream.cpp b/libdjvu/ByteStream.cpp
index 158c33c..be01847 100644
--- a/libdjvu/ByteStream.cpp
+++ b/libdjvu/ByteStream.cpp
@@ -73,6 +73,7 @@
#include "GOS.h"
#include "GURL.h"
#include "DjVuMessage.h"
+#include <stddef.h>
#include <fcntl.h>
#if defined(WIN32) || defined(__CYGWIN32__)
# include <io.h>
diff --git a/libdjvu/DjVuFileCache.cpp b/libdjvu/DjVuFileCache.cpp
index 6b1e85d..7d7a192 100644
--- a/libdjvu/DjVuFileCache.cpp
+++ b/libdjvu/DjVuFileCache.cpp
@@ -63,6 +63,7 @@
#include "DjVuFileCache.h"
#include "debug.h"
+#include <stddef.h>
#include <stdlib.h>
diff --git a/libdjvu/DjVuGlobal.cpp b/libdjvu/DjVuGlobal.cpp
index e6d3cec..df9278e 100644
--- a/libdjvu/DjVuGlobal.cpp
+++ b/libdjvu/DjVuGlobal.cpp
@@ -76,6 +76,8 @@
#include "GThreads.h"
#include "GException.h"
#include "GContainer.h"
+
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/libdjvu/DjVuGlobalMemory.cpp b/libdjvu/DjVuGlobalMemory.cpp
index 3c6012c..c8ba309 100644
--- a/libdjvu/DjVuGlobalMemory.cpp
+++ b/libdjvu/DjVuGlobalMemory.cpp
@@ -67,6 +67,8 @@
#include "DjVuGlobal.h"
#include "GException.h"
+
+#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include "debug.h"
diff --git a/libdjvu/DjVuMessage.cpp b/libdjvu/DjVuMessage.cpp
index 6f5a735..1726025 100644
--- a/libdjvu/DjVuMessage.cpp
+++ b/libdjvu/DjVuMessage.cpp
@@ -71,6 +71,7 @@
#include "debug.h"
#include <ctype.h>
#include <string.h>
+#include <stddef.h>
#include <stdlib.h>
#ifdef WIN32
# include <tchar.h>
diff --git a/libdjvu/DjVuMessageLite.cpp b/libdjvu/DjVuMessageLite.cpp
index b8c1010..5daa9d9 100644
--- a/libdjvu/DjVuMessageLite.cpp
+++ b/libdjvu/DjVuMessageLite.cpp
@@ -73,8 +73,8 @@
#include "debug.h"
#include <ctype.h>
#include <string.h>
+#include <stddef.h>
#include <stdlib.h>
-// #include <stdio.h>
#ifdef WIN32
#include <tchar.h>
#include <windows.h>
diff --git a/libdjvu/DjVuPalette.cpp b/libdjvu/DjVuPalette.cpp
index c489f7b..76b0bf4 100644
--- a/libdjvu/DjVuPalette.cpp
+++ b/libdjvu/DjVuPalette.cpp
@@ -64,6 +64,8 @@
#include "ByteStream.h"
#include "BSByteStream.h"
#include "DjVuPalette.h"
+
+#include <stddef.h>
#include <stdlib.h>
#include <math.h>
diff --git a/libdjvu/DjVuPort.h b/libdjvu/DjVuPort.h
index f6a92f6..e2b3125 100644
--- a/libdjvu/DjVuPort.h
+++ b/libdjvu/DjVuPort.h
@@ -65,6 +65,7 @@
#include "GThreads.h"
#include "GURL.h"
+#include "stddef.h"
#ifdef HAVE_NAMESPACES
namespace DJVU {
diff --git a/libdjvu/DjVuToPS.cpp b/libdjvu/DjVuToPS.cpp
index 5517bf3..6914ff9 100644
--- a/libdjvu/DjVuToPS.cpp
+++ b/libdjvu/DjVuToPS.cpp
@@ -72,6 +72,7 @@
#include "GPixmap.h"
#include "debug.h"
#include <stdarg.h>
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <time.h>
diff --git a/libdjvu/GBitmap.cpp b/libdjvu/GBitmap.cpp
index ab5c0de..797edcc 100644
--- a/libdjvu/GBitmap.cpp
+++ b/libdjvu/GBitmap.cpp
@@ -66,6 +66,8 @@
#include "GString.h"
#include "GThreads.h"
#include "GException.h"
+#include <stddef.h>
+#include <stdlib.h>
#include <string.h>
// - Author: Leon Bottou, 05/1997
diff --git a/libdjvu/GException.cpp b/libdjvu/GException.cpp
index 2ea179a..89da70f 100644
--- a/libdjvu/GException.cpp
+++ b/libdjvu/GException.cpp
@@ -60,6 +60,7 @@
# pragma implementation
#endif
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/libdjvu/GOS.cpp b/libdjvu/GOS.cpp
index e784932..d2088e2 100644
--- a/libdjvu/GOS.cpp
+++ b/libdjvu/GOS.cpp
@@ -65,6 +65,7 @@
#include "GOS.h"
#include "GURL.h"
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <ctype.h>
diff --git a/libdjvu/GPixmap.cpp b/libdjvu/GPixmap.cpp
index 392df54..4bf6f57 100644
--- a/libdjvu/GPixmap.cpp
+++ b/libdjvu/GPixmap.cpp
@@ -75,6 +75,8 @@
#include "GThreads.h"
#include "Arrays.h"
#include "JPEGDecoder.h"
+
+#include <stddef.h>
#include <stdlib.h>
#include <math.h>
#include <assert.h>
diff --git a/libdjvu/GSmartPointer.cpp b/libdjvu/GSmartPointer.cpp
index 6e523e7..58aef5b 100644
--- a/libdjvu/GSmartPointer.cpp
+++ b/libdjvu/GSmartPointer.cpp
@@ -67,6 +67,7 @@
// Our original implementation consisted of multiple classes.
// <http://prdownloads.sourceforge.net/djvu/DjVu2_2b-src.tgz>.
+#include <stddef.h>
#include <string.h>
#if PARANOID_DEBUG
# include <assert.h>
diff --git a/libdjvu/GSmartPointer.h b/libdjvu/GSmartPointer.h
index 82781bd..8a8bb8a 100644
--- a/libdjvu/GSmartPointer.h
+++ b/libdjvu/GSmartPointer.h
@@ -97,6 +97,8 @@
#include "DjVuGlobal.h"
#include "atomic.h"
+#include <stddef.h>
+
#ifdef HAVE_NAMESPACES
namespace DJVU {
# ifdef NOT_DEFINED // Just to fool emacs c++ mode
diff --git a/libdjvu/GString.cpp b/libdjvu/GString.cpp
index 03f6226..350b11b 100644
--- a/libdjvu/GString.cpp
+++ b/libdjvu/GString.cpp
@@ -73,6 +73,7 @@
#include "GThreads.h"
#include "debug.h"
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/libdjvu/GString.h b/libdjvu/GString.h
index b63b753..3aa1f76 100644
--- a/libdjvu/GString.h
+++ b/libdjvu/GString.h
@@ -108,6 +108,7 @@
#include "DjVuGlobal.h"
#include "GContainer.h"
+#include <stddef.h>
#include <stdlib.h>
#include <stdarg.h>
#ifdef WIN32
diff --git a/libdjvu/GThreads.cpp b/libdjvu/GThreads.cpp
index d81f3c3..253fed8 100644
--- a/libdjvu/GThreads.cpp
+++ b/libdjvu/GThreads.cpp
@@ -71,6 +71,8 @@
#include "GThreads.h"
#include "GException.h"
#include "DjVuMessageLite.h"
+
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/libdjvu/GURL.cpp b/libdjvu/GURL.cpp
index c37bf52..a80078c 100644
--- a/libdjvu/GURL.cpp
+++ b/libdjvu/GURL.cpp
@@ -72,6 +72,7 @@
#include "GURL.h"
#include "debug.h"
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <ctype.h>
diff --git a/libdjvu/GUnicode.cpp b/libdjvu/GUnicode.cpp
index 415c081..a8b25b8 100644
--- a/libdjvu/GUnicode.cpp
+++ b/libdjvu/GUnicode.cpp
@@ -62,6 +62,8 @@
#include "GString.h"
+#include <stddef.h>
+
#if HAS_ICONV
#include <iconv.h>
#endif
diff --git a/libdjvu/IFFByteStream.h b/libdjvu/IFFByteStream.h
index a653f8c..e31b216 100644
--- a/libdjvu/IFFByteStream.h
+++ b/libdjvu/IFFByteStream.h
@@ -124,6 +124,7 @@
#include "DjVuGlobal.h"
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/libdjvu/IW44EncodeCodec.cpp b/libdjvu/IW44EncodeCodec.cpp
index 8d7b12c..49081b7 100644
--- a/libdjvu/IW44EncodeCodec.cpp
+++ b/libdjvu/IW44EncodeCodec.cpp
@@ -76,6 +76,7 @@
#include "IFFByteStream.h"
#include "GRect.h"
+#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>
diff --git a/libdjvu/IW44Image.cpp b/libdjvu/IW44Image.cpp
index 9476726..4a19fb5 100644
--- a/libdjvu/IW44Image.cpp
+++ b/libdjvu/IW44Image.cpp
@@ -76,6 +76,7 @@
#include "IFFByteStream.h"
#include "GRect.h"
+#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>
diff --git a/libdjvu/JPEGDecoder.h b/libdjvu/JPEGDecoder.h
index bd430a0..fad1d4c 100644
--- a/libdjvu/JPEGDecoder.h
+++ b/libdjvu/JPEGDecoder.h
@@ -64,6 +64,7 @@
#ifdef NEED_JPEG_DECODER
+#include <stddef.h>
#include <string.h>
#include <setjmp.h>
diff --git a/libdjvu/MMX.cpp b/libdjvu/MMX.cpp
index 5ab60bb..528dab6 100644
--- a/libdjvu/MMX.cpp
+++ b/libdjvu/MMX.cpp
@@ -62,6 +62,7 @@
#include "MMX.h"
#include <stdio.h>
+#include <stddef.h>
#include <stdlib.h>
diff --git a/libdjvu/UnicodeByteStream.h b/libdjvu/UnicodeByteStream.h
index 0ae112b..9b49a17 100644
--- a/libdjvu/UnicodeByteStream.h
+++ b/libdjvu/UnicodeByteStream.h
@@ -88,6 +88,7 @@
#include "GString.h"
#include "ByteStream.h"
+#include <stddef.h>
#ifdef HAVE_NAMESPACES
namespace DJVU {
diff --git a/libdjvu/XMLParser.cpp b/libdjvu/XMLParser.cpp
index 84386c5..7da923a 100644
--- a/libdjvu/XMLParser.cpp
+++ b/libdjvu/XMLParser.cpp
@@ -75,6 +75,7 @@
#include "debug.h"
#include <stdio.h>
#include <ctype.h>
+#include <stddef.h>
#include <stdlib.h>
diff --git a/libdjvu/ZPCodec.cpp b/libdjvu/ZPCodec.cpp
index f6e971d..ff5b9bf 100644
--- a/libdjvu/ZPCodec.cpp
+++ b/libdjvu/ZPCodec.cpp
@@ -66,6 +66,8 @@
#include "ZPCodec.h"
#include "ByteStream.h"
#include "GException.h"
+
+#include <stddef.h>
#include <stdlib.h>
#include <assert.h>
#include <math.h>
diff --git a/libdjvu/atomic.cpp b/libdjvu/atomic.cpp
index bdc193e..63fd483 100644
--- a/libdjvu/atomic.cpp
+++ b/libdjvu/atomic.cpp
@@ -28,6 +28,7 @@
# include "config.h"
#endif
+#include <stddef.h>
#include <stdlib.h>
#include <assert.h>
#include "atomic.h"
diff --git a/libdjvu/ddjvuapi.cpp b/libdjvu/ddjvuapi.cpp
index b18b84b..f40f5aa 100644
--- a/libdjvu/ddjvuapi.cpp
+++ b/libdjvu/ddjvuapi.cpp
@@ -60,6 +60,7 @@
# pragma implementation "ddjvuapi.h"
#endif
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/libdjvu/ddjvuapi.h b/libdjvu/ddjvuapi.h
index d0ed48f..841f223 100644
--- a/libdjvu/ddjvuapi.h
+++ b/libdjvu/ddjvuapi.h
@@ -64,6 +64,7 @@ extern "C" {
}
#endif
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/libdjvu/miniexp.cpp b/libdjvu/miniexp.cpp
index e0fb087..fc51297 100644
--- a/libdjvu/miniexp.cpp
+++ b/libdjvu/miniexp.cpp
@@ -23,6 +23,7 @@
# pragma implementation "miniexp.h"
#endif
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <ctype.h>
diff --git a/libdjvu/miniexp.h b/libdjvu/miniexp.h
index 91e345d..993005b 100644
--- a/libdjvu/miniexp.h
+++ b/libdjvu/miniexp.h
@@ -38,7 +38,8 @@ extern "C" {
#ifndef MINILISPAPI
# define MINILISPAPI /**/
#endif
-
+
+#include <stddef.h>
/* -------------------------------------------------- */
/* LISP EXPRESSIONS */
diff --git a/tools/bzz.cpp b/tools/bzz.cpp
index ca092e1..2ebc7b9 100644
--- a/tools/bzz.cpp
+++ b/tools/bzz.cpp
@@ -94,6 +94,7 @@
#include "GURL.h"
#include "DjVuMessage.h"
#include <locale.h>
+#include <stddef.h>
#include <stdlib.h>
static const char *program = "(unknown)";
diff --git a/tools/c44.cpp b/tools/c44.cpp
index 6f23b53..855504b 100644
--- a/tools/c44.cpp
+++ b/tools/c44.cpp
@@ -226,6 +226,7 @@
#include <locale.h>
#include <stdio.h>
#include <string.h>
+#include <stddef.h>
#include <stdlib.h>
// command line data
diff --git a/tools/cjb2.cpp b/tools/cjb2.cpp
index 8cf89b9..11eb662 100644
--- a/tools/cjb2.cpp
+++ b/tools/cjb2.cpp
@@ -120,6 +120,7 @@
#include "jb2tune.h"
#include <locale.h>
+#include <stddef.h>
#include <stdlib.h>
#if HAVE_TIFF
#include <tiffio.h>
diff --git a/tools/cpaldjvu.cpp b/tools/cpaldjvu.cpp
index 111cbd3..b640a7a 100644
--- a/tools/cpaldjvu.cpp
+++ b/tools/cpaldjvu.cpp
@@ -118,6 +118,7 @@
#include "jb2tune.h"
#include <locale.h>
+#include <stddef.h>
#include <stdlib.h>
#include <math.h>
diff --git a/tools/csepdjvu.cpp b/tools/csepdjvu.cpp
index cd721f8..d5203d5 100644
--- a/tools/csepdjvu.cpp
+++ b/tools/csepdjvu.cpp
@@ -162,6 +162,7 @@
#include "jb2tune.h"
#include <locale.h>
+#include <stddef.h>
#include <stdlib.h>
#undef MIN
diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp
index 817e045..981a270 100644
--- a/tools/ddjvu.cpp
+++ b/tools/ddjvu.cpp
@@ -62,6 +62,7 @@
# include "config.h"
#endif
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
diff --git a/tools/djvm.cpp b/tools/djvm.cpp
index 951bd66..6ea88c2 100644
--- a/tools/djvm.cpp
+++ b/tools/djvm.cpp
@@ -135,9 +135,9 @@
#include "DjVuMessage.h"
#include <locale.h>
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
-#include <stdlib.h>
static const char * progname;
diff --git a/tools/djvmcvt.cpp b/tools/djvmcvt.cpp
index 9ca1c54..20b468a 100644
--- a/tools/djvmcvt.cpp
+++ b/tools/djvmcvt.cpp
@@ -144,6 +144,7 @@
#include <locale.h>
#include <stdio.h>
+#include <stddef.h>
#include <stdlib.h>
static const char * progname;
diff --git a/tools/djvudump.cpp b/tools/djvudump.cpp
index 6a0215a..2dddbdf 100644
--- a/tools/djvudump.cpp
+++ b/tools/djvudump.cpp
@@ -119,6 +119,7 @@ xxx
#include <locale.h>
#include <stdio.h>
#include <ctype.h>
+#include <stddef.h>
#include <stdlib.h>
void
diff --git a/tools/djvuextract.cpp b/tools/djvuextract.cpp
index 4a9f381..907b99c 100644
--- a/tools/djvuextract.cpp
+++ b/tools/djvuextract.cpp
@@ -105,6 +105,7 @@
#include "GOS.h"
#include "DjVuMessage.h"
#include <locale.h>
+#include <stddef.h>
#include <stdlib.h>
diff --git a/tools/djvumake.cpp b/tools/djvumake.cpp
index 7020484..4c5fc0f 100644
--- a/tools/djvumake.cpp
+++ b/tools/djvumake.cpp
@@ -153,6 +153,7 @@
#include <locale.h>
#include <stdio.h>
+#include <stddef.h>
#include <stdlib.h>
#include <ctype.h>
diff --git a/tools/djvups.cpp b/tools/djvups.cpp
index 51aa999..632b832 100644
--- a/tools/djvups.cpp
+++ b/tools/djvups.cpp
@@ -57,6 +57,7 @@
# include "config.h"
#endif
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
diff --git a/tools/djvused.cpp b/tools/djvused.cpp
index de84dcd..687fdca 100644
--- a/tools/djvused.cpp
+++ b/tools/djvused.cpp
@@ -61,6 +61,7 @@
#endif
#include <stdio.h>
+#include <stddef.h>
#include <stdlib.h>
#include <stdarg.h>
#include <errno.h>
diff --git a/tools/djvuserve.cpp b/tools/djvuserve.cpp
index 19a17da..818fe78 100644
--- a/tools/djvuserve.cpp
+++ b/tools/djvuserve.cpp
@@ -73,6 +73,7 @@
#include <locale.h>
#include <stdio.h>
+#include <stddef.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <time.h>
diff --git a/tools/djvutxt.cpp b/tools/djvutxt.cpp
index ba2c745..9e9124c 100644
--- a/tools/djvutxt.cpp
+++ b/tools/djvutxt.cpp
@@ -61,6 +61,7 @@
# include "config.h"
#endif
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
diff --git a/tools/tiff2pdf.h b/tools/tiff2pdf.h
index 082f5fb..656dc43 100644
--- a/tools/tiff2pdf.h
+++ b/tools/tiff2pdf.h
@@ -22,6 +22,7 @@
# endif
# if HAVE_TIFF
# include <stdio.h>
+# include <stddef.h>
# include <stdlib.h>
# include <tiff.h>
# include <tiffio.h>
diff --git a/xmltools/djvutoxml.cpp b/xmltools/djvutoxml.cpp
index 17c769b..b40535e 100644
--- a/xmltools/djvutoxml.cpp
+++ b/xmltools/djvutoxml.cpp
@@ -71,6 +71,7 @@
#include <locale.h>
#include <stdio.h>
+#include <stddef.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <assert.h>
diff --git a/xmltools/djvuxmlparser.cpp b/xmltools/djvuxmlparser.cpp
index bdc5768..6679a9d 100644
--- a/xmltools/djvuxmlparser.cpp
+++ b/xmltools/djvuxmlparser.cpp
@@ -70,6 +70,7 @@
#include <stdio.h>
#include <ctype.h>
#include <locale.h>
+#include <stddef.h>
#include <stdlib.h>
static void

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

@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null);
let
name = "ikiwiki";
version = "3.20121212";
version = "3.20130212";
lib = stdenv.lib;
in
@ -32,7 +32,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
sha256 = "1frsr2sqzsnagbxvyjsgk4nrl1p1048vybsd1zw1ln1mqik31ydz";
sha256 = "1svajjhrwaq7wwgmhaxc2ld12cla3pdi9i7m8ll2rfa11cdhhf6m";
};
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate

5
pkgs/applications/misc/taskjuggler/default.nix
View File

@ -1,7 +1,6 @@
{stdenv, fetchurl,
zlib, libpng, libjpeg, perl, expat, qt3,
libX11, libXext, libSM, libICE,
withKde, kdelibs, kdebase
}:
stdenv.mkDerivation rec {
@ -13,7 +12,6 @@ stdenv.mkDerivation rec {
buildInputs =
[zlib libpng libX11 libXext libSM libICE perl expat libjpeg]
++ (if withKde then [kdelibs] else [])
;
patches = [ ./timezone-glibc.patch ];
@ -51,7 +49,6 @@ stdenv.mkDerivation rec {
--x-includes=${libX11}/include
--x-libraries=${libX11}/lib
--with-qt-dir=${qt3}
--with-kde-support=${if withKde then "yes" else "no"} --with-ical-support=${if withKde then "yes" else "no"}
";
preInstall = ''
@ -61,7 +58,7 @@ stdenv.mkDerivation rec {
installFlags =
# kde_locale is not defined when installing without kde.
if withKde then "" else "kde_locale=\${out}/share/locale";
"kde_locale=\${out}/share/locale";
meta = {
homepage = "http://www.taskjuggler.org";

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

@ -50,7 +50,7 @@ let
use_system_libexpat = true;
use_system_libexif = true;
use_system_libjpeg = true;
use_system_libpng = true;
use_system_libpng = !post24;
use_system_libusb = true;
use_system_libxml = true;
use_system_speex = true;

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

@ -6,13 +6,13 @@
sha256 = "1pn7qv1s6lcx8k26h89x9zdy43rzdq12f92s2l6cfdhr9ls9wv0s";
};
beta = {
version = "25.0.1364.36";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.36.tar.bz2";
sha256 = "1pn7qv1s6lcx8k26h89x9zdy43rzdq12f92s2l6cfdhr9ls9wv0s";
version = "25.0.1364.68";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.68.tar.bz2";
sha256 = "0ps3dnpih2nxb0zkw251cfrls126ysnp818bjzcbl325cbypcgc9";
};
stable = {
version = "24.0.1312.52";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.52.tar.bz2";
sha256 = "04fp04591dszx07wwdsgxf0wb2sxm863z1qxn5dii6f9yjqgh3gk";
version = "24.0.1312.69";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.69.tar.bz2";
sha256 = "1nvnhkky72nywk601vx5bbjp1m2f5dygza9h34y20inz3jgg8nbr";
};
}

7
pkgs/applications/networking/browsers/chromium/update.sh
View File

@ -78,7 +78,12 @@ get_channel_exprs()
do
channel="${chline%%,*}";
version="${chline##*,}";
url="${bucket_url%/}/chromium-$version.tar.bz2";
# XXX: Remove case after version 26 is stable:
case "${version%%.*}" in
26) url="${bucket_url%/}/chromium-$version-lite.tar.xz";;
*) url="${bucket_url%/}/chromium-$version.tar.bz2";;
esac;
echo -n "Checking if sha256 of version $version is cached..." >&2;
if sha256="$(sha_lookup "$version")";

4
pkgs/applications/networking/browsers/firefox/13.0.nix
View File

@ -21,8 +21,8 @@ rec {
src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha1 = "3752f13f26a51dd2e42d2805a707a842e6f8d1b1";
url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha256 = "1qwvs3rdmrnkjnjvhi3vh4mjdpxr43zcm7llc6z5qws9n9yx15n1";
};
commonConfigureFlags =

6
pkgs/applications/networking/browsers/firefox/18.0.nix
View File

@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "18.0.1";
firefoxVersion = "18.0.2";
xulVersion = "18.0.1"; # this attribute is used by other packages
xulVersion = "18.0.2"; # this attribute is used by other packages
src = fetchurl {
@ -27,7 +27,7 @@ rec {
# Fall back to this url for versions not available at releases.mozilla.org.
"ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
];
sha1 = "26415396233450a4e66bb0e0a73a258e1cb174ef";
sha1 = "fe5810d61edf6f4dc8bc477a08f9483b955f747b";
};
commonConfigureFlags =

12
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
View File

@ -44,9 +44,9 @@ let
throw "no x86_64 debugging version available"
else rec {
# -> http://labs.adobe.com/downloads/flashplayer10.html
version = "11.2.202.251";
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux_x86_64.tar.gz";
sha256 = "0nkwpqp8ilv21rlmr4jv8abdnfmz292y3w1qlx6r67qf926nfrz2";
version = "11.2.202.262";
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
sha256 = "1bfr7ajpqkah4kshhqkmi2c15mm962absrq9ks7gfsfaircp387j";
}
else if stdenv.system == "i686-linux" then
if debug then {
@ -55,9 +55,9 @@ let
url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz;
sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk";
} else rec {
version = "11.2.202.251";
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux_i386.tar.gz";
sha256 = "0nph42s1bspf88m1qqrvc93kkxkrvq3lfs5iq4l5dflwzs32jdm3";
version = "11.2.202.262";
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
sha256 = "0fhslr46apa6qfzdhagmjb8vbl741ryh6j14qy2271nl2q687jsx";
}
else throw "Flash Player is not supported on this platform";

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

@ -45,6 +45,8 @@ in
stdenv.mkDerivation rec {
name = "google-talk-plugin-${version}";
# Use the following to determine the current upstream version:
# curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | sed -nr 's/^Version: *([^ ]+)-1$/\1/p'
version = "3.10.2.0";
src =

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

@ -1,18 +1,22 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, libosip, libexosip
, speex, readline, mediastreamer }:
, speex, readline, mediastreamer, libsoup }:
stdenv.mkDerivation rec {
name = "linphone-3.5.0";
name = "linphone-3.5.2";
src = fetchurl {
url = "mirror://savannah/linphone/3.5.x/sources/${name}.tar.gz";
sha256 = "1jrgsyx2mn6y50hjfx79fzqhp42r78cjr63w3bfjdl258zy2f6ix";
sha256 = "0830iam7kgqphgk3q6qx93kp5wrf0gnm5air82jamy7377jxadys";
};
buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex ];
patches = [ ./fix-deprecated.patch ];
buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex libsoup ];
buildNativeInputs = [ intltool pkgconfig ];
preConfigure = "rm -r mediastreamer2 oRTP";
configureFlags = "--enable-external-ortp --enable-external-mediastreamer";
meta = {

35
pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch Normal file
View File

@ -0,0 +1,35 @@
diff --git a/gtk/main.c b/gtk/main.c
index 7079bc8..f076127 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1643,7 +1643,7 @@ int main(int argc, char *argv[]){
GdkPixbuf *pbuf;
const char *app_name="Linphone";
- g_thread_init(NULL);
+ g_type_init();
gdk_threads_init();
progpath = strdup(argv[0]);
diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c
index 1c54fca..45c9091 100644
--- a/gtk/setupwizard.c
+++ b/gtk/setupwizard.c
@@ -270,7 +270,7 @@ static void account_username_changed(GtkEntry *entry, GtkWidget *w) {
linphone_account_creator_set_username(creator, gtk_entry_get_text(username));
if (g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{3,}$", gtk_entry_get_text(username), 0, 0)) {
- g_thread_create(check_username_availability, (void*)w, FALSE, NULL);
+ g_thread_new (NULL, check_username_availability, (void*)w);
}
else {
if (gtk_entry_get_text_length(username) < LOGIN_MIN_SIZE) {
@@ -534,7 +534,7 @@ GtkWidget * linphone_gtk_create_assistant(void){
ok = create_pixbuf(linphone_gtk_get_ui_config("ok","ok.png"));
notok = create_pixbuf(linphone_gtk_get_ui_config("notok","notok.png"));
- g_thread_init (NULL);
+ g_type_init ();
gdk_threads_init ();
GtkWidget *p1=create_intro();

8
pkgs/applications/office/gnucash/default.nix
View File

@ -1,6 +1,7 @@
{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk, libgnomeui, libofx
, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui
, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper
, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade
, libgsf, libart_lgpl
}:
/* If you experience GConf errors when running GnuCash on NixOS, see
@ -19,9 +20,12 @@ stdenv.mkDerivation rec {
buildInputs = [
pkgconfig libxml2 gconf glib gtk libgnomeui libgtkhtml gtkhtml
libgnomeprint goffice enchant gettext intltool perl guile slibGuile
swig isocodes bzip2 makeWrapper libofx
swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl
];
# fix a problem with new intltool versions, taken from Gentoo
patchPhase = "patch -p3 < ${./potfiles-skip.patch}";
configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx";
postInstall = ''

147
pkgs/applications/office/gnucash/potfiles-skip.patch Normal file
View File

@ -0,0 +1,147 @@
Index: gnucash/branches/2.4/po/POTFILES.skip
===================================================================
--- gnucash/branches/2.4/po/POTFILES.skip (revision 18623)
+++ gnucash/branches/2.4/po/POTFILES.skip (revision 22300)
@@ -19,2 +19,142 @@
src/libqof/qof/qofquery-serialize.c
src/libqof/qof/qofsql.c
+
+# The scheme files are handled by intl-scm/guile-strings.c because
+# intltool wouldn't scan scheme files. They're here now because
+# intltool 0.50 *does* scan them, and it creates an error during make
+# check. Once the whole world has upgraded to intltool 0.50, intl-scm
+# can be deleted and these files added to POTFILES.in.
+
+src/app-utils/date-utilities.scm
+src/app-utils/prefs.scm
+src/business/business-utils/business-prefs.scm
+src/business/business-utils/business-utils.scm
+src/business/business-utils/gnucash/business-utils.scm
+src/import-export/qif-import/qif-dialog-utils.scm
+src/import-export/qif-import/qif-file.scm
+src/import-export/qif-import/qif-import/qif-dialog-utils.scm
+src/import-export/qif-import/qif-import/qif-file.scm
+src/import-export/qif-import/qif-import/qif-merge-groups.scm
+src/import-export/qif-import/qif-import/qif-parse.scm
+src/import-export/qif-import/qif-import/qif-to-gnc.scm
+src/import-export/qif-import/qif-merge-groups.scm
+src/import-export/qif-import/qif-parse.scm
+src/import-export/qif-import/qif-to-gnc.scm
+src/report/business-reports/aging.scm
+src/report/business-reports/balsheet-eg.eguile.scm
+src/report/business-reports/balsheet-eg.scm
+src/report/business-reports/business-reports.scm
+src/report/business-reports/customer-summary.scm
+src/report/business-reports/easy-invoice.scm
+src/report/business-reports/fancy-invoice.scm
+src/report/business-reports/gnucash/report/aging.scm
+src/report/business-reports/gnucash/report/balsheet-eg.eguile.scm
+src/report/business-reports/gnucash/report/balsheet-eg.scm
+src/report/business-reports/gnucash/report/business-reports.scm
+src/report/business-reports/gnucash/report/customer-summary.scm
+src/report/business-reports/gnucash/report/easy-invoice.scm
+src/report/business-reports/gnucash/report/fancy-invoice.scm
+src/report/business-reports/gnucash/report/invoice.scm
+src/report/business-reports/gnucash/report/job-report.scm
+src/report/business-reports/gnucash/report/owner-report.scm
+src/report/business-reports/gnucash/report/payables.scm
+src/report/business-reports/gnucash/report/receivables.scm
+src/report/business-reports/gnucash/report/taxinvoice.eguile.scm
+src/report/business-reports/gnucash/report/taxinvoice.scm
+src/report/business-reports/invoice.scm
+src/report/business-reports/job-report.scm
+src/report/business-reports/owner-report.scm
+src/report/business-reports/payables.scm
+src/report/business-reports/receivables.scm
+src/report/business-reports/taxinvoice.eguile.scm
+src/report/business-reports/taxinvoice.scm
+src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+src/report/locale-specific/us/gnucash/report/taxtxf.scm
+src/report/locale-specific/us/taxtxf-de_DE.scm
+src/report/locale-specific/us/taxtxf.scm
+src/report/report-gnome/gnucash/report/report-gnome.scm
+src/report/report-gnome/report-gnome.scm
+src/report/report-system/eguile-gnc.scm
+src/report/report-system/gnucash/report/eguile-gnc.scm
+src/report/report-system/html-acct-table.scm
+src/report/report-system/html-fonts.scm
+src/report/report-system/html-style-sheet.scm
+src/report/report-system/html-utilities.scm
+src/report/report-system/options-utilities.scm
+src/report/report-system/report-utilities.scm
+src/report/report-system/report.scm
+src/report/standard-reports/account-piecharts.scm
+src/report/standard-reports/account-summary.scm
+src/report/standard-reports/advanced-portfolio.scm
+src/report/standard-reports/average-balance.scm
+src/report/standard-reports/balance-sheet.scm
+src/report/standard-reports/budget-balance-sheet.scm
+src/report/standard-reports/budget-barchart.scm
+src/report/standard-reports/budget-flow.scm
+src/report/standard-reports/budget-income-statement.scm
+src/report/standard-reports/budget.scm
+src/report/standard-reports/cash-flow.scm
+src/report/standard-reports/category-barchart.scm
+src/report/standard-reports/daily-reports.scm
+src/report/standard-reports/equity-statement.scm
+src/report/standard-reports/general-journal.scm
+src/report/standard-reports/general-ledger.scm
+src/report/standard-reports/gnucash/report/standard-reports/account-piecharts.scm
+src/report/standard-reports/gnucash/report/standard-reports/account-summary.scm
+src/report/standard-reports/gnucash/report/standard-reports/advanced-portfolio.scm
+src/report/standard-reports/gnucash/report/standard-reports/average-balance.scm
+src/report/standard-reports/gnucash/report/standard-reports/balance-sheet.scm
+src/report/standard-reports/gnucash/report/standard-reports/budget-balance-sheet.scm
+src/report/standard-reports/gnucash/report/standard-reports/budget-barchart.scm
+src/report/standard-reports/gnucash/report/standard-reports/budget-flow.scm
+src/report/standard-reports/gnucash/report/standard-reports/budget-income-statement.scm
+src/report/standard-reports/gnucash/report/standard-reports/budget.scm
+src/report/standard-reports/gnucash/report/standard-reports/cash-flow.scm
+src/report/standard-reports/gnucash/report/standard-reports/category-barchart.scm
+src/report/standard-reports/gnucash/report/standard-reports/daily-reports.scm
+src/report/standard-reports/gnucash/report/standard-reports/equity-statement.scm
+src/report/standard-reports/gnucash/report/standard-reports/general-journal.scm
+src/report/standard-reports/gnucash/report/standard-reports/general-ledger.scm
+src/report/standard-reports/gnucash/report/standard-reports/income-statement.scm
+src/report/standard-reports/gnucash/report/standard-reports/net-barchart.scm
+src/report/standard-reports/gnucash/report/standard-reports/net-linechart.scm
+src/report/standard-reports/gnucash/report/standard-reports/portfolio.scm
+src/report/standard-reports/gnucash/report/standard-reports/price-scatter.scm
+src/report/standard-reports/gnucash/report/standard-reports/register.scm
+src/report/standard-reports/gnucash/report/standard-reports/sx-summary.scm
+src/report/standard-reports/gnucash/report/standard-reports/transaction.scm
+src/report/standard-reports/gnucash/report/standard-reports/trial-balance.scm
+src/report/standard-reports/income-statement.scm
+src/report/standard-reports/net-barchart.scm
+src/report/standard-reports/net-linechart.scm
+src/report/standard-reports/portfolio.scm
+src/report/standard-reports/price-scatter.scm
+src/report/standard-reports/register.scm
+src/report/standard-reports/sx-summary.scm
+src/report/standard-reports/transaction.scm
+src/report/standard-reports/trial-balance.scm
+src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+src/report/stylesheets/gnucash/report/stylesheet-footer.scm
+src/report/stylesheets/gnucash/report/stylesheet-plain.scm
+src/report/stylesheets/stylesheet-easy.scm
+src/report/stylesheets/stylesheet-fancy.scm
+src/report/stylesheets/stylesheet-footer.scm
+src/report/stylesheets/stylesheet-plain.scm
+src/report/utility-reports/gnucash/report/hello-world.scm
+src/report/utility-reports/gnucash/report/view-column.scm
+src/report/utility-reports/gnucash/report/welcome-to-gnucash.scm
+src/report/utility-reports/hello-world.scm
+src/report/utility-reports/view-column.scm
+src/report/utility-reports/welcome-to-gnucash.scm
+src/scm/build-config.scm
+src/scm/build-config.scm.in
+src/scm/command-line.scm
+src/scm/gnucash/price-quotes.scm
+src/scm/main-window.scm
+src/scm/price-quotes.scm
+src/tax/us/de_DE.scm
+src/tax/us/gnucash/tax/de_DE.scm
+src/tax/us/txf-de_DE.scm
+src/tax/us/txf.scm
+

8
pkgs/applications/office/gnumeric/default.nix
View File

@ -3,12 +3,12 @@
, pango, pkgconfig, scrollkeeper, zlib
}:
stdenv.mkDerivation {
name = "gnumeric-1.11.3";
stdenv.mkDerivation rec {
name = "gnumeric-1.12.0";
src = fetchurl {
url = mirror://gnome/sources/gnumeric/1.11/gnumeric-1.11.3.tar.xz;
sha256 = "1hblcbba4qzlby094dih6ncclgf2n5ac59lqg9dykpz8ad3hxw72";
url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
sha256 = "037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111";
};
configureFlags = "--disable-component";

34
pkgs/applications/office/ledger/2.6.3.nix
View File

@ -1,40 +1,24 @@
# Patchelf fails to hard-code the library paths to ledger's
# libamounts.so and libledger-2.6.3 shared objects:
#
# $ ldd ~/.nix-profile/bin/ledger
# linux-vdso.so.1 => (0x00007fff513ff000)
# libamounts.so.0 => not found
# libledger-2.6.3.so => not found
# libstdc++.so.6 => /nix/store/3r8kfi33y3lbrsvlx8vzwm74h8178y35-gcc-4.5.1/lib/../lib64/libstdc++.so.6 (0x00007f1f0feee000)
# libpcre.so.0 => /nix/store/kfhy189arpj3wrfzpgw8p9ac4g4hfgca-pcre-8.10/lib/libpcre.so.0 (0x00007f1f0fcd3000)
# libgmp.so.3 => /nix/store/ji6py9m9w2ray1bmpkmgig9llj1i2ggf-gmp-4.3.2/lib/libgmp.so.3 (0x00007f1f0fa7f000)
# libm.so.6 => /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libm.so.6 (0x00007f1f0f7fd000)
# libgcc_s.so.1 => /nix/store/3r8kfi33y3lbrsvlx8vzwm74h8178y35-gcc-4.5.1/lib/../lib64/libgcc_s.so.1 (0x00007f1f0f5e8000)
# libc.so.6 => /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libc.so.6 (0x00007f1f0f27d000)
# /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/ld-linux-x86-64.so.2 (0x00007f1f101ef000)
#
# Fortunately, libtools builds the program with proper paths hard-coded
# alread, so we don't need patchelf. Phew!
{ stdenv, fetchurl, emacs, gmp, pcre, expat }:
{stdenv, fetchurl, emacs, gmp, pcre, expat}:
let
stdenv.mkDerivation rec {
name = "ledger-2.6.3";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "https://github.com/downloads/jwiegley/ledger/${name}.tar.gz";
url = "https://github.com/downloads/ledger/ledger/${name}.tar.gz";
sha256 = "05zpnypcwgck7lwk00pbdlcwa347xsqifxh4zsbbn01m98bx1v5k";
};
buildInputs = [ emacs gmp pcre expat ];
configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3";
dontPatchELF = true;
doCheck = true;
# Patchelf breaks the hard-coded rpath to ledger's libamounts.0.so and
# libledger-2.6.3.so. Fortunately, libtool chooses proper rpaths to
# begin with, so we can just disable patchelf to avoid the issue.
dontPatchELF = true;
meta = {
homepage = "http://ledger-cli.org/";
description = "A double-entry accounting system with a command-line reporting interface";

0
pkgs/applications/office/openoffice/libreoffice.nix → pkgs/applications/office/libreoffice/default.nix
View File

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

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

105
pkgs/applications/office/openoffice/builder.sh
View File

@ -1,105 +0,0 @@
source $stdenv/setup
export nodep=TRUE
export NO_HIDS=TRUE
export PATH=$icu/sbin:$PATH
postUnpack() {
tar xvjf $src_system
}
preConfigure() {
./configure --help
for i in sysui/desktop/share/makefile.mk; do
substituteInPlace $i --replace /bin/bash $shell
done
SRCDIR=
sed -e '/CURL_NO_OLDIES/d' -i ucb/source/ucp/ftp/makefile.mk
}
postConfigure() {
for i in LinuxX86*Env.Set; do
substituteInPlace $i --replace /usr /no-such-path
done
substituteInPlace solenv/inc/libs.mk \
--replace /usr/lib/libjpeg.so $libjpeg/lib/libjpeg.so \
--replace /usr/lib64/libjpeg.so $libjpeg/lib/libjpeg.so
}
buildPhase() {
source LinuxX86*Env.Set.sh
./bootstrap
# bootstrap defines the alias 'build', that mostly runs this perl script:
(cd instsetoo_native; perl ../solenv/bin/build.pl --all) # wait a few hours... add -P4 for quadcores
}
wrapSOffice() {
local fn=$1
local arg=$2
# !!! should use makeWrapper for this.
cat > $out/bin/$fn <<EOF
#! $shell
# Add fontconfig to the library search path; apparently OpenOffice
# looks for it at runtime.
export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH\${LD_LIBRARY_PATH:+:}$fontconfig/lib:$libjpeg/lib:$cups/lib
export JAVA_HOME=$jdk
exec $ooFiles/openoffice.org3/program/soffice $arg "\$@"
EOF
chmod +x $out/bin/$fn
}
installPhase() {
ooFiles=$out/lib/openoffice
# This was all borrowed from ooo-build-2.2.1's bin/ooinstall.
# This needs the ./bootstrap having run in the buildPhase to get some env vars.
eval $(grep 'BUILD\|LAST_MINOR' $SOLARENV/inc/minor.mk)
export PYTHONPATH=$SOLARVERSION/$INPATH/lib:$SRC_ROOT/instsetoo_native/$INPATH/bin:$PYTHONPATH
export OUT=../$INPATH
export LOCAL_OUT=../$INPATH
export LOCAL_COMMON_OUT=../$INPATH
# Do the actual installation into $out.
(cd $SRC_ROOT/instsetoo_native/util && perl -w $SOLARENV/bin/make_installer.pl \
-f openoffice.lst -l en-US -p OpenOffice \
-buildid $BUILD -simple $ooFiles)
mkdir -p $out/bin
for i in soffice ooffice; do wrapSOffice $i; done
# Create some wrappers to start individual OpenOffice components.
for i in writer calc draw impress base math web; do wrapSOffice oo$i -$i; done
# Create symlinks to desktop files, so that openoffice.org apps can be picked from
# the application menu in KDE and GNOME
mkdir -p $out/share
ln -s $out/lib/openoffice/openoffice.org3/share/xdg $out/share/applications
# Apply a minor correction to the *.desktop files in order to correctly address the icons
# The openoffice- prefix should be removed from the icon identifiers
for appl in $out/share/applications/*.desktop
do
chmod 644 $appl # What's wrong with the file permissions?
sed -i '/Icon/d' $appl
echo "Icon=$(echo $(basename $appl) | sed 's/.desktop//')" >> $appl
done
# Copy icons so that the menu items in KDE and GNOME will look much nicer
(cd $SRC_ROOT/sysui/desktop/icons
install -v -d $out/share/icons/{hicolor,locolor} -m 755
cp -rv hicolor/*x* $out/share/icons/hicolor
cp -rv locolor/*x* $out/share/icons/locolor
)
# The desktop files expect a openoffice.org3 executable in the PATH, which is a symlink to soffice
ln -s $out/bin/soffice $out/bin/openoffice.org3
}
genericBuild

105
pkgs/applications/office/openoffice/default.nix
View File

@ -1,105 +0,0 @@
{ stdenv, fetchurl, 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, cairo, which
, icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups
, libXinerama, openssl, gperf, cppunit, GConf, ORBit2
}:
let version = "3.2.1"; in
stdenv.mkDerivation rec {
name = "openoffice.org-${version}";
builder = ./builder.sh;
downloadRoot = "http://openoffice.mirrorbrain.org/files/stable";
versionDirs = true;
src = fetchurl {
url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_core.tar.bz2";
sha256 = "0gj2hinhnzkazh44k1an05x5cj7n6721f2grqrkjh31cm38r9p6i";
};
patches = [ ./oo.patch ./root-required.patch ./xlib.patch ];
postPatch =
/* Compiling with GCC 4.5 fails:
Compiling: cppu/source/AffineBridge/AffineBridge.cxx
[...]
../../inc/uno/lbnames.h:67:2: error: #error "Supported gcc majors are 2 , 3 and 4 <= 4.4. Unsupported gcc major version."
However, we can't compile with GCC 4.4 because then we'd end up with
two different versions of libstdc++ (because the deps are compiled
with 4.5), which isn't supported (link time error.)
Thus, force compilation with 4.5 and hope for the best. */
'' sed -i "cppu/inc/uno/lbnames.h" \
-e 's/#[[:blank:]]*error "Supported.*$//g'
'';
src_system = fetchurl {
url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_system.tar.bz2";
sha256 = "0giy3sza64ij19w7b06rxcrkrb5kq2fvkz486vh3mv08s8xa8zfc";
};
preConfigure = ''
PATH=$PATH:${icu}/sbin
'';
configureFlags = "
--with-package-format=native
--disable-epm
--disable-fontooo
--disable-gnome-vfs
--disable-gnome-vfs
--disable-mathmldtd
--disable-mozilla
--disable-odk
--disable-pasf
--with-cairo
--with-system-libs
--with-system-python
--with-system-boost
--with-system-db
--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
--without-system-lpsolve
--without-system-graphite
";
LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib";
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
];
inherit icu fontconfig libjpeg jdk cups;
meta = {
description = "OpenOffice.org is a multiplatform and multilingual office suite";
homepage = http://www.openoffice.org/;
license = "LGPL";
maintainers = [ stdenv.lib.maintainers.raskin ];
};
}

72
pkgs/applications/office/openoffice/oo.patch
View File

@ -1,72 +0,0 @@
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
index 74c64bf..fbf8d21 100644
--- a/libtextcat/makefile.mk
+++ b/libtextcat/makefile.mk
@@ -57,7 +57,7 @@ ADDITIONAL_FILES= \
#CONFIGURE_DIR=$(BUILD_DIR)
#relative to CONFIGURE_DIR
-CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
+CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" --prefix=$(TMPDIR)
CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
BUILD_ACTION=make
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 0d92de9..aae3b4f 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -130,7 +130,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
# do not enable grddl parser (#i93768#)
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR)
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index fba6460..fc70419 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -126,7 +126,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR)
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 710d7d6..dd60f0d 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -132,7 +132,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR)
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/hunspell/hunspell-1.2.8.patch b/hunspell/hunspell-1.2.8.patch
index 37b7964..e6fd962 100644
--- a/hunspell/hunspell-1.2.8.patch
+++ b/hunspell/hunspell-1.2.8.patch
@@ -619,3 +619,15 @@
p++;
}
if (i > 0 && buf[i - 1] == '\n') {
+diff --git a/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh b/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh
+index 90080f6..f069517 100755
+--- a/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh
++++ b/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh
+--- misc/hunspell-1.2.8/tests/test.sh Sep 4 01:25:35 2007
++++ misc/build/hunspell-1.2.8/tests/test.sh Jun 18 11:53:11 2008
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ export LC_ALL="C"
+
+ function check_valgrind_log () {

25
pkgs/applications/office/openoffice/root-required.patch
View File

@ -1,25 +0,0 @@
As nix chroot environment does not have the 'root' as owner, we have to disable
the "owner=root" tar parameters when doing these tar files.
They are built at openoffice build time.
diff --git a/sysui/desktop/slackware/makefile.mk b/sysui/desktop/slackware/makefile.mk
index 3342aca..49679b1 100644
--- a/sysui/desktop/slackware/makefile.mk
+++ b/sysui/desktop/slackware/makefile.mk
@@ -100,7 +100,7 @@ $(MISC)/$(TARGET)/usr/share/applications/ :
$(MISC)/$(TARGET)/empty.tar :
@$(MKDIRHIER) $(@:d)/empty
- @tar -C $(MISC)/$(TARGET)/empty --owner=root --group=root --same-owner -cf $@ .
+ @tar -C $(MISC)/$(TARGET)/empty -cf $@ .
# --- packaging ---------------------------------------------------
@@ -112,7 +112,7 @@ $(MENUFILES) : $(MISC)/$(TARGET)/empty.tar
-$(RM) -r $(MISC)$/$(@:b)
dmake $(MISC)$/$(@:b)$/usr/share/applications $(MISC)$/$(@:b)$/install$/slack-desc $(MISC)$/$(@:b)$/install$/doinst.sh
@$(COPY) $(MISC)/$(TARGET)$/empty.tar $@.tmp
- @tar -C $(MISC)/$(@:b) --owner=root --group=root --same-owner --exclude application.flag -rf $@.tmp install usr opt
+ @tar -C $(MISC)/$(@:b) --exclude application.flag -rf $@.tmp install usr opt
@gzip < $@.tmp > $@
@$(RM) $@.tmp
$(RM) -r $(MISC)$/$(@:b)

22
pkgs/applications/office/openoffice/xlib.patch
View File

@ -1,22 +0,0 @@
https://bugs.freedesktop.org/show_bug.cgi?id=31322
diff -rc OOO320_m19-orig//vcl/unx/inc/dtint.hxx OOO320_m19//vcl/unx/inc/dtint.hxx
*** OOO320_m19-orig//vcl/unx/inc/dtint.hxx 2010-05-26 20:34:28.000000000 +0200
--- OOO320_m19//vcl/unx/inc/dtint.hxx 2011-02-15 17:04:32.134813676 +0100
***************
*** 36,42 ****
class SalDisplay;
class AllSettings;
! #ifndef _XLIB_H_
// forwards from X
struct Display;
struct XEvent;
--- 36,42 ----
class SalDisplay;
class AllSettings;
! #if !defined(_XLIB_H_) && !defined(_X11_XLIB_H_)
// forwards from X
struct Display;
struct XEvent;

6
pkgs/applications/science/logic/hol_light/default.nix
View File

@ -9,11 +9,11 @@ let
in
stdenv.mkDerivation {
name = "hol_light-20121213";
name = "hol_light-20130124";
src = fetchsvn {
url = http://hol-light.googlecode.com/svn/trunk;
rev = "153";
sha256 = "1n4da5k3jya8mf7dgif8cl5sr2dqf6vl21fw1fcdna215v2x1rc0";
rev = "155";
sha256 = "057223kcv7y2vcnyzvrygvdafn6mb7ycr1m5rj3fsrwz0yl8dqnr";
};
buildInputs = [ ocaml findlib camlp5 ];

8
pkgs/applications/science/misc/tulip/default.nix
View File

@ -1,13 +1,13 @@
{ fetchurl, stdenv, libxml2, freetype, mesa, glew, qt4
, cmake, makeWrapper, libjpeg }:
let version = "3.7.0"; in
let version = "4.1.0"; in
stdenv.mkDerivation rec {
name = "tulip-${version}";
src = fetchurl {
url = "mirror://sourceforge/auber/tulip/tulip-3.7.0/${name}-src.tar.gz";
sha256 = "150fj9pdxblvl5sby61cb2kq98r6h8yljk3vq5xizn198d3fz4jq";
url = "mirror://sourceforge/auber/${name}_src.tar.gz";
sha256 = "1js1f8xdm9g2m66xbhfxa8ixzw6h4gjynxsm83p54l3i0hs3biig";
};
buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg ];
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
doCheck = false;
meta = {
description = "Tulip, a visualization framework for the analysis and visualization of relational data";
description = "A visualization framework for the analysis and visualization of relational data";
longDescription =
'' Tulip is an information visualization framework dedicated to the

10
pkgs/applications/version-management/darcs/default.nix
View File

@ -1,18 +1,18 @@
{ cabal, curl, extensibleExceptions, filepath, hashedStorage
, haskeline, html, HTTP, mmap, mtl, network, parsec, random
, regexCompat, tar, terminfo, text, vector, zlib
, regexCompat, tar, terminfo, text, utf8String, vector, zlib
}:
cabal.mkDerivation (self: {
pname = "darcs";
version = "2.8.3";
sha256 = "0nbg45i5sgbsc488siqirgysy3z912xghqbwm5hcsl37j910hxch";
version = "2.8.4";
sha256 = "164zclgib9ql4rqykpdhhk2bad0m5v0k0iwzsj0z7nax5nxlvarz";
isLibrary = true;
isExecutable = true;
buildDepends = [
extensibleExceptions filepath hashedStorage haskeline html HTTP
mmap mtl network parsec random regexCompat tar terminfo text vector
zlib
mmap mtl network parsec random regexCompat tar terminfo text
utf8String vector zlib
];
extraLibraries = [ curl ];
postInstall = ''

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

@ -49,7 +49,7 @@ rec {
network pcreLight SHA stm utf8String networkInfo dbus clientsession cryptoApi dataDefault
extensibleExceptions filepath hamlet httpTypes networkMulticast text time transformers
transformersBase wai waiLogger warp yesod yesodDefault yesodStatic testpack QuickCheck
SafeSemaphore networkPprotocolXmpp async dns DAV;
SafeSemaphore networkPprotocolXmpp async dns DAV uuid Glob;
};
qgit = import ./qgit {

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

@ -8,18 +8,18 @@
, networkMulticast, pcreLight, QuickCheck, SHA, stm, text, time
, transformers, transformersBase, utf8String, wai, waiLogger, warp
, yesod, yesodDefault, yesodStatic, testpack, SafeSemaphore
, networkPprotocolXmpp, async, dns, DAV
, networkPprotocolXmpp, async, dns, DAV, uuid, Glob
}:
let
version = "3.20130107";
version = "3.20130216";
in
stdenv.mkDerivation {
name = "git-annex-${version}";
src = fetchurl {
url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}";
sha256 = "15x4rmpxv3mgp8r4gb6jana5262nvyl6rm5p8slc5z5ijl0qwbzq";
sha256 = "1zbxkv9kkfyr8haml0wih1fi2xi6qazwzcxjyv8q65fa80ksskbr";
name = "git-annex-${version}.tar.gz";
};
@ -31,7 +31,7 @@ stdenv.mkDerivation {
networkInfo networkMulticast pcreLight QuickCheck SHA stm text time
transformers transformersBase utf8String wai waiLogger warp yesod
yesodDefault yesodStatic testpack SafeSemaphore networkPprotocolXmpp
async dns DAV ];
async dns DAV uuid Glob ];
checkTarget = "test";
doCheck = true;

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

@ -3,6 +3,7 @@
, libxslt, tcl, tk, makeWrapper
, svnSupport, subversionClient, perlLibs, smtpPerlLibs
, guiSupport
, withManual ? true
, pythonSupport ? true
, sendEmailSupport
}:
@ -26,8 +27,7 @@ stdenv.mkDerivation {
patches = [ ./docbook2texi.patch ];
buildInputs = [curl openssl zlib expat gettext cpio makeWrapper]
++ # documentation tools
[ asciidoc texinfo xmlto docbook2x
++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
docbook_xsl docbook_xml_dtd_45 libxslt ]
++ stdenv.lib.optionals guiSupport [tcl tk];
@ -91,7 +91,7 @@ stdenv.mkDerivation {
notSupported $out/libexec/git-core/git-send-email "reinstall with config git = { sendEmailSupport = true } set"
'')
+ ''# Install man pages and Info manual
+ stdenv.lib.optionalString withManual ''# Install man pages and Info manual
make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${perl}/bin/perl" cmd-list.made install install-info \
-C Documentation ''

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs }:
{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs, expat }:
stdenv.mkDerivation rec {
name = "kdesvn-1.5.5";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
patches = [ ./docbook.patch ./virtual_inheritance.patch ];
buildInputs = [ apr aprutil subversion db4 kdelibs ];
buildInputs = [ apr aprutil subversion db4 kdelibs expat ];
buildNativeInputs = [ gettext ];

20
pkgs/applications/video/RealPlayer/builder.sh
View File

@ -1,20 +0,0 @@
source $stdenv/setup
source $makeWrapper
mkdir -p $out/real
skip=143273 # Look for "BZh91" in the executable.
(dd bs=1 count=$skip of=/dev/null && dd) < $src | (cd $out/real && tar xvfj -)
rm -rf $out/real/Bin $out/real/postinst
patchelf --interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) $out/real/realplay.bin
mkdir -p $out/bin
makeWrapper "$out/real/realplay.bin" "$out/bin/realplay" \
--set HELIX_LIBS "$out/real" \
--suffix-each LD_LIBRARY_PATH ':' "$(addSuffix /lib $libPath)"
#echo "$libstdcpp5/lib" > $out/real/mozilla/extra-library-path # !!! must be updated, use patchelf --rpath
echo "$out/bin" > $out/real/mozilla/extra-bin-path

19
pkgs/applications/video/RealPlayer/default.nix
View File

@ -1,19 +0,0 @@
{stdenv, fetchurl, libstdcpp5, glib, pango, atk, gtk, libX11, makeWrapper}:
# Note that RealPlayer 10 need libstdc++.so.5, i.e., GCC 3.3, not 3.4.
assert stdenv.system == "i686-linux";
(stdenv.mkDerivation {
name = "RealPlayer-10.0.8.805-GOLD";
builder = ./builder.sh;
src = fetchurl {
url = http://software-dl.real.com/25ae61d70a6855a52c14/unix/RealPlayer10GOLD.bin;
md5 = "d28b31261059231a3e93c7466f8153e6";
};
inherit libstdcpp5 makeWrapper;
libPath = [libstdcpp5 glib pango atk gtk libX11];
}) // {mozillaPlugin = "/real/mozilla";}

6
pkgs/applications/video/kdenlive/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "kdenlive-${version}";
version = "0.9.2";
version = "0.9.4";
src = fetchurl {
url = "mirror://kde/stable/kdenlive/0.9.2/src/${name}.tar.bz2";
sha256 = "1h240s0c10z8sgvwmrfzam33qlx7j2a5b12lw1mk02ihs9hl43j1";
url = "mirror://kde/stable/kdenlive/${version}/src/${name}.tar.bz2";
sha256 = "1l3axf3y83gdfr6yc1lmy296h09gypkpqsc01w7pprg0y19rrfif";
};
buildInputs =

132
pkgs/applications/video/mplayer2/default.nix Normal file
View File

@ -0,0 +1,132 @@
{ stdenv, fetchurl, fetchgit, freetype, pkgconfig, yasm, freefont_ttf, ffmpeg, libass
, python3, docutils, which
, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null
, xineramaSupport ? true, libXinerama ? null
, xvSupport ? true, libXv ? null
, alsaSupport ? true, alsaLib ? null
, screenSaverSupport ? true, libXScrnSaver ? null
, vdpauSupport ? true, libvdpau ? null
, dvdnavSupport ? true, libdvdnav ? null
, bluraySupport ? true, libbluray ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, jackaudioSupport ? false, jackaudio ? null
, pulseSupport ? true, pulseaudio ? null
# For screenshots
, libpngSupport ? true, libpng ? null
, useUnfreeCodecs ? false
}:
assert x11Support -> (libX11 != null && libXext != null && mesa != null);
assert xineramaSupport -> (libXinerama != null && x11Support);
assert xvSupport -> (libXv != null && x11Support);
assert alsaSupport -> alsaLib != null;
assert screenSaverSupport -> libXScrnSaver != null;
assert vdpauSupport -> libvdpau != null;
assert dvdnavSupport -> libdvdnav != null;
assert bluraySupport -> libbluray != null;
assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert jackaudioSupport -> jackaudio != null;
assert pulseSupport -> pulseaudio != null;
assert libpngSupport -> libpng != null;
let
codecs_src =
let
dir = http://www.mplayerhq.hu/MPlayer/releases/codecs/;
in
if stdenv.system == "i686-linux" then fetchurl {
url = "${dir}/essential-20071007.tar.bz2";
sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic";
} else if stdenv.system == "x86_64-linux" then fetchurl {
url = "${dir}/essential-amd64-20071007.tar.bz2";
sha256 = "13xf5b92w1ra5hw00ck151lypbmnylrnznq9hhb0sj36z5wz290x";
} else if stdenv.system == "powerpc-linux" then fetchurl {
url = "${dir}/essential-ppc-20071007.tar.bz2";
sha256 = "18mlj8dp4wnz42xbhdk1jlz2ygra6fbln9wyrcyvynxh96g1871z";
} else null;
codecs = if codecs_src != null then stdenv.mkDerivation {
name = "MPlayer-codecs-essential-20071007";
src = codecs_src;
installPhase = ''
mkdir $out
cp -prv * $out
'';
meta.license = "unfree";
} else null;
in
stdenv.mkDerivation rec {
name = "mplayer2-20130130";
src = fetchgit {
url = "git://git.mplayer2.org/mplayer2.git";
rev = "d3c580156c0b8777ff082426ebd61bb7ffe0c225";
sha256 = "1akf2mb2zklz609ks555vjvcs1gw8nwg5kbb9jwra8c4v1dfyhys";
};
prePatch = ''
sed -i /^_install_strip/d configure
'';
buildInputs = with stdenv.lib;
[ freetype pkgconfig ffmpeg libass docutils which ]
++ optionals x11Support [ libX11 libXext mesa ]
++ optional alsaSupport alsaLib
++ optional xvSupport libXv
++ optional theoraSupport libtheora
++ optional xineramaSupport libXinerama
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ optional bluraySupport libbluray
++ optional jackaudioSupport jackaudio
++ optional pulseSupport pulseaudio
++ optional screenSaverSupport libXScrnSaver
++ optional vdpauSupport libvdpau
++ optional speexSupport speex
++ optional libpngSupport libpng
;
buildNativeInputs = [ yasm python3 ];
postConfigure = ''
patchShebangs TOOLS
'';
configureFlags = with stdenv.lib;
''
${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"}
${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"}
${optionalString dvdnavSupport "--extra-ldflags=-ldvdread"}
${if xvSupport then "--enable-xv" else "--disable-xv"}
${if x11Support then "--enable-x11 --enable-gl --extra-cflags=-I{libx11}/include"
else "--disable-x11 --disable-gl"}
--disable-xvid
--disable-ossaudio
'';
NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext";
enableParallelBuilding = true;
# Provide a reasonable standard font. Maybe we should symlink here.
postInstall =
''
mkdir -p $out/share/mplayer
cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf
'';
meta = {
description = "A movie player that supports many video formats (MPlayer fork)";
homepage = "http://mplayer2.org";
license = "GPLv3+";
maintainers = [ stdenv.lib.maintainers.viric ];
platforms = stdenv.lib.platforms.linux;
};
}

19
pkgs/applications/virtualization/qemu/0.15.nix
View File

@ -1,19 +0,0 @@
{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses }:
stdenv.mkDerivation rec {
name = "qemu-0.15.1";
src = fetchurl {
url = "http://wiki.qemu.org/download/${name}.tar.gz";
sha256 = "1fmm7l7hm0vsmahp41pgvbl62hh833k802brn6hg8kcfkd6v21bp";
};
buildInputs = [ python zlib pkgconfig glib SDL ncurses ];
meta = {
description = "QEmu processor emulator";
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

19
pkgs/applications/virtualization/qemu/1.0.nix
View File

@ -1,19 +0,0 @@
{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses }:
stdenv.mkDerivation rec {
name = "qemu-1.0.1";
src = fetchurl {
url = "http://wiki.qemu.org/download/${name}.tar.gz";
sha256 = "0y43v5ls3j7iqczfswxkksiqww77nllydncygih7ylc20zhh528r";
};
buildInputs = [ python zlib pkgconfig glib SDL ncurses ];
meta = {
description = "QEmu processor emulator";
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

21
pkgs/applications/virtualization/qemu/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses, perl, pixman }:
stdenv.mkDerivation rec {
name = "qemu-1.3.1";
src = fetchurl {
url = "http://wiki.qemu.org/download/${name}.tar.bz2";
sha256 = "1bqfrb5dlsxm8gxhkksz8qzi5fhj3xqhxyfwbqcphhcv1kpyfwip";
};
buildInputs = [ python zlib pkgconfig glib SDL ncurses perl pixman ];
enableParallelBuilding = true;
meta = {
description = "QEmu processor emulator";
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [ viric shlevy ];
platforms = with stdenv.lib.platforms; linux;
};
}

5
pkgs/applications/virtualization/virtinst/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
distutils_extra simplejson readline glance cheetah lockfile httplib2
# !!! should libvirt be a build-time dependency? Note that
# libxml2Python is a dependency of libvirt.py.
libvirt libxml2Python
libvirt libxml2Python urlgrabber
];
buildInputs =
@ -31,8 +31,9 @@ stdenv.mkDerivation rec {
buildPhase = "python setup.py build";
installPhase =
''
''
python setup.py install --prefix="$out";
wrapPythonPrograms
'';
meta = {

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

@ -121,7 +121,7 @@ in stdenv.mkDerivation {
--base-dir "$libexec/ExtensionPacks" \
--cert-dir "$libexec/ExtPackCertificates" \
--name "Oracle VM VirtualBox Extension Pack" \
--tarball "${extensionPack}"
--tarball "${extensionPack}" \
--sha-256 "${extensionPack.outputHash}"
''}

4
pkgs/applications/window-managers/xmonad/default.nix
View File

@ -9,6 +9,10 @@ cabal.mkDerivation (self: {
buildDepends = [
extensibleExceptions filepath mtl utf8String X11
];
postInstall = ''
mkdir -p $out/share/man/man1
mv $out/share/xmonad-*/man/*.1 $out/share/man/man1/
'';
meta = {
homepage = "http://xmonad.org";
description = "A tiling window manager";

21
pkgs/build-support/fetchurl/builder.sh
View File

@ -6,7 +6,7 @@ source $mirrorsFile
# Curl flags to handle redirects, not use EPSV, handle cookies for
# servers to need them during redirects, and work on SSL without a
# certificate (this isn't a security problem because we check the
# cryptographic hash of the output anyway).
# cryptographic hash of the output anyway).
curl="curl \
--location --max-redirs 20 \
--retry 3
@ -29,20 +29,6 @@ tryDownload() {
finish() {
# On old versions of Nix, verify the hash of the output. On newer
# versions, Nix verifies the hash itself.
if test "$NIX_OUTPUT_CHECKED" != "1"; then
if test "$outputHashAlgo" != "md5"; then
echo "hashes other than md5 are unsupported in Nix <= 0.7, upgrade to Nix 0.8"
exit 1
fi
actual=$(md5sum -b "$out" | cut -c1-32)
if test "$actual" != "$id"; then
echo "hash is $actual, expected $id"
exit 1
fi
fi
stopNest
exit 0
}
@ -52,10 +38,11 @@ tryHashedMirrors() {
if test -n "$NIX_HASHED_MIRRORS"; then
hashedMirrors="$NIX_HASHED_MIRRORS"
fi
for mirror in $hashedMirrors; do
url="$mirror/$outputHashAlgo/$outputHash"
if $curl --fail --silent --show-error --head "$url" \
if $curl --retry 0 --connect-timeout "${NIX_CONNECT_TIMEOUT:-15}" \
--fail --silent --show-error --head "$url" \
--write-out "%{http_code}" --output /dev/null > code 2> log; then
tryDownload "$url"
if test -n "$success"; then finish; fi

20
pkgs/build-support/fetchurl/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, curl}: # Note that `curl' may be `null', in case of the native stdenv.
{ stdenv, curl }: # Note that `curl' may be `null', in case of the native stdenv.
let
@ -17,10 +17,7 @@ let
# Names of the master sites that are mirrored (i.e., "sourceforge",
# "gnu", etc.).
sites =
if builtins ? attrNames
then builtins.attrNames mirrors
else [] /* backwards compatibility */;
sites = builtins.attrNames mirrors;
impureEnvVars = [
# We borrow these environment variables from the caller to allow
@ -35,10 +32,14 @@ let
# This variable allows the user to override hashedMirrors from the
# command-line.
"NIX_HASHED_MIRRORS"
# This variable allows overriding the timeout for connecting to
# the hashed mirrors.
"NIX_CONNECT_TIMEOUT"
] ++ (map (site: "NIX_MIRRORS_${site}") sites);
in
{ # URL to fetch.
url ? ""
@ -79,9 +80,9 @@ stdenv.mkDerivation {
if showURLs then "urls"
else if name != "" then name
else baseNameOf (toString (builtins.head urls_));
builder = ./builder.sh;
buildInputs = [curl];
urls = urls_;
@ -90,9 +91,6 @@ stdenv.mkDerivation {
# (http://nixos.org/tarballs) over the original URLs.
preferHashedMirrors = true;
# Compatibility with Nix <= 0.7.
id = md5;
# New-style output content requirements.
outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else
if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5";

14
pkgs/build-support/fetchurl/mirrors.nix
View File

@ -224,6 +224,20 @@ rec {
ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/
];
xfce = [
http://archive.xfce.org/
http://mirror.netcologne.de/xfce/
http://archive.se.xfce.org/xfce/
http://archive.be.xfce.org/xfce/
http://mirror.perldude.de/archive.xfce.org/
http://archive.be2.xfce.org/
http://ftp.udc.es/xfce/
http://archive.al-us.xfce.org/
http://mirror.yongbok.net/X11/xfce-mirror/
http://mirrors.tummy.com/pub/archive.xfce.org/
http://xfce.mirror.uber.com.au/
];
# X.org.
xorg = [
http://xorg.freedesktop.org/releases/

11
pkgs/build-support/release/nix-build.nix
View File

@ -46,17 +46,17 @@ stdenv.mkDerivation (
header "Copying build directory to $KEEPBUILDDIR"
mkdir -p $KEEPBUILDDIR
cp -R $TMPDIR/* $KEEPBUILDDIR
stopNest
stopNest
fi
fi
'';
}
// args //
// args //
{
name = name + (if src ? version then "-" + src.version else "");
postHook = ''
. ${./functions.sh}
origSrc=$src
@ -75,7 +75,10 @@ stdenv.mkDerivation (
echo "$system" > $out/nix-support/system
if [ -z "${toString doCoverageAnalysis}" ]; then
echo "nix-build none $out" >> $out/nix-support/hydra-build-products
for i in $outputs; do
if [ "$i" = out ]; then j=none; else j="$i"; fi
echo "nix-build $j ''${!i}" >> $out/nix-support/hydra-build-products
done
fi
'';

5
pkgs/data/misc/poppler-data/default.nix
View File

@ -1,11 +1,11 @@
{ fetchurl, stdenv, cmake }:
stdenv.mkDerivation rec {
name = "poppler-data-0.4.5";
name = "poppler-data-0.4.6";
src = fetchurl {
url = "http://poppler.freedesktop.org/${name}.tar.gz";
sha256 = "1zbh1zd083wfwrcw7vxc2bn32h42y6iyh24syxcb3r5ggd2vr41i";
sha256 = "1yhaz74b50hjkz3ii077kmq3qg3p3kdyxm33cv6r1njvz8fr01pk";
};
buildInputs = [ cmake ];
@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
homepage = http://poppler.freedesktop.org/;
description = "Encoding files for Poppler, a PDF rendering library";
platforms = stdenv.lib.platforms.all;
license = "free"; # more free licenses combined
maintainers = [ stdenv.lib.maintainers.urkud ];
};
}

8
pkgs/desktops/e17/default.nix
View File

@ -10,6 +10,8 @@ rec {
ecore = callPackage ./ecore { };
eio = callPackage ./eio { };
embryo = callPackage ./embryo { };
edje = callPackage ./edje { lua = pkgs.lua5; };
@ -20,6 +22,12 @@ rec {
eeze = callPackage ./eeze { };
emotion = callPackage ./emotion { };
ethumb = callPackage ./ethumb { };
elementary = callPackage ./elementary { };
#### WINDOW MANAGER

5
pkgs/desktops/e17/e_dbus/default.nix
View File

@ -2,10 +2,10 @@
, dbus_libs }:
stdenv.mkDerivation rec {
name = "e_dbus-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1kky76v7yydsjihgi1hbwpyqhdmbxmxj2dw4p7kiqbl67dmsjhxg";
sha256 = "16ckrpzzw5x1cs0fwqkk8431al55xil5magihkp9l3s77g0qd26q";
};
buildInputs = [ pkgconfig zlib libjpeg expat ecore eina evas ];
propagatedBuildInputs = [ dbus_libs ];
@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
--disable-edbus-test-client
--disable-edbus-notify-send
--disable-edbus-notify-test
--disable-edbus-async-test
'';
meta = {
description = "Enlightenment's D-Bus wrapping and glue layer library";

11
pkgs/desktops/e17/ecore/default.nix
View File

@ -1,13 +1,16 @@
{ stdenv, fetchurl, pkgconfig, eina, evas, libX11, libXext }:
{ stdenv, fetchurl, pkgconfig, eina, evas, libX11, libXext, libXrender
, libXcomposite, libXfixes, libXdamage }:
stdenv.mkDerivation rec {
name = "ecore-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1fq3prr2i9n14jppfpns3dg1mkk3iy0ijv2d47pm4krymd7l4hs4";
sha256 = "08ljda6p0zj1h5sq3l0js6mihw8cr6ydynn42dnka36vachvmfjb";
};
buildInputs = [ pkgconfig eina evas ];
propagatedBuildInputs = [ libX11 libXext ];
propagatedBuildInputs = [ libX11 libXext libXcomposite libXrender libXfixes
libXdamage
];
meta = {
description = "Enlightenment's core mainloop, display abstraction and utility library";
longDescription = ''

8
pkgs/desktops/e17/edje/default.nix
View File

@ -2,12 +2,16 @@
, ecore, embryo }:
stdenv.mkDerivation rec {
name = "edje-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "15vh0plb9gb75q0lgbqv4kjz0pyhbfxk39x3inzn87ih567z73xx";
sha256 = "1hsyj46bk94yd9ymf9425pf4ygy36h5gdkg9fhf8qds8cnn2kcy7";
};
buildInputs = [ pkgconfig expat zlib libjpeg lua eina eet evas ecore embryo ];
patchPhase = ''
substituteInPlace src/bin/edje_cc_out.c --replace '%s/embryo_cc' '${embryo}/bin/embryo_cc'
substituteInPlace src/bin/edje_cc_out.c --replace 'eina_prefix_bin_get(pfx),' ""
'';
meta = {
description = "Enlightenment's abstract GUI layout and animation object library";
longDescription = ''

4
pkgs/desktops/e17/eet/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, eina, zlib, libjpeg }:
stdenv.mkDerivation rec {
name = "eet-${version}";
version = "1.6.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1cq6i9g020mi5mr069jykx1fvihd18k1y4x49skmhzfh7dv10dfp";
sha256 = "0ys2579v45f9x2n47shq0k63g0sdbj1ndhh72dvfajihsgjwd767";
};
buildInputs = [ pkgconfig eina zlib libjpeg ];
meta = {

4
pkgs/desktops/e17/eeze/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, eina, ecore, udev }:
stdenv.mkDerivation rec {
name = "eeze-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1v0n6bn3g04bjq0cxp6ixw7hb4kjbqpvywpvgik960xkn4pva76p";
sha256 = "0274fs4cxgw6420yyz9frrc8zhj0qqyvwczzslq3kih3sx1nikxr";
};
buildInputs = [ pkgconfig eina ecore ];
propagatedBuildInputs = [ udev ];

4
pkgs/desktops/e17/efreet/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, eina, eet, ecore }:
stdenv.mkDerivation rec {
name = "efreet-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1nydy3ahdq7q6b0xxaj79a8kd4b4xy3hzf1fdh117c9pwp4fxhl0";
sha256 = "1yw7qjddqcnsz1vb693pa57v9wydvzfy198dc23mz46qfqx08nlg";
};
buildInputs = [ pkgconfig eina eet ecore ];
meta = {

4
pkgs/desktops/e17/eina/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "eina-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1vchzb34hd9z8ghh75ch7sdf90gmzzpxryk3yq8hjcdxd0zjx9yj";
sha256 = "0kd4116njrbag9h459cmfpg07c4ag04z3yrsg513lpi27amch27w";
};
meta = {
description = "Enlightenment's core data structure library";

24
pkgs/desktops/e17/eio/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, eet, eina, ecore }:
stdenv.mkDerivation rec {
name = "eio-${version}";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1bsam5q364kc4xwfv7pql6686gj0byhk42zwjqx9ajf70l23kss6";
};
buildInputs = [ pkgconfig eet eina ecore ];
meta = {
description = "A library that integrates with EFL to provide efficient filesystem IO";
longDescription = ''
Eio integrates with EFL (Ecore, Eina) to provide efficient filesystem Input/Output.
It use the best techniques to achieve such purpose, like using at-variants, splice,
properly handling errors and doing it in an asynchronous fashion by means of worker
threads. It is also ported to Windows, so multi-platform.
Whenever you need to list a directory, copy, move or delete files, Eio will do that
task better than you'd achieve with naive implementations, and it is easy to use.
'';
homepage = http://enlightenment.org/;
license = stdenv.lib.licenses.lgpl21;
};
}

19
pkgs/desktops/e17/elementary/default.nix Normal file
View File

@ -0,0 +1,19 @@
{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje }:
stdenv.mkDerivation rec {
name = "elementary-${version}";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "08cb4x9639xyrb8d4vzvhl6v385qjfswl717sicm7iimh5zlm2l9";
};
buildInputs = [ pkgconfig eina eet evas ecore edje ];
meta = {
description = "Enlightenment's core data structure library";
longDescription = ''
Enlightenment's Eina is a core data structure and common utility
library.
'';
homepage = http://enlightenment.org/;
license = stdenv.lib.licenses.lgpl21;
};
}

6
pkgs/desktops/e17/embryo/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, eina }:
stdenv.mkDerivation rec {
name = "embryo-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "0hcjlf0rljz4zs1y5l4h0gn2gyqb1h4msfsaps8flaym4mxrvvd9";
sha256 = "104fsa179w2dfg00sfnap7c3b4ixcps4crxa6yav755awssdcim9";
};
buildInputs = [ pkgconfig eina ];
meta = {
@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
untouched.
'';
homepage = http://enlightenment.org/;
license = with stdenv.lib.licenses; [ bsd2 bsd3 ]; # not sure
license = with stdenv.lib.licenses; [ bsd2.shortName bsd3.shortName ]; # not sure
};
}

19
pkgs/desktops/e17/emotion/default.nix Normal file
View File

@ -0,0 +1,19 @@
{ stdenv, fetchurl, pkgconfig, ecore, evas, eet, eina, edje }:
stdenv.mkDerivation rec {
name = "emotion-${version}";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1sfw8kpj2fcqymzd6q7p51xxib1n2arvjl1hnwhqkvwhlsq2b4sw";
};
buildInputs = [ pkgconfig ecore evas eet eina edje ];
meta = {
description = "A library to easily integrate media playback into EFL applications";
longDescription = ''
Emotion is a library to easily integrate media playback into EFL applications,
it will take care of using Ecore's main loop and video display is done using Evas.
'';
homepage = http://enlightenment.org/;
license = stdenv.lib.licenses.lgpl21;
};
}

12
pkgs/desktops/e17/enlightenment/default.nix
View File

@ -1,12 +1,14 @@
{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus, embryo }:
{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus
, embryo, eio, xcbutilkeysyms, libjpeg }:
stdenv.mkDerivation rec {
name = "enlightenment-${version}";
version = "0.16.999.65643";
version = "0.17.1";
src = fetchurl {
url = "http://download.enlightenment.org/snapshots/2011-11-28/${name}.tar.gz";
sha256 = "1bb577gbccb1wrifrhv9pzm451zhig2p29mwz55b187ls31p36kz";
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1z2vx9r7yc55rs673jg7d685slgdv9dss45asg50wh5wxp2mfi3y";
};
buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus embryo ];
buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus embryo
eio xcbutilkeysyms libjpeg ];
configureFlags = ''
--with-profile=FAST_PC
--disable-illume

22
pkgs/desktops/e17/ethumb/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ stdenv, fetchurl, pkgconfig, eina, evas, ecore, edje, eet }:
stdenv.mkDerivation rec {
name = "ethumb-${version}";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "0prka3knz8p2n46dfrzgwn55khhhrhjny4vvnzkjcwmhvz7kgc9l";
};
buildInputs = [ pkgconfig eina evas ecore edje eet ];
meta = {
description = "A thumbnail generation library";
longDescription = ''
Ethumb - thumbnail generation library. Features:
* create thumbnails with a predefined frame (possibly an edje frame);
* have an option to create fdo-like thumbnails;
* have a client/server utility;
* TODO: make thumbnails from edje backgrounds, icons and themes;
'';
homepage = http://enlightenment.org/;
license = stdenv.lib.licenses.lgpl21;
};
}

4
pkgs/desktops/e17/evas/default.nix
View File

@ -2,10 +2,10 @@
, libX11, libXext, eina, eet }:
stdenv.mkDerivation rec {
name = "evas-${version}";
version = "1.2.0-alpha";
version = "1.7.5";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1lyya0nc8p0vs63azkflwq7lqqml94cqzjpg12h43sbvza342rsq";
sha256 = "0x3k89q2wxgxjsbhdf4qws7jgpjl7rpqji98ca3nf25jf2lm1cvh";
};
buildInputs = [ pkgconfig freetype fontconfig libpng libjpeg
libX11 libXext eina eet

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

@ -29,8 +29,6 @@
libgtkhtml = callPackage ./platform/libgtkhtml { };
intltool = callPackage ./platform/intltool { };
GConf = callPackage ./platform/GConf { };
gconfmm = callPackage ./platform/gconfmm { };

5
pkgs/desktops/gnome-2/platform/gtkglext/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk, mesa, pango }:
{ stdenv, fetchurl, pkgconfig, glib, gtk, mesa, pango, pangox_compat, xlibs }:
stdenv.mkDerivation rec {
name = "gtkglext-1.2.0";
@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0lbz96jwz57hnn52b8rfj54inwpwcc9fkdq6ya043cgnfih77g8n";
};
buildInputs = [ pkgconfig gtk mesa pango ];
buildInputs = with xlibs;
[ pkgconfig glib gtk mesa pango pangox_compat libX11 libXmu ];
# The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and
# `GTK_WIDGET_NO_WINDOW', all of which appear to be deprecated nowadays.

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

@ -1,13 +0,0 @@
{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gettext}:
stdenv.mkDerivation rec {
name = "intltool-0.40.6";
src = fetchurl {
url = mirror://gnome/sources/intltool/0.40/intltool-0.40.6.tar.bz2;
sha256 = "0r1vkvy5xzqk01yl6a0xlrry39bra24alkrx6279b77hc62my7jd";
};
buildInputs = [ pkgconfig ];
propagatedBuildInputs = [ perl perlXMLParser gettext ];
}

51
pkgs/desktops/kde-3/kdelibs/default.nix
View File

@ -1,51 +0,0 @@
{ stdenv, fetchurl, xlibs, zlib, perl, qt3, openssl, pcre
, pkgconfig, libtiff, libxml2, libxslt, libtool, expat
, freetype, bzip2, cups, attr, acl
}:
let version = "3.5.10"; in
stdenv.mkDerivation {
name = "kdelibs-${version}";
src = fetchurl {
url = "mirror://kde/stable/${version}/src/kdelibs-${version}.tar.bz2";
sha256 = "0wjw51r96h6rngbsrzndw890xggzvrakydsbaldlrvbh3jq9qzk1";
};
patches = [
# We're not supposed to use linux/inotify.h, use sys/inotify.h instead.
# Adapted from Gentoo.
./inotify.patch
# Fixes compilation issues with openssl-1.0.0
./kdelibs-3.5.10-openssl_1.0.0.patch
];
buildInputs = [
zlib perl qt3 openssl pcre pkgconfig libtiff libxml2
libxslt expat libtool freetype bzip2 cups
xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft
];
propagatedBuildInputs = [attr acl];
# Prevent configure from looking for pkg-config and freetype-config
# in the wrong location (it looks in /usr/bin etc. *before* looking
# in $PATH).
preConfigure = ''
substituteInPlace configure \
--replace /usr/bin /no-such-path \
--replace /usr/local/bin /no-such-path \
--replace /opt/local/bin /no-such-path
'';
configureFlags = ''
--without-arts
--with-ssl-dir=${openssl}
--x-includes=${xlibs.libX11}/include
--x-libraries=${xlibs.libX11}/lib
'';
meta.platforms = stdenv.lib.platforms.linux;
}

30
pkgs/desktops/kde-3/kdelibs/inotify.patch
View File

@ -1,30 +0,0 @@
diff -rc kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp kdelibs-3.5.10/kio/kio/kdirwatch.cpp
*** kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp 2006-07-22 10:16:37.000000000 +0200
--- kdelibs-3.5.10/kio/kio/kdirwatch.cpp 2009-04-01 13:26:48.000000000 +0200
***************
*** 64,74 ****
// debug
#include <sys/ioctl.h>
! #ifdef HAVE_INOTIFY
#include <unistd.h>
#include <fcntl.h>
#include <sys/syscall.h>
- #include <linux/types.h>
// Linux kernel headers are documented to not compile
#define _S390_BITOPS_H
#include <linux/inotify.h>
--- 64,76 ----
// debug
#include <sys/ioctl.h>
! #if 1
! #include <sys/inotify.h>
! #include <fcntl.h>
! #elif HAVE_INOTIFY
#include <unistd.h>
#include <fcntl.h>
#include <sys/syscall.h>
// Linux kernel headers are documented to not compile
#define _S390_BITOPS_H
#include <linux/inotify.h>

180
pkgs/desktops/kde-3/kdelibs/kdelibs-3.5.10-openssl_1.0.0.patch
View File

@ -1,180 +0,0 @@
diff -Naur kdelibs-3.5.10-old/kio/kssl/kopenssl.cc kdelibs-3.5.10-new/kio/kssl/kopenssl.cc
--- kdelibs-3.5.10-old/kio/kssl/kopenssl.cc 2006-07-22 01:16:39.000000000 -0700
+++ kdelibs-3.5.10-new/kio/kssl/kopenssl.cc 2010-03-31 09:34:38.000000000 -0700
@@ -96,9 +96,14 @@
static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *,
const EVP_CIPHER *,unsigned char *,int ,
pem_password_cb *, void *) = 0L;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L;
+static ASN1_ITEM *K_NETSCAPE_X509_it = 0L;
+#else
static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L;
static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L;
static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L;
+#endif
static int (*K_X509_print_fp) (FILE *, X509*) = 0L;
static int (*K_i2d_PKCS12) (PKCS12*, unsigned char**) = 0L;
static int (*K_i2d_PKCS12_fp) (FILE *, PKCS12*) = 0L;
@@ -404,9 +409,14 @@
K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl");
K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write");
K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio");
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp");
+ K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it");
+#else
K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth");
K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp");
K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER");
+#endif
K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp");
K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12");
K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp");
@@ -568,7 +578,7 @@
K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session");
K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION");
K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION");
- K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
+ K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
#endif
@@ -956,7 +966,13 @@
else return -1;
}
-
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) {
+ if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it)
+ return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x);
+ else return -1;
+}
+#else
ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) {
if (K_X509_asn1_meth) return (K_X509_asn1_meth)();
else return 0L;
@@ -968,7 +984,7 @@
return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x);
else return -1;
}
-
+#endif
int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) {
if (K_X509_print_fp) return (K_X509_print_fp)(fp, x);
diff -Naur kdelibs-3.5.10-old/kio/kssl/kopenssl.h kdelibs-3.5.10-new/kio/kssl/kopenssl.h
--- kdelibs-3.5.10-old/kio/kssl/kopenssl.h 2006-07-22 01:16:39.000000000 -0700
+++ kdelibs-3.5.10-new/kio/kssl/kopenssl.h 2010-03-31 09:35:20.000000000 -0700
@@ -48,6 +48,9 @@
#include <openssl/stack.h>
#include <openssl/bn.h>
#undef crypt
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define STACK _STACK
+#endif
#endif
#include <kstaticdeleter.h>
@@ -446,12 +449,12 @@
*/
int PEM_write_bio_X509(BIO *bp, X509 *x);
-
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
/*
* X509_asn1_meth - used for netscape output
*/
ASN1_METHOD *X509_asn1_meth();
-
+#endif
/*
* ASN1_i2d_fp - used for netscape output
@@ -531,6 +534,9 @@
*/
void sk_free(STACK *s);
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
+#endif
/*
* Number of elements in the stack
@@ -543,6 +549,9 @@
*/
char *sk_value(STACK *s, int n);
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
+#endif
/*
* Create a new stack
@@ -555,6 +564,9 @@
*/
int sk_push(STACK *s, char *d);
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
+#endif
/*
* Duplicate the stack
diff -Naur kdelibs-3.5.10-old/kio/kssl/ksmimecrypto.cc kdelibs-3.5.10-new/kio/kssl/ksmimecrypto.cc
--- kdelibs-3.5.10-old/kio/kssl/ksmimecrypto.cc 2005-10-10 08:05:44.000000000 -0700
+++ kdelibs-3.5.10-new/kio/kssl/ksmimecrypto.cc 2010-03-31 09:34:38.000000000 -0700
@@ -87,7 +87,7 @@
STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList<KSSLCertificate> &certs) {
- STACK_OF(X509) *x509 = sk_new(NULL);
+ STACK_OF(X509) *x509 = reinterpret_cast<STACK_OF(X509)*>(sk_new(NULL));
KSSLCertificate *cert = certs.first();
while(cert) {
sk_X509_push(x509, cert->getCert());
diff -Naur kdelibs-3.5.10-old/kio/kssl/ksslcertificate.cc kdelibs-3.5.10-new/kio/kssl/ksslcertificate.cc
--- kdelibs-3.5.10-old/kio/kssl/ksslcertificate.cc 2006-01-19 09:06:12.000000000 -0800
+++ kdelibs-3.5.10-new/kio/kssl/ksslcertificate.cc 2010-03-31 09:34:38.000000000 -0700
@@ -1003,17 +1003,31 @@
QByteArray KSSLCertificate::toNetscape() {
QByteArray qba;
#ifdef KSSL_HAVE_SSL
-ASN1_HEADER ah;
-ASN1_OCTET_STRING os;
-KTempFile ktf;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ NETSCAPE_X509 nx;
+ ASN1_OCTET_STRING hdr;
+#else
+ ASN1_HEADER ah;
+ ASN1_OCTET_STRING os;
+#endif
+ KTempFile ktf;
- os.data = (unsigned char *)NETSCAPE_CERT_HDR;
- os.length = strlen(NETSCAPE_CERT_HDR);
- ah.header = &os;
- ah.data = (char *)getCert();
- ah.meth = d->kossl->X509_asn1_meth();
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ hdr.data = (unsigned char *)NETSCAPE_CERT_HDR;
+ hdr.length = strlen(NETSCAPE_CERT_HDR);
+ nx.header = &hdr;
+ nx.cert = getCert();
+
+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx);
+#else
+ os.data = (unsigned char *)NETSCAPE_CERT_HDR;
+ os.length = strlen(NETSCAPE_CERT_HDR);
+ ah.header = &os;
+ ah.data = (char *)getCert();
+ ah.meth = d->kossl->X509_asn1_meth();
- d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
+#endif
ktf.close();

22
pkgs/desktops/xfce-4.8/applications/gigolo.nix
View File

@ -1,22 +0,0 @@
{ stdenv, fetchurl, python, gettext, intltool, pkgconfig, gtk, gvfs}:
stdenv.mkDerivation rec {
name = "gigolo-0.4.1";
src = fetchurl {
url = "http://archive.xfce.org/src/apps/gigolo/0.4/${name}.tar.bz2";
sha256 = "1y8p9bbv1a4qgbxl4vn6zbag3gb7gl8qj75cmhgrrw9zrvqbbww2";
};
buildInputs = [ python gettext intltool gtk pkgconfig gvfs];
preConfigure = ''
sed -i "waf" -e "1 s^.*/env[ ]*python^#!${python}/bin/python^";
'';
meta = {
homepage = http://goodies.xfce.org/projects/applications/gigolo;
description = "Gigolo is a frontend to easily manage connections to remote filesystems";
platforms = stdenv.lib.platforms.linux;
};
}

20
pkgs/desktops/xfce-4.8/applications/mousepad.nix
View File

@ -1,20 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4, gtk }:
stdenv.mkDerivation rec {
name = "mousepad-0.2.16";
src = fetchurl {
url = "http://archive.xfce.org/src/apps/mousepad/0.2/${name}.tar.bz2";
sha1 = "4e63033e0a71578f3ec9a0d2e6a505efd0424ef9";
};
buildInputs = [ pkgconfig intltool libxfce4util libxfcegui4 gtk ];
meta = {
homepage = http://www.xfce.org/projects/mousepad/;
description = "A simple text editor for Xfce";
license = "GPLv2+";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}

25
pkgs/desktops/xfce-4.8/applications/terminal.nix
View File

@ -1,25 +0,0 @@
{ stdenv, fetchurl
, pkgconfig, ncurses
, intltool, vte
, exo, libxfce4util
, gtk
}:
stdenv.mkDerivation {
name = "xfce-terminal-0.4.8";
src = fetchurl {
url = http://archive.xfce.org/src/apps/xfce4-terminal/0.4/Terminal-0.4.8.tar.bz2;
sha1 = "2f12c3a0fffad18976d47e531d404ee308cb2f05";
};
buildInputs = [ pkgconfig intltool exo gtk vte libxfce4util ncurses ];
meta = {
homepage = http://www.xfce.org/projects/terminal;
description = "A modern terminal emulator primarily for the Xfce desktop environment";
license = "GPLv2+";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}

18
pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix
View File

@ -1,18 +0,0 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk, xfce }:
stdenv.mkDerivation rec {
name = "xfce4-notifyd-0.2.2";
src = fetchurl {
url = "http://archive.xfce.org/src/apps/xfce4-notifyd/0.2/${name}.tar.bz2";
sha256 = "0s4ilc36sl5k5mg5727rmqims1l3dy5pwg6dk93wyjqnqbgnhvmn";
};
buildInputs = [ intltool pkgconfig gtk xfce.libxfce4util xfce.libxfce4ui xfce.xfconf ];
meta = {
homepage = http://goodies.xfce.org/projects/applications/xfce4-notifyd;
description = "The Xfce Notify Daemon";
platforms = stdenv.lib.platforms.linux;
};
}

18
pkgs/desktops/xfce-4.8/applications/xfce4-taskmanager.nix
View File

@ -1,18 +0,0 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk }:
stdenv.mkDerivation rec {
name = "xfce4-taskmanager-1.0.0";
src = fetchurl {
url = "http://archive.xfce.org/src/apps/xfce4-taskmanager/1.0/${name}.tar.bz2";
sha256 = "1vm9gw7j4ngjlpdhnwdf7ifx6xrrn21011almx2vwidhk2f9zvy0";
};
buildInputs = [ intltool pkgconfig gtk ];
meta = {
homepage = http://goodies.xfce.org/projects/applications/xfce4-taskmanager;
description = "Easy to use task manager for XFCE";
platforms = stdenv.lib.platforms.linux;
};
}

19
pkgs/desktops/xfce-4.8/core/exo.nix
View File

@ -1,19 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4util }:
stdenv.mkDerivation rec {
name = "exo-0.6.2";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/exo/0.6/${name}.tar.bz2";
sha1 = "2486f12c814630068665e22cdf417f0f0f05dab1";
};
buildInputs =
[ pkgconfig intltool URI glib gtk libxfce4util ];
meta = {
homepage = http://www.xfce.org/projects/exo;
description = "Application library for the Xfce desktop environment";
license = "GPLv2+";
};
}

18
pkgs/desktops/xfce-4.8/core/garcon.nix
View File

@ -1,18 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util }:
stdenv.mkDerivation rec {
name = "garcon-0.1.9";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/garcon/0.1/${name}.tar.bz2";
sha1 = "2eeab19bc10747a40b44afd4598a2f555eb69952";
};
buildInputs = [ pkgconfig intltool glib libxfce4util ];
meta = {
homepage = http://www.xfce.org/;
description = "Xfce menu support library";
license = "GPLv2+";
};
}

21
pkgs/desktops/xfce-4.8/core/gtk-xfce-engine.nix
View File

@ -1,21 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk }:
stdenv.mkDerivation rec {
name = "gtk-xfce-engine-2.8.1";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/gtk-xfce-engine/2.8/${name}.tar.bz2";
sha1 = "d7779f07cc76585be063bc25fa91e660e1fd9c97";
};
buildInputs =
[ pkgconfig intltool gtk ];
meta = {
homepage = http://www.xfce.org/;
description = "GTK+ theme engine for Xfce";
license = "GPLv2+";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}

24
pkgs/desktops/xfce-4.8/core/libxfce4ui.nix
View File

@ -1,24 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, xfconf
, libstartup_notification }:
stdenv.mkDerivation rec {
name = "libxfce4ui-4.8.1";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/libxfce4ui/4.8/${name}.tar.bz2";
sha1 = "408645581e589135aa03d2e9b84f4eede68596b2";
};
buildInputs =
[ pkgconfig intltool gtk libxfce4util xfconf
libstartup_notification
];
enableParallelBuilding = true;
meta = {
homepage = http://www.xfce.org/;
description = "Basic GUI library for Xfce";
license = "LGPLv2+";
};
}

18
pkgs/desktops/xfce-4.8/core/libxfce4util.nix
View File

@ -1,18 +0,0 @@
{ stdenv, fetchurl, pkgconfig, glib, intltool }:
stdenv.mkDerivation rec {
name = "libxfce4util-4.8.2";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/libxfce4util/4.8/${name}.tar.bz2";
sha1 = "e7498c2e5fca2c89dfef89e0788f10eebbd020c3";
};
buildInputs = [ pkgconfig glib intltool ];
meta = {
homepage = http://www.xfce.org/;
description = "Basic utility non-GUI functions for Xfce";
license = "bsd";
};
}

27
pkgs/desktops/xfce-4.8/core/thunar.nix
View File

@ -1,27 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
, dbus_glib, libstartup_notification, xfconf, xfce4panel, udev, libnotify }:
stdenv.mkDerivation rec {
version = "1.2.3";
name = "thunar-${version}";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/thunar/1.2/Thunar-${version}.tar.bz2";
sha1 = "a05d0e14515d70c5ad94cca881822a707d366863";
};
buildInputs =
[ pkgconfig intltool gtk exo libxfce4util libxfce4ui
dbus_glib libstartup_notification xfconf xfce4panel udev libnotify
];
enableParallelBuilding = true;
meta = {
homepage = http://thunar.xfce.org/;
description = "Xfce file manager";
license = "GPLv2+";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}

29
pkgs/desktops/xfce-4.8/core/xfce4-panel.nix
View File

@ -1,29 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, garcon
, libxfce4ui, xfconf, libwnck, exo }:
stdenv.mkDerivation rec {
name = "xfce4-panel-4.8.6";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/xfce4-panel/4.8/${name}.tar.bz2";
sha1 = "332fc968332e6271e1bb65d6de8de2524b0440ec";
};
patches = [ ./xfce4-panel-datadir.patch ];
patchFlags = "-p1";
buildInputs =
[ pkgconfig intltool gtk libxfce4util garcon libxfce4ui xfconf
exo libwnck
];
enableParallelBuilding = true;
meta = {
homepage = http://www.xfce.org/;
description = "Xfce panel";
license = "GPLv2+";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}

24
pkgs/desktops/xfce-4.8/core/xfce4-session.nix
View File

@ -1,24 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
, libwnck, dbus_glib, xfconf, xorg, xfce4panel }:
stdenv.mkDerivation rec {
name = "xfce4-session-4.8.2";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/xfce4-session/4.8/${name}.tar.bz2";
sha1 = "636c2983552861a959225e554898675152a4d812";
};
buildInputs =
[ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib
xfconf xorg.iceauth xfce4panel
];
meta = {
homepage = http://www.xfce.org/;
description = "Session manager for Xfce";
license = "GPLv2+";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}

26
pkgs/desktops/xfce-4.8/core/xfce4-settings.nix
View File

@ -1,26 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
, xfconf, xorg, libnotify, libxklavier }:
stdenv.mkDerivation rec {
name = "xfce4-settings-4.8.3";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/xfce4-settings/4.8/${name}.tar.bz2";
sha1 = "98431633ba3ec2a4a10182bc7266904d9256949b";
};
buildInputs =
[ pkgconfig intltool exo gtk libxfce4util libxfce4ui
xfconf libnotify xorg.libXcursor libxklavier
];
configureFlags = "--enable-pluggable-dialogs --enable-sound-settings";
meta = {
homepage = http://www.xfce.org/;
description = "Settings manager for Xfce";
license = "GPLv2+";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}

20
pkgs/desktops/xfce-4.8/core/xfconf.nix
View File

@ -1,20 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus_glib }:
stdenv.mkDerivation rec {
name = "xfconf-4.8.1";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/xfconf/4.8/${name}.tar.bz2";
sha1 = "aeab124f7c548e387b37a5476e594ef559515533";
};
buildInputs = [ pkgconfig intltool glib libxfce4util ];
propagatedBuildInputs = [ dbus_glib ];
meta = {
homepage = http://www.xfce.org/;
description = "Simple client-server configuration storage and query system for Xfce";
license = "GPLv2";
};
}

26
pkgs/desktops/xfce-4.8/core/xfdesktop.nix
View File

@ -1,26 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, libxfce4util
, libxfce4ui, libwnck, xfconf, garcon, libnotify, exo }:
stdenv.mkDerivation rec {
name = "xfdesktop-4.8.3";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/xfdesktop/4.8/${name}.tar.bz2";
sha1 = "b3af72a69627f860f22b37d021efd81e4e37eb55";
};
buildInputs =
[ pkgconfig intltool gtk dbus_glib libxfce4util libxfce4ui libwnck xfconf
garcon libnotify exo
];
enableParallelBuilding = true;
meta = {
homepage = http://www.xfce.org/;
description = "Xfce desktop manager";
license = "GPLv2+";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}

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

@ -1,94 +0,0 @@
{ callPackage, pkgs }:
rec {
inherit (pkgs) gtk glib;
#### SUPPORT
# The useful bits from ‘gnome-disk-utility’.
libgdu = callPackage ./support/libgdu.nix { };
# Gvfs is required by Thunar for the trash feature and for volume
# mounting. Should use the one from Gnome, but I don't want to mess
# with the Gnome packages (or pull in a zillion Gnome dependencies).
gvfs = callPackage ./support/gvfs.nix { };
#### CORE
libxfce4util = callPackage ./core/libxfce4util.nix { };
exo = callPackage ./core/exo.nix {
inherit (pkgs.perlPackages) URI;
};
xfconf = callPackage ./core/xfconf.nix { };
libxfcegui4 = callPackage ./core/libxfcegui4.nix {
inherit (pkgs.gnome) libglade;
};
libxfce4ui = callPackage ./core/libxfce4ui.nix { };
xfwm4 = callPackage ./core/xfwm4.nix {
inherit (pkgs.gnome) libwnck;
};
xfceutils = callPackage ./core/xfce-utils.nix { };
garcon = callPackage ./core/garcon.nix { };
xfce4panel = callPackage ./core/xfce4-panel.nix {
inherit (pkgs.gnome) libwnck;
};
xfce4session = callPackage ./core/xfce4-session.nix {
inherit (pkgs.gnome) libwnck;
};
xfce4settings = callPackage ./core/xfce4-settings.nix { };
xfdesktop = callPackage ./core/xfdesktop.nix {
inherit (pkgs.gnome) libwnck;
};
thunar = callPackage ./core/thunar.nix { };
thunar_volman = callPackage ./core/thunar-volman.nix { };
gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { };
xfce4_appfinder = callPackage ./core/xfce4-appfinder.nix { };
#### APPLICATIONS
terminal = callPackage ./applications/terminal.nix {
inherit (pkgs.gnome) vte;
};
gigolo = callPackage ./applications/gigolo.nix { };
mousepad = callPackage ./applications/mousepad.nix { };
ristretto = callPackage ./applications/ristretto.nix { };
xfce4_notifyd = callPackage ./applications/xfce4-notifyd.nix { };
xfce4_power_manager = callPackage ./applications/xfce4-power-manager.nix { };
xfce4mixer = callPackage ./applications/xfce4-mixer.nix { };
xfce4_taskmanager = callPackage ./applications/xfce4-taskmanager.nix { };
#### ART
xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { };
#### PANEL PLUGINS
xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix {};
xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix {};
}

37
pkgs/desktops/xfce/4_08.nix Normal file
View File

@ -0,0 +1,37 @@
{ pkgs, newScope }: let
common = (import ./common.nix) { inherit pkgs newScope xfce_self; };
callPackage = common.callPackage;
xfce_self = common.xfce_common // rec { # the lines are very long but it seems better than the even-odd line approach
#### CORE
exo = callPackage ./core/exo.nix { v= "0.6.2"; h= "0f8zh5y057l7xffskjvky6k88hrnz6jyk35mvlfpmx26anlgd77l"; };
libxfce4ui = callPackage ./core/libxfce4ui.nix { v= "4.8.1"; h= "0mlrcr8rqmv047xrb2dbh7f4knsppb1anx2b05s015h6v8lyvjrr"; };
libxfce4util = callPackage ./core/libxfce4util.nix { v= "4.8.2"; h= "05n8586h2fwkibfld5fm4ygx1w66jnbqqb3li0ardjvm2n24k885"; };
libxfcegui4 = callPackage ./core/libxfcegui4.nix { v= "4.8.1"; h= "0hr4h6a9p6w3qw1976p8v9c9pwhd9zhrjlbaph0p7nyz7j1836ih"; };
thunar = callPackage ./core/thunar.nix { v= "1.2.3"; h= "19mczys6xr683r68g3s2njrrmnk1p73zypvwrhajw859c6nsjsp6"; };
xfce4panel = callPackage ./core/xfce4-panel.nix { v= "4.8.6"; h= "00zdkg1jg4n2n109nxan8ji2m06r9mc4lnlrvb55xvj229m2dwb6"; };
xfce4session = callPackage ./core/xfce4-session.nix { v= "4.8.2"; h= "1l608kik98jxbjl73waf8515hzji06lr80qmky2qlnp0b6js5g1i"; };
xfce4settings = callPackage ./core/xfce4-settings.nix { v= "4.8.3"; h= "0bmw0s6jp2ws4n0f3387zwsyv46b0w89m6r70yb7wrqy9r3wqy6q"; };
xfceutils = callPackage ./core/xfce-utils.nix { v= "4.8.3"; h= "09mr0amp2f632q9i3vykaa0x5nrfihfm9v5nxsx9vch8wvbp0l03"; };
xfconf = callPackage ./core/xfconf.nix { v= "4.8.1"; h= "1jwkb73xcgqfly449jwbn2afiyx50p150z60x19bicps75sp6q4q"; };
xfdesktop = callPackage ./core/xfdesktop.nix { v= "4.8.3"; h= "097lc9djmay0jyyl42jmvcfda75ndp265nzn0aa3hv795bsn1175"; };
xfwm4 = callPackage ./core/xfwm4.nix { v= "4.8.3"; h= "0zi2g1d2jdgw5armlk9xjh4ykmydy266gdba86nmhy951gm8n3hb"; };
xfce4_appfinder = callPackage ./core/xfce4-appfinder.nix { v= "4.8.0"; h= "0zy7i9x4qjchmyb8nfpb7m2ply5n2aq35p9wrhb8lpz4am1ihx7x"; };
#### APPLICATIONS
terminal = null; # newer versions don't build with 4.8
# versions > 0.3* don't build with xfce-4.8.*
ristretto = callPackage ./applications/ristretto.nix { v= "0.3.7"; h= "19mzy159j4qhd7pd1b83gimxfdg3mwdab9lq9kk505d21r7iqc9b"; };
xfce4mixer = callPackage ./applications/xfce4-mixer.nix { v= "4.8.0"; h= "1aqgjxvck6hx26sk3n4n5avhv02vs523mfclcvjb3xnks3yli7wz"; };
}; # xfce_self
in xfce_self

35
pkgs/desktops/xfce/4_10.nix Normal file
View File

@ -0,0 +1,35 @@
{ pkgs, newScope }: let
common = (import ./common.nix) { inherit pkgs newScope xfce_self; };
callPackage = common.callPackage;
xfce_self = common.xfce_common // rec { # the lines are very long but it seems better than the even-odd line approach
#### CORE
exo = callPackage ./core/exo.nix { v= "0.10.2"; h= "1kknxiz703q4snmry65ajm26jwjslbgpzdal6bd090m3z25q51dk"; };
libxfce4ui = callPackage ./core/libxfce4ui.nix { v= "4.10.0"; h= "1qm31s6568cz4c8rl9fsfq0xmf7pldxm0ki62gx1cpybihlgmfd2"; };
libxfce4util = callPackage ./core/libxfce4util.nix { v= "4.10.0"; h= "13k0wwbbqvdmbj4xmk4nxdlgvrdgr5y6r3dk380mzfw053hzwy89"; };
libxfcegui4 = callPackage ./core/libxfcegui4.nix { v= "4.10.0"; h= "0cs5im0ib0cmr1lhr5765yliqjfyxvk4kwy8h1l8bn3mj6bzk0ib"; };
thunar = callPackage ./core/thunar.nix { v= "1.6.2"; h= "11dx38rvkfbp91pxrprymxhimsm90gvizp277x9s5rwnwcm1ggbx"; };
xfce4panel = callPackage ./core/xfce4-panel.nix { v= "4.10.0"; h= "1f8903nx6ivzircl8d8s9zna4vjgfy0qhjk5d2x19g9bmycgj89k"; };
xfce4session = callPackage ./core/xfce4-session.nix { v= "4.10.0"; h= "1kj65jkjhd0ysf0yxsf88wzpyv6n8i8qgd3gb502hf1x9jksk2mv"; };
xfce4settings = callPackage ./core/xfce4-settings.nix { v= "4.10.0"; h= "0zppq747z9lrxyv5zrrvpalq7hb3gfhy9p7qbldisgv7m6dz0hq8"; };
xfceutils = null; # removed in 4.10
xfconf = callPackage ./core/xfconf.nix { v= "4.10.0"; h= "0xh520z0qh0ib0ijgnyrgii9h5d4pc53n6mx1chhyzfc86j1jlhp"; };
xfdesktop = callPackage ./core/xfdesktop.nix { v= "4.10.0"; h= "0yrddj1lgk3xn4w340y89z7x2isks72ia36pka08kk2x8gpfcyl9"; };
xfwm4 = callPackage ./core/xfwm4.nix { v= "4.10.0"; h= "170zzs7adj47srsi2cl723w9pl8k8awd7w1bpzxby7hj92zmf8s9"; };
xfce4_appfinder = callPackage ./core/xfce4-appfinder.nix { v= "4.9.4"; h= "12lgrbd1n50w9n8xkpai98s2aw8vmjasrgypc57sp0x0qafsqaxq"; };
#### APPLICATIONS
ristretto = callPackage ./applications/ristretto.nix { v= "0.6.3"; h= "0y9d8w1plwp4vmxs44y8k8x15i0k0xln89k6jndhv6lf57g1cs1b"; };
terminal = xfce4terminal; # it has changed its name
xfce4mixer = callPackage ./applications/xfce4-mixer.nix { v= "4.10.0"; h= "1pnsd00583l7p5d80rxbh58brzy3jnccwikbbbm730a33c08kid8"; };
xfce4terminal = callPackage ./applications/terminal.nix { v= "0.6.1"; h= "1j6lpkq952mrl5p24y88f89wn9g0namvywhma639xxsswlkn8d31"; };
};
in xfce_self

19
pkgs/desktops/xfce/applications/gigolo.nix Normal file
View File

@ -0,0 +1,19 @@
{ h, v, stdenv, fetchXfce, python, gettext, intltool, pkgconfig, gtk, gvfs }:
stdenv.mkDerivation rec {
name = "gigolo-${v}";
src = fetchXfce.app name h;
buildInputs = [ python gettext intltool gtk pkgconfig gvfs];
preConfigure = ''
sed -i "waf" -e "1 s^.*/env[ ]*python^#!${python}/bin/python^";
'';
meta = {
homepage = http://goodies.xfce.org/projects/applications/gigolo;
description = "A frontend to easily manage connections to remote filesystems";
platforms = stdenv.lib.platforms.linux;
};
}

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