diff --git a/pkgs/applications/audio/abcde/abcde.patch b/pkgs/applications/audio/abcde/abcde.patch new file mode 100644 index 00000000000..ae187043e6c --- /dev/null +++ b/pkgs/applications/audio/abcde/abcde.patch @@ -0,0 +1,30 @@ +Two changes: + +* Add an alias for `which', so abcde can find things in store +* Choose the right CDROM reader syntax for `cd-paranoia' + +--- abcde-2.5.4/abcde~ 2012-09-18 06:09:31.000000000 -0700 ++++ abcde-2.5.4/abcde 2012-10-27 00:08:48.000862364 -0700 +@@ -17,6 +17,11 @@ + + VERSION='2.5.4' + ++which () ++{ ++ type -P $1 ++} ++ + usage () + { + echo "This is abcde v$VERSION." +@@ -3497,6 +3502,10 @@ + for DEFAULT_CDROMREADER in $DEFAULT_CDROMREADERS; do + if new_checkexec $DEFAULT_CDROMREADER; then + CDROMREADERSYNTAX=$DEFAULT_CDROMREADER ++ case "$DEFAULT_CDROMREADER" in ++ cd-paranoia) CDROMREADERSYNTAX=cdparanoia;; ++ *) CDROMREADERSYNTAX=$DEFAULT_CDROMREADER;; ++ esac + break + fi + done diff --git a/pkgs/applications/audio/abcde/cd-paranoia.patch b/pkgs/applications/audio/abcde/cd-paranoia.patch deleted file mode 100644 index 58cada65fb8..00000000000 --- a/pkgs/applications/audio/abcde/cd-paranoia.patch +++ /dev/null @@ -1,16 +0,0 @@ -Choose the right CDROM reader syntax for `cd-paranoia'. - ---- abcde-2.3.99.6/abcde 2006-08-05 21:14:00.000000000 +0200 -+++ abcde-2.3.99.6/abcde 2008-10-29 22:55:38.000000000 +0100 -@@ -3184,7 +3184,10 @@ if [ -n "$DISCID" ] || [ "$CDROMREADERSY - if [ "$CDROMREADERSYNTAX" = "" ]; then - for DEFAULT_CDROMREADER in $DEFAULT_CDROMREADERS; do - if new_checkexec $DEFAULT_CDROMREADER; then -- CDROMREADERSYNTAX=$DEFAULT_CDROMREADER -+ case "$DEFAULT_CDROMREADER" in -+ cd-paranoia) CDROMREADERSYNTAX=cdparanoia;; -+ *) CDROMREADERSYNTAX=$DEFAULT_CDROMREADER;; -+ esac - break - fi - done diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index e7da594e4bc..e8c37d25694 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools, id3v2, lame +{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools, id3v2, lame, flac, eject, mkcue +, perl, DigestSHA, MusicBrainz, MusicBrainzDiscID , makeWrapper }: -let version = "2.3.99.6"; +let version = "2.5.4"; in stdenv.mkDerivation { name = "abcde-${version}"; src = fetchurl { url = "mirror://debian/pool/main/a/abcde/abcde_${version}.orig.tar.gz"; - sha256 = "1wl4ygj1cf1d6g05gwwygsd5g83l039fzi011r30ma5lnm763lyb"; + sha256 = "14g5lsgh53hza9848351kwpygc0yqpvvzp3s923aja77f2wpkdl5"; }; # FIXME: This package does not support MP3 encoding (only Ogg), # nor `distmp3', `eject', etc. - patches = [ ./install.patch ./which.patch ./cd-paranoia.patch ]; + patches = [ ./abcde.patch ]; configurePhase = '' sed -i "s|^[[:blank:]]*prefix *=.*$|prefix = $out|g ; @@ -29,25 +30,37 @@ in substituteInPlace "abcde" \ --replace "/etc/abcde.conf" "$out/etc/abcde.conf" + ''; + # no ELFs in this package, only scripts + dontStrip = true; + dontPatchELF = true; + buildInputs = [ makeWrapper ]; postInstall = '' - substituteInPlace "$out/bin/cddb-tool" \ - --replace '#!/bin/sh' '#!${bash}/bin/sh' - substituteInPlace "$out/bin/abcde" \ - --replace '#!/bin/bash' '#!${bash}/bin/bash' + # substituteInPlace "$out/bin/cddb-tool" \ + # --replace '#!/bin/sh' '#!${bash}/bin/sh' + # substituteInPlace "$out/bin/abcde" \ + # --replace '#!/bin/bash' '#!${bash}/bin/bash' + + # generic fixup script should be doing this, but it ignores this file for some reason + substituteInPlace "$out/bin/abcde-musicbrainz-tool" \ + --replace '#!/usr/bin/perl' '#!${perl}/bin/perl' wrapProgram "$out/bin/abcde" --prefix PATH ":" \ "$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbisTools}/bin:${id3v2}/bin:${lame}/bin" wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \ "${wget}/bin" + + wrapProgram "$out/bin/abcde-musicbrainz-tool" --prefix PATH ":" \ + "${wget}/bin" ''; meta = { - homepage = http://www.hispalinux.es/~data/abcde.php; + homepage = "http://lly.org/~rcw/abcde/page/"; licence = "GPLv2+"; description = "A Better CD Encoder (ABCDE)"; diff --git a/pkgs/applications/audio/abcde/install.patch b/pkgs/applications/audio/abcde/install.patch deleted file mode 100644 index f5ab75f4bb9..00000000000 --- a/pkgs/applications/audio/abcde/install.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- abcde-2.3.3/Makefile~ 2005-08-26 00:43:27.000000000 +0200 -+++ abcde-2.3.3/Makefile 2008-05-26 22:20:17.000000000 +0200 -@@ -14,13 +14,13 @@ clean: - - install: - $(INSTALL) -d -m 755 $(bindir) -- $(INSTALL) -m 755 -o 0 abcde $(bindir) -- $(INSTALL) -m 755 -o 0 cddb-tool $(bindir) -+ $(INSTALL) -m 755 abcde $(bindir) -+ $(INSTALL) -m 755 cddb-tool $(bindir) - $(INSTALL) -d -m 755 $(mandir) -- $(INSTALL) -m 644 -o 0 abcde.1 $(mandir) -- $(INSTALL) -m 644 -o 0 cddb-tool.1 $(mandir) -+ $(INSTALL) -m 644 abcde.1 $(mandir) -+ $(INSTALL) -m 644 cddb-tool.1 $(mandir) - $(INSTALL) -d -m 755 $(etcdir) -- $(INSTALL) -m 644 -o 0 abcde.conf $(etcdir) -+ $(INSTALL) -m 644 abcde.conf $(etcdir) - - tarball: - @cd .. && tar czvf abcde_$(VERSION).orig.tar.gz \ diff --git a/pkgs/applications/audio/abcde/which.patch b/pkgs/applications/audio/abcde/which.patch deleted file mode 100644 index 70474000ddd..00000000000 --- a/pkgs/applications/audio/abcde/which.patch +++ /dev/null @@ -1,16 +0,0 @@ -Add an alias for `which'. - ---- abcde-2.3.99.6/abcde 2006-08-05 21:14:00.000000000 +0200 -+++ abcde-2.3.99.6/abcde 2008-10-29 22:49:16.000000000 +0100 -@@ -15,6 +15,11 @@ - - VERSION='2.3.99-$Revision: 222M $' - -+which () -+{ -+ type -P $1 -+} -+ - usage () - { - echo "This is abcde v$VERSION." diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix new file mode 100644 index 00000000000..81d44fdcb74 --- /dev/null +++ b/pkgs/applications/audio/bristol/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, alsaLib, jackaudio, pkgconfig, pulseaudio, xlibs }: + +stdenv.mkDerivation rec { + name = "bristol-${version}"; + version = "0.60.10"; + + src = fetchurl { + url = "mirror://sourceforge/bristol/${name}.tar.gz"; + sha256 = "070rn5zdx6vrqmq7w1rrpxig3bxlylbsw82nlmkjnhjrgm6yx753"; + }; + + buildInputs = [ + alsaLib jackaudio pkgconfig pulseaudio xlibs.libX11 xlibs.libXext + xlibs.xproto + ]; + + meta = with stdenv.lib; { + description = "A range of synthesiser, electric piano and organ emulations"; + homepage = http://bristol.sourceforge.net; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.goibhniu ]; + }; +} \ No newline at end of file diff --git a/pkgs/applications/editors/emacs-modes/nxml/builder.sh b/pkgs/applications/editors/emacs-modes/nxml/builder.sh deleted file mode 100644 index d2393362ebb..00000000000 --- a/pkgs/applications/editors/emacs-modes/nxml/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/emacs/site-lisp -cd $out/emacs/site-lisp -tar xvfz $src -mv nxml-mode-*/* . -rmdir nxml-mode-* diff --git a/pkgs/applications/editors/emacs-modes/nxml/default.nix b/pkgs/applications/editors/emacs-modes/nxml/default.nix deleted file mode 100644 index c8d441475c8..00000000000 --- a/pkgs/applications/editors/emacs-modes/nxml/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{stdenv, fetchurl}: stdenv.mkDerivation { - name = "nxml-mode-20041004"; - builder = ./builder.sh; - src = fetchurl { - url = http://nixos.org/tarballs/nxml-mode-20041004.tar.gz; - md5 = "ac137024cf337d6f11d8ab278d39b4db"; - }; -} diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix new file mode 100644 index 00000000000..1c08dc6db8d --- /dev/null +++ b/pkgs/applications/editors/geany/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool }: + +let + version = "1.22"; +in + +stdenv.mkDerivation rec { + name = "geany-${version}"; + + src = fetchurl { + url = "http://download.geany.org/${name}.tar.gz"; + md5 = "1cb7f6cea8e301c416211786cec474fa"; + }; + + buildInputs = [ gtk2 which pkgconfig intltool ]; + + doCheck = true; + + enableParallelBuilding = true; + + meta = { + description = "A GTK2 small and ligthweight IDE."; + longDescription = '' + Geany is a small and lightweight Integrated Development Environment. + It was developed to provide a small and fast IDE, which has only a few dependencies from other packages. + Another goal was to be as independent as possible from a special Desktop Environment like KDE or GNOME. + Geany only requires the GTK2 runtime libraries. + Some basic features of Geany: + - Syntax highlighting + - Code folding + - Symbol name auto-completion + - Construct completion/snippets + - Auto-closing of XML and HTML tags + - Call tips + - Many supported filetypes including C, Java, PHP, HTML, Python, Perl, Pascal (full list) + - Symbol lists + - Code navigation + - Build system to compile and execute your code + - Simple project management + - Plugin interface + ''; + homepage = "http://www.geany.org/"; + license = "GPL"; + maintainers = [ stdenv.lib.maintainers.bbenoist ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index badd18b8915..4d48ba69086 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -9,10 +9,10 @@ let in stdenv.mkDerivation rec { - name = "gobby-0.4.93"; + name = "gobby-0.4.94"; src = fetchurl { url = "http://releases.0x539.de/gobby/${name}.tar.gz"; - sha256 = "1zk6p0kdp9vcvrr3kx0kw106ln309hd7bbsq8li1g0pcnkgrf4q4"; + sha256 = "b9798808447cd94178430f0fb273d0e45d0ca30ab04560e3790bac469e03bb00"; }; buildInputs = [ pkgconfig gtkmm gsasl gtksourceview libxmlxx libinf intltool ] diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 974ced7d2b1..15cdadb04f5 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -2,27 +2,16 @@ stdenv.mkDerivation (rec { pname = "nano"; - version = "2.2.3"; + version = "2.2.6"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.gz"; - sha256 = "1vpl993xrpj8bqi1ayga8fc0j2jag90xp6rqakzwm3bxw71hmwi2"; + sha256 = "0yp6pid67k8h7394spzw0067fl2r7rxm2b6kfccg87g8nlry2s5y"; }; - + buildInputs = [ ncurses gettext ]; - - configureFlags = '' - --disable-browser - --disable-help - --disable-justify - --disable-mouse - --disable-operatingdir - --disable-speller - --disable-tabcomp - --disable-wrapping - ''; meta = { homepage = http://www.nano-editor.org/; diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 4b2ebceda47..0e8f860c510 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 = "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/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix new file mode 100644 index 00000000000..930df87214a --- /dev/null +++ b/pkgs/applications/misc/gmrun/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, glib, gtk2, pkgconfig, popt }: + +let + version = "0.9.2"; +in + +stdenv.mkDerivation rec { + name = "gmrun-${version}"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/gmrun/gmrun/${version}/${name}.tar.gz"; + md5 = "6cef37a968006d9496fc56a7099c603c"; + }; + + buildInputs = [ glib gtk2 pkgconfig popt ]; + + doCheck = true; + + enableParallelBuilding = true; + + patches = [ + ./gcc43.patch + ./gmrun-0.9.2-xdg.patch + ]; + + meta = { + description = "Gnome Completion-Run Utility."; + longDescription = '' + A simple program which provides a "run program" window, featuring a bash-like TAB completion. + It uses GTK+ interface. + Also, supports CTRL-R / CTRL-S / "!" for searching through history. + Running commands in a terminal with CTRL-Enter. URL handlers. + ''; + homepage = "http://sourceforge.net/projects/gmrun/"; + license = "GPL"; + maintainers = [ stdenv.lib.maintainers.bbenoist ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/misc/gmrun/gcc43.patch b/pkgs/applications/misc/gmrun/gcc43.patch new file mode 100644 index 00000000000..60e4338e893 --- /dev/null +++ b/pkgs/applications/misc/gmrun/gcc43.patch @@ -0,0 +1,51 @@ +--- a/src/gtkcompletionline.cc.orig 2003-11-16 11:55:07.000000000 +0100 ++++ a/src/gtkcompletionline.cc 2008-05-08 08:51:22.000000000 +0200 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + using namespace std; + +--- a/src/ci_string.h.orig 2001-05-16 16:39:31.000000000 +0200 ++++ a/src/ci_string.h 2008-05-08 08:51:33.000000000 +0200 +@@ -7,6 +7,7 @@ + #define __CI_STRING_H__ + + #include ++#include + #include + + struct ci_char_traits : public std::char_traits +--- a/src/prefs.cc.orig 2002-08-16 12:48:22.000000000 +0200 ++++ a/src/prefs.cc 2008-05-08 08:51:54.000000000 +0200 +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #include + +--- a/src/main.cc.orig 2003-11-16 11:55:07.000000000 +0100 ++++ a/src/main.cc 2008-05-08 09:03:11.000000000 +0200 +@@ -14,6 +14,7 @@ + #include + + #include ++#include + #include + #include + #include + +--- a/src/gtkcompletionline.cc.orig 2009-06-19 22:38:14.000000000 +0400 ++++ a/src/gtkcompletionline.cc 2009-06-19 22:37:14.000000000 +0400 +@@ -376,7 +377,7 @@ + return 0; + } + +-int my_alphasort(const void* va, const void* vb) { ++int my_alphasort(const dirent** va, const dirent** vb) { + const struct dirent** a = (const struct dirent**)va; + const struct dirent** b = (const struct dirent**)vb; diff --git a/pkgs/applications/misc/gmrun/gmrun-0.9.2-xdg.patch b/pkgs/applications/misc/gmrun/gmrun-0.9.2-xdg.patch new file mode 100644 index 00000000000..b5cd41a3c5b --- /dev/null +++ b/pkgs/applications/misc/gmrun/gmrun-0.9.2-xdg.patch @@ -0,0 +1,58 @@ +diff -ur a/src/history.cc src/history.cc +--- a/src/history.cc 2002-08-17 15:19:31.000000000 +0200 ++++ a/src/history.cc 2012-06-04 23:42:35.314653414 +0200 +@@ -24,8 +24,15 @@ + HistoryFile::HistoryFile() + { + m_file_entries = 0; +- m_filename = g_get_home_dir(); +- m_filename += "/.gmrun_history"; ++ const char* filename = getenv("XDG_CACHE_HOME"); ++ if (filename != 0 && *filename != '\0') { ++ m_filename = filename; ++ m_filename += "/gmrun_history"; ++ } ++ else { ++ m_filename = g_get_home_dir(); ++ m_filename += "/.gmrun_history"; ++ } + m_current = 0; + m_default_set = false; + read_the_file(); +diff -ur a/src/prefs.cc src/prefs.cc +--- a/src/prefs.cc 2012-06-04 22:35:00.671949439 +0200 ++++ a/src/prefs.cc 2012-06-04 23:24:24.184445962 +0200 +@@ -35,12 +35,29 @@ + file_name += GMRUNRC; + init(file_name); + +- file_name = getenv("HOME"); +- if (!file_name.empty()) { ++ file_name.clear(); ++ const char* filename = getenv("XDG_CONFIG_HOME"); ++ if (filename != 0 && *filename != '\0') { ++ file_name = filename; + string::iterator i = file_name.end() - 1; +- if (*i == '/') file_name.erase(i); +- file_name += "/."; ++ if (*i != '/') { ++ file_name += '/'; ++ } + file_name += GMRUNRC; ++ } ++ else { ++ filename = getenv("HOME"); ++ if (filename != 0 && *filename != '\0') { ++ file_name = filename; ++ string::iterator i = file_name.end() - 1; ++ if (*i != '/') { ++ file_name += '/'; ++ } ++ file_name += '.'; ++ file_name += GMRUNRC; ++ } ++ } ++ if (!file_name.empty()) { + init(file_name); + } + } diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 5ac2ad6b9ad..86b24e7e401 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, libX11, ncurses}: +{ stdenv, fetchurl, libX11, ncurses, libXext, libXft }: stdenv.mkDerivation rec { - name = "st-0.2.1"; + name = "st-0.3"; src = fetchurl { - url = http://hg.suckless.org/st/archive/0.2.1.tar.gz; - sha256 = "15yqyys69ifjc4vrzvamrg7x0pwa60mnjpi0kap4y9ykhds83xab"; + url = http://hg.suckless.org/st/archive/0.3.tar.gz; + sha256 = "12ypldjjpsq3nvhszgjsk4wgqkwcvz06qiqw8k5npv3rd1nbx9cl"; }; - buildInputs = [ libX11 ncurses ]; + buildInputs = [ libX11 ncurses libXext libXft ]; installPhase = '' TERMINFO=$out/share/terminfo make install PREFIX=$out diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix new file mode 100644 index 00000000000..67ff2ec5541 --- /dev/null +++ b/pkgs/applications/misc/xfe/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, fox_1_6, pkgconfig, gettext, x11, gcc, intltool, file, libpng }: + +let + version = "1.33"; +in + +stdenv.mkDerivation rec { + name = "xfe-${version}"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/xfe/xfe/${version}/${name}.tar.gz"; + md5 = "fb089ba73add411b08a6560eeb51742d"; + }; + + buildInputs = [ fox_1_6 pkgconfig gettext x11 gcc intltool file libpng ]; + + doCheck = false; + + enableParallelBuilding = true; + + meta = { + description = "X File Explorer (Xfe) is an MS-Explorer like file manager for X."; + longDescription = '' + X File Explorer (Xfe) is an MS-Explorer like file manager for X. + It is based on the popular, but discontinued, X Win Commander, which was developed by Maxim Baranov. + Xfe aims to be the filemanager of choice for all the Unix addicts! + ''; + homepage = "http://sourceforge.net/projects/xfe/"; + license = "GPLv2"; + maintainers = [ stdenv.lib.maintainers.bbenoist ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/networking/browsers/firefox/15.0.nix b/pkgs/applications/networking/browsers/firefox/17.0.nix similarity index 89% rename from pkgs/applications/networking/browsers/firefox/15.0.nix rename to pkgs/applications/networking/browsers/firefox/17.0.nix index cb79f4422eb..30cd54b9d43 100644 --- a/pkgs/applications/networking/browsers/firefox/15.0.nix +++ b/pkgs/applications/networking/browsers/firefox/17.0.nix @@ -15,18 +15,24 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "15.0.1"; + firefoxVersion = "17.0"; - xulVersion = "15.0.1"; # this attribute is used by other packages + xulVersion = "17.0"; # this attribute is used by other packages src = fetchurl { - url = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "bdbc4b6656c59b926e18f99b3335484427d08641"; + 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" diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index ba052738ad5..d7a8ac51a06 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.02-1578"; + name = "opera-12.11-1661"; src = if stdenv.system == "i686-linux" then fetchurl { - url = "${mirror}/linux/1202/${name}.i386.linux.tar.xz"; - sha256 = "60ccef14673818a8690fe3b76f861d180e2d8d3b87513b1652e6117c6dff3e86"; + url = "${mirror}/linux/1211/${name}.i386.linux.tar.xz"; + sha256 = "0ax2kcnl0hb7fz56c9gcjia3dnwabxl2mq2hvszmbky4i399jlkk"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "${mirror}/linux/1202/${name}.x86_64.linux.tar.xz"; - sha256 = "e861f14b984898b5a2c0d04915e515a5677152dc302b614a3ac1bb13da7a9b81"; + url = "${mirror}/linux/1211/${name}.x86_64.linux.tar.xz"; + sha256 = "1pnad4kdasrmm27kg6frldipyzcfy1y610rasbqic9frzb9q8dbp"; } else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; 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/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 1d5bcfa5b9b..a1fc52337ed 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -12,14 +12,14 @@ enableOfficialBranding ? false }: -let version = "16.0.2"; in +let version = "17.0"; in stdenv.mkDerivation { name = "thunderbird-${version}"; src = fetchurl { url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2"; - sha1 = "842d852b31a388d4cf3ac59bc89e8611474e2ec7"; + sha1 = "ccc5f2e155364948945abf6fd27bebeb4d797aa8"; }; enableParallelBuilding = true; @@ -50,6 +50,7 @@ stdenv.mkDerivation { "--disable-webm" "--disable-tests" "--enable-calendar" + "--disable-ogg" ] ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 59d85a4ddaa..fe4f101e27c 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -44,12 +44,12 @@ rec { gitAnnex = lib.makeOverridable (import ./git-annex) { inherit stdenv fetchurl perl coreutils git libuuid rsync findutils curl ikiwiki which openssh; - inherit (haskellPackages_ghc741) ghc bloomfilter dataenc editDistance hinotify hS3 hslogger HTTP + inherit (haskellPackages) ghc bloomfilter dataenc editDistance hinotify hS3 hslogger HTTP blazeBuilder blazeHtml caseInsensitive IfElse json liftedBase MissingH monadControl mtl network pcreLight SHA stm utf8String networkInfo dbus clientsession cryptoApi dataDefault extensibleExceptions filepath hamlet httpTypes networkMulticast text time transformers transformersBase wai waiLogger warp yesod yesodDefault yesodStatic testpack QuickCheck - SafeSemaphore networkPprotocolXmpp async dns; + SafeSemaphore networkPprotocolXmpp async dns DAV; }; qgit = import ./qgit { 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 d8c72f1264c..713cf0d62a6 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 @@ -8,18 +8,18 @@ , networkMulticast, pcreLight, QuickCheck, SHA, stm, text, time , transformers, transformersBase, utf8String, wai, waiLogger, warp , yesod, yesodDefault, yesodStatic, testpack, SafeSemaphore -, networkPprotocolXmpp, async, dns +, networkPprotocolXmpp, async, dns, DAV }: let - version = "3.20121112"; + version = "3.20121112-161-gb27d9eb"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { - url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}"; - sha256 = "1ch91jvzm3di5p024kwx0ikgf588lk7bp36hlgj4ar9aa2fdl7yr"; + url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;h=b27d9ebd0f63bdc449440f2529224d5b655ddbb3;sf=tgz"; + sha256 = "507efc50e33566a51a6abf688920d30fc55ce984c9c35be085e6df0767686b3a"; name = "git-annex-${version}.tar.gz"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation { networkInfo networkMulticast pcreLight QuickCheck SHA stm text time transformers transformersBase utf8String wai waiLogger warp yesod yesodDefault yesodStatic testpack SafeSemaphore networkPprotocolXmpp - async dns ]; + async dns DAV ]; checkTarget = "test"; doCheck = true; diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 50a5ae8f6c3..8e454ad9f8f 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.5"; + version = "1.7.7"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion//${name}.tar.bz2"; - sha1 = "05c079762690d5ac1ccd2549742e7ef70fa45cf1"; + sha1 = "c9fc0c5992eda36ba9affd93a15929e25958a951"; }; buildInputs = [ zlib apr aprutil sqlite ] diff --git a/pkgs/development/androidenv/examples/deployment/default.nix b/pkgs/development/androidenv/examples/deployment/default.nix deleted file mode 100644 index 7ef5b1b108c..00000000000 --- a/pkgs/development/androidenv/examples/deployment/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -let - pkgs = import {}; -in -rec { - myfirstapp = import ./myfirstapp { - inherit (pkgs) androidenv; - }; - - emulate_myfirstapp = import ./emulate-myfirstapp { - inherit (pkgs) androidenv; - inherit myfirstapp; - }; -} diff --git a/pkgs/development/androidenv/examples/deployment/emulate-myfirstapp/default.nix b/pkgs/development/androidenv/examples/deployment/emulate-myfirstapp/default.nix deleted file mode 100644 index 6631e380f6f..00000000000 --- a/pkgs/development/androidenv/examples/deployment/emulate-myfirstapp/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{androidenv, myfirstapp}: - -androidenv.emulateApp { - name = "MyFirstApp"; - app = myfirstapp; - platformVersion = "16"; - useGoogleAPIs = true; - package = "com.example.my.first.app"; - activity = "MainActivity"; -} diff --git a/pkgs/development/androidenv/examples/deployment/myfirstapp/default.nix b/pkgs/development/androidenv/examples/deployment/myfirstapp/default.nix deleted file mode 100644 index 75f1f1de7b6..00000000000 --- a/pkgs/development/androidenv/examples/deployment/myfirstapp/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{androidenv}: - -androidenv.buildApp { - name = "MyFirstApp"; - src = ../../src/myfirstapp; - platformVersions = [ "16" ]; - useGoogleAPIs = true; - /*release = true; - keyStore = /home/sander/keystore; - keyAlias = "sander"; - keyStorePassword = "foobar"; - keyAliasPassword = "foobar";*/ -} diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/.classpath b/pkgs/development/androidenv/examples/src/myfirstapp/.classpath deleted file mode 100644 index a4763d1eece..00000000000 --- a/pkgs/development/androidenv/examples/src/myfirstapp/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/.project b/pkgs/development/androidenv/examples/src/myfirstapp/.project deleted file mode 100644 index c066df34ea1..00000000000 --- a/pkgs/development/androidenv/examples/src/myfirstapp/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - My First App - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/.settings/org.eclipse.jdt.core.prefs b/pkgs/development/androidenv/examples/src/myfirstapp/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f77b31c2d2c..00000000000 --- a/pkgs/development/androidenv/examples/src/myfirstapp/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/AndroidManifest.xml b/pkgs/development/androidenv/examples/src/myfirstapp/AndroidManifest.xml deleted file mode 100644 index 12e1877a5a5..00000000000 --- a/pkgs/development/androidenv/examples/src/myfirstapp/AndroidManifest.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/README.txt b/pkgs/development/androidenv/examples/src/myfirstapp/README.txt deleted file mode 100644 index 26263c11aca..00000000000 --- a/pkgs/development/androidenv/examples/src/myfirstapp/README.txt +++ /dev/null @@ -1,6 +0,0 @@ -This is the example application taken from the Goole Android development -introduction: "Building Your First App": - -http://developer.android.com/training/basics/firstapp/index.html - - diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/ant.properties b/pkgs/development/androidenv/examples/src/myfirstapp/ant.properties deleted file mode 100644 index b0971e891ef..00000000000 --- a/pkgs/development/androidenv/examples/src/myfirstapp/ant.properties +++ /dev/null @@ -1,17 +0,0 @@ -# This file is used to override default values used by the Ant build system. -# -# This file must be checked into Version Control Systems, as it is -# integral to the build system of your project. - -# This file is only used by the Ant script. - -# You can use this to override default values such as -# 'source.dir' for the location of your java source folder and -# 'out.dir' for the location of your output folder. - -# You can also use it define how the release builds are signed by declaring -# the following properties: -# 'key.store' for the location of your keystore and -# 'key.alias' for the name of the key to use. -# The password will be asked during the build when you use the 'release' target. - diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/build.xml b/pkgs/development/androidenv/examples/src/myfirstapp/build.xml deleted file mode 100644 index 924742adaaa..00000000000 --- a/pkgs/development/androidenv/examples/src/myfirstapp/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/ic_launcher-web.png b/pkgs/development/androidenv/examples/src/myfirstapp/ic_launcher-web.png deleted file mode 100644 index c37372acb9c..00000000000 Binary files a/pkgs/development/androidenv/examples/src/myfirstapp/ic_launcher-web.png and /dev/null differ diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/proguard-project.txt b/pkgs/development/androidenv/examples/src/myfirstapp/proguard-project.txt deleted file mode 100644 index f2fe1559a21..00000000000 --- a/pkgs/development/androidenv/examples/src/myfirstapp/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/project.properties b/pkgs/development/androidenv/examples/src/myfirstapp/project.properties deleted file mode 100644 index 9b84a6b4bf9..00000000000 --- a/pkgs/development/androidenv/examples/src/myfirstapp/project.properties +++ /dev/null @@ -1,14 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-16 diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-hdpi/ic_action_search.png b/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-hdpi/ic_action_search.png deleted file mode 100644 index 67de12decbd..00000000000 Binary files a/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-hdpi/ic_action_search.png and /dev/null differ diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-hdpi/ic_launcher.png b/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index a301d5795aa..00000000000 Binary files a/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-ldpi/ic_launcher.png b/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-ldpi/ic_launcher.png deleted file mode 100644 index 2c2a58b2fad..00000000000 Binary files a/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-ldpi/ic_launcher.png and /dev/null differ diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-mdpi/ic_action_search.png b/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-mdpi/ic_action_search.png deleted file mode 100644 index 134d5490bd3..00000000000 Binary files a/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-mdpi/ic_action_search.png and /dev/null differ diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-mdpi/ic_launcher.png b/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index f91f736fe7a..00000000000 Binary files a/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-xhdpi/ic_action_search.png b/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-xhdpi/ic_action_search.png deleted file mode 100644 index d699c6b37e0..00000000000 Binary files a/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-xhdpi/ic_action_search.png and /dev/null differ diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-xhdpi/ic_launcher.png b/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 96095ec84ba..00000000000 Binary files a/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/res/layout/activity_display_message.xml b/pkgs/development/androidenv/examples/src/myfirstapp/res/layout/activity_display_message.xml deleted file mode 100644 index 61319561d0f..00000000000 --- a/pkgs/development/androidenv/examples/src/myfirstapp/res/layout/activity_display_message.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/res/layout/activity_main.xml b/pkgs/development/androidenv/examples/src/myfirstapp/res/layout/activity_main.xml deleted file mode 100644 index 0d867aa0da0..00000000000 --- a/pkgs/development/androidenv/examples/src/myfirstapp/res/layout/activity_main.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - -