diff --git a/doc/meta.xml b/doc/meta.xml
index 30b5ad247d1..09252410d80 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -176,6 +176,12 @@ following:
(“MIT”) License.
+
+ perl5
+ The Perl 5 license (Artistic License, version 1
+ and GPL, version 1 or later).
+
+
free
Catch-all for free software licenses not listed
diff --git a/maintainers/scripts/copy-tarball.sh b/maintainers/scripts/copy-tarball.sh
index b4c2e93dab1..de325120efc 100755
--- a/maintainers/scripts/copy-tarball.sh
+++ b/maintainers/scripts/copy-tarball.sh
@@ -10,25 +10,25 @@ base="$(basename "$url")"
if [ -z "$base" ]; then echo "bad URL"; exit 1; fi
dstPath="$distDir/$base"
-if [ -e "$dstPath" ]; then echo "$dstPath already exists"; exit 0; fi
+if [ -e "$dstPath" ]; then if [ -n "$VERBOSE" ]; then echo "$dstPath already exists"; fi; exit 0; fi
if [ -z "$file" ]; then
echo "downloading $url to $dstPath"
- if [ -n "$dryRun" ]; then exit 0; fi
+ if [ -n "$DRY_RUN" ]; then exit 0; fi
declare -a res
if ! res=($(PRINT_PATH=1 nix-prefetch-url "$url")); then
- continue
+ exit
fi
-
+
storePath=${res[1]}
else
storePath="$file"
fi
-
+
cp $storePath "$dstPath.tmp.$$"
mv -f "$dstPath.tmp.$$" "$dstPath"
diff --git a/maintainers/scripts/copy-tarballs.sh b/maintainers/scripts/copy-tarballs.sh
index 80aeef9d66d..a261f817585 100755
--- a/maintainers/scripts/copy-tarballs.sh
+++ b/maintainers/scripts/copy-tarballs.sh
@@ -8,7 +8,19 @@ urls=$(nix-instantiate --eval-only --xml --strict ' 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 < $out/nix-support/propagated-user-env-packages
- '';
- meta = {
- description = "Popular music player for KDE";
- license = "GPL";
- homepage = http://amarok.kde.org;
- inherit (kdelibs.meta) maintainers;
- };
-}
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index 72b58b5b33e..306620ca1c9 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -4,12 +4,12 @@
}:
stdenv.mkDerivation rec {
- version = "2.0.0";
+ version = "2.0.2";
name = "audacity-${version}";
src = fetchurl {
url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.bz2";
- sha256 = "0spbib3f86b4qri0g13idyxvysg28hkpsglmjza681zrln62hjfq";
+ sha256 = "17c7p5jww5zcg2k2fs1751mv5kbadcmgicszi1zxwj2p5b35x2mc";
};
buildInputs = [ pkgconfig wxGTK libsndfile expat alsaLib libsamplerate
libvorbis libmad flac id3lib ffmpeg gettext ];
diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix
index 81d44fdcb74..0978b15bfaf 100644
--- a/pkgs/applications/audio/bristol/default.nix
+++ b/pkgs/applications/audio/bristol/default.nix
@@ -14,6 +14,11 @@ stdenv.mkDerivation rec {
xlibs.xproto
];
+ preInstall = ''
+ sed -e "s@\`which bristol\`@$out/bin/bristol@g" -i bin/startBristol
+ sed -e "s@\`which brighton\`@$out/bin/brighton@g" -i bin/startBristol
+ '';
+
meta = with stdenv.lib; {
description = "A range of synthesiser, electric piano and organ emulations";
homepage = http://bristol.sourceforge.net;
diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix
index d25cfeb3cd1..a73744ebbe8 100644
--- a/pkgs/applications/audio/pavucontrol/default.nix
+++ b/pkgs/applications/audio/pavucontrol/default.nix
@@ -2,17 +2,17 @@
, libglademm, libcanberra, intltool, gettext }:
stdenv.mkDerivation rec {
- name = "pavucontrol-0.9.10";
+ name = "pavucontrol-1.0";
src = fetchurl {
- url = "http://0pointer.de/lennart/projects/pavucontrol/${name}.tar.gz";
- sha256 = "0g2sd9smwwpnyq8yc65dl9z0iafj2rrimi8v58wkxx98vhnnvsby";
+ url = "http://freedesktop.org/software/pulseaudio/pavucontrol/${name}.tar.xz";
+ sha256 = "1plcyrc7p6gqxjhxx2xh6162bkb29wixjrqrjnl9b8g3nrjjigix";
};
buildInputs = [ pkgconfig pulseaudio gtkmm libsigcxx libglademm libcanberra
intltool gettext ];
- configureFlags = "--disable-lynx";
+ configureFlags = "--disable-lynx --disable-gtk3";
meta = {
description = "PulseAudio Volume Control";
diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index 0675b02a314..601aa7bf53a 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, pkgconfig, x11, libjpeg, libpng12, libXmu
-, fontconfig, freetype, pam, consolekit, dbus_libs }:
+, fontconfig, freetype, pam, dbus_libs }:
stdenv.mkDerivation rec {
name = "slim-1.3.4";
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
buildInputs =
[ cmake pkgconfig x11 libjpeg libpng12 libXmu fontconfig freetype
pam dbus_libs
- ] ++ stdenv.lib.optional (consolekit != null) consolekit;
+ ];
preConfigure = "substituteInPlace CMakeLists.txt --replace /etc $out/etc";
- cmakeFlags = [ "-DUSE_PAM=1" ] ++ stdenv.lib.optional (consolekit != null) "-DUSE_CONSOLEKIT=1";
+ cmakeFlags = [ "-DUSE_PAM=1" ];
NIX_CFLAGS_LINK = "-lXmu";
diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index 1b3e4e27f5b..01b4ff547e8 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -8,7 +8,16 @@ stdenv.mkDerivation rec {
sha256 = "18gvhyhwpabmgv4lh21lg8vl3z7acdyhh2mr2kj9g75wksj39pcp";
};
- doCheck = true;
+ /* FIXME: Tests currently fail on Darwin:
+
+ building test scripts for ed-1.5...
+ testing ed-1.5...
+ *** Output e1.o of script e1.ed is incorrect ***
+ *** Output r3.o of script r3.ed is incorrect ***
+ make: *** [check] Error 127
+
+ */
+ doCheck = !stdenv.isDarwin;
crossAttrs = {
compileFlags = [ "CC=${stdenv.cross.config}-gcc" ];
diff --git a/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix b/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix
index b629186033f..0a26e8fd43d 100644
--- a/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix
+++ b/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, emacs }:
stdenv.mkDerivation rec {
- name = "flymake-cursor-0.1.4";
+ name = "flymake-cursor-0.1.5";
src = fetchurl {
url = "http://www.emacswiki.org/emacs/download/flymake-cursor.el";
- sha256 = "1wxqqmn2fk2b778nksvgn1mi7ajarcpc5lla90xx9jwz47d9hx02";
+ sha256 = "1qqppd1786w8pl1avjb01n23lwihb7m0hr23abjklsxz03gmp4qz";
};
phases = [ "buildPhase" "installPhase"];
diff --git a/pkgs/applications/editors/emacs-modes/htmlize/default.nix b/pkgs/applications/editors/emacs-modes/htmlize/default.nix
index d4de24d394c..da3bde88d75 100644
--- a/pkgs/applications/editors/emacs-modes/htmlize/default.nix
+++ b/pkgs/applications/editors/emacs-modes/htmlize/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
- name = "htmlize-1.40";
+ name = "htmlize-1.43";
builder = ./builder.sh;
src = fetchurl {
url = http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el.cgi;
- sha256 = "1v7pzif5b7dr6iyllqvzka8i6s23rsjdnmilnma054gv8d4shw6a";
+ sha256 = "0bdaxh3pjf4z55i7vz4yz3yz45720h8aalhmx13bgkrpijzn93bi";
};
meta = {
diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index 1c08dc6db8d..289cf7ff8d6 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
+ # It have no reasons to exist in a redistribuable package
+ postInstall = "rm $out/share/icons/hicolor/icon-theme.cache";
+
meta = {
description = "A GTK2 small and ligthweight IDE.";
longDescription = ''
diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix
index 194f13a090c..efaf719c7c4 100644
--- a/pkgs/applications/editors/jedit/default.nix
+++ b/pkgs/applications/editors/jedit/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "jedit-4.4.2";
src = fetchurl {
- url = mirror://sf/jedit/jedit4.4.2source.tar.bz2;
+ url = mirror://sourceforge/jedit/jedit4.4.2source.tar.bz2;
sha256 = "5e9ad9c32871b77ef0b9fe46dcfcea57ec52558d36113b7280194a33430b8ceb";
};
diff --git a/pkgs/applications/editors/jedit/wrapper.nix b/pkgs/applications/editors/jedit/wrapper.nix
deleted file mode 100644
index 1126a7278d6..00000000000
--- a/pkgs/applications/editors/jedit/wrapper.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
- name = jedit.name+"_startscript";
-
- java = jre+"/bin/java";
- jeditjar = jedit+"/lib/jedit.jar";
-
- phases = "buildPhase";
-
- buildPhase = "
-mkdir -p \$out/bin
-cat > \$out/bin/${jedit.name} << EOF
-#!/bin/sh
-exec $java -jar $jeditjar \\$*
-EOF
- chmod +x \$out/bin/${jedit.name}
-";
-}
diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix
index 41028601da7..bd53f8d81d0 100644
--- a/pkgs/applications/editors/nedit/default.nix
+++ b/pkgs/applications/editors/nedit/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, x11, motif, libXpm}:
-assert stdenv.system == "i686-linux";
+assert stdenv.isLinux;
stdenv.mkDerivation {
name = "nedit-5.5";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
inherit motif;
buildInputs = [x11 motif libXpm];
- buildFlags = if stdenv.system == "i686-linux" then "linux" else "";
+ buildFlags = if stdenv.isLinux then "linux" else "";
meta = {
homepage = http://www.nedit.org;
diff --git a/pkgs/applications/editors/vbindiff/default.nix b/pkgs/applications/editors/vbindiff/default.nix
new file mode 100644
index 00000000000..a03ce539d50
--- /dev/null
+++ b/pkgs/applications/editors/vbindiff/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, ncurses }:
+
+stdenv.mkDerivation rec {
+ name = "vbindiff-${version}";
+ version = "3.0_beta4";
+
+ buildInputs = [ ncurses ];
+
+ src = fetchurl {
+ url = "http://www.cjmweb.net/vbindiff/${name}.tar.gz";
+ sha256 = "0gcqy4ggp60qc6blq1q1gc90xmhip1m6yvvli4hdqlz9zn3mlpbx";
+ };
+
+ meta = {
+ description = "A terminal visual binary diff viewer";
+ homepage = "http://www.cjmweb.net/vbindiff/";
+ license = stdenv.lib.licenses.gpl2Plus;
+ };
+}
diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix
index 0d765a0ad5c..13a36e258fd 100644
--- a/pkgs/applications/editors/zile/default.nix
+++ b/pkgs/applications/editors/zile/default.nix
@@ -1,16 +1,19 @@
{ fetchurl, stdenv, ncurses, boehmgc, perl, help2man }:
stdenv.mkDerivation rec {
- name = "zile-2.4.7";
+ name = "zile-2.4.9";
src = fetchurl {
url = "mirror://gnu/zile/${name}.tar.gz";
- sha256 = "1ak7qjb7s4whxg8qpkg7yixfnhinwfmzgav7rzi0kjmm93z35xcc";
+ sha256 = "0j801c28ypm924rw3lqyb6khxyslg6ycrv16wmmwcam0mk3mj6f7";
};
buildInputs = [ ncurses boehmgc ];
buildNativeInputs = [ help2man perl ];
+ # `help2man' wants to run Zile, which fails when cross-compiling.
+ crossAttrs.buildNativeInputs = [];
+
# Tests can't be run because most of them rely on the ability to
# fiddle with the terminal.
doCheck = false;
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index cbab2da551a..b96d1bc84f7 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -3,7 +3,7 @@
, bzip2
, freetype
, graphviz
-, ghostscript
+, ghostscript ? null
, libjpeg
, libpng
, libtiff
@@ -27,16 +27,17 @@ stdenv.mkDerivation rec {
sha256 = "0m0sa4jxsvm8pf9nfvkzlbzq13d1lj15lfz6jif12l6ywyh2c1cs";
};
- configureFlags = ''
+ configureFlags = "" + stdenv.lib.optionalString (ghostscript != null && stdenv.system != "x86_64-darwin") ''
--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts
--with-gslib
+ '' + ''
--with-frozenpaths
${if librsvg != null then "--with-rsvg" else ""}
'';
propagatedBuildInputs =
- [ bzip2 freetype ghostscript libjpeg libpng libtiff libxml2 zlib librsvg
- libtool jasper libX11 ];
+ [ bzip2 freetype libjpeg libpng libtiff libxml2 zlib librsvg
+ libtool jasper libX11 ] ++ stdenv.lib.optional (ghostscript != null && stdenv.system != "x86_64-darwin") ghostscript;
buildInputs = [ tetex graphviz ];
@@ -46,6 +47,8 @@ stdenv.mkDerivation rec {
'' else "";
meta = {
- homepage = http://www.imagemagick.org;
+ homepage = http://www.imagemagick.org/;
+ description = "A software suite to create, edit, compose, or convert bitmap images";
+ platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 15d7042e7dd..801fdeeaaae 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -3,24 +3,24 @@
, libgnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb
-, openexr, pixman, pkgconfig, sqlite, bash }:
+, openexr, pixman, pkgconfig, sqlite, bash, libxslt }:
assert stdenv ? glibc;
stdenv.mkDerivation rec {
- version = "1.0.5";
+ version = "1.1.1";
name = "darktable-${version}";
src = fetchurl {
url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz";
- sha256 = "0c18530446d2f2459fe533a1ef6fc2711300efe7466f36c23168ec2230fb5fbd";
+ sha256 = "0k1m7nd42yn4c2jr1ps1g96fqk9pq20cxjp7dmlza61pj2j9nads";
};
buildInputs =
[ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk
ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
- librsvg libtiff libxcb openexr pixman pkgconfig sqlite
+ librsvg libtiff libxcb openexr pixman pkgconfig sqlite libxslt
];
preConfigure = ''
diff --git a/pkgs/applications/graphics/darktable/libpng-15.patch b/pkgs/applications/graphics/darktable/libpng-15.patch
deleted file mode 100644
index f817a326448..00000000000
--- a/pkgs/applications/graphics/darktable/libpng-15.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 5803d31ae7704e0349821dcc20a94a1cddda69f1
-Author: Tim Harder
-Date: Wed Sep 21 14:13:55 2011 -0700
-
- Fix build with libpng-1.5
-
- Explicitly include the zlib.h header for the Z_BEST_COMPRESSION and
- Z_DEFAULT_STRATEGY macros since >=libpng-1.5 doesn't pull it in anymore
- via the png.h header.
-
-diff --git a/src/imageio/format/png.c b/src/imageio/format/png.c
-index 40c7d48..c7be566 100644
---- a/src/imageio/format/png.c
-+++ b/src/imageio/format/png.c
-@@ -28,6 +28,7 @@
- #include
- #include
- #include
-+#include
-
- DT_MODULE(1)
-
diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index 7662d64e9de..769acd2a3b6 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
patches = [ ./glib-top-level-header.patch ];
+ # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
+ # It have no reasons to exist in a redistribuable package
+ postInstall = "rm $out/share/icons/hicolor/icon-theme.cache";
+
meta = {
description = "Gnome Diagram drawing software";
homepage = http://live.gnome.org/Dia;
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index e19d06927a2..0cd34027966 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, x11, imlib2, libjpeg, libpng, giblib
, libXinerama, curl }:
-stdenv.mkDerivation {
- name = "feh-2.4";
+stdenv.mkDerivation rec {
+ name = "feh-2.8";
src = fetchurl {
- url = http://feh.finalrewind.org/feh-2.4.tar.bz2;
- sha256 = "00liykp0ipmmiggl26wk72iawcff6zpmbniifdr3f5yf0sfanz48";
+ url = "http://feh.finalrewind.org/${name}.tar.bz2";
+ sha256 = "0zmslchnzvi9ydxj2mgci4x8zpv5mdfkf7kyny3nibbpajibqmrx";
};
buildInputs = [x11 imlib2 giblib libjpeg libpng libXinerama curl ];
diff --git a/pkgs/applications/graphics/freecad/cmakeinstall.patch b/pkgs/applications/graphics/freecad/cmakeinstall.patch
deleted file mode 100644
index 6b8f9fb1a60..00000000000
--- a/pkgs/applications/graphics/freecad/cmakeinstall.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: src/3rdParty/salomesmesh/CMakeLists.txt
-===================================================================
---- a/src/3rdParty/salomesmesh/CMakeLists.txt (revision 4193)
-+++ a/src/3rdParty/salomesmesh/CMakeLists.txt (working copy)
-@@ -191,7 +191,7 @@
- INCLUDE_DIRECTORIES(src/StdMeshers)
-
- ADD_LIBRARY(StdMeshers SHARED ${StdMeshers_source_files})
--TARGET_LINK_LIBRARIES(StdMeshers SMESH TKernel TKMath TKAdvTools f2c)
-+TARGET_LINK_LIBRARIES(StdMeshers SMESH TKernel TKMath TKAdvTools f2c gfortran)
- SET(StdMeshers_CFLAGS "")
- IF(WIN32)
- SET(StdMeshers_CFLAGS "-DSTDMESHERS_EXPORTS -DMEFISTO2D_EXPORTS")
-@@ -218,9 +218,9 @@
- # Libraries are installed by default in /usr/local/lib/SMESH-5.1.2.7
- INSTALL(TARGETS SMDS Driver DriverSTL DriverDAT DriverUNV
- SMESHDS SMESH StdMeshers
-- DESTINATION /usr/local/lib/${INSTALL_PATH_NAME})
-+ DESTINATION lib)
- # Headers are installed by default in /usr/local/include/SMESH-5.1.2.7
- INSTALL(DIRECTORY inc/
-- DESTINATION /usr/local/include/${INSTALL_PATH_NAME}
-+ DESTINATION include
- FILES_MATCHING PATTERN "*.h*")
- ENDIF(UNIX)
-Index: src/3rdParty/Pivy-0.5/CMakeLists.txt
-===================================================================
---- a/src/3rdParty/Pivy-0.5/CMakeLists.txt (revision 4193)
-+++ a/src/3rdParty/Pivy-0.5/CMakeLists.txt (working copy)
-@@ -56,6 +56,7 @@
- set_target_properties(coin PROPERTIES OUTPUT_NAME "_coin")
- set_target_properties(coin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/pivy)
- set_target_properties(coin PROPERTIES PREFIX "")
-+ install(TARGETS coin DESTINATION bin/pivy)
- endif(MSVC)
-
- fc_copy_sources_outpath("bin/pivy" "coin"
-Index: CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt (revision 4193)
-+++ a/CMakeLists.txt (working copy)
-@@ -57,13 +57,6 @@
-
- # ================================================================================
-
--
--if(WIN32)
-- SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
--else(WIN32)
-- SET(CMAKE_INSTALL_PREFIX "/usr/lib/freecad")
--endif(WIN32)
--
- # ================================================================================
- # == Win32 is default behaviour use the LibPack copied in Source tree ============
- if(MSVC)
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index cfe97e12476..c681bc415e3 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -1,17 +1,15 @@
-{ fetchsvn, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts,
+{ fetchgit, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts,
boost, zlib,
python, swig, gfortran, soqt, libf2c, pyqt4, makeWrapper }:
-# It builds but fails to install
-
stdenv.mkDerivation rec {
name = "freecad-${version}";
- version = "svn-${src.rev}";
+ version = "git-20121213";
- src = fetchsvn {
- url = https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk;
- rev = "4184";
- sha256 = "26bd8407ce38f070b81ef39145aed093eed3c200d165a605b8169162d66568ce";
+ src = fetchgit {
+ url = git://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad;
+ rev = "d3949cedc7e3c924d426660515e06eaf55d1a67f";
+ sha256 = "0a07ih0z5d8m69zasmvi7z4lgq0pa67k2g7r1l6nz2d0b30py61w";
};
buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
@@ -19,12 +17,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- # The freecad people are used to boost 1.42, and we have newer boost that
- # require the -DBOOST_FILESYSTEM_VERSION=2 for freecad to build
- # For zlib to build in i686-linux, as g++ plus glibc defines _LARGEFILE64_SOURCE,
- # we need the -D-FILE_OFFSET_BITS=64 indication for zlib headers to work.
- NIX_CFLAGS_COMPILE = "-DBOOST_FILESYSTEM_VERSION=2 -D_FILE_OFFSET_BITS=64";
-
# This should work on both x86_64, and i686 linux
preBuild = ''
export NIX_LDFLAGS="-L${gfortran.gcc}/lib64 -L${gfortran.gcc}/lib $NIX_LDFLAGS";
@@ -35,7 +27,7 @@ stdenv.mkDerivation rec {
--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1
'';
- patches = [ ./cmakeinstall.patch ./pythonpath.patch ];
+ patches = [ ./pythonpath.patch ];
meta = {
homepage = http://free-cad.sourceforge.net/;
diff --git a/pkgs/applications/graphics/freecad/pythonpath.patch b/pkgs/applications/graphics/freecad/pythonpath.patch
index 849c778aedb..8b09a574807 100644
--- a/pkgs/applications/graphics/freecad/pythonpath.patch
+++ b/pkgs/applications/graphics/freecad/pythonpath.patch
@@ -1,14 +1,18 @@
-http://sourceforge.net/apps/phpbb/free-cad/viewtopic.php?f=4&t=847&p=6364
-
-Index: src/Main/MainGui.cpp
-===================================================================
---- a/src/Main/MainGui.cpp (revision 4193)
-+++ a/src/Main/MainGui.cpp (working copy)
-@@ -149,10 +149,10 @@
+diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp
+index 03407c5..b029384 100644
+--- a/src/Main/MainGui.cpp
++++ b/src/Main/MainGui.cpp
+@@ -190,15 +190,15 @@ int main( int argc, char ** argv )
// http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559846
putenv("LANG=C");
putenv("LC_ALL=C");
- putenv("PYTHONPATH=");
++ //putenv("PYTHONPATH=");
+ #elif defined(FC_OS_MACOSX)
+ (void)QLocale::system();
+ putenv("LANG=C");
+ putenv("LC_ALL=C");
+- putenv("PYTHONPATH=");
+ //putenv("PYTHONPATH=");
#else
setlocale(LC_NUMERIC, "C");
diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix
index 4b2ebceda47..0f42ac7743e 100644
--- a/pkgs/applications/graphics/gocr/default.nix
+++ b/pkgs/applications/graphics/gocr/default.nix
@@ -1,14 +1,23 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, tk }:
stdenv.mkDerivation rec {
- name = "gocr-0.44";
+ name = "gocr-0.49";
src = fetchurl {
- url = http://prdownloads.sourceforge.net/jocr/gocr-0.44.tar.gz;
- sha256 = "0kvb7cbk6z5n4g0hhbwpdk2f3819yfamwsmkwanj99yhni6p5mr0";
+ url = http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz;
+ sha256 = "06hpzp7rkkwfr1fvmc8kcfz9v490i9yir7f7imh13gmka0fr6afc";
};
+ postInstall = ''
+ sed -i -e 's|exec wish|exec ${tk}/bin/wish|' $out/bin/gocr.tcl
+ '';
+
meta = {
+ homepage = "http://jocr.sourceforge.net/";
description = "GPL Optical Character Recognition";
+ license = "GPLv2";
+
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.simons ];
};
}
diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
new file mode 100644
index 00000000000..df50dd5bd79
--- /dev/null
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, pkgconfig, zlib, qt4, freetype, cairo, lua5, texLive, ghostscriptX
+, makeWrapper }:
+let ghostscript = ghostscriptX; in
+stdenv.mkDerivation rec {
+ name = "ipe-7.1.2";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/ipe7/ipe/7.1.0/${name}-src.tar.gz";
+ sha256 = "04fs5slci3bmpgz8d038h3hnzzdw57xykcpsmisdxci2xrkxx41k";
+ };
+
+ # changes taken from Gentoo portage
+ preConfigure = ''
+ cd src
+ sed -i \
+ -e 's/fpic/fPIC/' \
+ -e 's/moc-qt4/moc/' \
+ config.mak || die
+ sed -i -e 's/install -s/install/' common.mak || die
+ '';
+
+ IPEPREFIX="$$out";
+ URWFONTDIR="${texLive}/texmf-dist/fonts/type1/urw/";
+
+ buildInputs = [
+ pkgconfig zlib qt4 freetype cairo lua5 texLive ghostscript makeWrapper
+ ];
+
+ postInstall = ''
+ for prog in $out/bin/*; do
+ wrapProgram "$prog" --prefix PATH : "${texLive}/bin"
+ done
+ '';
+
+ #TODO: make .desktop entry
+
+ meta = {
+ description = "An editor for drawing figures";
+ homepage = http://ipe7.sourceforge.net;
+ license = "GPLv3+";
+ longDescription = ''
+ Ipe is an extensible drawing editor for creating figures in PDF and Postscript format.
+ It supports making small figures for inclusion into LaTeX-documents
+ as well as presentations in PDF.
+ '';
+ };
+}
diff --git a/pkgs/applications/graphics/kuickshow/builder.sh b/pkgs/applications/graphics/kuickshow/builder.sh
deleted file mode 100644
index 2283e956f7b..00000000000
--- a/pkgs/applications/graphics/kuickshow/builder.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-source $stdenv/setup
-
-patchPhase=patchPhase
-patchPhase() {
- sed -e "s@-ljpeg6b@-ljpeg@" -i configure
-}
-
-genericBuild
-
-ln -sv $KDEDIR/share/mimelnk $out/share
diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index b09a38dcaa4..9343f3ec135 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -1,19 +1,24 @@
-{stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal
+{stdenv, fetchgit, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal
, mpfr, gmp
}:
stdenv.mkDerivation rec {
- version = "2011.12";
+ version = "git-20121213";
name = "openscad-${version}";
- src = fetchurl {
- url = "https://github.com/downloads/openscad/openscad/${name}.src.tar.gz";
- sha256 = "0gaqwzxbbzc21lhb4y26j8g0g28dhrwrgkndizp5ddab5axi4zjh";
- };
+ # src = fetchurl {
+ # url = "https://github.com/downloads/openscad/openscad/${name}.src.tar.gz";
+ # sha256 = "0gaqwzxbbzc21lhb4y26j8g0g28dhrwrgkndizp5ddab5axi4zjh";
+ # };
+ src = fetchgit {
+ url = "https://github.com/openscad/openscad.git";
+ rev = "c0612a9ed0899c96963e04c848a59b0164a689a2";
+ sha256 = "1zqiwk1cjbj7sng9sdarbrs0zxkn9fsa84dyv8n0zlyh40s7kvw2";
+ };
buildInputs = [qt4 bison flex eigen boost mesa glew opencsg cgal gmp mpfr];
configurePhase = ''
- export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I ${eigen}/include/eigen2 "
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${eigen}/include/eigen*) "
qmake PREFIX="$out"
'';
diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix
new file mode 100644
index 00000000000..df18c6d1520
--- /dev/null
+++ b/pkgs/applications/graphics/qiv/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, gtk, imlib2, file } :
+
+stdenv.mkDerivation (rec {
+ name = "qiv-2.2.4";
+
+ src = fetchurl {
+ url = "http://spiegl.de/qiv/download/${name}.tgz";
+ sha256 = "ed6078dc550c1dc2fe35c1e0f46463c13589a24b83d4f7101b71a7485e51abb7";
+ };
+
+ buildInputs = [ pkgconfig gtk imlib2 file ];
+
+ preBuild=''
+ substituteInPlace Makefile --replace /usr/local "$out"
+ substituteInPlace Makefile --replace /man/ /share/man/
+ '';
+
+ meta = {
+ description = "qiv (quick image viewer)";
+ homepage = http://spiegl.de/qiv/;
+ };
+})
diff --git a/pkgs/applications/graphics/rawtherapee/optional-rawzor.patch b/pkgs/applications/graphics/rawtherapee/optional-rawzor.patch
deleted file mode 100644
index bc0210803a1..00000000000
--- a/pkgs/applications/graphics/rawtherapee/optional-rawzor.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,7 @@
- cmake_minimum_required(VERSION 2.6)
-
-+option (WITH_RAWZOR "Build with Rawzor support" ON)
-+
- add_subdirectory (rtexif)
- add_subdirectory (rtengine)
- add_subdirectory (rtgui)
---- a/rtengine/CMakeLists.txt
-+++ b/rtengine/CMakeLists.txt
-@@ -9,9 +9,13 @@
- IF (WIN32)
- SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../lib; ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win")
- SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../winclude; ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win")
-- SET (EXTRA_LIB "ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libiptcdata.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libjpeg.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libpng.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libtiff.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libz.a ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win/rwz_sdk_s.a")
-+ SET (EXTRA_LIB "ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libiptcdata.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libjpeg.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libpng.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libtiff.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libz.a")
-+ if (WITH_RAWZOR)
- ADD_DEFINITIONS (-DRAWZOR_SUPPORT)
-+ SET (EXTRA_LIB "${EXTRA_LIB} ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win/rwz_sdk_s.a")
-+ endif (WITH_RAWZOR)
- ELSE (WIN32)
-+ if (WITH_RAWZOR)
- IF (CMAKE_SIZEOF_VOID_P EQUAL 4)
- SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32")
- SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32")
-@@ -19,10 +23,11 @@
- SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64")
- SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64")
- ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4)
-- pkg_check_modules (IPTCDATA REQUIRED libiptcdata)
-- pkg_check_modules (LCMS REQUIRED lcms)
- SET (EXTRA_LIB "-lrwz_sdk")
- ADD_DEFINITIONS (-DRAWZOR_SUPPORT)
-+ endif (WITH_RAWZOR)
-+ pkg_check_modules (IPTCDATA REQUIRED libiptcdata)
-+ pkg_check_modules (LCMS REQUIRED lcms)
- ENDIF (WIN32)
-
- include_directories (${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../rtexif ${EXTRA_INCDIR} ${GTHREAD_INCLUDE_DIRS} ${GOBJECT_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS} ${IPTCDATA_INCLUDE_DIRS} ${LCMS_INCLUDE_DIRS})
---- a/rtengine/imagedata.cc
-+++ b/rtengine/imagedata.cc
-@@ -19,7 +19,9 @@
- #include
- #include
- #include
-+#ifdef RAWZOR_SUPPORT
- #include
-+#endif
-
- using namespace rtengine;
-
---- a/rtengine/myfile.cc
-+++ b/rtengine/myfile.cc
-@@ -19,7 +19,9 @@
- #include
- #include
- #include
-+#ifdef RAWZOR_SUPPORT
- #include
-+#endif
-
- IMFILE* fopen (const char* fname) {
-
---- a/rtgui/CMakeLists.txt
-+++ b/rtgui/CMakeLists.txt
-@@ -75,6 +75,7 @@
- if (NOT ZLIB_LIBRARIES)
- message(SEND_ERROR "libz was not found!")
- endif (NOT ZLIB_LIBRARIES)
-+ if (WITH_RAWZOR)
- IF (CMAKE_SIZEOF_VOID_P EQUAL 4)
- SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32")
- SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32")
-@@ -82,6 +83,7 @@
- SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64")
- SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64")
- ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4)
-+ endif (WITH_RAWZOR)
-
- include_directories (/usr/local/lib ${CMAKE_CURRENT_SOURCE_DIR}/../rtengine . ${CMAKE_CURRENT_SOURCE_DIR}/../rtexif ${EXTRA_INCDIR} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS}
- ${GTK_INCLUDE_DIRS} ${GTKMM_INCLUDE_DIRS} ${GIO_INCLUDE_DIRS} ${GIOMM_INCLUDE_DIRS} ${IPTCDATA_INCLUDE_DIRS} ${LCMS_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${GOBJECT_INCLUDE_DIRS} )
diff --git a/pkgs/applications/graphics/sane/backends-git.nix b/pkgs/applications/graphics/sane/backends-git.nix
new file mode 100644
index 00000000000..2455923bbb8
--- /dev/null
+++ b/pkgs/applications/graphics/sane/backends-git.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, fetchgit, hotplugSupport ? true, libusb ? null, gt68xxFirmware ? null }:
+let
+ firmware = gt68xxFirmware { inherit fetchurl; };
+in
+assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux");
+
+stdenv.mkDerivation {
+ name = "sane-backends-1.0.22.482-g071f226";
+
+ src = fetchgit {
+ url = "http://git.debian.org/git/sane/sane-backends.git";
+ rev = "071f2269cd68d3411cbfa05a3d028b74496db970";
+ sha256 = "178xkv30m6irk4k0gqnfcl5kramm1qyj24dar8gp32428z1444xf";
+ };
+
+ udevSupport = hotplugSupport;
+
+ buildInputs = if libusb != null then [libusb] else [];
+
+ postInstall = ''
+ if test "$udevSupport" = "1"; then
+ mkdir -p $out/etc/udev/rules.d/
+ ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \
+ cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules
+ fi
+ '';
+
+ preInstall =
+ if gt68xxFirmware != null then
+ "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw +
+ " \${out}/share/sane/gt68xx/" + firmware.name
+ else "";
+
+ meta = {
+ homepage = "http://www.sane-project.org/";
+ description = "Scanner Access Now Easy";
+ license = "GPLv2+";
+
+ maintainers = [ stdenv.lib.maintainers.simons ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/applications/graphics/sane/backends.nix
similarity index 74%
rename from pkgs/misc/sane-backends/default.nix
rename to pkgs/applications/graphics/sane/backends.nix
index ac6fed5deb4..0fcfca74741 100644
--- a/pkgs/misc/sane-backends/default.nix
+++ b/pkgs/applications/graphics/sane/backends.nix
@@ -1,20 +1,19 @@
-{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null
-, pkgconfig ? null
-, gt68xxFirmware ? null }:
-let
- firmware = gt68xxFirmware {inherit fetchurl;};
-in
+{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null, pkgconfig ? null , gt68xxFirmware ? null }:
+
assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux");
+let
+ firmware = gt68xxFirmware { inherit fetchurl; };
+in
stdenv.mkDerivation rec {
version = "1.0.23";
name = "sane-backends-${version}";
-
+
src = fetchurl {
url = "https://launchpad.net/ubuntu/+archive/primary/+files/sane-backends_${version}.orig.tar.gz";
sha256 = "4d4f5b2881615af7fc0ed75fdde7dc623a749e80e40f3f792fe4010163cbb029";
};
-
+
udevSupport = hotplugSupport;
buildInputs = []
@@ -32,8 +31,17 @@ stdenv.mkDerivation rec {
'';
preInstall =
- if gt68xxFirmware != null then
+ if gt68xxFirmware != null then
"mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw +
" \${out}/share/sane/gt68xx/" + firmware.name
else "";
+
+ meta = {
+ homepage = "http://www.sane-project.org/";
+ description = "Scanner Access Now Easy";
+ license = "GPLv2+";
+
+ maintainers = [ stdenv.lib.maintainers.simons ];
+ platforms = stdenv.lib.platforms.linux;
+ };
}
diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix
new file mode 100644
index 00000000000..1c768e29873
--- /dev/null
+++ b/pkgs/applications/graphics/sane/frontends.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, saneBackends, libX11, gtk, pkgconfig, libusb ? null}:
+
+stdenv.mkDerivation rec {
+ name = "sane-frontends-1.0.14";
+
+ src = fetchurl {
+ url = "ftp://ftp.sane-project.org/pub/sane/sane-frontends-1.0.14/${name}.tar.gz";
+ md5 = "c63bf7b0bb5f530cf3c08715db721cd3";
+ };
+
+ preConfigure = ''
+ sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c
+ '';
+
+ buildInputs = [saneBackends libX11 gtk pkgconfig] ++
+ (if (libusb != null) then [libusb] else []);
+
+ meta = {
+ homepage = "http://www.sane-project.org/";
+ description = "Scanner Access Now Easy";
+ license = "GPLv2+";
+
+ maintainers = [ stdenv.lib.maintainers.simons ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/misc/xsane/default.nix b/pkgs/applications/graphics/sane/xsane.nix
similarity index 68%
rename from pkgs/misc/xsane/default.nix
rename to pkgs/applications/graphics/sane/xsane.nix
index 8dd99c3c74d..c4fdf3a0044 100644
--- a/pkgs/misc/xsane/default.nix
+++ b/pkgs/applications/graphics/sane/xsane.nix
@@ -1,10 +1,10 @@
-{stdenv, fetchurl, saneBackends, saneFrontends,
- libX11, gtk, pkgconfig, libpng, libusb ? null}:
-stdenv.mkDerivation {
+{ stdenv, fetchurl, saneBackends, saneFrontends, libX11, gtk, pkgconfig, libpng, libusb ? null }:
+
+stdenv.mkDerivation rec {
name = "xsane-0.998";
src = fetchurl {
- url = http://www.xsane.org/download/xsane-0.998.tar.gz;
+ url = "http://www.xsane.org/download/${name}.tar.gz";
sha256 = "0vn2cj85ijgp2v2j2h9xpqmg2jwlbxmwyb88kxhjjakqay02ybm3";
};
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
homepage = http://www.sane-project.org/;
description = "Graphical scanning frontend for sane";
license = "GPLv2+";
- maintainers = with stdenv.lib.maintainers; [viric];
+ maintainers = with stdenv.lib.maintainers; [viric simons];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/applications/misc/fetchmail/security-fix.patch b/pkgs/applications/misc/fetchmail/security-fix.patch
deleted file mode 100644
index 4d48c7aa055..00000000000
--- a/pkgs/applications/misc/fetchmail/security-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- old/sink.c (revision 5118)
-+++ new/sink.c (revision 5119)
-@@ -262,7 +262,7 @@
- const char *md1 = "MAILER-DAEMON", *md2 = "MAILER-DAEMON@";
-
- /* don't bounce in reply to undeliverable bounces */
-- if (!msg->return_path[0] ||
-+ if (!msg || !msg->return_path[0] ||
- strcmp(msg->return_path, "<>") == 0 ||
- strcasecmp(msg->return_path, md1) == 0 ||
- strncasecmp(msg->return_path, md2, strlen(md2)) == 0)
diff --git a/pkgs/applications/misc/freicoin/default.nix b/pkgs/applications/misc/freicoin/default.nix
new file mode 100644
index 00000000000..163cb04c27e
--- /dev/null
+++ b/pkgs/applications/misc/freicoin/default.nix
@@ -0,0 +1,30 @@
+{ fetchurl, stdenv, db4, boost, gmp, mpfr, miniupnpc, qt4, unzip }:
+
+stdenv.mkDerivation rec {
+ version = "0.0.1-3";
+ name = "freicoin-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/freicoin/freicoin/archive/v${version}.zip";
+ sha256 = "19q4llv67kmvfr0x56rnqcf0d050dayv246q4i51mmkvjijc1qpf";
+ };
+
+ # I think that openssl and zlib are required, but come through other
+ # packages
+ buildInputs = [ db4 boost gmp mpfr miniupnpc qt4 unzip ];
+
+ configurePhase = "qmake";
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp freicoin-qt $out/bin
+ '';
+
+ meta = {
+ description = "Peer-to-peer currency with demurrage fee";
+ homepage = "http://freicoi.in/";
+ license = "MIT";
+ maintainers = with stdenv.lib.maintainers; [viric];
+ platforms = with stdenv.lib.platforms; linux;
+ };
+}
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index 2fa36b33eb0..73db728b1a6 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gtk, gettext }:
stdenv.mkDerivation rec {
- name = "girara-0.1.2";
+ name = "girara-0.1.4";
src = fetchurl {
url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
- sha256 = "89231d0da3c790e0765ad85d74f64cf50051b8bafe6065882e34e378ab14ec99";
+ sha256 = "831cf523b131bfa1c182efbf146d68fb642fe62d22ee199caf0cd71408a85739";
};
buildInputs = [ pkgconfig gtk gettext ];
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
index 881f5339bdf..f7b8a511bc6 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, qt4, libXtst, libvorbis, phonon, hunspell }:
+{ stdenv, fetchurl, pkgconfig, qt4, libXtst, libvorbis, phonon, hunspell }:
stdenv.mkDerivation rec {
name = "goldendict-1.0.1";
src = fetchurl {
url = "mirror://sourceforge/goldendict/${name}-src.tar.bz2";
sha256 = "19p99dd5jgs0k66sy30vck7ymqj6dv1lh6w8xw18zczdll2h9yxk";
};
- buildInputs = [ qt4 libXtst libvorbis phonon hunspell ];
+ buildInputs = [ pkgconfig qt4 libXtst libvorbis phonon hunspell ];
unpackPhase = ''
mkdir ${name}-src
cd ${name}-src
diff --git a/pkgs/applications/misc/gphoto2/src-for-gphotofs.nix b/pkgs/applications/misc/gphoto2/src-for-gphotofs.nix
deleted file mode 100644
index 0967ef424bc..00000000000
--- a/pkgs/applications/misc/gphoto2/src-for-gphotofs.nix
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index 1f99a02f429..bbc8aaac49b 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null);
let
name = "ikiwiki";
- version = "3.20120725";
+ version = "3.20121212";
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 = "b600096a77b17e4a9e8a9552c4d36e01ed9217a0f8ff8a4f15110cf80e7adfad";
+ sha256 = "1frsr2sqzsnagbxvyjsgk4nrl1p1048vybsd1zw1ln1mqik31ydz";
};
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
diff --git a/pkgs/applications/misc/krusader/krusader-gcc44.patch b/pkgs/applications/misc/krusader/krusader-gcc44.patch
deleted file mode 100644
index f8840d5f33c..00000000000
--- a/pkgs/applications/misc/krusader/krusader-gcc44.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp~ 2009-04-29 17:13:43.000000000 +0000
-+++ krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp 2009-04-29 17:14:01.000000000 +0000
-@@ -37,6 +37,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
- #include "virtualcopyjob.h"
diff --git a/pkgs/applications/misc/librecad/2.0.nix b/pkgs/applications/misc/librecad/2.0.nix
new file mode 100644
index 00000000000..2394d116314
--- /dev/null
+++ b/pkgs/applications/misc/librecad/2.0.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, qt4, muparser, which, boost}:
+
+stdenv.mkDerivation {
+ name = "librecad-2.0.0beta1";
+
+ src = fetchurl {
+ url = https://github.com/LibreCAD/LibreCAD/tarball/2.0.0beta1;
+ name = "librecad-2.0.0beta1.tar.gz";
+ sha256 = "8bf969b79be115f3b3ff72cc030a4c21fe93164dd0cb19ddfb78a7d66b8bc770";
+ };
+
+ patchPhase = ''
+ sed -i -e s,/bin/bash,`type -P bash`, scripts/postprocess-unix.sh
+ sed -i -e s,/usr/share,$out/share, librecad/src/lib/engine/rs_system.cpp
+ '';
+
+ configurePhase = ''
+ qmake librecad.pro PREFIX=$out MUPARSER_DIR=${muparser} BOOST_DIR=${boost}
+ '';
+
+ installPhase = ''
+ ensureDir $out/bin $out/share
+ cp -R unix/librecad $out/bin
+ cp -R unix/resources $out/share/librecad
+ '';
+
+ buildInputs = [ qt4 muparser which boost ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "A 2D CAD package based upon Qt";
+ homepage = http://librecad.org;
+ license = "GPLv2";
+ maintainers = with stdenv.lib.maintainers; [viric];
+ platforms = with stdenv.lib.platforms; linux;
+ };
+}
diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix
index bcf0f1aee79..59bd4888e4a 100644
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/pkgs/applications/misc/librecad/default.nix
@@ -1,28 +1,34 @@
-{ stdenv, fetchurl, qt4}:
+{ stdenv, fetchurl, qt4, muparser, which}:
stdenv.mkDerivation {
- name = "librecad-1.0.0";
+ name = "librecad-1.0.2";
src = fetchurl {
- url = https://github.com/LibreCAD/LibreCAD/tarball/v1.0.0;
- name = "librecad-1.0.0.tar.gz";
- sha256 = "0s1ikyvy98zz1vw3xf5la73n3sykib6292cmhh2z738ggwigicc9";
+ url = https://github.com/LibreCAD/LibreCAD/tarball/v1.0.2;
+ name = "librecad-1.0.2.tar.gz";
+ sha256 = "13ee7e401e4f5fbc68c2e017b7189bec788038f4f6e77f559861ceb8cfb1907d";
};
patchPhase = ''
sed -i -e s,/bin/bash,`type -P bash`, scripts/postprocess-unix.sh
+ sed -i -e s,/usr/share,$out/share, src/lib/engine/rs_system.cpp
'';
configurePhase = "qmake PREFIX=$out";
- # It builds, but it does not install
- installPhase = "exit 1";
+ installPhase = ''
+ ensureDir $out/bin $out/share
+ cp -R unix/librecad $out/bin
+ cp -R unix/resources $out/share/librecad
+ '';
- buildInputs = [ qt4 ];
+ buildInputs = [ qt4 muparser which ];
meta = {
description = "A 2D CAD package based upon Qt";
homepage = http://librecad.org;
license = "GPLv2";
+ maintainers = with stdenv.lib.maintainers; [viric];
+ platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index cb832ed99f5..798b0e5162f 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -3,19 +3,19 @@
}:
stdenv.mkDerivation rec {
- version = "2.0.4";
+ version = "2.0.5.1";
name = "lyx-${version}";
src = fetchurl {
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${name}.tar.xz";
- sha256 = "137dzmz1z6aqz9mdj8gmmi0k60s9sfn6gy916j175cwzq6hpncb8";
+ sha256 = "18k9qbz40v6lqmkfcg98wvcv4wi4p36ach1jz3z2b15gbmv2gr9n";
};
configureFlags = [
#"--without-included-boost"
/* Boost is a huge dependency from which 1.4 MB of libs would be used.
Using internal boost stuff only increases executable by around 0.2 MB. */
- #"--without-included-mythes" # such a small library isn't worth a split package
+ #"--without-included-mythes" # such a small library isn't worth a separate package
];
buildInputs = [
diff --git a/pkgs/applications/misc/nut/2.6.3.nix b/pkgs/applications/misc/nut/2.6.3.nix
deleted file mode 100644
index 471529675db..00000000000
--- a/pkgs/applications/misc/nut/2.6.3.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi }:
-
-stdenv.mkDerivation {
- name = "nut-2.6.3";
- src = fetchurl {
- url = http://www.networkupstools.org/source/2.6/nut-2.6.3.tar.gz;
- sha256 = "0fk3bcivv26kw1psxb6sykqp9n5w02j01s1idypzlci0kmr3p49l";
- };
-
- buildInputs = [ neon libusb openssl udev avahi freeipmi ];
- buildNativeInputs = [ pkgconfig ];
-
- configureFlags = [
- "--with-all"
- "--with-ssl"
- "--without-snmp" # Until we have it ...
- "--without-powerman" # Until we have it ...
- "--without-cgi"
- "--without-hal"
- ];
-
- meta = {
- description = "Network UPS Tools";
- longDescription = ''
- Network UPS Tools is a collection of programs which provide a common
- interface for monitoring and administering UPS, PDU and SCD hardware.
- It uses a layered approach to connect all of the parts.
- '';
- homepage = http://www.networkupstools.org/;
- platforms = with stdenv.lib.platforms; linux;
- maintainers = with stdenv.lib.maintainers; [ pierron ];
- priority = 10;
- };
-}
diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix
index 51ae8633a7c..b89a35d2f81 100644
--- a/pkgs/applications/misc/nut/default.nix
+++ b/pkgs/applications/misc/nut/default.nix
@@ -1,21 +1,28 @@
-{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev }:
+{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi }:
-stdenv.mkDerivation {
- name = "nut-2.6.1";
+stdenv.mkDerivation rec {
+ name = "nut-2.6.5";
src = fetchurl {
- url = http://www.networkupstools.org/source/2.6/nut-2.6.1.tar.gz;
- sha256 = "f5c46b856c0cf5b7f0e4b22d82b670af64cc98717a90eaac8723dd402a181c00";
+ url = "http://www.networkupstools.org/source/2.6/${name}.tar.gz";
+ sha256 = "0gxrzsblx0jc4g9w0903ybwqbv1d79vq5hnks403fvnay4fgg3b1";
};
- buildInputs = [ pkgconfig neon libusb openssl udev ];
+ buildInputs = [ neon libusb openssl udev avahi freeipmi ];
- configureFlags = [
- "--with-all"
- "--without-snmp" # Until we have it ...
- "--without-powerman" # Until we have it ...
- "--without-cgi"
- ];
+ buildNativeInputs = [ pkgconfig ];
+
+ configureFlags =
+ [ "--with-all"
+ "--with-ssl"
+ "--without-snmp" # Until we have it ...
+ "--without-powerman" # Until we have it ...
+ "--without-cgi"
+ "--without-hal"
+ "--with-systemdsystemunitdir=$(out)/etc/systemd/systemd"
+ ];
+
+ enableParallelBuilding = true;
meta = {
description = "Network UPS Tools";
@@ -27,5 +34,6 @@ stdenv.mkDerivation {
homepage = http://www.networkupstools.org/;
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [ pierron ];
+ priority = 10;
};
}
diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix
deleted file mode 100644
index ee8876e6b33..00000000000
--- a/pkgs/applications/misc/qcad/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-# translations still misssing
-
-{ stdenv, fetchurl, qt3, libpng, libXext, libX11 }:
-
-stdenv.mkDerivation {
- name = "qcad-2.0.5.0-1-community";
-
- src = fetchurl {
- url = http://www.ribbonsoft.com/archives/qcad/qcad-2.0.5.0-1-community.src.tar.gz;
- sha256 = "07aiw7zjf1fc04dhgwwp29adwb2qs165n7v04lh09zy0k2aplcl3";
- };
-
- # TODO: add translations
- buildPhase = ''
- cd scripts
- sh build_qcad.sh notrans
- cd ..
- '';
-
- buildInputs = [ qt3 libpng libXext libX11 ];
-
- prePatch = ''
- sed -i 's/-pedantic//' mkspecs/defs.pro
- # patch -p1 < ${ ./qcad-2.0.4.0-1.src-intptr.patch }
- '';
- patches = [
- /* taken from gentoo, fixes amd64 compilation issue */
- ./qcad-2.0.4.0-1.src-intptr.patch
- /* taken from gentoo, fixes gcc 4.3 or above compilation issue */
- ./qcad-2.0.4.0-gcc43.patch
- ];
-
- # probably there is more to be done. But this seems to work for now (eg see gentoo ebuild)
- installPhase = ''
- mkdir -p $out/{bin,share}
- cp -r qcad $out/share
-
- # The compilation does not fail with error code. But qcad will not exist
- # if it failed.
- test -f $out/share/qcad/qcad
-
- cat >> $out/bin/qcad << EOF
- #!/bin/sh
- cd $out/share/qcad
- ./qcad "\$@"
- EOF
- chmod +x $out/bin/qcad
- '';
-
- meta = {
- description = "A 2D CAD package based upon Qt";
- homepage = http://www.ribbonsoft.de/qcad.html;
- license = "GPLv2"; # community edition
- };
-}
diff --git a/pkgs/applications/misc/qcad/qcad-2.0.4.0-1.src-intptr.patch b/pkgs/applications/misc/qcad/qcad-2.0.4.0-1.src-intptr.patch
deleted file mode 100644
index 6d8b6acca5b..00000000000
--- a/pkgs/applications/misc/qcad/qcad-2.0.4.0-1.src-intptr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp
---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp 2004-09-14 15:13:02.000000000 -0500
-+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp 2006-06-23 14:21:40.000000000 -0500
-@@ -849,7 +849,7 @@
- os << " layer: NULL ";
- } else {
- os << " layer: " << e.layer->getName().latin1() << " ";
-- os << " layer address: " << (int)(e.layer) << " ";
-+ os << " layer address: " << (intptr_t)(e.layer) << " ";
- }
-
- os << e.pen << "\n";
-diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp
---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp 2004-09-14 15:13:02.000000000 -0500
-+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp 2006-06-23 14:21:23.000000000 -0500
-@@ -57,7 +57,7 @@
- os << " name: " << l.getName().latin1()
- << " pen: " << l.getPen()
- << " frozen: " << (int)l.isFrozen()
-- << " address: " << (int)(&l)
-+ << " address: " << (intptr_t)(&l)
- << std::endl;
- return os;
- }
diff --git a/pkgs/applications/misc/qcad/qcad-2.0.4.0-gcc43.patch b/pkgs/applications/misc/qcad/qcad-2.0.4.0-gcc43.patch
deleted file mode 100644
index bc68e81c715..00000000000
--- a/pkgs/applications/misc/qcad/qcad-2.0.4.0-gcc43.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naur qcad-2.0.4.0-1.src/dxflib/src/dl_writer_ascii.cpp qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer_ascii.cpp
---- qcad-2.0.4.0-1.src/dxflib/src/dl_writer_ascii.cpp 2004-09-14 16:13:01.000000000 -0400
-+++ qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer_ascii.cpp 2008-04-27 08:35:47.000000000 -0400
-@@ -30,6 +30,7 @@
- #endif // _MSC_VER > 1000
-
- #include
-+#include
-
- #include "dl_writer_ascii.h"
- #include "dl_exception.h"
-diff -Naur qcad-2.0.4.0-1.src/dxflib/src/dl_writer.h qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer.h
---- qcad-2.0.4.0-1.src/dxflib/src/dl_writer.h 2004-09-14 16:13:01.000000000 -0400
-+++ qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer.h 2008-04-27 08:35:48.000000000 -0400
-@@ -34,6 +34,7 @@
-
-
- #include
-+#include
-
- #include "dl_attributes.h"
-
-diff -Naur qcad-2.0.4.0-1.src/qcadactions/src/rs_actionzoompan.cpp qcad-2.0.4.0-1.src.new/qcadactions/src/rs_actionzoompan.cpp
---- qcad-2.0.4.0-1.src/qcadactions/src/rs_actionzoompan.cpp 2004-09-14 16:13:03.000000000 -0400
-+++ qcad-2.0.4.0-1.src.new/qcadactions/src/rs_actionzoompan.cpp 2008-04-27 08:35:48.000000000 -0400
-@@ -28,6 +28,7 @@
- #include "rs_snapper.h"
- #include "rs_point.h"
-
-+#include
-
- RS_ActionZoomPan::RS_ActionZoomPan(RS_EntityContainer& container,
- RS_GraphicView& graphicView)
-diff -Naur qcad-2.0.4.0-1.src/qcadlib/src/information/rs_information.h qcad-2.0.4.0-1.src.new/qcadlib/src/information/rs_information.h
---- qcad-2.0.4.0-1.src/qcadlib/src/information/rs_information.h 2004-09-14 16:13:02.000000000 -0400
-+++ qcad-2.0.4.0-1.src.new/qcadlib/src/information/rs_information.h 2008-04-27 08:35:48.000000000 -0400
-@@ -31,7 +31,7 @@
- #include "rs_line.h"
- #include "rs_arc.h"
-
--
-+#include
-
- /**
- * Class for getting information about entities. This includes
diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index a1297d64a18..d52fd178165 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -3,7 +3,7 @@
let
name = "rxvt-unicode";
- version = "9.15";
+ version = "9.16";
n = "${name}-${version}";
in
@@ -13,7 +13,7 @@ stdenv.mkDerivation (rec {
src = fetchurl {
url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2";
- sha256 = "ec1aa2932da844979ed8140bd92223defb12042aa5e877e05ac31139ca81f2b1";
+ sha256 = "0x28wyslqnhn2q11y4hncqdl07wgh5ypywl92fq0jxycr36ibfvn";
};
buildInputs =
@@ -23,7 +23,7 @@ stdenv.mkDerivation (rec {
preConfigure =
''
- configureFlags="${if perlSupport then "--enable-perl" else "--disable-perl"}";
+ configureFlags="--with-terminfo=$out/share/terminfo ${if perlSupport then "--enable-perl" else "--disable-perl"}";
export TERMINFO=$out/share/terminfo # without this the terminfo won't be compiled by tic, see man tic
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2"
NIX_LDFLAGS="$NIX_LDFLAGS -lfontconfig -lXrender "
@@ -36,10 +36,6 @@ stdenv.mkDerivation (rec {
meta = {
description = "A clone of the well-known terminal emulator rxvt";
- longDescription = "
- You should put this into your ~/.bashrc:
- export TERMINFO=~/.nix-profile/share/terminfo
- ";
homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html";
};
})
diff --git a/pkgs/applications/misc/semnotes/default.nix b/pkgs/applications/misc/semnotes/default.nix
index fbc4df3a0b7..52a575130c0 100644
--- a/pkgs/applications/misc/semnotes/default.nix
+++ b/pkgs/applications/misc/semnotes/default.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation {
name = "semnotes-0.4.0-1";
src = fetchurl {
- url = "mirror://sf/semn/0.4.0/semnotes-0.4.0-1-src.tar.bz2";
+ url = "mirror://sourceforge/semn/0.4.0/semnotes-0.4.0-1-src.tar.bz2";
sha256 = "1zh5jfh7pyhyz5fbzcgzyckdg0ny7sf8s16yy6rjw9n021zz5i7m";
};
diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix
index 86b24e7e401..70089759626 100644
--- a/pkgs/applications/misc/st/default.nix
+++ b/pkgs/applications/misc/st/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
name = "st-0.3";
src = fetchurl {
- url = http://hg.suckless.org/st/archive/0.3.tar.gz;
- sha256 = "12ypldjjpsq3nvhszgjsk4wgqkwcvz06qiqw8k5npv3rd1nbx9cl";
+ url = "http://dl.suckless.org/st/${name}.tar.gz";
+ sha256 = "0d0fjixiis4ixbz4l18rqhnssa7cy2bap3jkjyphqlqhl7lahv3d";
};
buildInputs = [ libX11 ncurses libXext libXft ];
diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
index 73eefef2505..0ef9acbcef4 100644
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "xmobar";
- version = "0.15";
- sha256 = "1wa141bf3krzr8qcd9cyix3cflbw1yr1l3299ashjs7skqnjadcl";
+ version = "0.16";
+ sha256 = "1dx4kwygzp4c5j4jj4lsfgjfvhh863v68s106lmwc86a30h60p8i";
isLibrary = false;
isExecutable = true;
buildDepends = [
@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
];
extraLibraries = [ libXrandr wirelesstools ];
configureFlags = "-fwith_xft -fwith_iwlib";
- patchPhase = ''
- sed -i -e 's|mtl ==.*$|mtl,|' xmobar.cabal
- '';
meta = {
homepage = "http://projects.haskell.org/xmobar/";
description = "A Minimalistic Text Based Status Bar";
diff --git a/pkgs/applications/misc/xpdf/xpdf-3.01pl2.patch b/pkgs/applications/misc/xpdf/xpdf-3.01pl2.patch
deleted file mode 100644
index 3ea3cb8c923..00000000000
--- a/pkgs/applications/misc/xpdf/xpdf-3.01pl2.patch
+++ /dev/null
@@ -1,471 +0,0 @@
-diff -cr xpdf-3.01.orig/goo/gmem.c xpdf-3.01/goo/gmem.c
-*** xpdf-3.01.orig/goo/gmem.c Tue Aug 16 22:34:30 2005
---- xpdf-3.01/goo/gmem.c Tue Jan 17 17:03:57 2006
-***************
-*** 11,16 ****
---- 11,17 ----
- #include
- #include
- #include
-+ #include
- #include "gmem.h"
-
- #ifdef DEBUG_MEM
-***************
-*** 63,69 ****
- int lst;
- unsigned long *trl, *p;
-
-! if (size == 0)
- return NULL;
- size1 = gMemDataSize(size);
- if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) {
---- 64,70 ----
- int lst;
- unsigned long *trl, *p;
-
-! if (size <= 0)
- return NULL;
- size1 = gMemDataSize(size);
- if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) {
-***************
-*** 86,92 ****
- #else
- void *p;
-
-! if (size == 0)
- return NULL;
- if (!(p = malloc(size))) {
- fprintf(stderr, "Out of memory\n");
---- 87,93 ----
- #else
- void *p;
-
-! if (size <= 0)
- return NULL;
- if (!(p = malloc(size))) {
- fprintf(stderr, "Out of memory\n");
-***************
-*** 102,108 ****
- void *q;
- int oldSize;
-
-! if (size == 0) {
- if (p)
- gfree(p);
- return NULL;
---- 103,109 ----
- void *q;
- int oldSize;
-
-! if (size <= 0) {
- if (p)
- gfree(p);
- return NULL;
-***************
-*** 120,126 ****
- #else
- void *q;
-
-! if (size == 0) {
- if (p)
- free(p);
- return NULL;
---- 121,127 ----
- #else
- void *q;
-
-! if (size <= 0) {
- if (p)
- free(p);
- return NULL;
-***************
-*** 140,147 ****
- void *gmallocn(int nObjs, int objSize) {
- int n;
-
- n = nObjs * objSize;
-! if (objSize == 0 || n / objSize != nObjs) {
- fprintf(stderr, "Bogus memory allocation size\n");
- exit(1);
- }
---- 141,151 ----
- void *gmallocn(int nObjs, int objSize) {
- int n;
-
-+ if (nObjs == 0) {
-+ return NULL;
-+ }
- n = nObjs * objSize;
-! if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
- fprintf(stderr, "Bogus memory allocation size\n");
- exit(1);
- }
-***************
-*** 151,158 ****
- void *greallocn(void *p, int nObjs, int objSize) {
- int n;
-
- n = nObjs * objSize;
-! if (objSize == 0 || n / objSize != nObjs) {
- fprintf(stderr, "Bogus memory allocation size\n");
- exit(1);
- }
---- 155,168 ----
- void *greallocn(void *p, int nObjs, int objSize) {
- int n;
-
-+ if (nObjs == 0) {
-+ if (p) {
-+ gfree(p);
-+ }
-+ return NULL;
-+ }
- n = nObjs * objSize;
-! if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
- fprintf(stderr, "Bogus memory allocation size\n");
- exit(1);
- }
-diff -cr xpdf-3.01.orig/xpdf/JBIG2Stream.cc xpdf-3.01/xpdf/JBIG2Stream.cc
-*** xpdf-3.01.orig/xpdf/JBIG2Stream.cc Tue Aug 16 22:34:31 2005
---- xpdf-3.01/xpdf/JBIG2Stream.cc Tue Jan 17 17:29:46 2006
-***************
-*** 13,18 ****
---- 13,19 ----
- #endif
-
- #include
-+ #include
- #include "GList.h"
- #include "Error.h"
- #include "JArithmeticDecoder.h"
-***************
-*** 681,686 ****
---- 682,691 ----
- w = wA;
- h = hA;
- line = (wA + 7) >> 3;
-+ if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
-+ data = NULL;
-+ return;
-+ }
- // need to allocate one extra guard byte for use in combine()
- data = (Guchar *)gmalloc(h * line + 1);
- data[h * line] = 0;
-***************
-*** 692,697 ****
---- 697,706 ----
- w = bitmap->w;
- h = bitmap->h;
- line = bitmap->line;
-+ if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
-+ data = NULL;
-+ return;
-+ }
- // need to allocate one extra guard byte for use in combine()
- data = (Guchar *)gmalloc(h * line + 1);
- memcpy(data, bitmap->data, h * line);
-***************
-*** 720,726 ****
- }
-
- void JBIG2Bitmap::expand(int newH, Guint pixel) {
-! if (newH <= h) {
- return;
- }
- // need to allocate one extra guard byte for use in combine()
---- 729,735 ----
- }
-
- void JBIG2Bitmap::expand(int newH, Guint pixel) {
-! if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) {
- return;
- }
- // need to allocate one extra guard byte for use in combine()
-***************
-*** 2294,2299 ****
---- 2303,2316 ----
- !readUWord(&stepX) || !readUWord(&stepY)) {
- goto eofError;
- }
-+ if (w == 0 || h == 0 || w >= INT_MAX / h) {
-+ error(getPos(), "Bad bitmap size in JBIG2 halftone segment");
-+ return;
-+ }
-+ if (gridH == 0 || gridW >= INT_MAX / gridH) {
-+ error(getPos(), "Bad grid size in JBIG2 halftone segment");
-+ return;
-+ }
-
- // get pattern dictionary
- if (nRefSegs != 1) {
-diff -cr xpdf-3.01.orig/xpdf/JPXStream.cc xpdf-3.01/xpdf/JPXStream.cc
-*** xpdf-3.01.orig/xpdf/JPXStream.cc Tue Aug 16 22:34:31 2005
---- xpdf-3.01/xpdf/JPXStream.cc Tue Jan 17 17:14:06 2006
-***************
-*** 12,17 ****
---- 12,18 ----
- #pragma implementation
- #endif
-
-+ #include
- #include "gmem.h"
- #include "Error.h"
- #include "JArithmeticDecoder.h"
-***************
-*** 818,823 ****
---- 819,830 ----
- / img.xTileSize;
- img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1)
- / img.yTileSize;
-+ // check for overflow before allocating memory
-+ if (img.nXTiles <= 0 || img.nYTiles <= 0 ||
-+ img.nXTiles >= INT_MAX / img.nYTiles) {
-+ error(getPos(), "Bad tile count in JPX SIZ marker segment");
-+ return gFalse;
-+ }
- img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles,
- sizeof(JPXTile));
- for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
-diff -cr xpdf-3.01.orig/xpdf/Stream.cc xpdf-3.01/xpdf/Stream.cc
-*** xpdf-3.01.orig/xpdf/Stream.cc Tue Aug 16 22:34:31 2005
---- xpdf-3.01/xpdf/Stream.cc Tue Jan 17 17:31:52 2006
-***************
-*** 15,20 ****
---- 15,21 ----
- #include
- #include
- #include
-+ #include
- #ifndef WIN32
- #include
- #endif
-***************
-*** 406,418 ****
---- 407,432 ----
- width = widthA;
- nComps = nCompsA;
- nBits = nBitsA;
-+ predLine = NULL;
-+ ok = gFalse;
-
- nVals = width * nComps;
-+ if (width <= 0 || nComps <= 0 || nBits <= 0 ||
-+ nComps >= INT_MAX / nBits ||
-+ width >= INT_MAX / nComps / nBits ||
-+ nVals * nBits + 7 < 0) {
-+ return;
-+ }
- pixBytes = (nComps * nBits + 7) >> 3;
- rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
-+ if (rowBytes <= 0) {
-+ return;
-+ }
- predLine = (Guchar *)gmalloc(rowBytes);
- memset(predLine, 0, rowBytes);
- predIdx = rowBytes;
-+
-+ ok = gTrue;
- }
-
- StreamPredictor::~StreamPredictor() {
-***************
-*** 1004,1009 ****
---- 1018,1027 ----
- FilterStream(strA) {
- if (predictor != 1) {
- pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+ if (!pred->isOk()) {
-+ delete pred;
-+ pred = NULL;
-+ }
- } else {
- pred = NULL;
- }
-***************
-*** 1259,1264 ****
---- 1277,1285 ----
- if (columns < 1) {
- columns = 1;
- }
-+ if (columns + 4 <= 0) {
-+ columns = INT_MAX - 4;
-+ }
- rows = rowsA;
- endOfBlock = endOfBlockA;
- black = blackA;
-***************
-*** 2899,2904 ****
---- 2920,2930 ----
- height = read16();
- width = read16();
- numComps = str->getChar();
-+ if (numComps <= 0 || numComps > 4) {
-+ error(getPos(), "Bad number of components in DCT stream");
-+ numComps = 0;
-+ return gFalse;
-+ }
- if (prec != 8) {
- error(getPos(), "Bad DCT precision %d", prec);
- return gFalse;
-***************
-*** 2925,2930 ****
---- 2951,2961 ----
- height = read16();
- width = read16();
- numComps = str->getChar();
-+ if (numComps <= 0 || numComps > 4) {
-+ error(getPos(), "Bad number of components in DCT stream");
-+ numComps = 0;
-+ return gFalse;
-+ }
- if (prec != 8) {
- error(getPos(), "Bad DCT precision %d", prec);
- return gFalse;
-***************
-*** 2947,2952 ****
---- 2978,2988 ----
-
- length = read16() - 2;
- scanInfo.numComps = str->getChar();
-+ if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
-+ error(getPos(), "Bad number of components in DCT stream");
-+ scanInfo.numComps = 0;
-+ return gFalse;
-+ }
- --length;
- if (length != 2 * scanInfo.numComps + 3) {
- error(getPos(), "Bad DCT scan info block");
-***************
-*** 3041,3046 ****
---- 3077,3083 ----
- numACHuffTables = index+1;
- tbl = &acHuffTables[index];
- } else {
-+ index &= 0x0f;
- if (index >= numDCHuffTables)
- numDCHuffTables = index+1;
- tbl = &dcHuffTables[index];
-***************
-*** 3827,3832 ****
---- 3864,3873 ----
- FilterStream(strA) {
- if (predictor != 1) {
- pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+ if (!pred->isOk()) {
-+ delete pred;
-+ pred = NULL;
-+ }
- } else {
- pred = NULL;
- }
-diff -cr xpdf-3.01.orig/xpdf/Stream.h xpdf-3.01/xpdf/Stream.h
-*** xpdf-3.01.orig/xpdf/Stream.h Tue Aug 16 22:34:31 2005
---- xpdf-3.01/xpdf/Stream.h Tue Jan 17 17:19:54 2006
-***************
-*** 232,237 ****
---- 232,239 ----
-
- ~StreamPredictor();
-
-+ GBool isOk() { return ok; }
-+
- int lookChar();
- int getChar();
-
-***************
-*** 249,254 ****
---- 251,257 ----
- int rowBytes; // bytes per line
- Guchar *predLine; // line buffer
- int predIdx; // current index in predLine
-+ GBool ok;
- };
-
- //------------------------------------------------------------------------
-***************
-*** 527,533 ****
- short getWhiteCode();
- short getBlackCode();
- short lookBits(int n);
-! void eatBits(int n) { inputBits -= n; }
- };
-
- //------------------------------------------------------------------------
---- 530,536 ----
- short getWhiteCode();
- short getBlackCode();
- short lookBits(int n);
-! void eatBits(int n) { if ((inputBits -= n) < 0) inputBits = 0; }
- };
-
- //------------------------------------------------------------------------
-diff -cr xpdf-3.01.orig/splash/SplashXPathScanner.cc xpdf-3.01/splash/SplashXPathScanner.cc
-*** xpdf-3.01.orig/splash/SplashXPathScanner.cc Tue Aug 16 22:34:31 2005
---- xpdf-3.01/splash/SplashXPathScanner.cc Wed Feb 1 17:01:14 2006
-***************
-*** 186,192 ****
- }
-
- void SplashXPathScanner::computeIntersections(int y) {
-! SplashCoord ySegMin, ySegMax, xx0, xx1;
- SplashXPathSeg *seg;
- int i, j;
-
---- 186,192 ----
- }
-
- void SplashXPathScanner::computeIntersections(int y) {
-! SplashCoord xSegMin, xSegMax, ySegMin, ySegMax, xx0, xx1;
- SplashXPathSeg *seg;
- int i, j;
-
-***************
-*** 236,254 ****
- } else if (seg->flags & splashXPathVert) {
- xx0 = xx1 = seg->x0;
- } else {
-! if (ySegMin <= y) {
-! // intersection with top edge
-! xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
- } else {
-! // x coord of segment endpoint with min y coord
-! xx0 = (seg->flags & splashXPathFlip) ? seg->x1 : seg->x0;
- }
-! if (ySegMax >= y + 1) {
-! // intersection with bottom edge
-! xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
-! } else {
-! // x coord of segment endpoint with max y coord
-! xx1 = (seg->flags & splashXPathFlip) ? seg->x0 : seg->x1;
- }
- }
- if (xx0 < xx1) {
---- 236,262 ----
- } else if (seg->flags & splashXPathVert) {
- xx0 = xx1 = seg->x0;
- } else {
-! if (seg->x0 < seg->x1) {
-! xSegMin = seg->x0;
-! xSegMax = seg->x1;
- } else {
-! xSegMin = seg->x1;
-! xSegMax = seg->x0;
- }
-! // intersection with top edge
-! xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
-! // intersection with bottom edge
-! xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
-! // the segment may not actually extend to the top and/or bottom edges
-! if (xx0 < xSegMin) {
-! xx0 = xSegMin;
-! } else if (xx0 > xSegMax) {
-! xx0 = xSegMax;
-! }
-! if (xx1 < xSegMin) {
-! xx1 = xSegMin;
-! } else if (xx1 > xSegMax) {
-! xx1 = xSegMax;
- }
- }
- if (xx0 < xx1) {
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 0c58965fc19..6c3ff038c74 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
- version = "0.1.2";
+ version = "0.2.1";
name = "zathura-core-${version}";
src = fetchurl {
url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
- sha256 = "a496c25071e54f675b65ee5eab02fd002c04c2d7d5cf4aa8a1cb517cc13beaef";
+ sha256 = "075b9def201c77ca738dc9e15b252bc23c085b7c4671a1810d1d962e8d0bd790";
};
buildInputs = [ pkgconfig gtk girara gettext ];
diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix
index b5ba4f9ada7..5ed445b6984 100644
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@@ -13,7 +13,7 @@ rec {
zathuraWrapper = stdenv.mkDerivation rec {
- name = "zathura-0.1.2";
+ name = "zathura-${zathura_core.version}";
plugins_path = stdenv.lib.makeSearchPath "lib" [
zathura_pdf_poppler
diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix
index c4656e73236..bddb3471bfe 100644
--- a/pkgs/applications/misc/zathura/djvu/default.nix
+++ b/pkgs/applications/misc/zathura/djvu/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }:
stdenv.mkDerivation rec {
- name = "zathura-djvu-0.1.1";
+ name = "zathura-djvu-0.2.1";
src = fetchurl {
url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
- sha256 = "04adad7bf1bb392eae4b7b856fe7d40a137f8185ac274289df922758ae827172";
+ sha256 = "d8bb3c9e30244a0733e49740ee2dd099ce39fa16f2c320af27a0c09d9a25bcc3";
};
buildInputs = [ pkgconfig djvulibre gettext zathura_core gtk girara ];
diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
index 17e00b4e622..e0fcb0573a4 100644
--- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler, gettext }:
stdenv.mkDerivation rec {
- name = "zathura-pdf-poppler-0.1.1";
+ name = "zathura-pdf-poppler-0.2.1";
src = fetchurl {
url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
- sha256 = "bec5fee721fcaee9f4b53d3882908b19efa82815393aa8c3619ff948b909d4a7";
+ sha256 = "1c162ea887e52f48d6dc80f8427a773768f2df2e37242dab7efddeb3d2e361cd";
};
buildInputs = [ pkgconfig poppler gettext zathura_core girara ];
diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix
index ae9aeee7715..7f70eb952e1 100644
--- a/pkgs/applications/misc/zathura/ps/default.nix
+++ b/pkgs/applications/misc/zathura/ps/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }:
stdenv.mkDerivation rec {
- name = "zathura-ps-0.1.0";
+ name = "zathura-ps-0.2.0";
src = fetchurl {
url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
- sha256 = "1669fd11e436636cdedb2cde206b562f4f9c666cea9773f6f2014e765fd62789";
+ sha256 = "717eda01213b162421b6b52f29d6b981edc302fddf351ccb2c093b6842751414";
};
buildInputs = [ pkgconfig libspectre gettext zathura_core gtk girara ];
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 7d41f72df20..e32b31dc856 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, config, fetchurl, makeWrapper, which
+{ stdenv, fetchurl, makeWrapper, which
# default dependencies
, bzip2, flac, speex
@@ -15,32 +15,24 @@
, libXScrnSaver, libXcursor, mesa
# optional dependencies
-, libgnome_keyring # config.gnomeKeyring
-, gconf # config.gnome
-, libgcrypt # config.gnome || config.cups
-, nss, openssl # config.openssl
-, pulseaudio # config.pulseaudio
-, libselinux # config.selinux
+, libgcrypt ? null # gnomeSupport || cupsSupport
+
+# package customization
+, channel ? "stable"
+, enableSELinux ? false, libselinux ? null
+, enableNaCl ? false
+, useOpenSSL ? false, nss ? null, openssl ? null
+, gnomeSupport ? false, gconf ? null
+, gnomeKeyringSupport ? false, libgnome_keyring ? null
+, proprietaryCodecs ? true
+, cupsSupport ? false
+, pulseSupport ? false, pulseaudio ? null
}:
with stdenv.lib;
let
- mkConfigurable = mapAttrs (flag: default: attrByPath ["chromium" flag] default config);
-
- cfg = mkConfigurable {
- channel = "stable";
- selinux = false;
- nacl = false;
- openssl = false;
- gnome = false;
- gnomeKeyring = false;
- proprietaryCodecs = true;
- cups = false;
- pulseaudio = config.pulseaudio or true;
- };
-
- sourceInfo = builtins.getAttr cfg.channel (import ./sources.nix);
+ sourceInfo = builtins.getAttr channel (import ./sources.nix);
mkGypFlags =
let
@@ -62,7 +54,7 @@ let
use_system_libusb = true;
use_system_libxml = true;
use_system_speex = true;
- use_system_ssl = cfg.openssl;
+ use_system_ssl = useOpenSSL;
use_system_stlport = true;
use_system_xdg_utils = true;
use_system_yasm = true;
@@ -86,11 +78,10 @@ let
post23 = !versionOlder sourceInfo.version "24.0.0.0";
post24 = !versionOlder sourceInfo.version "25.0.0.0";
+ only24 = post23 && !post24;
- maybeFixPulseAudioBuild = optional (post23 && cfg.pulseaudio) (fetchurl {
- url = http://archrepo.jeago.com/sources/chromium-dev/pulse_audio_fix.patch;
- sha256 = "1w91mirrkqigdhsj892mqxlc0nlv1dsp5shc46w9xf8nl96jxgfb";
- });
+ maybeFixPulseAudioBuild = optional (only24 && pulseSupport)
+ ./pulse_audio_fix.patch;
in stdenv.mkDerivation rec {
name = "${packageName}-${version}";
@@ -107,44 +98,46 @@ in stdenv.mkDerivation rec {
which makeWrapper
python perl pkgconfig
nspr udev
- (if cfg.openssl then openssl else nss)
+ (if useOpenSSL then openssl else nss)
utillinux alsaLib
gcc bison gperf
krb5
glib gtk dbus_glib
libXScrnSaver libXcursor mesa
- ] ++ optional cfg.gnomeKeyring libgnome_keyring
- ++ optionals cfg.gnome [ gconf libgcrypt ]
- ++ optional cfg.selinux libselinux
- ++ optional cfg.cups libgcrypt
- ++ optional cfg.pulseaudio pulseaudio
+ ] ++ optional gnomeKeyringSupport libgnome_keyring
+ ++ optionals gnomeSupport [ gconf libgcrypt ]
+ ++ optional enableSELinux libselinux
+ ++ optional cupsSupport libgcrypt
+ ++ optional pulseSupport pulseaudio
++ optional post24 pciutils;
- opensslPatches = optional cfg.openssl openssl.patches;
+ opensslPatches = optional useOpenSSL openssl.patches;
prePatch = "patchShebangs .";
- patches = optional cfg.cups ./cups_allow_deprecated.patch
- ++ optional cfg.pulseaudio ./pulseaudio_array_bounds.patch
+ patches = optional cupsSupport ./cups_allow_deprecated.patch
+ ++ optional pulseSupport ./pulseaudio_array_bounds.patch
++ maybeFixPulseAudioBuild;
- postPatch = optionalString cfg.openssl ''
+ postPatch = optionalString useOpenSSL ''
cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
+ '' + optionalString post24 ''
+ sed -i -r -e "s/-f(stack-protector)(-all)?/-fno-\1/" build/common.gypi
'';
gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {
linux_use_gold_binary = false;
linux_use_gold_flags = false;
proprietary_codecs = false;
- use_gnome_keyring = cfg.gnomeKeyring;
- use_gconf = cfg.gnome;
- use_gio = cfg.gnome;
- use_pulseaudio = cfg.pulseaudio;
- disable_nacl = !cfg.nacl;
- use_openssl = cfg.openssl;
- selinux = cfg.selinux;
- use_cups = cfg.cups;
- } // optionalAttrs cfg.proprietaryCodecs {
+ use_gnome_keyring = gnomeKeyringSupport;
+ use_gconf = gnomeSupport;
+ use_gio = gnomeSupport;
+ use_pulseaudio = pulseSupport;
+ disable_nacl = !enableNaCl;
+ use_openssl = useOpenSSL;
+ selinux = enableSELinux;
+ use_cups = cupsSupport;
+ } // optionalAttrs proprietaryCodecs {
# enable support for the H.264 codec
proprietary_codecs = true;
ffmpeg_branding = "Chrome";
@@ -205,7 +198,7 @@ in stdenv.mkDerivation rec {
meta = {
description = "Chromium, an open source web browser";
homepage = http://www.chromium.org/;
- maintainers = with maintainers; [ goibhniu chaoflow ];
+ maintainers = with maintainers; [ goibhniu chaoflow aszlig ];
license = licenses.bsd3;
platforms = platforms.linux;
};
diff --git a/pkgs/applications/networking/browsers/chromium/pulse_audio_fix.patch b/pkgs/applications/networking/browsers/chromium/pulse_audio_fix.patch
new file mode 100644
index 00000000000..01ff89a9a63
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/pulse_audio_fix.patch
@@ -0,0 +1,11 @@
+--- chromium-build/media/audio/pulse/pulse_output.cc.orig 2012-10-26 09:44:38.509209905 -0700
++++ chromium-build/media/audio/pulse/pulse_output.cc 2012-10-26 09:45:32.178819603 -0700
+@@ -86,7 +86,7 @@
+
+ // All channel maps have the same size array of channel positions.
+ for (unsigned int channel = 0; channel != CHANNELS_MAX; ++channel) {
+- int channel_position = kChannelOrderings[channel_layout][channel];
++ int channel_position = ChannelOrder(channel_layout, static_cast(channel));
+ if (channel_position > -1) {
+ channel_map.map[channel_position] = ChromiumToPAChannelPosition(
+ static_cast(channel));
diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index 9b6616ec63c..a7687e731f5 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
dev = {
- version = "25.0.1323.1";
- url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1323.1.tar.bz2";
- sha256 = "1i7ga1qhnjvnw2gynmpmsvvl5pxcb5z9sgldp87d9yalim5sra6s";
+ version = "25.0.1364.36";
+ url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.36.tar.bz2";
+ sha256 = "1pn7qv1s6lcx8k26h89x9zdy43rzdq12f92s2l6cfdhr9ls9wv0s";
};
beta = {
- version = "24.0.1312.14";
- url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.14.tar.bz2";
- sha256 = "03w8cg4kqmpj82976ax9x6y275y9gcri4vc11cvfjp6r1issxzk8";
+ version = "25.0.1364.36";
+ url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.36.tar.bz2";
+ sha256 = "1pn7qv1s6lcx8k26h89x9zdy43rzdq12f92s2l6cfdhr9ls9wv0s";
};
stable = {
- version = "23.0.1271.64";
- url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.64.tar.bz2";
- sha256 = "1rzz08sgw07nkmvhhgyrkrcxj3z24lxbx0di6ky6jz3lshibp578";
+ version = "24.0.1312.52";
+ url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.52.tar.bz2";
+ sha256 = "04fp04591dszx07wwdsgxf0wb2sxm863z1qxn5dii6f9yjqgh3gk";
};
}
diff --git a/pkgs/applications/networking/browsers/firefox/17.0.nix b/pkgs/applications/networking/browsers/firefox/17.0.nix
deleted file mode 100644
index 30cd54b9d43..00000000000
--- a/pkgs/applications/networking/browsers/firefox/17.0.nix
+++ /dev/null
@@ -1,185 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
-, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
-, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
-, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
-
-, # If you want the resulting program to call itself "Firefox" instead
- # of "Shiretoko" or whatever, enable this option. However, those
- # binaries may not be distributed without permission from the
- # Mozilla Foundation, see
- # http://www.mozilla.org/foundation/trademarks/.
- enableOfficialBranding ? false
-}:
-
-assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
-
-rec {
-
- firefoxVersion = "17.0";
-
- xulVersion = "17.0"; # this attribute is used by other packages
-
-
- src = fetchurl {
- urls = [
- # It is better to use this url for official releases, to take load off Mozilla's ftp server.
- "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
- # 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 = "4f5f175c1662d67f70e78403607d8eda600efd8b";
- };
-
- commonConfigureFlags =
- [ "--enable-optimize"
- #"--enable-profiling"
- "--disable-debug"
- "--enable-strip"
- "--with-system-jpeg"
- "--with-system-zlib"
- "--with-system-bz2"
- "--with-system-nspr"
- "--with-system-nss"
- # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
- # "--enable-system-cairo" # disabled for the moment because our Cairo is too old
- "--enable-system-sqlite"
- "--disable-crashreporter"
- "--disable-tests"
- "--disable-necko-wifi" # maybe we want to enable this at some point
- "--disable-installer"
- "--disable-updater"
- ];
-
-
- xulrunner = stdenv.mkDerivation rec {
- name = "xulrunner-${xulVersion}";
-
- inherit src;
-
- buildInputs =
- [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
- python dbus dbus_glib pango freetype fontconfig xlibs.libXi
- xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
- alsaLib nspr nss libnotify xlibs.pixman yasm mesa
- xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
- xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
- ];
-
- configureFlags =
- [ "--enable-application=xulrunner"
- "--disable-javaxpcom"
- ] ++ commonConfigureFlags;
-
- enableParallelBuilding = true;
-
- preConfigure =
- ''
- export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
-
- mkdir ../objdir
- cd ../objdir
- configureScript=../mozilla-release/configure
- ''; # */
-
- #installFlags = "SKIP_GRE_REGISTRATION=1";
-
- postInstall = ''
- # Fix run-mozilla.sh search
- libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
- echo libDir: $libDir
- test -n "$libDir"
- cd $out/bin
- rm xulrunner
-
- for i in $out/lib/$libDir/*; do
- file $i;
- if file $i | grep executable &>/dev/null; then
- echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
- chmod a+x "$out/bin/$(basename "$i")";
- fi;
- done
- for i in $out/lib/$libDir/*.so; do
- patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
- done
- for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do
- wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir"
- done
- rm -f $out/bin/run-mozilla.sh
- ''; # */
-
- meta = {
- description = "Mozilla Firefox XUL runner";
- homepage = http://www.mozilla.com/en-US/firefox/;
- };
-
- passthru = { inherit gtk; version = xulVersion; };
- };
-
-
- firefox = stdenv.mkDerivation rec {
- name = "firefox-${firefoxVersion}";
-
- inherit src;
-
- enableParallelBuilding = true;
-
- buildInputs =
- [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
- dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
- xlibs.pixman yasm mesa sqlite file unzip pysqlite
- ];
-
- propagatedBuildInputs = [xulrunner];
-
- configureFlags =
- [ "--enable-application=browser"
- "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
- "--enable-chrome-format=jar"
- "--disable-elf-hack"
- ]
- ++ commonConfigureFlags
- ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
-
- makeFlags = [
- "SYSTEM_LIBXUL=1"
- ];
-
- # Hack to work around make's idea of -lbz2 dependency
- preConfigure =
- ''
- find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
- stdenv.lib.concatStringsSep ":"
- (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
- }' ';'
- '';
-
- postInstall =
- ''
- ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
- for j in $out/bin/*; do
- i="$(readlink "$j")";
- file $i;
- if file $i | grep executable &>/dev/null; then
- rm "$out/bin/$(basename "$i")"
- echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"
- chmod a+x "$out/bin/$(basename "$i")"
- fi;
- done;
- cd "$out/lib/"firefox-*
- rm firefox
- echo -e '#!${stdenv.shell}\n${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
- chmod a+x firefox
- ''; # */
-
- meta = {
- description = "Mozilla Firefox - the browser, reloaded";
- homepage = http://www.mozilla.com/en-US/firefox/;
- maintainers = [ stdenv.lib.maintainers.eelco ];
- };
-
- passthru = {
- inherit gtk xulrunner nspr;
- isFirefox3Like = true;
- };
- };
-}
diff --git a/pkgs/applications/networking/browsers/firefox/16.0.nix b/pkgs/applications/networking/browsers/firefox/18.0.nix
similarity index 87%
rename from pkgs/applications/networking/browsers/firefox/16.0.nix
rename to pkgs/applications/networking/browsers/firefox/18.0.nix
index a9a10fbc4ec..66acae13084 100644
--- a/pkgs/applications/networking/browsers/firefox/16.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/18.0.nix
@@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
- firefoxVersion = "16.0.2";
+ firefoxVersion = "18.0.1";
- xulVersion = "16.0.2"; # this attribute is used by other packages
+ xulVersion = "18.0.1"; # 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 = "0ffe96896583e92561b341330ab09ddc50140dd1";
+ sha1 = "26415396233450a4e66bb0e0a73a258e1cb174ef";
};
commonConfigureFlags =
@@ -35,11 +35,11 @@ rec {
#"--enable-profiling"
"--disable-debug"
"--enable-strip"
- "--with-system-jpeg"
+ # "--with-system-jpeg" # Too old in nixpkgs
"--with-system-zlib"
"--with-system-bz2"
"--with-system-nspr"
- "--with-system-nss"
+ # "--with-system-nss" # Too old in nixpkgs
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
# "--enable-system-cairo" # disabled for the moment because our Cairo is too old
"--enable-system-sqlite"
@@ -94,7 +94,7 @@ rec {
for i in $out/lib/$libDir/*; do
file $i;
if file $i | grep executable &>/dev/null; then
- echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
+ echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
chmod a+x "$out/bin/$(basename "$i")";
fi;
done
@@ -156,18 +156,9 @@ rec {
postInstall =
''
ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
- for j in $out/bin/*; do
- i="$(readlink "$j")";
- file $i;
- if file $i | grep executable &>/dev/null; then
- rm "$out/bin/$(basename "$i")"
- echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"
- chmod a+x "$out/bin/$(basename "$i")"
- fi;
- done;
cd "$out/lib/"firefox-*
rm firefox
- echo -e '#!${stdenv.shell}\n${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
+ echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
chmod a+x firefox
''; # */
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index 2eb34f68b8b..7e2bfb692a3 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -13,6 +13,7 @@
, libXrender
, libXcursor
, libXt
+, libvdpau
, gtk
, glib
, pango
@@ -43,9 +44,9 @@ let
throw "no x86_64 debugging version available"
else rec {
# -> http://labs.adobe.com/downloads/flashplayer10.html
- version = "11.2.202.238";
- url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
- sha256 = "07d09xjnn2hm877psmv9a6c4cfighxw24p0apq2ykawnrjpjc6zn";
+ 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";
}
else if stdenv.system == "i686-linux" then
if debug then {
@@ -54,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.238";
- url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
- sha256 = "0p05pr4vmc4536axjyljhxhqizq4ihslar8g638dj24251byp7ca";
+ version = "11.2.202.251";
+ url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux_i386.tar.gz";
+ sha256 = "0nph42s1bspf88m1qqrvc93kkxkrvq3lfs5iq4l5dflwzs32jdm3";
}
else throw "Flash Player is not supported on this platform";
@@ -78,6 +79,7 @@ stdenv.mkDerivation {
rpath = stdenv.lib.makeLibraryPath
[ zlib alsaLib curl nss nspr fontconfig freetype expat libX11
libXext libXrender libXcursor libXt gtk glib pango atk cairo gdk_pixbuf
+ libvdpau
];
buildPhase = ":";
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
index 0ff7c92d3d8..44f191e54f1 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, x11
-, GConf, gnome_mplayer, MPlayer, gmtk
+, GConf, gnome_mplayer, mplayer, gmtk
}:
stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
# browser's $PATH.
postInstall =
''
- echo "${gnome_mplayer}/bin:${MPlayer}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
+ echo "${gnome_mplayer}/bin:${mplayer}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
'';
passthru.mozillaPlugin = "/lib/mozilla/plugins";
diff --git a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix
index 2ef8e8ae432..63ae2ef86d4 100644
--- a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix
@@ -1,6 +1,6 @@
args: with args;
stdenv.mkDerivation {
- name = "libnsbmp-0.0.1";
+ name = "libnsgif-0.0.1";
src = fetchurl {
url = http://www.netsurf-browser.org/projects/releases/libnsgif-0.0.1-src.tar.gz;
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
installPhase = "make PREFIX=$out install";
buildInputs = [];
- meta = {
+ meta = {
description = "Libnsbmp is a decoding library for gif image file formats"; # used by netsurf
homepage = http://www.netsurf-browser.org/projects/libnsgif/;
license = "MIT";
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index d7a8ac51a06..80b09bcd8a8 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -13,18 +13,18 @@ let
in
stdenv.mkDerivation rec {
- name = "opera-12.11-1661";
+ name = "opera-12.12-1707";
src =
if stdenv.system == "i686-linux" then
fetchurl {
- url = "${mirror}/linux/1211/${name}.i386.linux.tar.xz";
- sha256 = "0ax2kcnl0hb7fz56c9gcjia3dnwabxl2mq2hvszmbky4i399jlkk";
+ url = "${mirror}/linux/1212/${name}.i386.linux.tar.xz";
+ sha256 = "1jkrhxjxa5kz4bhyma0zlnsszdn84sq4pks3x8bfcayn12m6yxkz";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
- url = "${mirror}/linux/1211/${name}.x86_64.linux.tar.xz";
- sha256 = "1pnad4kdasrmm27kg6frldipyzcfy1y610rasbqic9frzb9q8dbp";
+ url = "${mirror}/linux/1212/${name}.x86_64.linux.tar.xz";
+ sha256 = "0acizxgyqblcvl91dwmvi937fi1kw6whz5qgxyl1fkygbayji90v";
}
else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
@@ -73,6 +73,10 @@ stdenv.mkDerivation rec {
postFixup = ''
oldRPATH=`patchelf --print-rpath $out/lib/opera/opera`
patchelf --set-rpath $oldRPATH:${cups}/lib $out/lib/opera/opera
+
+ # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
+ # It have no reasons to exist in a redistribuable package
+ rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = {
diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index 2402d2a902b..46081cac3a7 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -2,10 +2,10 @@
pkgconfig, webkit }:
stdenv.mkDerivation {
- name = "vimprobable2-1.0.2";
+ name = "vimprobable2-1.2.0";
src = fetchurl {
- url = "mirror://sourceforge/vimprobable/vimprobable2_1.0.2.tar.bz2";
- sha256 = "19gwlfv0lczbns73xg3637q7ixly62y3ijccnv0m1bqaqxjl4v8x";
+ url = "mirror://sourceforge/vimprobable/vimprobable2_1.2.0.tar.bz2";
+ sha256 = "0fjakrmz1syjwgx01j2icpdv69jgvfl2nlxbj8zxfr8mw0h2wg1f";
};
buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit ];
installPhase = ''
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index f1a906f9250..b979598e17c 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -21,8 +21,8 @@ assert stdenv.system == "x86_64-linux";
let
- version = "1.4.0";
- sha256 = "93933d95cce5956ed99342fa342d01ce2bde8d2e4339afb97f23e0c0ec98875e";
+ version = "1.4.21";
+ sha256 = "94073842f4a81feee80bca590e1df73fc3cab47ba879407ceba2de48f30d84e2";
# relative location where the dropbox libraries are stored
appdir = "opt/dropbox";
@@ -42,7 +42,7 @@ let
exec = "dropbox";
comment = "Online directories";
desktopName = "Dropbox";
- genericName = "Online storage";
+ genericName = "Online storage";
categories = "Application;Internet;";
};
@@ -65,7 +65,7 @@ in stdenv.mkDerivation {
installPhase = ''
ensureDir "$out/${appdir}"
- cp -r .dropbox-dist/* "$out/${appdir}/"
+ cp -r ".dropbox-dist/"* "$out/${appdir}/"
ensureDir "$out/bin"
ln -s "$out/${appdir}/dropbox" "$out/bin/dropbox"
@@ -78,13 +78,13 @@ in stdenv.mkDerivation {
-print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
ensureDir "$out/share/applications"
- cp ${desktopItem}/share/applications/* $out/share/applications
+ cp "${desktopItem}/share/applications/"* $out/share/applications
'';
buildInputs = [ patchelf ];
meta = {
+ homepage = "http://www.dropbox.com";
description = "Online stored folders (daemon version)";
- homepage = http://www.dropbox.com;
};
}
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
new file mode 100644
index 00000000000..43ee98b55dc
--- /dev/null
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, dbus, gnutls2, wxGTK28, libidn, tinyxml, gettext, pkgconfig, xdg_utils, gtk2, sqlite36 }:
+
+let version = "3.6.0.2"; in
+stdenv.mkDerivation {
+ name = "filezilla-${version}";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
+ sha256 = "01n6k1q21i21451rdx3rgc4hhxghdn5b0ldzpjsp44ipgww5wsjk";
+ };
+
+ configureFlags = [
+ "--disable-manualupdatecheck"
+ ];
+
+ buildInputs = [ dbus gnutls2 wxGTK28 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite36 ];
+
+ meta = {
+ homepage = "http://filezilla-project.org/";
+ description = "FileZilla is a cross-platform graphical FTP, FTPS and SFTP client a lot of features, supporting Windows, Linux, Mac OS X and more.";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix
index 7dc66886af6..03cbb1ce073 100644
--- a/pkgs/applications/networking/instant-messengers/kadu/default.nix
+++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation {
- name = "kadu-0.10.1";
+ name = "kadu-0.12.2";
src = fetchurl {
- url = http://download.kadu.im/stable/kadu-0.10.1.tar.bz2;
- sha256 = "0j88pyp2nqpc57j38zr135ypfiv4v329gfgiz9rdbqi8j26cyp7g";
+ url = http://download.kadu.im/stable/kadu-0.12.2.tar.bz2;
+ sha256 = "0rqhkiyn8c7jigpxmvwh7daxsgjxlvd16zjdss1azdzd9x2dbym1";
};
buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon pkgconfig
@@ -21,8 +21,12 @@ stdenv.mkDerivation {
patchShebangs .
'';
- # because I was not able to get those working
- patches = [ ./disable_some_plugins.patch ];
+ # Disable the kadu plugins I wasn't able to get to work
+ patchPhase = ''
+ sed -i -e '/mpd_mediaplayer/d' \
+ -e '/encryption_ng/d' \
+ -e '/encryption_ng_simlite/d' Plugins.cmake
+ '';
NIX_LDFLAGS="-lX11";
diff --git a/pkgs/applications/networking/instant-messengers/kadu/disable_some_plugins.patch b/pkgs/applications/networking/instant-messengers/kadu/disable_some_plugins.patch
deleted file mode 100644
index 0ee06c21382..00000000000
--- a/pkgs/applications/networking/instant-messengers/kadu/disable_some_plugins.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/Plugins.cmake b/Plugins.cmake
-index ad63f20..c14a781 100644
---- a/Plugins.cmake
-+++ b/Plugins.cmake
-@@ -30,9 +30,9 @@ set (COMPILE_PLUGINS
-
- # encryption
- # Encrypted chat support
-- encryption_ng
-+ # encryption_ng
- # OpenSSL encrypted chat support
-- encryption_ng_simlite
-+ # encryption_ng_simlite
-
- # docking
- # Tray icon support (common part of all docking modules)
-@@ -104,9 +104,9 @@ if (UNIX)
-
- # mediaplayer
- # MPD mediaplayer support
-- mpd_mediaplayer
-+ # mpd_mediaplayer
- # MPRIS Media Players support
-- mprisplayer_mediaplayer
-+ # mprisplayer_mediaplayer
- )
- endif (UNIX)
-
diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
index dd5a3dc8b9e..cae0213c6be 100644
--- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
@@ -1,19 +1,19 @@
-{stdenv, fetchurl, openssl, ncurses, pkgconfig, glib}:
+{stdenv, fetchurl, openssl, ncurses, pkgconfig, glib, loudmouth}:
stdenv.mkDerivation {
- name = "mcabber-0.9.9";
+ name = "mcabber-0.10.1";
src = fetchurl {
- url = http://mirror.mcabber.com/files/mcabber-0.9.9.tar.bz2;
- sha256 = "2a231c9241211d33745f110f35cfa6bdb051b32791461b9579794b6623863bb1";
+ url = "http://mcabber.com/files/mcabber-0.10.1.tar.bz2";
+ sha256 = "1248cgci1v2ypb90wfhyipwdyp1wskn3gzh78af5ai1a4w5rrjq0";
};
- meta = { homepage = "http://mirror.mcabber.com/";
+ meta = { homepage = "http://mcabber.com/";
description = "Small Jabber console client";
};
- buildInputs = [openssl ncurses pkgconfig glib];
+ buildInputs = [openssl ncurses pkgconfig glib loudmouth];
configureFlags = "--with-openssl=${openssl}";
}
diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix
index 7eee9f37ecc..66a18dbdfe9 100644
--- a/pkgs/applications/networking/instant-messengers/skype/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skype/default.nix
@@ -5,11 +5,11 @@
assert stdenv.system == "i686-linux";
stdenv.mkDerivation rec {
- name = "skype-4.0.0.8";
+ name = "skype-4.1.0.20";
src = fetchurl {
url = "http://download.skype.com/linux/${name}.tar.bz2";
- sha256 = "0gq24rbmjd05ihraarn45rwr79gidnwgllvprzrh5zqx02xll17p";
+ sha256 = "1qhcxkfmlpblpy9rqimzdl79rm781swbldkzi6nyw56bbp6lf7n3";
};
buildInputs =
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.1.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.1.nix
deleted file mode 100644
index 73eda93f7e8..00000000000
--- a/pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.1.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-{name="ktp-accounts-kcm";key="accounts_kcm";sha256="1lkqiwibxabg5p3k8l0zyzjyysi56dvbbcxp1sybd81hmxf6fzxh";}
-{name="ktp-approver";key="approver";sha256="0bw3i8av55n93ac6phvar03b6rz34wbqrzx7l2vd48d0y5ib0j6m";}
-{name="ktp-auth-handler";key="auth_handler";sha256="0kby9935df474b7jvzzg7v3zvrgml5caf96ps4dcrcvyz91ckd1y";}
-{name="ktp-common-internals";key="common_internals";sha256="1g22b0g9g14dsdl0qkdglgkf26c3pjc96q19kj2kai1i644i8k5h";}
-{name="ktp-contact-applet";key="contact_applet";sha256="0iwr202snsm72xjxv1jb9z24j8ikdx6ljaz5v9i0ha8f8rb1vrp5";}
-{name="ktp-contact-list";key="contact_list";sha256="06y1cw2kkn6ig5qnmzl7bdz9nghpv2c83c9vf9glgbxf77qfg3ms";}
-{name="ktp-filetransfer-handler";key="filetransfer_handler";sha256="1cdnl4sn34lmm7h7qv8rrkp7ia5gcg2704fqhvpv8n8gxwwhrc1a";}
-{name="ktp-kded-integration-module";key="kded_integration_module";sha256="1ccihqk0pg28v2q6p9dx37ql7hnwdz2060jf1s6p9yyd27fc4is0";}
-{name="ktp-presence-applet";key="presence_applet";sha256="0zgl8z81kmy2a03kzgvvqlr244cw9gw2kfrph1d6ax8zk4fqvxnz";}
-{name="ktp-send-file";key="send_file";sha256="1d1j0klp8dvmldn5c19zqfsxcm5hbaq5fxikpjg0q3j9ib8yh9la";}
-{name="ktp-text-ui";key="text_ui";sha256="0qikjh8ywlnwkfr4nd4hc9b15b824simhdj3n62yd87pmkk3avw6";}
-]
diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix
index 03a98cb2059..fd989739c94 100644
--- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix
@@ -36,6 +36,7 @@ in stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/tkabber \
+ --prefix PATH : "${tk}/bin" \
--set TCLLIBPATH '"${tclLibPaths}"' \
--set TKABBER_SITE_PLUGINS '$HOME/.nix-profile/share/tkabber-plugins'
'';
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index 8dcde90e538..16aaf3d9f3b 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -11,11 +11,11 @@ let
in with stdenv; mkDerivation rec {
- name = "quassel-0.7.1";
+ name = "quassel-0.7.4";
src = fetchurl {
url = "http://quassel-irc.org/pub/${name}.tar.bz2";
- sha256 = "1kby1yikiv5bpzkdri5dq39pxnsj9gjrcv1gigvy2jzy3g99qjli";
+ sha256 = "08f4m35bkmp9p1n560a3fg711s9izb25ddx2az03xzf1jl8qdrg7";
};
buildInputs = [ cmake qt4 ]
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index eb1a9c4474f..e583551bcf1 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -1,20 +1,28 @@
{ stdenv, fetchurl, ncurses, openssl, perl, python, aspell, gnutls
-, zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile }:
+, zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile
+, pythonPackages, cacert, cmake, makeWrapper }:
stdenv.mkDerivation rec {
- version = "0.3.9";
+ version = "0.4.0";
name = "weechat-${version}";
src = fetchurl {
url = "http://weechat.org/files/src/${name}.tar.gz";
- sha256 = "8666c788cbb212036197365df3ba3cf964a23e4f644d76ea51d66dbe3be593bb";
+ sha256 = "17jxknam1bbakmdfqy1b2cfc8l9ag90l3z1gcxdvwg358wasv9dc";
};
buildInputs =
[ ncurses perl python openssl aspell gnutls zlib curl pkgconfig
- libgcrypt ruby lua5 tcl guile
+ libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper
+ cacert cmake
];
+ postInstall = ''
+ wrapProgram "$out/bin/weechat-curses" \
+ --prefix PYTHONPATH : "$PYTHONPATH" \
+ --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages"
+ '';
+
meta = {
homepage = http://http://www.weechat.org/;
description = "A fast, light and extensible chat client";
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index c518f0430ff..9d7126452c9 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://notmuchmail.org/releases/${name}.tar.gz";
- sha256 = "0lx7kkrsg401zrgj8s4ziqds1jsha3szsh44v57mq4pkq0fijph9";
+ sha256 = "095e191dc0f3125c4fd98440fdf55050cba01b8e9f68245ffe0190a7f39ca753";
};
buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ];
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index a1fc52337ed..c0d87ee5a03 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
sha1 = "ccc5f2e155364948945abf6fd27bebeb4d797aa8";
};
- enableParallelBuilding = true;
+ enableParallelBuilding = false;
buildInputs =
[ pkgconfig perl python zip unzip bzip2 gtk dbus_glib alsaLib libIDL nspr
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index f2fbf704649..02f782c75a1 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -1,19 +1,19 @@
{ stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt
, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig
-, libxml2, ncurses, gettext, libunistring
+, libxml2, ncurses, gettext, libunistring, libidn
, makeWrapper }:
stdenv.mkDerivation rec {
- name = "gnunet-0.9.3";
+ name = "gnunet-0.9.5";
src = fetchurl {
url = "mirror://gnu/gnunet/${name}.tar.gz";
- sha256 = "0ppirvwjb7w7270g0w83z6wyk984cnxv2ydxj7qr0j1cz2j6nn2h";
+ sha256 = "162bahbskhzc0b2pda7v36dckm3p5p9rnbv2w0fbl0xl2gln63aa";
};
buildInputs = [
libextractor libmicrohttpd libgcrypt gmp curl libtool
- zlib adns sqlite libxml2 ncurses
+ zlib adns sqlite libxml2 ncurses libidn
pkgconfig gettext libunistring makeWrapper
];
@@ -36,6 +36,10 @@ stdenv.mkDerivation rec {
echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..."
substituteInPlace "$i" --replace "/tmp" "$TMPDIR"
done
+
+ # Ensure NSS installation works fine
+ configureFlags="$configureFlags --with-nssdir=$out/lib"
+ patchShebangs src/gns/nss/install-nss-plugin.sh
'';
doCheck = false;
@@ -72,7 +76,7 @@ stdenv.mkDerivation rec {
license = "GPLv2+";
- maintainers = [ stdenv.lib.maintainers.ludo ];
+ maintainers = with stdenv.lib.maintainers; [ ludo viric ];
platforms = stdenv.lib.platforms.gnu;
};
}
diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index 434d75bce58..d8634e31dad 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -10,16 +10,22 @@
, libXdamage
, libXext
, alsaLib
+, ffmpeg
+, libxkbfile
+#, xmlto, docbook_xml_dtd_412, docbook_xml_xslt
+, libXinerama
+, libXv
+, pulseaudioSupport ? true, pulseaudio
}:
assert printerSupport -> cups != null;
stdenv.mkDerivation rec {
name = "freerdp-${version}";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchurl {
- url = "https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-${version}.tar.gz";
- sha256 = "df9f5f3275436f3e413824ca40f1e41733a95121f45e1ed41ab410701c5764cc";
+ url = "https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz";
+ sha256 = "1my8gamvfrn6v9gcqxsa9cgxr42shc0l826zvxj8wpcay6gd321w";
};
buildInputs = [
@@ -32,11 +38,17 @@ stdenv.mkDerivation rec {
libXdamage
libXext
alsaLib
+ ffmpeg
+ libxkbfile
+# xmlto docbook_xml_dtd_412 docbook_xml_xslt
+ libXinerama
+ libXv
] ++ stdenv.lib.optional printerSupport cups;
configureFlags = [
- "--with-x"
- ] ++ stdenv.lib.optional printerSupport "--with-printer=cups";
+ "--with-x" "-DWITH_MANPAGES=OFF"
+ ] ++ stdenv.lib.optional printerSupport "--with-printer=cups"
+ ++ stdenv.lib.optional pulseaudioSupport "-DWITH_PULSEAUDIO=ON";
meta = {
description = "A Remote Desktop Protocol Client";
diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix
index 2266f7237f6..ef8ddf8b0e3 100644
--- a/pkgs/applications/networking/remote/freerdp/unstable.nix
+++ b/pkgs/applications/networking/remote/freerdp/unstable.nix
@@ -1,53 +1,63 @@
{ stdenv
, fetchgit
+, cmake
, openssl
, printerSupport ? true, cups
, pkgconfig
, zlib
, libX11
, libXcursor
-, alsaLib
-, cmake
-, libxkbfile
-, libXinerama
+, libXdamage
, libXext
-, directfb
-, cunit
+, alsaLib
+, ffmpeg
+, libxkbfile
+#, xmlto, docbook_xml_dtd_412, docbook_xml_xslt
+, libXinerama
+#, directfb
+#, cunit
+, libXv
+, pulseaudioSupport ? true, pulseaudio
}:
assert printerSupport -> cups != null;
-let rev = "498b88a1da748a4a2b4dbd12c795ca87fee24bab"; in
+let rev = "ec6effcb1e7759551cf31f5b18d768afc67db97d"; in
stdenv.mkDerivation rec {
- name = "freerdp-1.0pre${rev}";
+ name = "freerdp-1.1pre${rev}";
src = fetchgit {
url = git://github.com/FreeRDP/FreeRDP.git;
inherit rev;
- sha256 = "91ef562e96db483ada28236e524326a75b6942becce4fd2a65ace386186eccf7";
+ sha256 = "4e5af9a6769c4b34c6b75dffe83a385d1d86068c523ea9f62fabc651a2958455";
};
buildInputs = [
+ cmake
openssl
pkgconfig
zlib
libX11
libXcursor
- libxkbfile
- libXinerama
+ libXdamage
libXext
- directfb
+# directfb
+# cunit
alsaLib
- cmake
- cunit
+ ffmpeg
+ libxkbfile
+# xmlto docbook_xml_dtd_412 docbook_xml_xslt
+ libXinerama
+ libXv
] ++ stdenv.lib.optional printerSupport cups;
doCheck = false;
checkPhase = ''LD_LIBRARY_PATH="libfreerdp-cache:libfreerdp-chanman:libfreerdp-common:libfreerdp-core:libfreerdp-gdi:libfreerdp-kbd:libfreerdp-rail:libfreerdp-rfx:libfreerdp-utils" cunit/test_freerdp'';
- cmakeFlags = [ "-DWITH_DIRECTFB=ON" "-DWITH_CUNIT=ON" ];
+ cmakeFlags = [ "-DWITH_DIRECTFB=OFF" "-DWITH_CUNIT=OFF" "-DWITH_MANPAGES=OFF"
+ ] ++ stdenv.lib.optional pulseaudioSupport "-DWITH_PULSEAUDIO=ON";
meta = {
description = "A Remote Desktop Protocol Client";
diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index fdfd60e9837..a500bbaa240 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -4,12 +4,24 @@
stdenv.mkDerivation {
name = "abiword-2.8.6";
-
+
src = fetchurl {
url = http://www.abisource.org/downloads/abiword/2.8.6/source/abiword-2.8.6.tar.gz;
sha256 = "059sd2apxdmcacc4pll880i7vm18h0kyjsq299m1mz3c7ak8k46r";
};
+ prePatch = ''
+ sed -i -e '/#include /d' src/af/util/xp/ut_go_file.h
+ sed -i -e 's|#include |#include |' \
+ goffice-bits/goffice/app/goffice-app.h
+ sed -i -e 's/ptr->jmpbuf/jmpbuf(png_ptr)/' src/af/util/xp/ut_png.cpp
+ sed -i -e 's/\(m_pPNG\)->\(jmpbuf\)/png_\2(\1)/' \
+ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp
+ sed -i -e 's/--no-undefined //' src/Makefile*
+ '';
+
+ enableParallelBuilding = true;
+
buildInputs =
[ pkgconfig gtk libglade librsvg bzip2 libgnomecanvas fribidi libpng popt
libgsf enchant wv libjpeg
diff --git a/pkgs/applications/office/hledger-interest/default.nix b/pkgs/applications/office/hledger-interest/default.nix
index 5b9aefa182e..e66166f4713 100644
--- a/pkgs/applications/office/hledger-interest/default.nix
+++ b/pkgs/applications/office/hledger-interest/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hledger-interest";
- version = "1.4.1";
- sha256 = "05mzqmnr9c4zmss0f2aac4qh4s954nbkimv924d31q2lisdddvw8";
+ version = "1.4.2";
+ sha256 = "1his6pxrvs5p28bmk77bd8vaq6rhjlilwq598mbkgfvlqg7q076v";
isLibrary = false;
isExecutable = true;
buildDepends = [ Cabal hledgerLib mtl time ];
diff --git a/pkgs/applications/office/ledger/const.patch b/pkgs/applications/office/ledger/const.patch
deleted file mode 100644
index 8565fbfd0d4..00000000000
--- a/pkgs/applications/office/ledger/const.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/gnucash.cc b/gnucash.cc
-index 7d31526..c4edd77 100644
---- a/gnucash.cc
-+++ b/gnucash.cc
-@@ -201,7 +201,7 @@ static amount_t convert_number(const std::string& number,
- {
- const char * num = number.c_str();
-
-- if (char * p = std::strchr(num, '/')) {
-+ if (const char * p = std::strchr(num, '/')) {
- std::string numer_str(num, p - num);
- std::string denom_str(p + 1);
-
-diff --git a/option.cc b/option.cc
-index 10c23a7..8f2fead 100644
---- a/option.cc
-+++ b/option.cc
-@@ -892,7 +892,7 @@ OPT_BEGIN(market, "V") {
- namespace {
- void parse_price_setting(const char * optarg)
- {
-- char * equals = std::strchr(optarg, '=');
-+ const char * equals = std::strchr(optarg, '=');
- if (! equals)
- return;
-
-diff --git a/textual.cc b/textual.cc
-index 2033106..d897368 100644
---- a/textual.cc
-+++ b/textual.cc
-@@ -298,8 +298,8 @@ transaction_t * parse_transaction(char * line, account_t * account,
- DEBUG_PRINT("ledger.textual.parse", "line " << linenum << ": " <<
- "Parsed a note '" << xact->note << "'");
-
-- if (char * b = std::strchr(xact->note.c_str(), '['))
-- if (char * e = std::strchr(xact->note.c_str(), ']')) {
-+ if (const char * b = std::strchr(xact->note.c_str(), '['))
-+ if (const char * e = std::strchr(xact->note.c_str(), ']')) {
- char buf[256];
- std::strncpy(buf, b + 1, e - b - 1);
- buf[e - b - 1] = '\0';
diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix
new file mode 100644
index 00000000000..22180e9a3f7
--- /dev/null
+++ b/pkgs/applications/science/astronomy/celestia/default.nix
@@ -0,0 +1,62 @@
+{ stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu
+, lua, mesa, pkgconfig, perl, automake, autoconf, libtool, gettext
+}:
+
+let
+ name = "celestia-1.6.1";
+
+ gcc46Patch = fetchurl {
+ url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/celestia-1.6.1-gcc46.patch?h=packages/celestia";
+ sha256 = "1q840ip5h2q93r0d68jwrvf40ns5qzqss9vzd6xnwvs3wa77m5wp";
+ name = "celestia-1.6.1-gcc46.patch";
+ };
+
+ libpng15Patch = fetchurl {
+ url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/celestia-1.6.1-libpng15.patch?h=packages/celestia";
+ sha256 = "19yqbi5k944d3jm0q2mvcfg52kicy4j347gj62dyaijzj505x4pm";
+ name = "celestia-1.6.1-libpng15.patch";
+ };
+
+ linkingPatch = fetchurl {
+ url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/celestia-1.6.1-linking.patch?h=packages/celestia";
+ sha256 = "1qzv18b2prqbhy21js5bnf7vwkmrq1dmrq8r0wab7v10axjqdv35";
+ name = "celestia-1.6.1-linking.patch";
+ };
+
+ gcc47Patch = fetchurl {
+ url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/gcc-4.7-fixes.diff?h=packages/celestia";
+ sha256 = "1jqkafwrg1829cwqvlxxkqbf42zqfsgpqd8a5b2qlzma5napdmg5";
+ name = "gcc-4.7-fixes.diff";
+ };
+in
+stdenv.mkDerivation {
+ inherit name;
+
+ src = fetchurl {
+ url = "mirror://sourceforge/celestia/${name}.tar.gz";
+ sha256 = "1i1lvhbgllsh2z8i6jj4mvrjak4a7r69psvk7syw03s4p7670mfk";
+ };
+
+ buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu mesa pkgconfig lua
+ perl automake autoconf libtool gettext ];
+
+ patchPhase = ''
+ patch -Np0 -i "${gcc46Patch}"
+ patch -Np0 -i "${libpng15Patch}"
+ patch -Np1 -i "${linkingPatch}"
+ patch -Np1 -i "${gcc47Patch}"
+ autoreconf
+ configureFlagsArray=( --with-gtk --with-lua=${lua} CFLAGS="-O2 -fsigned-char" CXXFLAGS="-O2 -fsigned-char" )
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "Free space simulation";
+ homepage = "http://www.shatters.net/celestia/";
+ license = stdenv.lib.licenses.gpl2;
+
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.simons ];
+ };
+}
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index e890ee58307..541340df629 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -1,14 +1,14 @@
{stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv}:
let
- name = "stellarium-0.11.4";
+ name = "stellarium-0.11.4a";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sourceforge/stellarium/${name}.tar.gz";
- sha256 = "8ad5e9878eb36c2c27f4754dcfc69279123e0eae02cc388074e3cf9b23746535";
+ sha256 = "0gs3lf2061chgcyx22xbnn6b284nsnj8xal7jyjzj57s8yk4n619";
};
buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ];
diff --git a/pkgs/applications/science/biology/slr/default.nix b/pkgs/applications/science/biology/slr/default.nix
deleted file mode 100644
index 7111d1a854e..00000000000
--- a/pkgs/applications/science/biology/slr/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{stdenv, fetchurl, liblapack}:
-
-stdenv.mkDerivation {
- name = "slr-1.4.2";
-
- src = fetchurl {
- url = http://www.ebi.ac.uk/goldman-srv/SLR/download/v1.4.2/slr_source.tgz;
- sha256 = "03ak7jsz89zism6gx8fr1dwlwjgcmnrr9m6xgqpr0xzikxid02jp";
- };
-
- buildInputs = [ liblapack ];
- preConfigure = "mkdir bin; cd src";
- makeFlags = "-f Makefile.linux";
-
- meta = {
- description = "Phylogenetic Analysis by Maximum Likelihood (PAML)";
- longDescription = ''
-SLR is a program to detect sites in coding DNA that are unusually conserved and/or unusually variable (that is, evolving under purify or positive selection) by analysing the pattern of changes for an alignment of sequences on an evolutionary tree.
-'';
- license = "GPL3";
- homepage = http://www.ebi.ac.uk/goldman/SLR/;
- };
-}
diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix
index 61fb615b84d..54aae9e7d3b 100644
--- a/pkgs/applications/science/electronics/xoscope/default.nix
+++ b/pkgs/applications/science/electronics/xoscope/default.nix
@@ -10,6 +10,9 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk pkgconfig ];
+ # from: https://aur.archlinux.org/packages.php?ID=12140&detail=1
+ patches = [ ./gtkdepre.diff ];
+
meta = {
description = "Oscilloscope through the sound card";
homepage = http://xoscope.sourceforge.net;
diff --git a/pkgs/applications/science/electronics/xoscope/gtkdepre.diff b/pkgs/applications/science/electronics/xoscope/gtkdepre.diff
new file mode 100644
index 00000000000..993df9cb550
--- /dev/null
+++ b/pkgs/applications/science/electronics/xoscope/gtkdepre.diff
@@ -0,0 +1,58 @@
+diff -ru xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/gtkdatabox.c xoscope-2.0/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c
+--- xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/gtkdatabox.c 2010-06-07 10:42:24.000000000 +0200
++++ xoscope-2.0/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c 2010-06-07 10:45:40.000000000 +0200
+@@ -661,7 +661,7 @@
+ static void
+ gtk_databox_calculate_hcanvas (GtkDatabox *box)
+ {
+- if (!GTK_WIDGET_VISIBLE (box))
++ if (!gtk_widget_get_visible (box))
+ return;
+
+ if (box->priv->adjX->page_size == 1.0)
+@@ -698,7 +698,7 @@
+ static void
+ gtk_databox_calculate_vcanvas (GtkDatabox *box)
+ {
+- if (!GTK_WIDGET_VISIBLE (box))
++ if (!gtk_widget_get_visible (box))
+ return;
+
+ if (box->priv->adjY->page_size == 1.0)
+@@ -780,7 +780,7 @@
+ gtk_databox_draw (box, event);
+
+ gdk_draw_drawable (widget->window,
+- widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
++ widget->style->fg_gc[gtk_widget_get_state (widget)],
+ box->priv->canvas.pixmap, event->area.x, event->area.y,
+ event->area.x, event->area.y, event->area.width,
+ event->area.height);
+@@ -940,7 +940,7 @@
+ GtkWidget *widget = GTK_WIDGET (box);
+
+ g_return_if_fail (GTK_IS_DATABOX (box));
+- g_return_if_fail (GTK_WIDGET_VISIBLE (widget));
++ g_return_if_fail (gtk_widget_get_visible (widget));
+
+ gdk_draw_rectangle (box->priv->canvas.pixmap, widget->style->bg_gc[0],
+ TRUE, 0, 0,
+@@ -1150,7 +1150,7 @@
+ /* Copy a part of the pixmap to the screen */
+ if (pixmapCopyRect)
+ gdk_draw_drawable (widget->window,
+- widget->style->fg_gc[GTK_WIDGET_STATE (box)],
++ widget->style->fg_gc[gtk_widget_get_state (box)],
+ box->priv->canvas.pixmap,
+ pixmapCopyRect->x,
+ pixmapCopyRect->y,
+--- xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/Makefile.in 2011-09-02 16:43:43.000000000 +0200
++++ xoscope-2.0/gtkdatabox-0.6.0.0/gtk/Makefile.in 2011-09-02 16:43:57.000000000 +0200
+@@ -196,7 +196,6 @@
+ -DG_DISABLE_DEPRECATED\
+ -DGDK_DISABLE_DEPRECATED\
+ -DGDK_PIXBUF_DISABLE_DEPRECATED\
+- -DGTK_DISABLE_DEPRECATED\
+ `pkg-config gtk+-2.0 --cflags`
+
+ all: all-am
diff --git a/pkgs/applications/science/logic/eProver/default.nix b/pkgs/applications/science/logic/eprover/default.nix
similarity index 61%
rename from pkgs/applications/science/logic/eProver/default.nix
rename to pkgs/applications/science/logic/eprover/default.nix
index 327a5d3a623..8cc1de6e8da 100644
--- a/pkgs/applications/science/logic/eProver/default.nix
+++ b/pkgs/applications/science/logic/eprover/default.nix
@@ -1,12 +1,21 @@
{ stdenv, fetchurl, which, texLive }:
-
+let
+ s = # Generated upstream information
+ rec {
+ baseName="eprover";
+ version="1.6";
+ name="${baseName}-${version}";
+ hash="140cnw4qck1hancrqdh0f77yfba5ljhdnfxdxsl0a86a6y7ydbwi";
+ url="http://www4.in.tum.de/~schulz/WORK/E_DOWNLOAD/V_1.6/E.tgz";
+ sha256="140cnw4qck1hancrqdh0f77yfba5ljhdnfxdxsl0a86a6y7ydbwi";
+ };
+in
stdenv.mkDerivation {
- name = "EProver-1.4";
+ inherit (s) name;
src = fetchurl {
- name = "E-1.4.tar.gz";
- url = "http://www4.informatik.tu-muenchen.de/~schulz/WORK/E_DOWNLOAD/V_1.4/E.tgz";
- sha256 = "1hxkr21xqkkh4bzqip6qf70w9xvvb8p20zzkvyin631ffgvyvr93";
+ name = "E-${s.version}.tar.gz";
+ inherit (s) url sha256;
};
buildInputs = [which texLive];
@@ -27,6 +36,7 @@ stdenv.mkDerivation {
'';
meta = {
+ inherit (s) version;
description = "E automated theorem prover";
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/applications/science/logic/eprover/default.upstream b/pkgs/applications/science/logic/eprover/default.upstream
new file mode 100644
index 00000000000..fb2d80fafae
--- /dev/null
+++ b/pkgs/applications/science/logic/eprover/default.upstream
@@ -0,0 +1,3 @@
+url http://www4.informatik.tu-muenchen.de/~schulz/E/Download.html
+version_link '[.]tgz$'
+version '.*[/]V_([0-9.]+)[/].*' '\1'
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 5d9866a650b..e62751cde9d 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -9,11 +9,11 @@ let
in
stdenv.mkDerivation {
- name = "hol_light-20120529";
+ name = "hol_light-20121213";
src = fetchsvn {
url = http://hol-light.googlecode.com/svn/trunk;
- rev = "141";
- sha256 = "a11d7e5db7c6035a2debcf9e73f43c6322389aeac5bc4d123ebf58918052a57f";
+ rev = "153";
+ sha256 = "1n4da5k3jya8mf7dgif8cl5sr2dqf6vl21fw1fcdna215v2x1rc0";
};
buildInputs = [ ocaml findlib camlp5 ];
diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix
index 91d8c122a8d..2acc0ac8d89 100644
--- a/pkgs/applications/science/logic/iprover/default.nix
+++ b/pkgs/applications/science/logic/iprover/default.nix
@@ -13,7 +13,7 @@ let
baseName="iprover";
version="0.8.1";
name="${baseName}_v${version}";
- url="${baseName}.googlecode.com/files/${name}.tar.gz";
+ url="http://${baseName}.googlecode.com/files/${name}.tar.gz";
hash="15qn523w4l296np5rnkwi50a5x2xqz0kaza7bsh9bkazph7jma7w";
};
in
diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix
new file mode 100644
index 00000000000..009bed3ffe2
--- /dev/null
+++ b/pkgs/applications/science/logic/logisim/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, jre }:
+
+let version = "2.7.1"; in
+
+stdenv.mkDerivation {
+ name = "logisim-${version}";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/project/circuit/2.7.x/${version}/logisim-generic-${version}.jar";
+ sha256 = "1hkvc9zc7qmvjbl9579p84hw3n8wl3275246xlzj136i5b0phain";
+ };
+
+ phases = [ "installPhase" ];
+
+ installPhase = ''
+ mkdir -pv $out/bin
+ cp -v $src $out/logisim.jar
+
+ cat > $out/bin/logisim << EOF
+ #!${stdenv.shell}
+ ${jre}/bin/java -jar $out/logisim.jar
+ EOF
+
+ chmod +x $out/bin/logisim
+ '';
+
+ meta = {
+ homepage = "http://ozark.hendrix.edu/~burch/logisim";
+ description = "Logisim is an educational tool for designing and simulating digital logic circuits.";
+ license = "GPLv2+";
+ };
+}
diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix
index 165c8a2f148..430537fd57f 100644
--- a/pkgs/applications/science/logic/opensmt/default.nix
+++ b/pkgs/applications/science/logic/opensmt/default.nix
@@ -15,7 +15,7 @@ let
version="20101017";
name="${baseName}-${version}";
filename="${baseName}_src_${version}";
- url="${baseName}.googlecode.com/files/${filename}.tgz";
+ url="http://${baseName}.googlecode.com/files/${filename}.tgz";
hash="0xrky7ixjaby5x026v7hn72xh7d401w9jhccxjn0khhn1x87p2w1";
};
in
diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index 18d145b6dde..d644a1633cb 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/applications/science/math/maxima/default.nix
@@ -2,7 +2,7 @@
let
name = "maxima";
- version = "5.28.0";
+ version = "5.29.1";
searchPath =
stdenv.lib.makeSearchPath "bin"
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
- sha256 = "d73e925f0116ba361bf4390c80e24d4fa763f647cc1fc4cc06bbf40ceb3facda";
+ sha256 = "1p94l28adcn0826nah460r9pz71h7wd5klsg885sl2gzds75bn74";
};
buildInputs = [sbcl texinfo perl makeWrapper];
diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix
index 5cc79469b76..9d8bc705fa4 100644
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/pkgs/applications/science/misc/boinc/default.nix
@@ -1,18 +1,20 @@
-{ fetchsvn, stdenv, autoconf, automake, pkgconfig, m4, curl,
-mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK,
-sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11 }:
+{ fetchgit, stdenv, autoconf, automake, pkgconfig, m4, curl,
+mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil,
+sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11, libxcb }:
stdenv.mkDerivation rec {
- name = "boinc-6.12.39";
+ name = "boinc-7.0.44";
- src = fetchsvn {
- url = "http://boinc.berkeley.edu/svn/tags/boinc_core_release_6_12_39";
- rev = 24341;
- sha256 = "158fkm4mr7wljsy8gav20km8jamf00mxjk1wsiqw6kx62bih37yb";
+ src = fetchgit {
+ url = "git://boinc.berkeley.edu/boinc.git";
+ rev = "7c449b1fb8a681ceb27d6895751b62a2b3adf0f2";
+ sha256 = "0hdramyl9nip3gadp7xiaz8ngyld15i93d8ai1nsd04bmrvdfqia";
};
buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi
- freeglut libjpeg wxGTK sqlite gtk libXScrnSaver libnotify patchelf libX11 ];
+ freeglut libjpeg wxGTK sqlite gtk libXScrnSaver libnotify patchelf libX11
+ libxcb xcbutil
+ ];
postConfigure = ''
sed -i -e s,/etc,$out/etc, client/scripts/Makefile
@@ -27,17 +29,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- configureFlags = "--disable-server --disable-fast-install";
-
- postInstall = "
- # Remove a leading rpath to /tmp/... I don't know how it got there
- # I could not manage to get rid of that through autotools.
- for a in $out/bin/*; do
- RPATH=$(patchelf --print-rpath $a)
- NEWRPATH=$(echo $RPATH | sed 's/^[^:]*://')
- patchelf --set-rpath $out/lib:$NEWRPATH $a
- done
- ";
+ configureFlags = "--disable-server";
meta = {
description = "Free software for distributed and grid computing";
diff --git a/pkgs/applications/science/misc/golly/src-for-default.nix b/pkgs/applications/science/misc/golly/src-for-default.nix
index bf0d9ddada4..00038373d56 100644
--- a/pkgs/applications/science/misc/golly/src-for-default.nix
+++ b/pkgs/applications/science/misc/golly/src-for-default.nix
@@ -1,9 +1,9 @@
rec {
- version="2.3-src";
- name="golly-2.3-src";
- hash="12r1lrrn4c1kafzvz5mmfq3750smqv5dwl1xpj3753h0rl9a9gx1";
- url="http://downloads.sourceforge.net/project/golly/golly/golly-2.3/golly-2.3-src.tar.gz";
- advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.3/golly-2.3-src.tar.gz";
+ version="2.4-src";
+ name="golly-2.4-src";
+ hash="06vajm019q4q4wfy6pc1669fbjqdb4jaxcc419bk0vzky40anl9w";
+ url="http://downloads.sourceforge.net/project/golly/golly/golly-2.4/golly-2.4-src.tar.gz";
+ advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.4/golly-2.4-src.tar.gz";
}
diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
new file mode 100644
index 00000000000..c687fd5908c
--- /dev/null
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -0,0 +1,46 @@
+
+{ stdenv, fetchurl, cmake,
+ singlePrec ? true,
+ fftw
+}:
+
+
+stdenv.mkDerivation {
+ name = "gromacs-4.5.5";
+
+ src = fetchurl {
+ url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.5.5.tar.gz";
+ md5 = "6a87e7cdfb25d81afa9fea073eb28468";
+ };
+
+ buildInputs = [cmake fftw];
+
+ cmakeFlags = ''
+ ${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"}
+ '';
+
+ meta = {
+ homepage = "http://www.gromacs.org";
+ licence = "GPLv2";
+ description = "The GROMACS molecular dynamics software package";
+ longDescription = ''
+ GROMACS is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems
+ with hundreds to millions of particles.
+
+ It is primarily designed for biochemical molecules like
+ proteins, lipids and nucleic acids that have a lot of
+ complicated bonded interactions, but since GROMACS is
+ extremely fast at calculating the nonbonded interactions (that
+ usually dominate simulations) many groups are also using it
+ for research on non-biological systems, e.g. polymers.
+
+ GROMACS supports all the usual algorithms you expect from a
+ modern molecular dynamics implementation, (check the online
+ reference or manual for details), but there are also quite a
+ few features that make it stand out from the competition.
+
+ See: http://www.gromacs.org/About_Gromacs for details.
+ '';
+ };
+}
diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix
index 856320f0168..1eb114ecd8c 100644
--- a/pkgs/applications/version-management/bazaar/default.nix
+++ b/pkgs/applications/version-management/bazaar/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, pythonPackages }:
stdenv.mkDerivation rec {
- version = "2.3";
+ version = "2.5";
release = ".1";
name = "bazaar-${version}${release}";
src = fetchurl {
url = "http://launchpad.net/bzr/${version}/${version}${release}/+download/bzr-${version}${release}.tar.gz";
- sha256 = "07kx41w4gqv68bcykdflsg68wvpmcyqknzyb4vr1zqlf27hahp53";
+ sha256 = "10krjbzia2avn09p0cdlbx2wya0r5v11w5ymvyl72af5dkx4cwwn";
};
buildInputs = [ pythonPackages.python pythonPackages.wrapPython ];
diff --git a/pkgs/applications/version-management/darcs/bash-completion.patch b/pkgs/applications/version-management/darcs/bash-completion.patch
deleted file mode 100644
index 8944ebeb9cb..00000000000
--- a/pkgs/applications/version-management/darcs/bash-completion.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/darcs-2.0.0/tools/darcs_completion b/darcs-2.0.0/tools/darcs_completion
-index 10628db..e36476e 100644
---- a/tools/darcs_completion
-+++ b/tools/darcs_completion
-@@ -3,7 +3,6 @@
- # darcs command line completion.
- # Copyright 2002 "David Roundy"
- #
--have darcs &&
- _darcs()
- {
- local cur
-@@ -48,5 +47,5 @@ _darcs()
- return 0
-
- }
--[ "$have" ] && complete -F _darcs -o default darcs
-+complete -F _darcs -o default darcs
-
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index fe4f101e27c..3120cc84e63 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -76,6 +76,11 @@ rec {
inherit stdenv fetchurl ncurses asciidoc xmlto docbook_xsl;
};
+ hub = import ./hub {
+ inherit (rubyLibs) rake;
+ inherit stdenv fetchgit groff makeWrapper;
+ };
+
gitFastExport = import ./fast-export {
inherit fetchgit stdenv mercurial coreutils git makeWrapper subversion;
};
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 713cf0d62a6..aef86c06cfb 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -12,14 +12,14 @@
}:
let
- version = "3.20121112-161-gb27d9eb";
+ version = "3.20130107";
in
stdenv.mkDerivation {
name = "git-annex-${version}";
src = fetchurl {
- url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;h=b27d9ebd0f63bdc449440f2529224d5b655ddbb3;sf=tgz";
- sha256 = "507efc50e33566a51a6abf688920d30fc55ce984c9c35be085e6df0767686b3a";
+ url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}";
+ sha256 = "15x4rmpxv3mgp8r4gb6jana5262nvyl6rm5p8slc5z5ijl0qwbzq";
name = "git-annex-${version}.tar.gz";
};
@@ -36,7 +36,6 @@ stdenv.mkDerivation {
checkTarget = "test";
doCheck = true;
- # The 'add_url' test fails because it attempts to use the network.
preConfigure = ''
makeFlagsArray=( PREFIX=$out )
sed -i -e 's|#!/usr/bin/perl|#!${perl}/bin/perl|' Build/mdwn2man
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index b3229909212..db3833f1855 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -9,7 +9,7 @@
let
- version = "1.8.0";
+ version = "1.8.1";
svn = subversionClient.override { perlBindings = true; };
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
- sha1 = "a03afc33f8f0723ad12649d79f1e8968526b4bf7";
+ sha1 = "wfj2pbqf9l56014dm330wb13qgcwx3dc";
};
patches = [ ./docbook2texi.patch ];
diff --git a/pkgs/applications/version-management/git-and-tools/git/docbook2texi-2.patch b/pkgs/applications/version-management/git-and-tools/git/docbook2texi-2.patch
deleted file mode 100644
index 25a76ea3dd2..00000000000
--- a/pkgs/applications/version-management/git-and-tools/git/docbook2texi-2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-
-make sure `gitman.info' isn't produced since it's broken (duplicate
-node names).
-
-diff --git a/Documentation/Makefile b/Documentation/Makefile
---- a/Documentation/Makefile
-+++ b/Documentation/Makefile
-@@ -84,7 +84,7 @@ man1: $(DOC_MAN1)
- man5: $(DOC_MAN5)
- man7: $(DOC_MAN7)
-
--info: git.info gitman.info
-+info: git.info
-
- install: man
- $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
-@@ -96,10 +96,9 @@ install: man
-
- install-info: info
- $(INSTALL) -d -m 755 $(DESTDIR)$(infodir)
-- $(INSTALL) -m 644 git.info gitman.info $(DESTDIR)$(infodir)
-+ $(INSTALL) -m 644 git.info $(DESTDIR)$(infodir)
- if test -r $(DESTDIR)$(infodir)/dir; then \
- $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) git.info ;\
-- $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) gitman.info ;\
- else \
- echo "No directory found in $(DESTDIR)$(infodir)" >&2 ; \
- fi
diff --git a/pkgs/applications/version-management/git-and-tools/git/glob-path.patch b/pkgs/applications/version-management/git-and-tools/git/glob-path.patch
deleted file mode 100644
index 7515ade5787..00000000000
--- a/pkgs/applications/version-management/git-and-tools/git/glob-path.patch
+++ /dev/null
@@ -1,529 +0,0 @@
-diff --git a/builtin-add.c b/builtin-add.c
-index bf13aa3..02c6751 100644
---- a/builtin-add.c
-+++ b/builtin-add.c
-@@ -123,6 +123,7 @@ int add_files_to_cache(const char *prefix, const char **pathspec, int flags)
- init_revisions(&rev, prefix);
- setup_revisions(0, NULL, &rev, NULL);
- rev.prune_data = pathspec;
-+ rev.glob_paths = 0; /* git-add has its own filename matching machinery */
- rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
- rev.diffopt.format_callback = update_callback;
- data.flags = flags;
-diff --git a/builtin-blame.c b/builtin-blame.c
-index 9bced3b..237d1fe 100644
---- a/builtin-blame.c
-+++ b/builtin-blame.c
-@@ -343,7 +343,7 @@ static struct origin *find_origin(struct scoreboard *sb,
- paths[0] = origin->path;
- paths[1] = NULL;
-
-- diff_tree_setup_paths(paths, &diff_opts);
-+ diff_tree_setup_paths(paths, &diff_opts, 0);
- if (diff_setup_done(&diff_opts) < 0)
- die("diff-setup");
-
-@@ -417,7 +417,7 @@ static struct origin *find_rename(struct scoreboard *sb,
- diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
- diff_opts.single_follow = origin->path;
- paths[0] = NULL;
-- diff_tree_setup_paths(paths, &diff_opts);
-+ diff_tree_setup_paths(paths, &diff_opts, 0);
- if (diff_setup_done(&diff_opts) < 0)
- die("diff-setup");
-
-@@ -1099,7 +1099,7 @@ static int find_copy_in_parent(struct scoreboard *sb,
- diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
-
- paths[0] = NULL;
-- diff_tree_setup_paths(paths, &diff_opts);
-+ diff_tree_setup_paths(paths, &diff_opts, 0);
- if (diff_setup_done(&diff_opts) < 0)
- die("diff-setup");
-
-@@ -2346,6 +2346,11 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
- parse_done:
- argc = parse_options_end(&ctx);
-
-+ if (revs.glob_paths) {
-+ error("git blame does not support `--glob-paths'");
-+ usage_with_options(blame_opt_usage, options);
-+ }
-+
- if (!blame_move_score)
- blame_move_score = BLAME_DEFAULT_MOVE_SCORE;
- if (!blame_copy_score)
-diff --git a/builtin-reset.c b/builtin-reset.c
-index 2e5a886..6026b34 100644
---- a/builtin-reset.c
-+++ b/builtin-reset.c
-@@ -128,14 +128,15 @@ static void update_index_from_diff(struct diff_queue_struct *q,
- }
-
- static int read_from_tree(const char *prefix, const char **argv,
-- unsigned char *tree_sha1)
-+ unsigned char *tree_sha1, int glob_paths)
- {
- struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
- int index_fd, index_was_discarded = 0;
- struct diff_options opt;
-
- memset(&opt, 0, sizeof(opt));
-- diff_tree_setup_paths(get_pathspec(prefix, (const char **)argv), &opt);
-+ diff_tree_setup_paths(get_pathspec(prefix, (const char **)argv),
-+ &opt, glob_paths);
- opt.output_format = DIFF_FORMAT_CALLBACK;
- opt.format_callback = update_index_from_diff;
- opt.format_callback_data = &index_was_discarded;
-@@ -171,6 +172,7 @@ static const char *reset_type_names[] = { "mixed", "soft", "hard", NULL };
- int cmd_reset(int argc, const char **argv, const char *prefix)
- {
- int i = 0, reset_type = NONE, update_ref_status = 0, quiet = 0;
-+ int glob_paths = 0;
- const char *rev = "HEAD";
- unsigned char sha1[20], *orig = NULL, sha1_orig[20],
- *old_orig = NULL, sha1_old_orig[20];
-@@ -182,6 +184,8 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
- OPT_SET_INT(0, "soft", &reset_type, "reset only HEAD", SOFT),
- OPT_SET_INT(0, "hard", &reset_type,
- "reset HEAD, index and working tree", HARD),
-+ OPT_BOOLEAN(0, "glob-paths", &glob_paths,
-+ "match paths with fnmatch"),
- OPT_BOOLEAN('q', NULL, &quiet,
- "disable showing new HEAD in hard reset and progress message"),
- OPT_END()
-@@ -246,7 +250,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
- else if (reset_type != NONE)
- die("Cannot do %s reset with paths.",
- reset_type_names[reset_type]);
-- return read_from_tree(prefix, argv + i, sha1);
-+ return read_from_tree(prefix, argv + i, sha1, glob_paths);
- }
- if (reset_type == NONE)
- reset_type = MIXED; /* by default */
-diff --git a/builtin-update-index.c b/builtin-update-index.c
-index 38eb53c..28b09a3 100644
---- a/builtin-update-index.c
-+++ b/builtin-update-index.c
-@@ -23,6 +23,7 @@ static int allow_replace;
- static int info_only;
- static int force_remove;
- static int verbose;
-+static int glob_paths;
- static int mark_valid_only;
- #define MARK_VALID 1
- #define UNMARK_VALID 2
-@@ -534,7 +535,7 @@ static int do_reupdate(int ac, const char **av,
- struct cache_entry *old = NULL;
- int save_nr;
-
-- if (ce_stage(ce) || !ce_path_match(ce, pathspec))
-+ if (ce_stage(ce) || !ce_path_match(ce, pathspec, glob_paths))
- continue;
- if (has_head)
- old = read_one_ent(NULL, head_sha1,
-@@ -659,6 +660,10 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
- force_remove = 1;
- continue;
- }
-+ if (!strcmp(path, "--glob-paths")) {
-+ glob_paths = 1;
-+ continue;
-+ }
- if (!strcmp(path, "-z")) {
- line_termination = 0;
- continue;
-@@ -702,6 +707,8 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
- usage(update_index_usage);
- die("unknown option %s", path);
- }
-+ if (glob_paths)
-+ die("--glob-paths without -g");
- p = prefix_path(prefix, prefix_length, path);
- update_one(p, NULL, 0);
- if (set_executable_bit)
-@@ -712,6 +719,8 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
- if (read_from_stdin) {
- struct strbuf buf, nbuf;
-
-+ if (glob_paths)
-+ die("--glob-paths without -g");
- strbuf_init(&buf, 0);
- strbuf_init(&nbuf, 0);
- while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
-diff --git a/cache.h b/cache.h
-index a779d92..5560195 100644
---- a/cache.h
-+++ b/cache.h
-@@ -387,7 +387,8 @@ extern int ce_same_name(struct cache_entry *a, struct cache_entry *b);
- extern int ie_match_stat(const struct index_state *, struct cache_entry *, struct stat *, unsigned int);
- extern int ie_modified(const struct index_state *, struct cache_entry *, struct stat *, unsigned int);
-
--extern int ce_path_match(const struct cache_entry *ce, const char **pathspec);
-+extern int ce_path_match(const struct cache_entry *ce, const char **pathspec,
-+ int glob_paths);
- extern int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, enum object_type type, const char *path);
- extern int index_pipe(unsigned char *sha1, int fd, const char *type, int write_object);
- extern int index_path(unsigned char *sha1, const char *path, struct stat *st, int write_object);
-diff --git a/diff-lib.c b/diff-lib.c
-index e7eaff9..87925a2 100644
---- a/diff-lib.c
-+++ b/diff-lib.c
-@@ -77,7 +77,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
- DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES))
- break;
-
-- if (!ce_path_match(ce, revs->prune_data))
-+ if (!ce_path_match(ce, revs->prune_data, revs->glob_paths))
- continue;
-
- if (ce_stage(ce)) {
-@@ -431,7 +431,7 @@ static int oneway_diff(struct cache_entry **src, struct unpack_trees_options *o)
- if (tree == o->df_conflict_entry)
- tree = NULL;
-
-- if (ce_path_match(idx ? idx : tree, revs->prune_data))
-+ if (ce_path_match(idx ? idx : tree, revs->prune_data, revs->glob_paths))
- do_oneway_diff(o, idx, tree);
-
- return 0;
-@@ -508,6 +508,7 @@ int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt)
-
- init_revisions(&revs, NULL);
- revs.prune_data = opt->paths;
-+ revs.glob_paths = opt->glob_paths;
- tree = parse_tree_indirect(tree_sha1);
- if (!tree)
- die("bad tree object %s", sha1_to_hex(tree_sha1));
-diff --git a/diff-no-index.c b/diff-no-index.c
-index f6994cf..ec549a7 100644
---- a/diff-no-index.c
-+++ b/diff-no-index.c
-@@ -240,6 +240,7 @@ void diff_no_index(struct rev_info *revs,
- }
- else
- revs->diffopt.paths = argv + argc - 2;
-+ revs->diffopt.glob_paths = 0;
- revs->diffopt.nr_paths = 2;
-
- DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);
-diff --git a/diff.h b/diff.h
-index 50fb5dd..56f0857 100644
---- a/diff.h
-+++ b/diff.h
-@@ -102,6 +102,7 @@ struct diff_options {
- FILE *file;
- int close_file;
-
-+ int glob_paths;
- int nr_paths;
- const char **paths;
- int *pathlens;
-@@ -128,7 +129,8 @@ const char *diff_get_color(int diff_use_color, enum color_diff ix);
-
- extern const char mime_boundary_leader[];
-
--extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
-+extern void diff_tree_setup_paths(const char **paths, struct diff_options *opt,
-+ int glob_paths);
- extern void diff_tree_release_paths(struct diff_options *);
- extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
- const char *base, struct diff_options *opt);
-diff --git a/gitk-git/gitk b/gitk-git/gitk
-index fddcb45..18c5cbc 100644
---- a/gitk-git/gitk
-+++ b/gitk-git/gitk
-@@ -1866,6 +1866,7 @@ proc makewindow {} {
- set gm [tk_optionMenu .tf.lbar.gdttype gdttype \
- [mc "containing:"] \
- [mc "touching paths:"] \
-+ [mc "touching paths (glob):"] \
- [mc "adding/removing string:"]]
- trace add variable gdttype write gdttype_change
- pack .tf.lbar.gdttype -side left -fill y
-@@ -3588,6 +3589,11 @@ proc do_file_hl {serial} {
- set highlight_paths [makepatterns $paths]
- highlight_filelist
- set gdtargs [concat -- $paths]
-+ } elseif {$gdttype eq [mc "touching paths (glob):"]} {
-+ if {[catch {set paths [shellsplit $highlight_files]}]} return
-+ set highlight_paths $paths
-+ highlight_filelist
-+ set gdtargs [concat --glob-paths -- $paths]
- } elseif {$gdttype eq [mc "adding/removing string:"]} {
- set gdtargs [list "-S$highlight_files"]
- } else {
-diff --git a/read-cache.c b/read-cache.c
-index 1648428..c11ded9 100644
---- a/read-cache.c
-+++ b/read-cache.c
-@@ -582,7 +582,8 @@ int ce_same_name(struct cache_entry *a, struct cache_entry *b)
- return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
- }
-
--int ce_path_match(const struct cache_entry *ce, const char **pathspec)
-+static int ce_path_match_standard(const struct cache_entry *ce,
-+ const char **pathspec)
- {
- const char *match, *name;
- int len;
-@@ -608,6 +609,31 @@ int ce_path_match(const struct cache_entry *ce, const char **pathspec)
- return 0;
- }
-
-+static int ce_path_match_globbed(const struct cache_entry *ce,
-+ const char **pathspec)
-+{
-+ const char *match, *name;
-+
-+ if (!pathspec)
-+ return 1;
-+
-+ name = ce->name;
-+ while ((match = *pathspec++) != NULL) {
-+ if (!fnmatch(match, name, 0))
-+ return 1;
-+ }
-+ return 0;
-+}
-+
-+int ce_path_match(const struct cache_entry *ce,
-+ const char **pathspec, int glob_paths)
-+{
-+ if (glob_paths)
-+ return ce_path_match_globbed(ce, pathspec);
-+ else
-+ return ce_path_match_standard(ce, pathspec);
-+}
-+
- /*
- * We fundamentally don't like some paths: we don't want
- * dot or dot-dot anywhere, and for obvious reasons don't
-diff --git a/revision.c b/revision.c
-index 3897fec..0dd1091 100644
---- a/revision.c
-+++ b/revision.c
-@@ -519,6 +519,7 @@ static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
- if (revs->diffopt.nr_paths) {
- ids.diffopts.nr_paths = revs->diffopt.nr_paths;
- ids.diffopts.paths = revs->diffopt.paths;
-+ ids.diffopts.glob_paths = revs->diffopt.glob_paths; /* CHECKME */
- ids.diffopts.pathlens = revs->diffopt.pathlens;
- }
-
-@@ -826,7 +827,7 @@ static void prepare_show_merge(struct rev_info *revs)
- struct cache_entry *ce = active_cache[i];
- if (!ce_stage(ce))
- continue;
-- if (ce_path_match(ce, revs->prune_data)) {
-+ if (ce_path_match(ce, revs->prune_data, revs->glob_paths)) {
- prune_num++;
- prune = xrealloc(prune, sizeof(*prune) * prune_num);
- prune[prune_num-2] = ce->name;
-@@ -837,6 +838,7 @@ static void prepare_show_merge(struct rev_info *revs)
- i++;
- }
- revs->prune_data = prune;
-+ revs->glob_paths = 0;
- revs->limited = 1;
- }
-
-@@ -1033,6 +1035,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
- revs->min_age = approxidate(arg + 8);
- } else if (!strcmp(arg, "--first-parent")) {
- revs->first_parent_only = 1;
-+ } else if (!strcmp(arg, "--glob-paths")) {
-+ revs->glob_paths = 1;
- } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
- init_reflog_walk(&revs->reflog_info);
- } else if (!strcmp(arg, "--default")) {
-@@ -1220,6 +1224,7 @@ void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
- int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
- {
- int i, flags, left, seen_dashdash;
-+ const char **paths = NULL;
-
- /* First, search for "--" */
- seen_dashdash = 0;
-@@ -1230,7 +1235,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
- argv[i] = NULL;
- argc = i;
- if (argv[i + 1])
-- revs->prune_data = get_pathspec(revs->prefix, argv + i + 1);
-+ paths = argv + i + 1;
- seen_dashdash = 1;
- break;
- }
-@@ -1290,6 +1295,9 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
- if (seen_dashdash || *arg == '^')
- die("bad revision '%s'", arg);
-
-+ if (revs->glob_paths)
-+ die("--glob-paths without --");
-+
- /* If we didn't have a "--":
- * (1) all filenames must exist;
- * (2) all rev-args must not be interpretable
-@@ -1301,10 +1309,19 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
-
- revs->prune_data = get_pathspec(revs->prefix,
- argv + i);
-+ revs->glob_paths = 0;
- break;
- }
- }
-
-+ /* Third, handle paths listed after -- */
-+ if (paths != NULL) {
-+ if (revs->glob_paths)
-+ revs->prune_data = paths;
-+ else
-+ revs->prune_data = get_pathspec(revs->prefix, paths);
-+ }
-+
- if (revs->def == NULL)
- revs->def = def;
- if (revs->show_merge)
-@@ -1333,12 +1350,14 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
- revs->limited = 1;
-
- if (revs->prune_data) {
-- diff_tree_setup_paths(revs->prune_data, &revs->pruning);
-+ diff_tree_setup_paths(revs->prune_data, &revs->pruning,
-+ revs->glob_paths);
- /* Can't prune commits with rename following: the paths change.. */
- if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
- revs->prune = 1;
- if (!revs->full_diff)
-- diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
-+ diff_tree_setup_paths(revs->prune_data, &revs->diffopt,
-+ revs->glob_paths);
- }
- if (revs->combine_merges) {
- revs->ignore_merges = 0;
-diff --git a/revision.h b/revision.h
-index fa68c65..a68cdb8 100644
---- a/revision.h
-+++ b/revision.h
-@@ -32,6 +32,9 @@ struct rev_info {
- void *prune_data;
- unsigned int early_output;
-
-+ /* whether prune_data contains fnmatch() patterns */
-+ unsigned int glob_paths:1;
-+
- /* Traversal flags */
- unsigned int dense:1,
- prune:1,
-diff --git a/tree-diff.c b/tree-diff.c
-index bbb126f..0aa1e9b 100644
---- a/tree-diff.c
-+++ b/tree-diff.c
-@@ -82,6 +82,11 @@ static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2, const
- return 0;
- }
-
-+static int tree_entry_interesting_globbed(struct tree_desc *, const char *,
-+ int, struct diff_options *);
-+static int tree_entry_interesting_standard(struct tree_desc *, const char *,
-+ int, struct diff_options *);
-+
- /*
- * Is a tree entry interesting given the pathspec we have?
- *
-@@ -91,7 +96,19 @@ static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2, const
- * - zero for no
- * - negative for "no, and no subsequent entries will be either"
- */
--static int tree_entry_interesting(struct tree_desc *desc, const char *base, int baselen, struct diff_options *opt)
-+static int tree_entry_interesting(struct tree_desc *desc,
-+ const char *base, int baselen, struct diff_options *opt)
-+{
-+ if (opt->glob_paths)
-+ return tree_entry_interesting_globbed(desc, base,
-+ baselen, opt);
-+ else
-+ return tree_entry_interesting_standard(desc, base,
-+ baselen, opt);
-+}
-+
-+static int tree_entry_interesting_standard(struct tree_desc *desc,
-+ const char *base, int baselen, struct diff_options *opt)
- {
- const char *path;
- const unsigned char *sha1;
-@@ -190,6 +207,41 @@ static int tree_entry_interesting(struct tree_desc *desc, const char *base, int
- return never_interesting; /* No matches */
- }
-
-+static int tree_entry_interesting_globbed(struct tree_desc *desc,
-+ const char *base, int baselen, struct diff_options *opt)
-+{
-+ const char *path;
-+ char *fullpath;
-+ const unsigned char *sha1;
-+ unsigned mode;
-+ int i;
-+ int pathlen;
-+ int result;
-+
-+ if (!opt->nr_paths)
-+ return 1;
-+ sha1 = tree_entry_extract(desc, &path, &mode);
-+ if (S_ISDIR(mode))
-+ return 1;
-+ pathlen = tree_entry_len(path, sha1);
-+
-+ fullpath = xmalloc(pathlen + baselen + 1);
-+ memcpy(fullpath, base, baselen);
-+ memcpy(fullpath + baselen, path, pathlen + 1);
-+
-+ result = 0;
-+ for (i = 0; i < opt->nr_paths; i++) {
-+ const char *match = opt->paths[i];
-+ if (!fnmatch(match, fullpath, 0)) {
-+ result = 1;
-+ break;
-+ }
-+ }
-+
-+ free(fullpath);
-+ return result;
-+}
-+
- /* A whole sub-tree went away or appeared */
- static void show_tree(struct diff_options *opt, const char *prefix, struct tree_desc *desc, const char *base, int baselen)
- {
-@@ -338,7 +390,7 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co
- diff_opts.single_follow = opt->paths[0];
- diff_opts.break_opt = opt->break_opt;
- paths[0] = NULL;
-- diff_tree_setup_paths(paths, &diff_opts);
-+ diff_tree_setup_paths(paths, &diff_opts, 0);
- if (diff_setup_done(&diff_opts) < 0)
- die("unable to set up diff options to follow renames");
- diff_tree(t1, t2, base, &diff_opts);
-@@ -362,7 +414,7 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co
- /* Update the path we use from now on.. */
- diff_tree_release_paths(opt);
- opt->paths[0] = xstrdup(p->one->path);
-- diff_tree_setup_paths(opt->paths, opt);
-+ diff_tree_setup_paths(opt->paths, opt, 0);
- break;
- }
- }
-@@ -440,11 +492,13 @@ void diff_tree_release_paths(struct diff_options *opt)
- free(opt->pathlens);
- }
-
--void diff_tree_setup_paths(const char **p, struct diff_options *opt)
-+void diff_tree_setup_paths(const char **p, struct diff_options *opt,
-+ int glob_paths)
- {
- opt->nr_paths = 0;
- opt->pathlens = NULL;
- opt->paths = NULL;
-+ opt->glob_paths = glob_paths;
-
- if (p) {
- int i;
diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
new file mode 100644
index 00000000000..e545d2bc6f4
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, groff, rake, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ name = "hub-${version}";
+ version = "1.10.3";
+
+ src = fetchgit {
+ url = "git://github.com/defunkt/hub.git";
+ rev = "refs/tags/v${version}";
+ sha256 = "0j0krmf0sf09hhw3nsn0w1y97d67762g4qrc8080bwcx38lbyvbg";
+ };
+
+ buildInputs = [ rake makeWrapper ];
+
+ installPhase = ''
+ rake install "prefix=$out"
+ '';
+
+ fixupPhase = ''
+ wrapProgram $out/bin/hub --prefix PATH : ${groff}/bin
+ '';
+
+ meta = {
+ description = "A GitHub specific wrapper for git";
+ homepage = "http://defunkt.io/hub/";
+ license = stdenv.lib.licenses.mit;
+ };
+}
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 486bebc2531..865033ae2d2 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -17,8 +17,6 @@ stdenv.mkDerivation {
buildInputs = [ python makeWrapper docutils unzip ];
- PYTHONPATH = "${python}/lib/python2.6/site-packages:${python}/lib/python2.7/site-packages:${docutils}/lib/python2.5/site-packages:${docutils}/lib/python2.6/site-packages:${docutils}/lib/python2.7/site-packages";
-
makeFlags = "PREFIX=$(out)";
postInstall = (stdenv.lib.optionalString guiSupport
@@ -47,8 +45,6 @@ stdenv.mkDerivation {
chmod u+x $out/share/cgi-bin/hgweb.cgi
'';
- doCheck = false; # The test suite fails, unfortunately. Not sure why.
-
meta = {
description = "A fast, lightweight SCM system for very large distributed projects";
homepage = "http://www.selenic.com/mercurial/";
diff --git a/pkgs/applications/version-management/monotone-viz/1.0.1.nix b/pkgs/applications/version-management/monotone-viz/1.0.1.nix
deleted file mode 100644
index dc4816cee51..00000000000
--- a/pkgs/applications/version-management/monotone-viz/1.0.1.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-args : with args;
-rec {
- src = fetchurl {
- name = "monotone-viz-1.0.1-nolablgtk.tar.gz";
- urls = [
- http://ftp.debian.org/debian/pool/main/m/monotone-viz/monotone-viz_1.0.1.orig.tar.gz
- #http://oandrieu.nerim.net/monotone-viz/monotone-viz-1.0.1-nolablgtk.tar.gz
- ];
- sha256 = "066qwrknjk5hwk9jblnf0bzvbmfbabq0zhsxkd3nzk469zkpvhl2";
- };
-
- buildInputs = [ocaml lablgtk libgnomecanvas gtk graphviz glib pkgconfig];
- configureFlags = ["--with-lablgtk-dir=${lablgtk}/lib/ocaml/lablgtk2"];
-
- /* doConfigure should be specified separately */
- phaseNames = ["doConfigure" "doMakeInstall"];
-
- name = "monotone-viz-" + version;
- meta = {
- description = "Monotone commit tree visualizer";
- };
-}
-
diff --git a/pkgs/applications/version-management/monotone-viz/graphviz.patch b/pkgs/applications/version-management/monotone-viz/graphviz.patch
deleted file mode 100644
index e1f9bfc5f7f..00000000000
--- a/pkgs/applications/version-management/monotone-viz/graphviz.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# patch "agraph.ml"
-# from [8ae6c9bb70bbf9fd80e4e62d9f162ac581619b9e]
-# to [05aa88921481ac9bfe238daeb4374fbc9993caaa]
-#
-============================================================
---- a/agraph.ml 8ae6c9bb70bbf9fd80e4e62d9f162ac581619b9e
-+++ b/agraph.ml 05aa88921481ac9bfe238daeb4374fbc9993caaa
-@@ -50,8 +50,9 @@ let dot_format params agraph =
- agraph.nodes in
-
- !+ "digraph \"monotone-viz\"\n{\n" ;
-- if params.lr_layout then
-- !+ " graph [rankdir=LR] ;\n" ;
-+ if params.lr_layout
-+ then !+ " graph [rankdir=LR] ;\n"
-+ else !+ " graph [rankdir=BT] ;\n" ;
- !+ " graph [ranksep=\"0.25\"] ;\n" ;
- !+ " node [label=\"\"] ;\n" ;
-
-@@ -222,11 +223,11 @@ let spawn_dot graph status done_cb =
- let dot_prg = graph.layout_params.dot_program in
- let cmd =
- if Viz_misc.debug "dot"
-- then [ "/bin/sh" ; "-c" ;
-+ then [ "/bin/sh" ; "-c" ;
- Printf.sprintf
- "set -o pipefail ; \
-- tee agraph.in.dot | %s -q -y -s%.0f | tee agraph.out.dot" dot_prg ppi ]
-- else [ dot_prg ; "-q" ; "-y" ; Printf.sprintf "-s%.0f" ppi ] in
-+ tee agraph.in.dot | %s -q -s%.0f | tee agraph.out.dot" dot_prg ppi ]
-+ else [ dot_prg ; "-q" ; Printf.sprintf "-s%.0f" ppi ] in
- let error fmt =
- Printf.kprintf (fun s -> done_cb (`LAYOUT_ERROR s)) fmt in
- try
diff --git a/pkgs/applications/version-management/rcs/no-root.patch b/pkgs/applications/version-management/rcs/no-root.patch
deleted file mode 100644
index 2fbfc86ff45..00000000000
--- a/pkgs/applications/version-management/rcs/no-root.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-In NixOS chroot builds, there is no root account. So configure should
-not rely on its existence in deciding whether to use getpwuid().
-
-diff -rc -x '*~' rcs-5.7-orig/src/conf.sh rcs-5.7/src/conf.sh
-*** rcs-5.7-orig/src/conf.sh 1995-06-16 08:19:24.000000000 +0200
---- rcs-5.7/src/conf.sh 2010-02-12 15:22:37.000000000 +0100
-***************
-*** 821,827 ****
- a= z=
- cat >a.c <&2
---- 821,827 ----
- a= z=
- cat >a.c <&2
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 8e454ad9f8f..885e4310a59 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport;
stdenv.mkDerivation rec {
- version = "1.7.7";
+ version = "1.7.8";
name = "subversion-${version}";
src = fetchurl {
url = "mirror://apache/subversion//${name}.tar.bz2";
- sha1 = "c9fc0c5992eda36ba9affd93a15929e25958a951";
+ sha1 = "12c7d8d5414bba74c9777c4d1dae74f152df63c2";
};
buildInputs = [ zlib apr aprutil sqlite ]
diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix
index 395dda240b8..5a514e8728d 100644
--- a/pkgs/applications/version-management/veracity/src-for-default.nix
+++ b/pkgs/applications/version-management/veracity/src-for-default.nix
@@ -1,9 +1,9 @@
rec {
- version="2.0.0.10822";
- name="veracity-2.0.0.10822";
- hash="0zgvrsjxfd1p9pflx1kxggmk953jhjk02h1hili9h1vdasvn2188";
- url="http://download.sourcegear.com/Veracity/release/2.0.0.10822/veracity-source-${version}.tar.gz";
- advertisedUrl="http://download.sourcegear.com/Veracity/release/2.0.0.10822/veracity-source-2.0.0.10822.tar.gz";
+ version="2.1.0.10979";
+ name="veracity-2.1.0.10979";
+ hash="15x3cwwjv9b0cbjx6insqk190wpnhwcm1z4b570hvw3lix3xnxhl";
+ url="http://download.sourcegear.com/Veracity/release/2.1.0.10979/veracity-source-${version}.tar.gz";
+ advertisedUrl="http://download.sourcegear.com/Veracity/release/2.1.0.10979/veracity-source-2.1.0.10979.tar.gz";
}
diff --git a/pkgs/applications/video/RealPlayer/builder.sh b/pkgs/applications/video/RealPlayer/builder.sh
deleted file mode 100644
index 9929634921c..00000000000
--- a/pkgs/applications/video/RealPlayer/builder.sh
+++ /dev/null
@@ -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
diff --git a/pkgs/applications/video/RealPlayer/default.nix b/pkgs/applications/video/RealPlayer/default.nix
deleted file mode 100644
index 968846f1dcb..00000000000
--- a/pkgs/applications/video/RealPlayer/default.nix
+++ /dev/null
@@ -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";}
diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix
new file mode 100644
index 00000000000..292010a3717
--- /dev/null
+++ b/pkgs/applications/video/gpac/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchsvn, pkgconfig, zlib }:
+
+stdenv.mkDerivation rec {
+ name = "gpac-0.5.0-svn";
+
+ src = fetchsvn {
+ url = "https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac";
+ rev = "4253";
+ sha256 = "0z4bd63c805q53hpb09gq0m0apy12z5a90zxx4jjx3ln64xq0pnn";
+ };
+
+ # this is the bare minimum configuration, as I'm only interested in MP4Box
+ # For most other functionality, this should probably be extended
+ buildNativeInputs = [ pkgconfig zlib ];
+
+ meta = {
+ description = "Open Source multimedia framework for research and academic purposes";
+ longDescription = ''
+ GPAC is an Open Source multimedia framework for research and academic purposes.
+ The project covers different aspects of multimedia, with a focus on presentation
+ technologies (graphics, animation and interactivity) and on multimedia packaging
+ formats such as MP4.
+
+ GPAC provides three sets of tools based on a core library called libgpac:
+
+ A multimedia player, called Osmo4 / MP4Client,
+ A multimedia packager, called MP4Box,
+ And some server tools included in MP4Box and MP42TS applications.
+ '';
+ homepage = http://gpac.wp.mines-telecom.fr;
+ license = stdenv.lib.licenses.lgpl21;
+
+ maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 812826d7ec2..1dc58607de0 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -16,11 +16,11 @@
}:
stdenv.mkDerivation rec {
- name = "mkvtoolnix-5.6.0";
+ name = "mkvtoolnix-5.9.0";
src = fetchurl {
url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.bz2";
- sha256 = "1hzwf4zaamny3qzmd6hyhy4hy9l67s3fjvznbi0avw0ad7g05i89";
+ sha256 = "1qdxzi72w5p77brlpp7y7llsgzlvl4p8fk1kzg934cqw6cqza4yr";
};
buildInputs = [ libmatroska flac libvorbis file boost lzo xdg_utils expat wxGTK zlib ruby gettext pkgconfig curl ];
diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/mplayer/default.nix
similarity index 97%
rename from pkgs/applications/video/MPlayer/default.nix
rename to pkgs/applications/video/mplayer/default.nix
index 944af1c2657..357c6eec6e7 100644
--- a/pkgs/applications/video/MPlayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -18,6 +18,7 @@
, pulseSupport ? false, pulseaudio ? null
# For screenshots
, libpngSupport ? true, libpng ? null
+, useUnfreeCodecs ? false
}:
assert x11Support -> (libX11 != null && libXext != null && mesa != null);
@@ -66,9 +67,7 @@ let
cp -prv * $out
'';
- meta = {
- license = "unfree";
- };
+ meta.license = "unfree";
} else null;
in
@@ -140,8 +139,7 @@ stdenv.mkDerivation rec {
${if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc"}
${if jackaudioSupport then "--enable-jack" else "--disable-jack"}
${if pulseSupport then "--enable-pulse" else "--disable-pulse"}
-
- ${optionalString (codecs != null) "--codecsdir=${codecs}"}
+ ${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"}
${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"}
--enable-freetype
--disable-xanim
@@ -154,6 +152,8 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext";
+ enableParallelBuilding = true;
+
# Provide a reasonable standard font. Maybe we should symlink here.
postInstall =
''
diff --git a/pkgs/applications/video/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch b/pkgs/applications/video/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch
deleted file mode 100644
index b1cfd49f1ba..00000000000
--- a/pkgs/applications/video/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: tvtime-1.0.2/src/videoinput.c
-===================================================================
---- tvtime-1.0.2.orig/src/videoinput.c
-+++ tvtime-1.0.2/src/videoinput.c
-@@ -35,8 +35,8 @@
- #ifdef HAVE_CONFIG_H
- # include "config.h"
- #endif
--#include "videodev.h"
--#include "videodev2.h"
-+#include
-+#include
- #include "videoinput.h"
- #include "mixer.h"
-
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 3341a01101c..7d04a02f27f 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
name = "vlc-${version}";
- version = "2.0.4";
+ version = "2.0.5";
src = fetchurl {
url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz";
- sha256 = "1dixankckfxf8xixfc32rc9mfsv6mx2lk5h13ym8bp4dsk86w1jf";
+ sha256 = "0vkbv477a7z0v55sigz6c3abxljz7jyysp7z8s29zk8vhq0fpyfz";
};
buildInputs =
diff --git a/pkgs/applications/virtualization/qemu/0.11.0.nix b/pkgs/applications/virtualization/qemu/0.11.0.nix
deleted file mode 100644
index bbcf1806452..00000000000
--- a/pkgs/applications/virtualization/qemu/0.11.0.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl, SDL, zlib, which}:
-
-stdenv.mkDerivation {
- name = "qemu-0.11.0";
-
- src = fetchurl {
- url = http://download.savannah.gnu.org/releases/qemu/qemu-0.11.0.tar.gz;
- sha256 = "1w3n61lzwvqg1ygn0vs8syybbmbcbk7lfyya098k201lp5rpwamw";
- };
-
- patchFlags = "-p2";
-
- buildInputs = [SDL zlib which];
-
- meta = {
- description = "QEmu processor emulator";
- };
-}
diff --git a/pkgs/applications/virtualization/qemu/0.13.nix b/pkgs/applications/virtualization/qemu/0.13.nix
deleted file mode 100644
index e1b63674969..00000000000
--- a/pkgs/applications/virtualization/qemu/0.13.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, SDL, zlib, which, ncurses }:
-
-stdenv.mkDerivation rec {
- name = "qemu-0.13.0";
-
- src = fetchurl {
- url = "mirror://savannah/releases/qemu/${name}.tar.gz";
- sha256 = "0xyqbwy78218ja6r9ya5p37j8hcd81l4cpw3ghvnxsjwn18mhvqy";
- };
-
- buildInputs = [ SDL zlib which ncurses ];
-
- meta = {
- description = "QEmu processor emulator";
- license = "GPLv2+";
- maintainers = with stdenv.lib.maintainers; [viric];
- platforms = with stdenv.lib.platforms; linux;
- };
-}
diff --git a/pkgs/applications/virtualization/qemu/svn-6642.nix b/pkgs/applications/virtualization/qemu/svn-6642.nix
deleted file mode 100644
index 32d67234ba7..00000000000
--- a/pkgs/applications/virtualization/qemu/svn-6642.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{stdenv, fetchsvn, SDL, zlib, which}:
-
-stdenv.mkDerivation {
- name = "qemu-svn-6642";
-
- src = fetchsvn {
- url = "svn://svn.sv.gnu.org/qemu/trunk";
- rev = "6642";
- sha256 = "12445ad91feb72eecd1db0d4319a8fa5d7dc971b89228bd0e121b49c5da9705e";
- };
-
- patchFlags = "-p2";
-
- buildInputs = [SDL zlib which];
-
- meta = {
- description = "QEmu processor emulator";
- };
-}
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index a8594c4ba16..f699119c5f0 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -1,16 +1,18 @@
{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
-, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel
+, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2
, which, alsaLib, curl, gawk
, xorriso, makeself, perl, pkgconfig
, javaBindings ? false, jdk ? null
, pythonBindings ? false, python ? null
+, enableExtensionPack ? false, requireFile ? null, patchelf ? null
}:
with stdenv.lib;
let
- version = "4.2.2";
+ version = "4.2.6";
+ extpackRevision = "82870";
forEachModule = action: ''
for mod in \
@@ -29,24 +31,30 @@ let
done
'';
+ extensionPack = requireFile {
+ name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}"
+ + ".vbox-extpack";
+ # Has to be base16 because it's used as an input to VBoxExtPackHelperApp!
+ sha256 = "f0113688a76efa0426c27c5541c78506b18637025c35aa682ecc6eeed5d56582";
+ url = "https://www.virtualbox.org/wiki/Downloads";
+ };
+
in stdenv.mkDerivation {
name = "virtualbox-${version}-${kernel.version}";
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
- sha256 = "943daa13694605d5d0a23ffef27c398b5e72ada669de89bad4b98f000f029700";
+ sha256 = "54526091bc2aa66b88ca878dd9ecc4466f96d607db2f6678a9d673ecf6646ae3";
};
buildInputs =
[ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL
- libcap glib kernel python alsaLib curl pam xorriso makeself perl
+ libcap glib kernel lvm2 python alsaLib curl pam xorriso makeself perl
pkgconfig which libXmu ]
++ optional javaBindings jdk
++ optional pythonBindings python;
- patches = [ ./remove_fa_ir.patch ];
-
- postPatch = ''
+ prePatch = ''
set -x
MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`
sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \
@@ -108,6 +116,15 @@ in stdenv.mkDerivation {
ln -s "$libexec/$file" $out/bin/$file
done
+ ${optionalString enableExtensionPack ''
+ "$libexec/VBoxExtPackHelperApp" install \
+ --base-dir "$libexec/ExtensionPacks" \
+ --cert-dir "$libexec/ExtPackCertificates" \
+ --name "Oracle VM VirtualBox Extension Pack" \
+ --tarball "${extensionPack}"
+ --sha-256 "${extensionPack.outputHash}"
+ ''}
+
# Create and fix desktop item
mkdir -p $out/share/applications
sed -i -e "s|Icon=VBox|Icon=$libexec/VBox.png|" $libexec/virtualbox.desktop
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index c4c7a9f2708..7a79a73c6b9 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -1,19 +1,20 @@
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
-, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}:
+, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor
+, dbus }:
-let version = "4.2.2"; in
+let version = "4.2.6"; in
stdenv.mkDerivation {
- name = "VirtualBox-GuestAdditions-${version}";
+ name = "VirtualBox-GuestAdditions-${version}-${kernel.version}";
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
- sha256 = "26f5390b36a3bb9855846d194dcd287b8e53613b599c6ffd7aff1b451cc7f1f1";
+ sha256 = "1lry4hjjk8p69km1bi3mpmyarlnxz9izs2c0s8pq5rjzv1bd7bxr";
};
KERN_DIR = "${kernel}/lib/modules/*/build";
- buildInputs = [ patchelf cdrkit makeWrapper ];
+ buildInputs = [ patchelf cdrkit makeWrapper dbus ];
installPhase = ''
mkdir -p $out
@@ -56,7 +57,7 @@ stdenv.mkDerivation {
cd ..
# Change the interpreter for various binaries
- for i in sbin/VBoxService bin/{VBoxClient,VBoxControl}
+ for i in sbin/VBoxService bin/{VBoxClient,VBoxControl} lib/VBoxGuestAdditions/mount.vboxsf
do
${if stdenv.system == "i686-linux" then ''
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $i
@@ -66,14 +67,12 @@ stdenv.mkDerivation {
''
else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions")
}
+ patchelf --set-rpath ${stdenv.gcc.gcc}/lib:${dbus}/lib:${libX11}/lib:${libXt}/lib:${libXext}/lib:${libXmu}/lib:${libXfixes}/lib:${libXrandr}/lib:${libXcursor}/lib $i
done
- # Change rpath for various binaries and libraries
- patchelf --set-rpath ${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXt}/lib:${libXext}/lib:${libXmu}/lib:${libXfixes}/lib:${libXrandr}/lib:${libXcursor}/lib bin/VBoxClient
-
for i in lib/VBoxOGL*.so
do
- patchelf --set-rpath $out/lib $i
+ patchelf --set-rpath $out/lib:${dbus}/lib $i
done
# Remove references to /usr from various scripts and files
@@ -82,6 +81,7 @@ stdenv.mkDerivation {
# Install binaries
mkdir -p $out/sbin
+ install -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/sbin/mount.vboxsf
install -m 755 sbin/VBoxService $out/sbin
mkdir -p $out/bin
diff --git a/pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch b/pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch
deleted file mode 100644
index 0d7a8342192..00000000000
--- a/pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-This patch is for VirtualBox-4.2.2, to temporarily remove references to the
-fa_IR language file from the source tree, as it somehow got lost during tarball
-creation. For more information on this subject please have a look at:
-
-https://www.virtualbox.org/pipermail/vbox-dev/2012-October/005408.html
-
-diff --git a/src/VBox/Frontends/VirtualBox/VBoxUI.pro b/src/VBox/Frontends/VirtualBox/VBoxUI.pro
-index ffeb410..37ac56a 100644
---- a/src/VBox/Frontends/VirtualBox/VBoxUI.pro
-+++ b/src/VBox/Frontends/VirtualBox/VBoxUI.pro
-@@ -63,7 +63,6 @@ TRANSLATIONS = \
- nls/VirtualBox_es.ts \
- nls/VirtualBox_eu.ts \
- nls/VirtualBox_fi.ts \
-- nls/VirtualBox_fa_IR.ts \
- nls/VirtualBox_fr.ts \
- nls/VirtualBox_gl_ES.ts \
- nls/VirtualBox_hu.ts \
-diff --git a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
-index 66f0ec3..2fc19b9 100644
---- a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
-+++ b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
-@@ -23,7 +23,6 @@ VBOX_APPROVED_GUI_LANGUAGES := \
- de \
- en \
- es \
-- fa_IR \
- hu \
- it \
- ja \
diff --git a/pkgs/applications/window-managers/compiz/bcop.nix b/pkgs/applications/window-managers/compiz/bcop.nix
deleted file mode 100644
index 254393d4c7f..00000000000
--- a/pkgs/applications/window-managers/compiz/bcop.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxslt }:
-
-stdenv.mkDerivation rec {
- name = "compiz-bcop-0.8.4";
-
- src = fetchurl {
- url = "http://releases.compiz.org/components/compiz-bcop/${name}.tar.bz2";
- sha256 = "0kwcvalmx2aab7j3x7s0xqm102i3kr5gh1z8mfws9q4qkqdclnfk";
- };
-
- buildInputs = [ pkgconfig libxslt ];
-
- meta = {
- homepage = http://www.compiz.org/;
- description = "Code generator for Compiz plugins";
- };
-}
diff --git a/pkgs/applications/window-managers/compiz/ccsm.nix b/pkgs/applications/window-managers/compiz/ccsm.nix
deleted file mode 100644
index 0406a170d19..00000000000
--- a/pkgs/applications/window-managers/compiz/ccsm.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, intltool, gtk
-, python, pygtk, pygobject, pycairo, compizconfig_python }:
-
-stdenv.mkDerivation rec {
- name = "ccsm-0.8.4";
-
- src = fetchurl {
- url = "http://releases.compiz.org/components/ccsm/${name}.tar.bz2";
- sha256 = "0vf16a2nmb0qwwxymvgl86nkfscj3n39jdw2q2p737pj5h1xmfa6";
- };
-
- buildInputs = [ makeWrapper python intltool gtk ];
-
- buildPhase = "python setup.py build --prefix=$out";
-
- pythonDeps = [ pygtk pygobject pycairo compizconfig_python ];
-
- installPhase =
- ''
- python setup.py install --prefix=$out
-
- wrapProgram $out/bin/ccsm --prefix PYTHONPATH ":" \
- "$(toPythonPath "$pythonDeps $out")"
- '';
-
- meta = {
- homepage = http://www.compiz.org/;
- description = "Compiz settings manager";
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/applications/window-managers/compiz/config-python.nix b/pkgs/applications/window-managers/compiz/config-python.nix
deleted file mode 100644
index 4de7fb41a48..00000000000
--- a/pkgs/applications/window-managers/compiz/config-python.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, xlibs, libcompizconfig, glib
-, python, pyrex }:
-
-stdenv.mkDerivation rec {
- name = "compizconfig-python-0.8.4";
-
- src = fetchurl {
- url = "http://releases.compiz.org/components/compizconfig-python/${name}.tar.bz2";
- sha256 = "0nkgqxddjw324aymzcy5nx6ilhfbpk9rra4qbzrq3l39xqsswd37";
- };
-
- buildInputs = [ pkgconfig libcompizconfig glib python pyrex xlibs.xlibs ];
-
- NIX_LDFLAGS = "-lcompizconfig";
-
- meta = {
- homepage = http://www.compiz.org/;
- description = "Python interface to the Compiz configuration";
- };
-}
diff --git a/pkgs/applications/window-managers/compiz/core.nix b/pkgs/applications/window-managers/compiz/core.nix
deleted file mode 100644
index d4a5b79b7fb..00000000000
--- a/pkgs/applications/window-managers/compiz/core.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, xlibs, mesa, libxml2, libxslt
-, libstartup_notification, libpng, glib, gtk, gnome, dbus_glib, librsvg, bzip2 }:
-
-let version = "0.8.6"; in
-
-stdenv.mkDerivation {
- name = "compiz-${version}";
-
- src = fetchurl {
- url = "http://releases.compiz.org/${version}/compiz-${version}.tar.bz2";
- sha256 = "132gmdawjmrmvazm31h3r3wwq97h58hz17yyc9sa6q2nkfsnkpy4";
- };
-
- patches =
- [ # Allow the path to the Compiz plugin library and metadata
- # directories to be overriden through $COMPIZ_PLUGINDIR and
- # $COMPIZ_METADATADIR, respectively.
- ./plugindir-core.patch
-
- # Fix compilation with recent GTK versions.
- ./gdk-deprecated.patch
- ];
-
- buildInputs =
- [ intltool pkgconfig libpng glib
- gtk gnome.libwnck gnome.GConf dbus_glib librsvg bzip2
- ];
-
- propagatedBuildInputs =
- [ xlibs.xlibs xlibs.libXfixes xlibs.libXrandr xlibs.libXrender
- xlibs.libXdamage xlibs.libXcomposite xlibs.libXinerama
- libstartup_notification mesa libxml2 libxslt
- ];
-
- meta = {
- homepage = http://www.compiz.org/;
- description = "A compositing window manager";
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix
new file mode 100644
index 00000000000..ba9d9574366
--- /dev/null
+++ b/pkgs/applications/window-managers/compiz/default.nix
@@ -0,0 +1,58 @@
+{stdenv, fetchurl, cmake, pkgconfig
+, libXrender, renderproto, gtk, libwnck, pango, cairo
+, GConf, libXdamage, damageproto, libxml2, libxslt, glibmm
+, libstartup_notification, libpthreadstubs, libxcb, intltool
+, ORBit2, libXau
+, dbus, dbus_glib, librsvg, mesa
+, libXdmcp, libnotify, python
+, hicolor_icon_theme, libjpeg_turbo, libsigcxx, protobuf, pygtk, pythonDBus
+, xdg_utils
+, gettext, boost, pyrex
+, makeWrapper
+}:
+let
+ s = # Generated upstream information
+ rec {
+ baseName="compiz";
+ version="0.9.8.6";
+ name="compiz-0.9.8.6";
+ hash="0agz5s11lwrkhk3svz3rwimlb6318ln3zcywlzczwks139svxnk6";
+ url="https://launchpad.net/compiz/0.9.8/0.9.8.6/+download/compiz-0.9.8.6.tar.bz2";
+ sha256="0agz5s11lwrkhk3svz3rwimlb6318ln3zcywlzczwks139svxnk6";
+ };
+ buildInputs = [cmake pkgconfig
+ libXrender renderproto gtk libwnck pango cairo
+ GConf libXdamage damageproto libxml2 libxslt glibmm libstartup_notification
+ libpthreadstubs libxcb intltool
+ ORBit2 libXau
+ dbus dbus_glib librsvg mesa
+ libXdmcp libnotify python
+ hicolor_icon_theme libjpeg_turbo libsigcxx protobuf pygtk pythonDBus
+ xdg_utils
+ gettext boost pyrex
+ makeWrapper
+ ];
+ in
+stdenv.mkDerivation rec {
+ inherit (s) name version;
+ src = fetchurl {
+ inherit (s) url sha256;
+ };
+ inherit buildInputs;
+
+ NIX_CFLAGS_COMPILE=" -Wno-error ";
+ postInstall = ''
+ wrapProgram "$out/bin/ccsm" \
+ --prefix PYTHONPATH : "$PYTHONPATH" \
+ --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages"
+ '';
+
+ meta = {
+ description = "Compoziting window manager";
+ homepage = "http://launchpad.net/compiz/";
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ inherit (s) version;
+ };
+}
diff --git a/pkgs/applications/window-managers/compiz/default.upstream b/pkgs/applications/window-managers/compiz/default.upstream
new file mode 100644
index 00000000000..b7fc98bd126
--- /dev/null
+++ b/pkgs/applications/window-managers/compiz/default.upstream
@@ -0,0 +1 @@
+url https://launchpad.net/compiz/+download
diff --git a/pkgs/applications/window-managers/compiz/gdk-deprecated.patch b/pkgs/applications/window-managers/compiz/gdk-deprecated.patch
deleted file mode 100644
index d80a5514ee9..00000000000
--- a/pkgs/applications/window-managers/compiz/gdk-deprecated.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru -x '*~' compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c
---- compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c 2010-03-28 14:15:35.000000000 +0200
-+++ compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c 2011-03-14 11:00:00.000000000 +0100
-@@ -31,10 +31,6 @@
- #include
- #include
-
--#ifndef GDK_DISABLE_DEPRECATED
--#define GDK_DISABLE_DEPRECATED
--#endif
--
- #ifndef GTK_DISABLE_DEPRECATED
- #define GTK_DISABLE_DEPRECATED
- #endif
diff --git a/pkgs/applications/window-managers/compiz/libcompizconfig.nix b/pkgs/applications/window-managers/compiz/libcompizconfig.nix
deleted file mode 100644
index 51d459e7a36..00000000000
--- a/pkgs/applications/window-managers/compiz/libcompizconfig.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl,intltool, pkgconfig, xlibs, libxml2, libxslt, compiz }:
-
-stdenv.mkDerivation rec {
- name = "libcompizconfig-0.8.4";
-
- src = fetchurl {
- url = "http://releases.compiz.org/components/libcompizconfig/${name}.tar.bz2";
- sha256 = "0adhl2nc2zrswl5n4a8ipymffq6yjwnxgpkv6rsk7sqvby9kwca1";
- };
-
- patches =
- [ # See ./core.nix.
- ./plugindir-libcompizconfig.patch
- ];
-
- buildInputs = [ pkgconfig intltool xlibs.libX11 compiz libxml2 libxslt ];
-
- meta = {
- homepage = http://www.compiz.org/;
- description = "Compiz configuration library";
- };
-}
diff --git a/pkgs/applications/window-managers/compiz/plugindir-core.patch b/pkgs/applications/window-managers/compiz/plugindir-core.patch
deleted file mode 100644
index 5a242e66088..00000000000
--- a/pkgs/applications/window-managers/compiz/plugindir-core.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ru -x '*~' compiz-0.8.6-orig/src/metadata.c compiz-0.8.6/src/metadata.c
---- compiz-0.8.6-orig/src/metadata.c 2010-03-28 14:15:35.000000000 +0200
-+++ compiz-0.8.6/src/metadata.c 2010-10-20 00:22:47.000000000 +0200
-@@ -146,7 +146,7 @@
- compAddMetadataFromFile (CompMetadata *metadata,
- const char *file)
- {
-- char *home;
-+ char *home, *metadatadir;
- Bool status = FALSE;
-
- home = getenv ("HOME");
-@@ -163,7 +163,10 @@
- }
- }
-
-- status |= addMetadataFromFilename (metadata, METADATADIR, file);
-+ metadatadir = getenv("COMPIZ_METADATADIR");
-+ if (!metadatadir) metadatadir = METADATADIR;
-+
-+ status |= addMetadataFromFilename (metadata, metadatadir, file);
- if (!status)
- {
- compLogMessage ("core", CompLogLevelWarn,
-diff -ru -x '*~' compiz-0.8.6-orig/src/plugin.c compiz-0.8.6/src/plugin.c
---- compiz-0.8.6-orig/src/plugin.c 2010-03-28 14:15:35.000000000 +0200
-+++ compiz-0.8.6/src/plugin.c 2010-10-20 00:25:16.000000000 +0200
-@@ -579,7 +579,10 @@
- }
- }
-
-- status = (*loaderLoadPlugin) (p, PLUGINDIR, name);
-+ plugindir = getenv("COMPIZ_PLUGINDIR");
-+ if (!plugindir) plugindir = PLUGINDIR;
-+
-+ status = (*loaderLoadPlugin) (p, plugindir, name);
- if (status)
- return p;
-
diff --git a/pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch b/pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch
deleted file mode 100644
index 207816a3c51..00000000000
--- a/pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ru -x '*~' libcompizconfig-0.8.4-orig/src/compiz.cpp libcompizconfig-0.8.4/src/compiz.cpp
---- libcompizconfig-0.8.4-orig/src/compiz.cpp 2009-10-14 02:36:04.000000000 +0200
-+++ libcompizconfig-0.8.4/src/compiz.cpp 2010-10-20 00:35:28.000000000 +0200
-@@ -3004,7 +3004,10 @@
- }
- }
-
-- loadPluginFromXMLFile (context, xmlName, (char *) METADATADIR);
-+ char *metadatadir = getenv("COMPIZ_METADATADIR");
-+ if (!metadatadir) metadatadir = METADATADIR;
-+
-+ loadPluginFromXMLFile (context, xmlName, metadatadir);
- free (xmlName);
- }
-
-@@ -3031,7 +3034,10 @@
- free (homeplugins);
- }
- }
-- loadPluginsFromXMLFiles (context, (char *)METADATADIR);
-+
-+ char *metadatadir = getenv("COMPIZ_METADATADIR");
-+ if (!metadatadir) metadatadir = METADATADIR;
-+ loadPluginsFromXMLFiles (context, metadatadir);
-
- if (home && strlen (home))
- {
-@@ -3043,7 +3049,10 @@
- free (homeplugins);
- }
- }
-- loadPluginsFromName (context, (char *)PLUGINDIR);
-+
-+ char *plugindir = getenv("COMPIZ_PLUGINDIR");
-+ if (!plugindir) plugindir = PLUGINDIR;
-+ loadPluginsFromName (context, plugindir);
- }
-
- static void
diff --git a/pkgs/applications/window-managers/compiz/plugins-extra.nix b/pkgs/applications/window-managers/compiz/plugins-extra.nix
deleted file mode 100644
index 8852ebd474e..00000000000
--- a/pkgs/applications/window-managers/compiz/plugins-extra.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, compiz, compiz_bcop
-, compiz_plugins_main, getopt, libjpeg, cairo, pango, gnome }:
-
-let version = "0.8.6"; in
-
-stdenv.mkDerivation rec {
- name = "compiz-plugins-extra-${version}";
-
- src = fetchurl {
- url = "http://releases.compiz.org/${version}/${name}.tar.bz2";
- sha256 = "1qbxfi332bbadm0ah48frnrl9dkczl111s5a91a0cqz5v7nbw4g1";
- };
-
- patches =
- [ # Support scaling wallpapers to the maximum size while still
- # respecting the aspect ratio.
- ./wallpaper-maxpect.patch
- ];
-
- NIX_CFLAGS_COMPILE = "-I${compiz_plugins_main}/include/compiz";
-
- buildInputs =
- [ intltool pkgconfig compiz compiz_bcop compiz_plugins_main getopt gnome.GConf ];
-
- meta = {
- homepage = http://www.compiz.org/;
- description = "Extra plugins for Compiz";
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/applications/window-managers/compiz/plugins-main.nix b/pkgs/applications/window-managers/compiz/plugins-main.nix
deleted file mode 100644
index ea1c01e7414..00000000000
--- a/pkgs/applications/window-managers/compiz/plugins-main.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, compiz, compiz_bcop
-, getopt, libjpeg, cairo, pango, gnome }:
-
-let version = "0.8.6"; in
-
-stdenv.mkDerivation rec {
- name = "compiz-plugins-main-${version}";
-
- src = fetchurl {
- url = "http://releases.compiz.org/${version}/${name}.tar.bz2";
- sha256 = "1nfn3r4q7wvzfkdh9hrm5zc816xa8cs2s7cliz0fmnqikcs4zp36";
- };
-
- buildInputs =
- [ intltool pkgconfig compiz compiz_bcop getopt libjpeg cairo pango gnome.GConf ];
-
- meta = {
- homepage = http://www.compiz.org/;
- description = "Main plugins for Compiz";
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch b/pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch
deleted file mode 100644
index 8130dff1dba..00000000000
--- a/pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -x '*~' -ru compiz-plugins-extra-0.8.6-orig/metadata/wallpaper.xml.in compiz-plugins-extra-0.8.6/metadata/wallpaper.xml.in
---- compiz-plugins-extra-0.8.6-orig/metadata/wallpaper.xml.in 2010-03-29 16:09:17.000000000 +0200
-+++ compiz-plugins-extra-0.8.6/metadata/wallpaper.xml.in 2010-10-21 00:23:18.000000000 +0200
-@@ -24,7 +24,7 @@
- <_long>Image position.
- int
- 0
-- 4
-+ 5
-
- 0
- <_name>Scale and Crop
-@@ -45,6 +45,10 @@
- 4
- <_name>Center Tiled
-
-+
-+ 5
-+ <_name>Centered Maxpect
-+
-
-