From e45d4e27227c63bb71244c5399f9cd3274c45291 Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Tue, 16 Oct 2012 17:32:22 +0200 Subject: [PATCH 001/306] Add bbenoist as maintainer Signed-off-by: Baptist BENOIST --- pkgs/lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index 18671255fce..4de3ff4237b 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -10,6 +10,7 @@ andres = "Andres Loeh "; antono = "Antono Vasiljev "; astsmtl = "Alexander Tsamutali "; + bbenoist = "Baptist BENOIST "; bjg = "Brian Gough "; bluescreen303 = "Mathijs Kwik "; chaoflow = "Florian Friesdorf "; From 51fe78841797c3d59ed7289df28ed19715c9acb7 Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Tue, 16 Oct 2012 17:30:08 +0200 Subject: [PATCH 002/306] Add geany-1.22 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 Signed-off-by: Baptist BENOIST --- pkgs/applications/editors/geany/default.nix | 47 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/editors/geany/default.nix 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bbe6bc588d..13f188cf545 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6925,6 +6925,8 @@ let fossil = callPackage ../applications/version-management/fossil { }; + geany = callPackage ../applications/editors/geany { }; + goldendict = callPackage ../applications/misc/goldendict { }; grass = import ../applications/misc/grass { From 946dcba80bdd67402db091cbebd0259b3218684e Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Tue, 16 Oct 2012 17:30:26 +0200 Subject: [PATCH 003/306] Add fox-1.7.9 Signed-off-by: Baptist BENOIST --- pkgs/development/libraries/fox/default.nix | 34 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/fox/default.nix diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix new file mode 100644 index 00000000000..76cc1d5c3d2 --- /dev/null +++ b/pkgs/development/libraries/fox/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, x11 }: + +let + version = "1.7.9"; +in + +stdenv.mkDerivation rec { + name = "fox-${version}"; + + src = fetchurl { + url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz"; + md5 = "b5897e9c664967f5042e57070037ff18"; + }; + + buildInputs = [ x11 ]; + + doCheck = true; + + enableParallelBuilding = true; + + meta = { + description = "FOX is a C++ based class library for building Graphical User Interfaces"; + longDescription = '' + FOX stands for Free Objects for X. + It is a C++ based class library for building Graphical User Interfaces. + Initially, it was developed for LINUX, but the scope of this project has in the course of time become somewhat more ambitious. + Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms. + ''; + homepage = "http://fox-toolkit.org"; + license = "LGPL"; + maintainers = [ stdenv.lib.maintainers.bbenoist ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13f188cf545..21dce48c780 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -728,6 +728,8 @@ let fortune = callPackage ../tools/misc/fortune { }; + fox = callPackage ../development/libraries/fox/default.nix { }; + fprot = callPackage ../tools/security/fprot { }; freeipmi = callPackage ../tools/system/freeipmi {}; From 829ad425d31311408547fc00c6b721080ea8f3cc Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Tue, 16 Oct 2012 17:30:44 +0200 Subject: [PATCH 004/306] Add xfe-1.33 and fox-1.6.9 This specific version of fox is required by xfe Signed-off-by: Baptist BENOIST --- pkgs/applications/misc/xfe/default.nix | 33 +++++++++++++++++++++ pkgs/development/libraries/fox/fox-1.6.nix | 34 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 3 files changed, 70 insertions(+) create mode 100644 pkgs/applications/misc/xfe/default.nix create mode 100644 pkgs/development/libraries/fox/fox-1.6.nix 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/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix new file mode 100644 index 00000000000..e8961621cab --- /dev/null +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, x11 }: + +let + version = "1.6.9"; +in + +stdenv.mkDerivation rec { + name = "fox-${version}"; + + src = fetchurl { + url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz"; + md5 = "8ab8274237431865f57b2f5596374a65"; + }; + + buildInputs = [ x11 ]; + + doCheck = true; + + enableParallelBuilding = true; + + meta = { + description = "FOX is a C++ based class library for building Graphical User Interfaces"; + longDescription = '' + FOX stands for Free Objects for X. + It is a C++ based class library for building Graphical User Interfaces. + Initially, it was developed for LINUX, but the scope of this project has in the course of time become somewhat more ambitious. + Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms. + ''; + homepage = "http://fox-toolkit.org"; + license = "LGPL"; + maintainers = [ stdenv.lib.maintainers.bbenoist ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21dce48c780..4cb5417a581 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -729,6 +729,7 @@ let fortune = callPackage ../tools/misc/fortune { }; fox = callPackage ../development/libraries/fox/default.nix { }; + fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { }; fprot = callPackage ../tools/security/fprot { }; @@ -7983,6 +7984,8 @@ let xen = callPackage ../applications/virtualization/xen { }; + xfe = callPackage ../applications/misc/xfe { }; + xfig = callPackage ../applications/graphics/xfig { stdenv = overrideGCC stdenv gcc34; }; From 440656dbd018472e0d81e9c8cc820598c40661c2 Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Tue, 16 Oct 2012 17:30:56 +0200 Subject: [PATCH 005/306] Add qtcreator-2.5.2 Signed-off-by: Baptist BENOIST --- pkgs/development/qtcreator/default.nix | 36 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/qtcreator/default.nix diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix new file mode 100644 index 00000000000..b57b9884e61 --- /dev/null +++ b/pkgs/development/qtcreator/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, qt4 }: + +let + version = "2.5.2"; +in + +stdenv.mkDerivation rec { + name = "qtcreator-${version}"; + + src = fetchurl { + url = "http://origin.releases.qt-project.org/qtcreator/${version}/qt-creator-${version}-src.tar.gz"; + md5 = "4a9c09cdf4609753283c31451c84ceb8"; + }; + + buildInputs = [ qt4 ]; + + doCheck = false; + + enableParallelBuilding = true; + + preConfigure = "qmake"; + installFlags = "INSTALL_ROOT=$(out)"; + + meta = { + description = "Qt Creator is a cross-platform IDE tailored to the needs of Qt developers."; + longDescription = '' + Qt Creator is a cross-platform IDE (integrated development environment) tailored to the needs of Qt developers. + It includes features such as an advanced code editor, a visual debugger and a GUI designer. + ''; + homepage = "http://qt-project.org/wiki/Category:Tools::QtCreator"; + license = "LGPL"; + + maintainers = [ stdenv.lib.maintainers.bbenoist ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4cb5417a581..4fddd5aaef1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7608,6 +7608,8 @@ let qsynth = callPackage ../applications/audio/qsynth { }; + qtcreator = callPackage ../development/qtcreator { }; + qtpfsgui = callPackage ../applications/graphics/qtpfsgui { }; qtractor = callPackage ../applications/audio/qtractor { }; From ca264f8da0e5a289b20bc20d16a4ec8f0756ade7 Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Tue, 16 Oct 2012 17:31:06 +0200 Subject: [PATCH 006/306] Add gmrun-0.9.2 Signed-off-by: Baptist BENOIST --- pkgs/applications/misc/gmrun/default.nix | 39 +++++++++++++ pkgs/applications/misc/gmrun/gcc43.patch | 51 ++++++++++++++++ .../misc/gmrun/gmrun-0.9.2-xdg.patch | 58 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 150 insertions(+) create mode 100644 pkgs/applications/misc/gmrun/default.nix create mode 100644 pkgs/applications/misc/gmrun/gcc43.patch create mode 100644 pkgs/applications/misc/gmrun/gmrun-0.9.2-xdg.patch 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fddd5aaef1..d54970c57c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7051,6 +7051,8 @@ let pcre = pcre.override { unicodeSupport = true; }; }; + gmrun = callPackage ../applications/misc/gmrun {}; + gnucash = callPackage ../applications/office/gnucash { inherit (gnome) libgnomeui libgtkhtml gtkhtml libbonoboui libgnomeprint; gconf = gnome.GConf; From 28c909af867461a19882fc5add902b23c233305c Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Tue, 16 Oct 2012 23:19:59 +0200 Subject: [PATCH 007/306] vtk: latest version + useQt4 option - Updated vtk to v5.10.0 (latest tagged release) - Introduced a useQt4 option which allows to set the VTK_USE_QT option to true - Added a package named vtkWithQt4 in the all-packages list Signed-off-by: Baptist BENOIST --- pkgs/development/libraries/vtk/default.nix | 26 +++++++++++++++++----- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index db7d0d77f69..9e4816cab0a 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -1,18 +1,32 @@ -{stdenv, fetchurl, cmake, mesa, libX11, xproto, libXt }: +{ stdenv, fetchurl, cmake, mesa, libX11, xproto, libXt +, useQt4 ? false, qt4 }: + +with stdenv.lib; + +let + os = stdenv.lib.optionalString; + majorVersion = "5.10"; + minorVersion = "0"; + version = "${majorVersion}.${minorVersion}"; +in stdenv.mkDerivation rec { - name = "vtk-5.4.2"; + name = "vtk-${os useQt4 "qvtk-"}${version}"; src = fetchurl { - url = "http://www.vtk.org/files/release/5.4/${name}.tar.gz"; - sha256 = "0gd7xlxiqww6xxcs2kicz0g6k147y3200np4jnsf10vlxs10az03"; + url = "${meta.homepage}files/release/${majorVersion}/vtk-${version}.tar.gz"; + md5 = "a0363f78910f466ba8f1bd5ab5437cb9"; }; - buildInputs = [ cmake mesa libX11 xproto libXt ]; + buildInputs = [ cmake mesa libX11 xproto libXt ] + ++ optional useQt4 qt4; + + cmakeFlags = optional useQt4 + [ "-DVTK_USE_QT:BOOL=ON" ]; meta = { description = "Open source libraries for 3D computer graphics, image processing and visualization"; homepage = http://www.vtk.org/; license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [ viric bbenoist ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bbe6bc588d..e5254b622ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4967,6 +4967,8 @@ let vtk = callPackage ../development/libraries/vtk { }; + vtkWithQt4 = vtk.override { useQt4 = true; }; + vxl = callPackage ../development/libraries/vxl { libpng = libpng12; }; From 39690a9904a5851c9d52cfe5376e01dad403bce4 Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Thu, 18 Oct 2012 11:09:10 +0200 Subject: [PATCH 008/306] qt: update to version 4.8.3 Signed-off-by: Baptist BENOIST --- .../libraries/qt-4.x/4.8/default.nix | 8 +- .../qt-4.x/4.8/dlopen-absolute-paths.diff | 76 +++++++++++-------- .../libraries/qt-4.x/4.8/dlopen-gtkstyle.diff | 14 ++-- 3 files changed, 55 insertions(+), 43 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index f56886259a6..e58ac9afdc6 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -12,7 +12,7 @@ }: let - v = "4.8.2"; + v = "4.8.3"; in # TODO: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${v}.tar.gz"; - sha256 = "0y93vkkn44md37gyg4y8sc9ylk27xkniaimfcpdcwd090qnjl6wj"; + md5 = "a663b6c875f8d7caa8ac9c30e4a4ec3b"; }; patches = [ ( substituteAll { @@ -142,10 +142,10 @@ stdenv.mkDerivation rec { } else {}); meta = with stdenv.lib; { - homepage = http://qt.nokia.com/products; + homepage = http://qt-project.org/; description = "A cross-platform application framework for C++"; license = "GPL/LGPL"; - maintainers = with maintainers; [ urkud sander ]; + maintainers = with maintainers; [ urkud sander bbenoist ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff index 9823d649365..9a77f708c34 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff +++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff @@ -1,6 +1,30 @@ ---- a/src/gui/painting/qcups.cpp 2011-12-08 09:06:02.000000000 +0400 -+++ b/src/gui/painting/qcups.cpp 2011-12-18 12:17:07.000000000 +0400 -@@ -87,7 +87,7 @@ +diff --git a/src/corelib/tools/qlocale_icu.cpp b/src/corelib/tools/qlocale_icu.cpp +index e8c3fb8..e554e53 100644 +--- a/src/corelib/tools/qlocale_icu.cpp ++++ b/src/corelib/tools/qlocale_icu.cpp +@@ -81,7 +81,7 @@ bool qt_initIcu(const QString &localeString) + if (status == NotLoaded) { + + // resolve libicui18n +- QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT)); ++ QLibrary lib(QLatin1String("@icu@/lib/libicui18n"), QLatin1String(U_ICU_VERSION_SHORT)); + lib.setLoadHints(QLibrary::ImprovedSearchHeuristics); + if (!lib.load()) { + qWarning() << "Unable to load library icui18n" << lib.errorString(); +@@ -111,7 +111,7 @@ bool qt_initIcu(const QString &localeString) + } + + // resolve libicuuc +- QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT)); ++ QLibrary ucLib(QLatin1String("@icu@/lib/libicuuc"), QLatin1String(U_ICU_VERSION_SHORT)); + ucLib.setLoadHints(QLibrary::ImprovedSearchHeuristics); + if (!ucLib.load()) { + qWarning() << "Unable to load library icuuc" << ucLib.errorString(); +diff --git a/src/gui/painting/qcups.cpp b/src/gui/painting/qcups.cpp +index 2d45175..31158b3 100644 +--- a/src/gui/painting/qcups.cpp ++++ b/src/gui/painting/qcups.cpp +@@ -87,7 +87,7 @@ static CupsPrintFile _cupsPrintFile = 0; static void resolveCups() { @@ -9,9 +33,11 @@ if(cupsLib.load()) { _cupsGetDests = (CupsGetDests) cupsLib.resolve("cupsGetDests"); _cupsFreeDests = (CupsFreeDests) cupsLib.resolve("cupsFreeDests"); ---- a/src/gui/painting/qprinterinfo_unix.cpp 2011-12-08 09:06:02.000000000 +0400 -+++ b/src/gui/painting/qprinterinfo_unix.cpp 2011-12-23 16:22:15.000000000 +0400 -@@ -454,7 +454,7 @@ +diff --git a/src/gui/painting/qprinterinfo_unix.cpp b/src/gui/painting/qprinterinfo_unix.cpp +index 48a3d8b..8220ee5 100644 +--- a/src/gui/painting/qprinterinfo_unix.cpp ++++ b/src/gui/painting/qprinterinfo_unix.cpp +@@ -454,7 +454,7 @@ int qt_retrieveNisPrinters(QList *printers) char *domain; int err; @@ -20,40 +46,24 @@ typedef int (*ypGetDefaultDomain)(char **); ypGetDefaultDomain _ypGetDefaultDomain = (ypGetDefaultDomain)lib.resolve("yp_get_default_domain"); typedef int (*ypAll)(const char *, const char *, const struct ypall_callback *); ---- a/src/network/kernel/qhostinfo_unix.cpp 2011-12-23 16:26:07.000000000 +0400 -+++ b/src/network/kernel/qhostinfo_unix.cpp 2011-12-23 16:25:55.000000000 +0400 -@@ -95,7 +95,7 @@ +diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp +index d36d98b..24b41bb 100644 +--- a/src/network/kernel/qhostinfo_unix.cpp ++++ b/src/network/kernel/qhostinfo_unix.cpp +@@ -95,7 +95,7 @@ static res_state_ptr local_res = 0; static void resolveLibrary() { #ifndef QT_NO_LIBRARY - QLibrary lib(QLatin1String("resolv")); + QLibrary lib(QLatin1String("@glibc@/lib/libresolv")); + lib.setLoadHints(QLibrary::ImprovedSearchHeuristics); if (!lib.load()) return; - ---- a/src/corelib/tools/qlocale_icu.cpp 2011-12-08 09:06:03.000000000 +0400 -+++ b/src/corelib/tools/qlocale_icu.cpp 2011-12-23 16:29:15.000000000 +0400 -@@ -81,7 +81,7 @@ - if (status == NotLoaded) { - - // resolve libicui18n -- QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT)); -+ QLibrary lib(QLatin1String("@icu@/lib/libicui18n"), QLatin1String(U_ICU_VERSION_SHORT)); - if (!lib.load()) { - qWarning() << "Unable to load library icui18n" << lib.errorString(); - status = ErrorLoading; -@@ -110,7 +110,7 @@ - } - - // resolve libicuuc -- QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT)); -+ QLibrary ucLib(QLatin1String("@icu@/lib/libicuuc"), QLatin1String(U_ICU_VERSION_SHORT)); - if (!ucLib.load()) { - qWarning() << "Unable to load library icuuc" << ucLib.errorString(); - status = ErrorLoading; ---- a/src/plugins/platforms/xlib/qxlibstatic.cpp 2011-12-08 09:06:02.000000000 +0400 -+++ b/src/plugins/platforms/xlib/qxlibstatic.cpp 2011-12-23 20:38:49.000000000 +0400 -@@ -242,7 +242,7 @@ +diff --git a/src/plugins/platforms/xlib/qxlibstatic.cpp b/src/plugins/platforms/xlib/qxlibstatic.cpp +index 784f56b..ead9732 100644 +--- a/src/plugins/platforms/xlib/qxlibstatic.cpp ++++ b/src/plugins/platforms/xlib/qxlibstatic.cpp +@@ -242,7 +242,7 @@ static void* qt_load_library_runtime(const char *library, int vernum, } # define XFIXES_LOAD_RUNTIME(vernum, symbol, symbol_type) \ diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff index 522676a2b31..a1c9238be1a 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff +++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff @@ -1,15 +1,17 @@ ---- a/src/gui/styles/qgtkstyle_p.cpp 2011-12-08 09:06:02.000000000 +0400 -+++ b/src/gui/styles/qgtkstyle_p.cpp 2011-12-24 17:56:46.000000000 +0400 -@@ -312,7 +312,7 @@ +diff --git a/src/gui/styles/qgtkstyle_p.cpp b/src/gui/styles/qgtkstyle_p.cpp +index 3b128e6..39434db 100644 +--- a/src/gui/styles/qgtkstyle_p.cpp ++++ b/src/gui/styles/qgtkstyle_p.cpp +@@ -312,7 +312,7 @@ GtkStyle* QGtkStylePrivate::gtkStyle(const QHashableLatin1Literal &path) void QGtkStylePrivate::resolveGtk() const { // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0 - QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0); + QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0); + libgtk.setLoadHints(QLibrary::ImprovedSearchHeuristics); gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init"); - gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new"); -@@ -434,8 +434,8 @@ +@@ -435,8 +435,8 @@ void QGtkStylePrivate::resolveGtk() const pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family"); pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style"); @@ -20,7 +22,7 @@ } /* \internal -@@ -607,9 +607,9 @@ +@@ -608,9 +608,9 @@ void QGtkStylePrivate::cleanupGtkWidgets() static bool resolveGConf() { if (!QGtkStylePrivate::gconf_client_get_default) { From ca5077f03f1bae64db08cbe593e57df0f627421c Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Thu, 25 Oct 2012 06:07:39 +0200 Subject: [PATCH 009/306] 2.6-2 moved to 2.6-3, so patches were not found Maybe some new important patches can be found here? http://patch-tracker.debian.org/package/plotutils/2.6-3 upstream source didn't change --- pkgs/tools/graphics/plotutils/debian-patches.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/plotutils/debian-patches.nix b/pkgs/tools/graphics/plotutils/debian-patches.nix index d72974445e6..0615d1f52e1 100644 --- a/pkgs/tools/graphics/plotutils/debian-patches.nix +++ b/pkgs/tools/graphics/plotutils/debian-patches.nix @@ -1,6 +1,6 @@ # Generated by debian-patches.sh from debian-patches.txt let - prefix = "http://patch-tracker.debian.org/patch/series/dl/plotutils/2.6-2"; + prefix = "http://patch-tracker.debian.org/patch/series/dl/plotutils/2.6-3"; in [ { From 8dfa0a361f0a11d91283c9cd36498f7219fcc6e6 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Thu, 25 Oct 2012 06:52:43 +0200 Subject: [PATCH 010/306] source of gupnp-igd is gone, too, use ubuntu source (launchpad) - same hash --- pkgs/development/libraries/gupnp-igd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index bd930e5ecf6..a8bb065d7eb 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "gupnp-igd-0.2.1"; src = fetchurl { - url = "http://www.gupnp.org/sites/all/files/sources/${name}.tar.gz"; + url = https://launchpad.net/ubuntu/+archive/primary/+files/gupnp-igd_0.2.1.orig.tar.gz; sha256 = "18ia8l24hbylz3dnbg2jf848bmbx0hjkq4fkwzzfn57z021f0fh2"; }; From f16f48be885ce57b5a119aeebafc3a7606656b32 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Fri, 26 Oct 2012 18:24:48 +0200 Subject: [PATCH 011/306] update pulseaudio to 2.1 Systemd support has also been added because pulseaudio needs it to be useable with the systemd branch of nixos. --- pkgs/servers/pulseaudio/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 21112250597..e315f788904 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -4,16 +4,17 @@ , jackaudioSupport ? false, jackaudio ? null , x11Support ? false, xlibs , json_c +, useSystemd ? false, systemd ? null }: assert jackaudioSupport -> jackaudio != null; stdenv.mkDerivation rec { - name = "pulseaudio-1.1"; + name = "pulseaudio-2.1"; src = fetchurl { - url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-1.1.tar.xz"; - sha256 = "1vpm0681zj2jvhbabvnmrmfxr3172k4x58kjb39y5g3fdw9k3rbg"; + url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-2.1.tar.xz"; + sha256 = "0zyal2mix7lzhxmr3pxlmss5kjca061iapvrh20bkgvsyixk8szg"; }; # Since `libpulse*.la' contain `-lgdbm', it must be propagated. @@ -26,13 +27,10 @@ stdenv.mkDerivation rec { #gtk gconf ] ++ stdenv.lib.optional jackaudioSupport jackaudio - ++ stdenv.lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ]; + ++ stdenv.lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ] + ++ stdenv.lib.optional useSystemd systemd; preConfigure = '' - # Change the `padsp' script so that it contains the full path to - # `libpulsedsp.so'. - sed -i "src/utils/padsp" \ - -e "s|libpulsedsp\.so|$out/lib/libpulsedsp.so|g" # Move the udev rules under $(prefix). sed -i "src/Makefile.in" \ From 78db9a8cb1db2dcac7ed14a657a74334733cfe76 Mon Sep 17 00:00:00 2001 From: Michael Ashton Date: Sat, 27 Oct 2012 15:13:56 -0700 Subject: [PATCH 012/306] Updated version of abcde to 2.5.4 - Added support for MusicBrainz queries to abcde package - Added new dependencies to abcde: mkcue, eject, perl, MusicBrainz, MusicBrainzDiscID - libdiscid version in pkg-config was incorrect; patched libdiscid to fix - Added WebServices::MusicBrainz Perl module - Added MusicBrainz::DiscID Perl module - Commented out XSLoader Perl module since it was broken, no packages depend on it, and it has been incorporated into the Perl core --- pkgs/applications/audio/abcde/abcde.patch | 30 +++++++++++++++ .../audio/abcde/cd-paranoia.patch | 16 -------- pkgs/applications/audio/abcde/default.nix | 31 ++++++++++----- pkgs/applications/audio/abcde/install.patch | 21 ---------- pkgs/applications/audio/abcde/which.patch | 16 -------- .../libraries/libdiscid/default.nix | 10 ++++- pkgs/top-level/all-packages.nix | 4 +- pkgs/top-level/perl-packages.nix | 38 +++++++++++++++---- 8 files changed, 95 insertions(+), 71 deletions(-) create mode 100644 pkgs/applications/audio/abcde/abcde.patch delete mode 100644 pkgs/applications/audio/abcde/cd-paranoia.patch delete mode 100644 pkgs/applications/audio/abcde/install.patch delete mode 100644 pkgs/applications/audio/abcde/which.patch 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/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index bd39ea9464c..3ee43ba3bee 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchurl, cmake }: +{ stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { name = "libdiscid-0.2.2"; + buildNativeInputs = [ pkgconfig ]; buildInputs = [ cmake ]; src = fetchurl { @@ -10,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "00l4ln9rk0vqf67iccwqrgc9qx1al92i05zylh85kd1zn9d5sjwp"; }; + # developer forgot to update his version number + # this is propagated to pkg-config + preConfigure = '' + substituteInPlace "CMakeLists.txt" \ + --replace "PROJECT_VERSION 0.1.1" "PROJECT_VERSION 0.2.2" + ''; + meta = { description = "A C library for creating MusicBrainz DiscIDs from audio CDs"; homepage = http://musicbrainz.org/doc/libdiscid; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 905b7b0ae40..3d20787dede 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6510,7 +6510,9 @@ let aangifte2011 = callPackage_i686 ../applications/taxes/aangifte-2011 { }; - abcde = callPackage ../applications/audio/abcde { }; + abcde = callPackage ../applications/audio/abcde { + inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID; + }; abiword = callPackage ../applications/office/abiword { inherit (gnome) libglade libgnomecanvas; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0604ae46e4f..18e21a6f309 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2775,6 +2775,30 @@ rec { }; }; + MusicBrainzDiscID = buildModule rec { + name = "MusicBrainz-DiscID-0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NJ/NJH/${name}.tar.gz"; + sha256 = "0fjph2q3yp0aa87gckv3391s47m13wbyylj7jb7vqx7hv0pzj0jh"; + }; + # Build.PL in this package uses which to find pkg-config -- make it use path instead + patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Build.PL''; + doCheck = false; # The main test performs network access + #buildInputs = [ TestMore TestPod ]; + buildInputs = [ pkgs.pkgconfig ]; + propagatedBuildInputs = [ pkgs.libdiscid ]; + }; + + MusicBrainz = buildPerlPackage rec { + name = "WebService-MusicBrainz-0.93"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BF/BFAIST/${name}.tar.gz"; + sha256 = "1gg62x6qv4jj73jsqh0sb237k96i22blj29afpbp1scp3m7i5g61"; + }; + propagatedBuildInputs = [ XMLLibXML LWP ClassAccessor URI ]; + doCheck = false; # Test performs network access. + }; + NamespaceAutoclean = buildPerlPackage rec { name = "namespace-autoclean-0.12"; src = fetchurl { @@ -4345,13 +4369,13 @@ rec { }; }; - XSLoader = buildPerlPackage { - name = "XSLoader-0.08"; - src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SAPER/XSLoader-0.08.tar.gz; - sha256 = "0mr4l3givrpyvz1kg0kap2ds8g0rza2cim9kbnjy8hi64igkixi5"; - }; - }; + # XSLoader = buildPerlPackage { + # name = "XSLoader-0.08"; + # src = fetchurl { + # url = mirror://cpan/authors/id/S/SA/SAPER/XSLoader-0.08.tar.gz; + # sha256 = "0mr4l3givrpyvz1kg0kap2ds8g0rza2cim9kbnjy8hi64igkixi5"; + # }; + # }; YAML = buildPerlPackage rec { name = "YAML-0.80"; From 6c48c3c230f7ca797dbe3d3793e94e2454416a3d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 4 Nov 2012 21:58:13 +0400 Subject: [PATCH 013/306] Add libpng dependency to MPlayer - screenshots now work --- pkgs/applications/video/MPlayer/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index 13ebd39734e..944af1c2657 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -16,6 +16,8 @@ , x264Support ? false, x264 ? null , jackaudioSupport ? false, jackaudio ? null , pulseSupport ? false, pulseaudio ? null +# For screenshots +, libpngSupport ? true, libpng ? null }: assert x11Support -> (libX11 != null && libXext != null && mesa != null); @@ -35,7 +37,7 @@ assert theoraSupport -> libtheora != null; assert x264Support -> x264 != null; assert jackaudioSupport -> jackaudio != null; assert pulseSupport -> pulseaudio != null; - +assert libpngSupport -> libpng != null; let @@ -109,7 +111,9 @@ stdenv.mkDerivation rec { ++ optional screenSaverSupport libXScrnSaver ++ optional lameSupport lame ++ optional vdpauSupport libvdpau - ++ optional speexSupport speex; + ++ optional speexSupport speex + ++ optional libpngSupport libpng + ; buildNativeInputs = [ yasm ]; From af2fd342cd7114b7d5c39a4fd37c1a89c15c6496 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 4 Nov 2012 23:52:19 +0400 Subject: [PATCH 014/306] Updating SBCL to freshest release 1.1.1. Replacing SBCL upstream tracking expression with a new version in a new format. Minuses: gave up on defining everything in Nix language (now update expression is a series of actions to do when downloading fresh release, it is actually interpreted by shell), now Nix expression contains meaningful whitespace (the area to regenerate is determined by the line with a specific comment and the closing brace on the otherwise empty line). Plusses: only one extra file which could even be moved out-of-tree if desired, clean semantics for traversing multiple links (it is not found in either Debian uscan or Gentoo euscan), the main expression is in one file and is less different from usual style. --- .../upstream-updater/update-walker.sh | 127 ++++++++++++++++++ pkgs/development/compilers/sbcl/default.nix | 11 +- .../compilers/sbcl/default.upstream | 9 ++ .../compilers/sbcl/src-for-default.nix | 9 -- .../compilers/sbcl/src-info-for-default.nix | 7 - 5 files changed, 146 insertions(+), 17 deletions(-) create mode 100755 pkgs/build-support/upstream-updater/update-walker.sh create mode 100644 pkgs/development/compilers/sbcl/default.upstream delete mode 100644 pkgs/development/compilers/sbcl/src-for-default.nix delete mode 100644 pkgs/development/compilers/sbcl/src-info-for-default.nix diff --git a/pkgs/build-support/upstream-updater/update-walker.sh b/pkgs/build-support/upstream-updater/update-walker.sh new file mode 100755 index 00000000000..12b12a11e89 --- /dev/null +++ b/pkgs/build-support/upstream-updater/update-walker.sh @@ -0,0 +1,127 @@ +#! /bin/sh + +own_dir="$(cd "$(dirname "$0")"; pwd)" + +CURRENT_URL= + +url () { + CURRENT_URL="$1" +} + +version_unpack () { + sed -re ' + s/[.]/ /g; + s@/@ / @g + s/-(rc|pre)/ -1 \1 /g; + s/-(gamma)/ -2 \1 /g; + s/-(beta)/ -3 \1 /g; + s/-(alpha)/ -4 \1 /g; + ' +} + +version_repack () { + sed -re ' + s/ -[0-9]+ ([a-z]+) /-\1/g; + s@ / @/@g + s/ /./g; + ' +} + +version_sort () { + version_unpack | + sort -t ' ' -k 1n -k 2n -k 3n -k 4n -k 5n -k 6n -k 7n -n | tac | + version_repack +} + +position_choice () { + head -n "${1:-1}" | tail -n "${2:-1}" +} + +matching_links () { + "$own_dir"/urls-from-page.sh "$CURRENT_URL" | grep -E "$1" +} + +link () { + CURRENT_URL="$(matching_links "$1" | position_choice "$2" "$3")" + echo "Linked by: $*" + echo "URL: $CURRENT_URL" >&2 +} + +version_link () { + CURRENT_URL="$(matching_links "$1" | version_sort | position_choice "$2" "$3")" + echo "Linked version by: $*" + echo "URL: $CURRENT_URL" >&2 +} + +redirect () { + CURRENT_URL="$(curl -I -L --max-redirs "${1:-99}" "$CURRENT_URL" | + grep -E '^Location: ' | position_choice "${2:-999999}" "$3" | + sed -e 's/^Location: //; s/\r//')" + echo "Redirected: $*" + echo "URL: $CURRENT_URL" >&2 +} + +replace () { + sed -re "s $1 $2 g" +} + +process () { + CURRENT_URL="$(echo "$CURRENT_URL" | replace "$1" "$2")" + echo "Processed: $*" + echo "URL: $CURRENT_URL" >&2 +} + +version () { + CURRENT_VERSION="$(echo "$CURRENT_URL" | replace "$1" "$2")" + echo "Version: $CURRENT_VERSION" >&2 +} + +hash () { + CURRENT_HASH="$(nix-prefetch-url "$CURRENT_URL")" +} + +name () { + CURRENT_NAME="$1" +} + +retrieve_version () { + PACKAGED_VERSION="$(nix-instantiate --eval-only '' -A "$CURRENT_NAME".meta.version | xargs)" +} + +target () { + CURRENT_TARGET="$1" +} + +update_found () { + echo "Compare: $CURRENT_VERSION vs $PACKAGED_VERSION" + [ "$CURRENT_VERSION" != "$PACKAGED_VERSION" ] +} + +do_regenerate () { + cat "$1" | grep -F '# Generated upstream information' -B 999999; + echo " rec {" + echo " baseName=\"$CURRENT_NAME\";" + echo " version=\"$CURRENT_VERSION\";" + echo ' name="${baseName}-${version}";' + echo " hash=\"$CURRENT_HASH\";" + echo " url=\"$CURRENT_URL\";" + cat "$1" | grep -F '# Generated upstream information' -A 999999 | grep -E '^ *[}]; *$' -A 999999; +} + +do_overwrite () { + hash + do_regenerate "$1" > "$1.new.tmp" + mv "$1.new.tmp" "$1" +} + +full_path () { + echo "$(cd "$(dirname "$1")"; pwd)/$(basename "$1")" +} + +process_config () { + source "$(full_path "$1")" + retrieve_version + update_found && do_overwrite "$CURRENT_TARGET" +} + +process_config "$1" diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index eb3f47a15c0..adffb7c5074 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -1,7 +1,14 @@ a : let fetchurl = a.fetchurl; - s= import ./src-for-default.nix; + s= # Generated upstream information + rec { + baseName="sbcl"; + version="1.1.1"; + name="${baseName}-${version}"; + hash="1gkwz0248zl2nhx79ck5wiyxj8407c10gcrpgg1c67102pgyiikv"; + url="mirror://sourceforge/project/sbcl/sbcl/1.1.1/sbcl-1.1.1-source.tar.bz2"; + }; buildInputs = with a; [ clisp makeWrapper ]; @@ -73,12 +80,14 @@ rec { '') ["doBuild" "minInit" "addInputs"]; inherit(s) name; + inherit(s) version; meta = { description = "Lisp compiler"; homepage = "http://www.sbcl.org"; license = "bsd"; maintainers = [a.lib.maintainers.raskin]; platforms = with a.lib.platforms; all; + inherit(s) version; }; } diff --git a/pkgs/development/compilers/sbcl/default.upstream b/pkgs/development/compilers/sbcl/default.upstream new file mode 100644 index 00000000000..de69a2828c6 --- /dev/null +++ b/pkgs/development/compilers/sbcl/default.upstream @@ -0,0 +1,9 @@ +name sbcl +target default.nix +url http://sf.net/projects/sbcl/files/sbcl/ +version_link '/sbcl/[0-9.]+/$' +link "source.tar.bz2" +version '.*/sbcl-([0-9.]+)-source.*' '\1' +redirect +process 'http://[a-z]+[.]dl[.]sourceforge[.]net/' 'mirror://sourceforge/' +process '[?].*' '' diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix deleted file mode 100644 index fc23f901e5a..00000000000 --- a/pkgs/development/compilers/sbcl/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="1.1.0"; - name="sbcl-1.1.0"; - hash="128zb7i6w2a93yjvh8mc6f36w47psnda671y81a9yl6mr5696k00"; - url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.1.0/sbcl-1.1.0-source.tar.bz2"; - advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.1.0/sbcl-1.1.0-source.tar.bz2"; - - -} diff --git a/pkgs/development/compilers/sbcl/src-info-for-default.nix b/pkgs/development/compilers/sbcl/src-info-for-default.nix deleted file mode 100644 index 597aded1792..00000000000 --- a/pkgs/development/compilers/sbcl/src-info-for-default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - baseName = "sbcl"; - downloadPage = "http://sourceforge.net/projects/sbcl/files/sbcl/"; - choiceCommand = "head -n 1 | sed -re 's%.*/([0-9.]+)/%http://downloads.sourceforge.net/project/sbcl/sbcl/\\1/sbcl-\\1-source.tar.bz2%'"; - sourceRegexp = "[/][0-9.]+/\$"; - versionExtractorSedScript = "s/.*-([0-9.rc]+)-.*/\\1/"; -} From 993601a7c5b8751da033f119a75f0607cecd8004 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 5 Nov 2012 09:45:03 +0100 Subject: [PATCH 015/306] screen: Enable PAM support by default. I hope noone is unhappy with enabling PAM bu default. Whover doesn't want PAM to take care of authentication can still use the "password" configuration directive. Signed-off-by: aszlig --- pkgs/tools/misc/screen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 329754ab5f5..930cd67bb13 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses}: +{ stdenv, fetchurl, ncurses, pam }: stdenv.mkDerivation rec { name = "screen-4.0.3"; @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { }; preConfigure = '' - configureFlags="--enable-telnet --infodir=$out/share/info --mandir=$out/share/man" + configureFlags="--enable-telnet --enable-pam --infodir=$out/share/info --mandir=$out/share/man" sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in ''; - buildInputs = [ ncurses ]; + buildInputs = [ ncurses pam ]; doCheck = true; From 234b4affa381b1900fadec83aca42b9211777ccc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 11:42:05 +0100 Subject: [PATCH 016/306] man-pages: update to version 3.43 --- pkgs/data/documentation/man-pages/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index f9e4f1b4371..465d83f8b4c 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "man-pages-3.42"; - + name = "man-pages-3.43"; + src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.xz"; - sha256 = "11kh0ifzqbxk797lq037ixqhpf6h90w9xxygzh796mddg4rr4s9j"; + sha256 = "05fjq8llfxm77mnf2jhly98780xbkakim7b7hbx6kafvvs5zisrf"; }; preBuild = From a4bb7cfc84185f4a7bb121de43bde86c288464c4 Mon Sep 17 00:00:00 2001 From: Paolo Capriotti Date: Fri, 2 Nov 2012 11:32:08 +0000 Subject: [PATCH 017/306] test-framework-th-prime: add version 0.0.5 --- .../haskell/test-framework-th-prime/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/test-framework-th-prime/default.nix diff --git a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix new file mode 100644 index 00000000000..ebcd608eb6a --- /dev/null +++ b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix @@ -0,0 +1,13 @@ +{ cabal, cpphs, haskellSrcExts, testFramework }: + +cabal.mkDerivation (self: { + pname = "test-framework-th-prime"; + version = "0.0.5"; + sha256 = "0lsxnbckh88cq38azml86szdcvx3rhs3is13ib4z0ryfqnv4hhpl"; + buildDepends = [ cpphs haskellSrcExts testFramework ]; + meta = { + description = "Template Haskell for test framework"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ee627aaf78b..4cf0faa91cf 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1570,6 +1570,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); testFrameworkTh = callPackage ../development/libraries/haskell/test-framework-th {}; + testFrameworkThPrime = callPackage ../development/libraries/haskell/test-framework-th-prime {}; + testpack = callPackage ../development/libraries/haskell/testpack {}; texmath = callPackage ../development/libraries/haskell/texmath {}; From 54f58e9f2afaca0f73b2a12476ac234561a2ffc0 Mon Sep 17 00:00:00 2001 From: Paolo Capriotti Date: Thu, 1 Nov 2012 14:07:15 +0000 Subject: [PATCH 018/306] optparse-applicative: add version 0.4.1 --- .../haskell/optparse-applicative/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/optparse-applicative/default.nix diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix new file mode 100644 index 00000000000..75f801eee18 --- /dev/null +++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "optparse-applicative"; + version = "0.4.1"; + sha256 = "00byv248662n6pr8gn5b777l0fjg6f0wcxfkbhw0qyhd1ciq8d38"; + buildDepends = [ transformers ]; + meta = { + homepage = "https://github.com/pcapriotti/optparse-applicative"; + description = "Utilities and combinators for parsing command line options"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4cf0faa91cf..312ab37ebfe 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1243,6 +1243,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {}; + optparse_applicative = callPackage ../development/libraries/haskell/optparse-applicative {}; + pathPieces = callPackage ../development/libraries/haskell/path-pieces {}; pandoc = callPackage ../development/libraries/haskell/pandoc {}; From 6ac427d3915f88c3ddc08f9958bd69c739651df6 Mon Sep 17 00:00:00 2001 From: Paolo Capriotti Date: Mon, 5 Nov 2012 13:45:49 +0000 Subject: [PATCH 019/306] Update git-annex to 3.20121017 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 13b3d263ad4..79473242e89 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 @@ -11,14 +11,14 @@ }: let - version = "3.20121010"; + version = "3.20121017"; 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 = "4db543af6cbcb2d92c808c01969425d1fd1a916b37386dcdfe1a3101876ccde2"; + sha256 = "1949efb22cd3154323ee00d3ab62b07158df4024283a67a53134a1fa2efa9841"; name = "git-annex-${version}.tar.gz"; }; From 321ee97b4c219a5580bbbd3a05929a849a70e2bb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:50 +0100 Subject: [PATCH 020/306] haskell-darcs: update to version 2.8.3 --- pkgs/applications/version-management/darcs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix index a6b4b9a60de..8ac93af8c46 100644 --- a/pkgs/applications/version-management/darcs/default.nix +++ b/pkgs/applications/version-management/darcs/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "darcs"; - version = "2.8.2"; - sha256 = "1gd8028k91hjsd9hvx3pw4h5zsn2ckc7pfp7f1f566dpp1g422v5"; + version = "2.8.3"; + sha256 = "0nbg45i5sgbsc488siqirgysy3z912xghqbwm5hcsl37j910hxch"; isLibrary = true; isExecutable = true; buildDepends = [ From ff8156ac13c5b36a2d5b02923c716381ebf8d4e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:50 +0100 Subject: [PATCH 021/306] haskell-GLFW: update to version 0.5.1.0 --- pkgs/development/libraries/haskell/GLFW/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/GLFW/default.nix b/pkgs/development/libraries/haskell/GLFW/default.nix index 59095ba7927..f204bcdf655 100644 --- a/pkgs/development/libraries/haskell/GLFW/default.nix +++ b/pkgs/development/libraries/haskell/GLFW/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "GLFW"; - version = "0.5.0.1"; - sha256 = "1zjxw0fn1am9n4bwqn8jwp14cdgyg1cv5v8rrg2bisggw7wdc4c6"; + version = "0.5.1.0"; + sha256 = "190d75w84y9gayxvdz13dnzpyflc5qy4vdg5iv9p2dpcamcih3km"; buildDepends = [ OpenGL ]; extraLibraries = [ libX11 mesa ]; meta = { From 5df5841f55cd4898ac5495bf276191cd8fb2b26a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:51 +0100 Subject: [PATCH 022/306] haskell-GLURaw: update to version 1.3.0.0 --- pkgs/development/libraries/haskell/GLURaw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/GLURaw/default.nix b/pkgs/development/libraries/haskell/GLURaw/default.nix index 459c7b99e5c..d719e8179d4 100644 --- a/pkgs/development/libraries/haskell/GLURaw/default.nix +++ b/pkgs/development/libraries/haskell/GLURaw/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "GLURaw"; - version = "1.2.0.0"; - sha256 = "06dsazj3zadjahwy926gnjngqg8cb1mhdxh8bg5f3axf3hsvxqp1"; + version = "1.3.0.0"; + sha256 = "1sh87jz9161svsf719y63cr21wf4d7wpbz75g2c2xss301qhafg0"; buildDepends = [ OpenGLRaw ]; extraLibraries = [ freeglut mesa ]; meta = { From eb1dff71ebd4034e9bc0cb37fdc2c40e443da2b9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:51 +0100 Subject: [PATCH 023/306] haskell-OpenGLRaw: update to version 1.3.0.0 --- pkgs/development/libraries/haskell/OpenGLRaw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix index b51e12eab65..a6a45bf5b24 100644 --- a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix +++ b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "OpenGLRaw"; - version = "1.2.0.0"; - sha256 = "1nwk93wlwh7gz2lb1dc88frmwik71g61a7k8xfiib2q5a8a8kf9r"; + version = "1.3.0.0"; + sha256 = "0ifp5inrm48hzpq0x9hlk5cxh2k64y05phmsdb5hydb7r6dcla32"; extraLibraries = [ mesa ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Opengl"; From 1392f6166a0e0d32cfa3f3b7ab98e11fd97810f6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:51 +0100 Subject: [PATCH 024/306] haskell-dbus: update to version 0.10.4 --- pkgs/development/libraries/haskell/dbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix index ba310862948..16cb2c7ca03 100644 --- a/pkgs/development/libraries/haskell/dbus/default.nix +++ b/pkgs/development/libraries/haskell/dbus/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "dbus"; - version = "0.10.3"; - sha256 = "1l74whkrznlycl6rc1h63rc1vmvp6q2g8g92imycf8f4sizmigfq"; + version = "0.10.4"; + sha256 = "0cv4sgk1mdxc81jlky21k0y3zg7qii585xiapr1m589r5528gj2f"; buildDepends = [ cereal libxmlSax network parsec random text transformers vector xmlTypes From 202ade2109a3f35e71dd8f7145daf26a75bccaa2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:51 +0100 Subject: [PATCH 025/306] haskell-ghc-events: update to version 0.4.2.0 --- pkgs/development/libraries/haskell/ghc-events/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix index dfbf5181d40..4cba5ed74e9 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ghc-events"; - version = "0.4.0.1"; - sha256 = "1ic8r3hn1m500xwq1n8wz7fp65vm43n7dkjnn341xdmpd1546wlc"; + version = "0.4.2.0"; + sha256 = "0209r9g5w4ifsaw3dkfra6kma1vyk50dc306an72mcwnp4l7dv4l"; isLibrary = true; isExecutable = true; buildDepends = [ binary mtl ]; From e0522ca42bac90df44a4cc6a88a876fc00e3e004 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:51 +0100 Subject: [PATCH 026/306] haskell-gitit: update to version 0.10.0.2 --- pkgs/development/libraries/haskell/gitit/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index 7de302aee6d..f1230ad2f39 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "gitit"; - version = "0.10.0.1"; - sha256 = "0dx4jq7j0s6h5lfl8qrr4qnyb3j0cnnc1c786yf8kcmhk04n028f"; + version = "0.10.0.2"; + sha256 = "0cnql35h4laqpaymg32dmszwzc74qmbmmjas44gcsd8v5n6f701i"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -18,7 +18,6 @@ cabal.mkDerivation (self: { safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize zlib ]; - jailbreak = true; meta = { homepage = "http://gitit.net"; description = "Wiki using happstack, git or darcs, and pandoc"; From a029dcbbea168859546160936ac85286c204ded4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:51 +0100 Subject: [PATCH 027/306] haskell-html-conduit: update to version 0.1.0.3 --- pkgs/development/libraries/haskell/html-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix index b3482292b04..ab0d5b7b969 100644 --- a/pkgs/development/libraries/haskell/html-conduit/default.nix +++ b/pkgs/development/libraries/haskell/html-conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "html-conduit"; - version = "0.1.0.2"; - sha256 = "0r9bnzz6r5q2fgichg8vfjgwyig33diqvj5pxchk97m3m5rqj5k4"; + version = "0.1.0.3"; + sha256 = "002862if2i9r0ww4q0iapp0j745970pfcmfpi3ni64k41qfqapsn"; buildDepends = [ conduit filesystemConduit resourcet systemFilepath tagstreamConduit text transformers xmlConduit xmlTypes From c51bb70aaebb4b8fb9cd82ee8a9ed4990707cd73 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:51 +0100 Subject: [PATCH 028/306] haskell-shakespeare-css: update to version 1.0.2 --- .../libraries/haskell/shakespeare-css/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 54bc170f069..61c783c6727 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -1,10 +1,10 @@ -{ cabal, parsec, shakespeare, text }: +{ cabal, parsec, shakespeare, text, transformers }: cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.1.5"; - sha256 = "0arfc64wsyn0af34blbjgxxr9xxk9k61p7zy4b7m3ynnpxqh2hzn"; - buildDepends = [ parsec shakespeare text ]; + version = "1.0.2"; + sha256 = "02sk9ql357ybj1h5a4xjn06di5zdafibabhy32j5vs9kpyamvck3"; + buildDepends = [ parsec shakespeare text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Stick your haskell variables into css at compile time"; From c19546cda7e840caecdf4fb53721b836a9218a30 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:51 +0100 Subject: [PATCH 029/306] haskell-shakespeare-js: update to version 1.0.1 --- pkgs/development/libraries/haskell/shakespeare-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index bed71a7c14e..c86a3fd2a74 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "1.0.0.6"; - sha256 = "0ilzg5g2pvq36cv5fhyv9sqz3nnj9gscrc2y4vlqkm6f1ks3gyg8"; + version = "1.0.1"; + sha256 = "1djv34x2nb634lmv28bm2qfsjr0vs0rlq98y8yaiyjdphkzhlaax"; buildDepends = [ shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; From efeadc8d3a0d94bc12eaa3de07e74507fbd0c544 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:52 +0100 Subject: [PATCH 030/306] haskell-shakespeare: update to version 1.0.2 --- pkgs/development/libraries/haskell/shakespeare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index fca3d04a305..11a03eaa9b2 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "1.0.1.4"; - sha256 = "01gw31g75v8r8hjvkv7mxvx7736ib9x9nqpxavpbrfplyxgk2y31"; + version = "1.0.2"; + sha256 = "1n7qymrn2f83a11zdh2950pf8rsqnc52blwi02amjxsvy2piidzm"; buildDepends = [ parsec text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; From d14453b73ca7e077cb6e188d734610623dc71098 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:52 +0100 Subject: [PATCH 031/306] haskell-stylish-haskell: update to version 0.5.4.0 --- .../development/libraries/haskell/stylish-haskell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index ef02145a2a7..fc875d75bd0 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "stylish-haskell"; - version = "0.5.3.0"; - sha256 = "1qg24cm2mxkskh701zcg5g8l5hnh3nkaw71mijxr80izls1wlf0z"; + version = "0.5.4.0"; + sha256 = "1bnsjs5s760xnk3s1l7kjqr2svxp4a881p9z2slaywi5kn0v5mwf"; isLibrary = true; isExecutable = true; buildDepends = [ From 41268019a2f61f0c0123e061c3342da027c0f561 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:52 +0100 Subject: [PATCH 032/306] haskell-vty: update to version 4.7.0.20 --- pkgs/development/libraries/haskell/vty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index 0e32dc1c81b..2642af7457e 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "4.7.0.18"; - sha256 = "1a414k8fcnjinr01ly49wyk025zacyznw7gclpa83qm0wn0q7bs3"; + version = "4.7.0.20"; + sha256 = "15slw4zpvfkx9qwj2g5ndcxwbw0kkhyq8frvh9kharqd0zqzgqzb"; buildDepends = [ deepseq mtl parallel parsec terminfo utf8String vector ]; From 22d12135b9ae7960f9751915735458d0473fefe7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:52 +0100 Subject: [PATCH 033/306] haskell-xml-conduit: update to version 1.0.3.2 --- pkgs/development/libraries/haskell/xml-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 3f2e6e6af4f..3978ae14843 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "1.0.3.1"; - sha256 = "1000gbdwfp98s44kkp793lmqrdm046phwxcvlik20b2485ml8yrj"; + version = "1.0.3.2"; + sha256 = "0vli0pj0d8nn4f7i8aihv6l931am0h0xsmh7k5pkh8lzvdgwihfi"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup conduit dataDefault failure monadControl From 42c1c63919250fd2eb754eec08565c791b1d42b8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:52 +0100 Subject: [PATCH 034/306] haskell-splot: update to version 0.3.6 --- pkgs/development/tools/haskell/splot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix index 12d603bc736..9f35054b4c0 100644 --- a/pkgs/development/tools/haskell/splot/default.nix +++ b/pkgs/development/tools/haskell/splot/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "splot"; - version = "0.3.5"; - sha256 = "1bayh9s0jj8874w7lv9m11h2f609h30ywgrp438h57jq1prs2wlk"; + version = "0.3.6"; + sha256 = "0fxjji6b0v3hf4pn1cbh88nvp4n4bfgfkiga6l149flk5nmlapqx"; isLibrary = false; isExecutable = true; buildDepends = [ From 4fa4749b4f284e00ef2a705a47f3836688b9fed0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:52 +0100 Subject: [PATCH 035/306] haskell-threadscope: update to version 0.2.2 --- pkgs/development/tools/haskell/threadscope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix index f0d80e84c5a..4928c40e129 100644 --- a/pkgs/development/tools/haskell/threadscope/default.nix +++ b/pkgs/development/tools/haskell/threadscope/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "threadscope"; - version = "0.2.1"; - sha256 = "08s9fbwg33rgbqjdx7n90q83livfay9khr2ddjwj8brw8k1wkmxg"; + version = "0.2.2"; + sha256 = "07cmza391hjq77lx8m9g2287bzsh5ffka3s07fr49v6x6hivsic3"; isLibrary = false; isExecutable = true; buildDepends = [ From 3385f76ae17561cc25c43cfcf7d1eef864442838 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:52 +0100 Subject: [PATCH 036/306] haskell-uuagc-cabal: update to version 1.0.3.0 --- pkgs/development/tools/haskell/uuagc/cabal.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix index 24eded529b3..3c2f0351672 100644 --- a/pkgs/development/tools/haskell/uuagc/cabal.nix +++ b/pkgs/development/tools/haskell/uuagc/cabal.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uuagc-cabal"; - version = "1.0.2.0"; - sha256 = "0nvnyc6c1611rziglpp0ywqkgg9sgfi9ph33ya33k5zv3jxxh1q0"; + version = "1.0.3.0"; + sha256 = "0kr0k8pgz52n4g7x998djwncfr9byyxg5slqq80qijh06v01bm79"; buildDepends = [ Cabal filepath mtl uulib ]; meta = { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; From 5ce4e11e40e20f47e8e8556acced2df934308910 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:52 +0100 Subject: [PATCH 037/306] haskell-uuagc: update to version 0.9.42.1 --- pkgs/development/tools/haskell/uuagc/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix index 833189b89ac..6289abd7120 100644 --- a/pkgs/development/tools/haskell/uuagc/default.nix +++ b/pkgs/development/tools/haskell/uuagc/default.nix @@ -1,16 +1,12 @@ -{ cabal, filepath, haskellSrcExts, mtl, uuagcBootstrap, uuagcCabal -, uulib -}: +{ cabal, filepath, haskellSrcExts, mtl, uuagcCabal, uulib }: cabal.mkDerivation (self: { pname = "uuagc"; - version = "0.9.40.3"; - sha256 = "053p7cbis843zn0qg8imc77xnfj4kna8wwfanxbj8kcapcqvwihl"; + version = "0.9.42.1"; + sha256 = "1xyzvv9rqzqdc7kd2rncafnglfg699sn3f4987kbsxzhilvmhw78"; isLibrary = true; isExecutable = true; - buildDepends = [ - filepath haskellSrcExts mtl uuagcBootstrap uuagcCabal uulib - ]; + buildDepends = [ filepath haskellSrcExts mtl uuagcCabal uulib ]; meta = { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; description = "Attribute Grammar System of Universiteit Utrecht"; From 2d5732e48d6cea7701276ec651bd88a7c0dc2d73 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:25:02 +0100 Subject: [PATCH 038/306] haskell: update OpenGL to version 2.6.0.0 and GLUT to version 2.3.1.0. --- .../haskell/GLUT/{2.3.0.0.nix => 2.3.1.0.nix} | 10 +++------ .../OpenGL/{2.5.0.0.nix => 2.6.0.0.nix} | 5 +++-- pkgs/top-level/haskell-packages.nix | 22 ++++++++----------- 3 files changed, 15 insertions(+), 22 deletions(-) rename pkgs/development/libraries/haskell/GLUT/{2.3.0.0.nix => 2.3.1.0.nix} (50%) rename pkgs/development/libraries/haskell/OpenGL/{2.5.0.0.nix => 2.6.0.0.nix} (82%) diff --git a/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix b/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix similarity index 50% rename from pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix rename to pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix index 4c50197a6d7..d65dfa15c6f 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix @@ -1,17 +1,13 @@ { cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL -, OpenGLRaw, StateVar, Tensor, fetchurl +, OpenGLRaw, StateVar, Tensor }: cabal.mkDerivation (self: { pname = "GLUT"; - version = "2.3.0.0"; - sha256 = "10rh57w3lx8fs0xy24lqilv5a5sgq57kshydja41r6fq9wdvwp99"; + version = "2.3.1.0"; + sha256 = "1ijx636py7gpm79r0qjsv8f4pw3m1cgz80gnn3qghs3lw0l8f1ci"; buildDepends = [ OpenGL OpenGLRaw StateVar Tensor ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; - patches = [ - (fetchurl { url = "https://github.com/haskell-opengl/GLUT/commit/e962ebb7bed7e61e4591ae67f86199d557c7d54c.patch"; sha256 = "0s9xrkz1pkbkhsjzwbj4ayynmvzp5cckkl2lrizcjwcnqv83srmq"; }) - (fetchurl { url = "https://github.com/haskell-opengl/GLUT/commit/fced812bc726c208064a2c48e411f4d609444abc.patch"; sha256 = "1kc7ic70lq43v8ikbcgbs5f2l4wzaz9vylhkmp38q26zs6qzbv07"; }) - ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL Utility Toolkit"; diff --git a/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.6.0.0.nix similarity index 82% rename from pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix rename to pkgs/development/libraries/haskell/OpenGL/2.6.0.0.nix index 9d8c1bb29ae..6ea45f6d08c 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.6.0.0.nix @@ -4,10 +4,11 @@ cabal.mkDerivation (self: { pname = "OpenGL"; - version = "2.5.0.0"; - sha256 = "1kpakn5i4aka67mqcpfq9jpl38h409x63zd14y35abpm6h3x8m3j"; + version = "2.6.0.0"; + sha256 = "0rbdx73gcjx4ksqdjishlnn1ibxj21cqg5pxphy8bsphlygzc76l"; buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ]; extraLibraries = [ libX11 mesa ]; + noHaddock = true; meta = { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL graphics system"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 312ab37ebfe..45308dc66e4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -123,14 +123,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); async = self.async_2_0_1_4; # 7.6 ok cgi = self.cgi_3001_1_8_3; # 7.6 ok fgl = self.fgl_5_4_2_4; # 7.6 ok - GLUT = self.GLUT_2_3_0_0; # 7.6 ok + GLUT = self.GLUT_2_3_1_0; # 7.6 ok haskellSrc = self.haskellSrc_1_0_1_5; # 7.6 ok html = self.html_1_0_1_2; # 7.6 ok HTTP = self.HTTP_4000_2_6; # 7.6 ok HUnit = self.HUnit_1_2_5_1; # 7.6 ok mtl = self.mtl_2_1_2; # 7.6 ok network = self.network_2_4_0_1; # 7.6 ok - OpenGL = self.OpenGL_2_5_0_0; # 7.6 ok + OpenGL = self.OpenGL_2_6_0_0; # 7.6 ok parallel = self.parallel_3_2_0_3; # 7.6 ok parsec = self.parsec_3_1_3; # 7.6 ok QuickCheck = self.QuickCheck_2_5_1_1; # 7.6 ok @@ -828,8 +828,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {}; gloss = callPackage ../development/libraries/haskell/gloss { - GLUT = self.GLUT23; - OpenGL = self.OpenGL25; + OpenGL = self.OpenGL_2_6_0_0; + GLUT = self.GLUT_2_3_1_0; }; glpkHs = callPackage ../development/libraries/haskell/glpk-hs {}; @@ -842,12 +842,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GLUT_2_2_2_1 = callPackage ../development/libraries/haskell/GLUT/2.2.2.1.nix { OpenGL = self.OpenGL_2_4_0_2; }; - GLUT_2_3_0_0 = callPackage ../development/libraries/haskell/GLUT/2.3.0.0.nix { - OpenGL = self.OpenGL_2_5_0_0; + GLUT_2_3_1_0 = callPackage ../development/libraries/haskell/GLUT/2.3.1.0.nix { + OpenGL = self.OpenGL_2_6_0_0; }; - GLUT22 = self.GLUT_2_2_2_1; - GLUT23 = self.GLUT_2_3_0_0; - GLUT = self.GLUT_2_3_0_0; + GLUT = self.GLUT_2_3_1_0; gtk = callPackage ../development/libraries/haskell/gtk { inherit (pkgs) gtk; @@ -1236,10 +1234,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {}; OpenGL_2_2_3_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.1.nix {}; OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {}; - OpenGL_2_5_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.5.0.0.nix {}; - OpenGL24 = self.OpenGL_2_4_0_2; - OpenGL25 = self.OpenGL_2_5_0_0; - OpenGL = self.OpenGL_2_5_0_0; + OpenGL_2_6_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.0.nix {}; + OpenGL = self.OpenGL_2_6_0_0; OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {}; From 860929e68bc26553efad645339c1aca94a853b1b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:25:21 +0100 Subject: [PATCH 039/306] haskell-gloss: jailbreak to fix build with recent versions of OpenGL --- pkgs/development/libraries/haskell/gloss/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 8fe5080b1ac..6aa82a78a7c 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "1.7.6.5"; sha256 = "0s02vbcyfqzlmjw68kp3arn3vvmldh04460gm050vbc6rqpc8dkv"; buildDepends = [ bmp GLUT OpenGL ]; + jailbreak = true; meta = { homepage = "http://gloss.ouroborus.net"; description = "Painless 2D vector graphics, animations and simulations"; From ae8a3386e4fb9a7b789befb0a81f090ed5068197 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Nov 2012 16:58:54 +0100 Subject: [PATCH 040/306] Email::Sender: Update to 0.120002 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0604ae46e4f..1cb58cfc4e2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1439,10 +1439,10 @@ rec { }; EmailSender = buildPerlPackage rec { - name = "Email-Sender-0.110001"; + name = "Email-Sender-0.120002"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "0z4nl7aizbailraqwkkqhx6k3hdz67wxszjfhd5yg2vn06ybsjwj"; + sha256 = "1cp735ndmh76xzijsm1hd0yh0m9yj34jc8akjhidkn677h2021dc"; }; buildInputs = [ TestMore ]; propagatedBuildInputs = From a1c54023ceede337c0de03342ea9ee98a188c1a8 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 5 Nov 2012 20:38:51 +0100 Subject: [PATCH 041/306] linux-3.0: upgrade to 3.0.51 --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index ad69486622e..a1e26a6d695 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -230,7 +230,7 @@ in import ./generic.nix ( rec { - version = "3.0.49"; + version = "3.0.51"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -238,7 +238,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0h24c0mhxznnlqgqq9yf12ad5g1ya33qjjcahzhaafb7kwvjkqyx"; + sha256 = "0pd33513l02fxp8nikfdwrxcm6rf7l2b6mfwhhkxkwh5gzszaa1m"; }; config = configWithPlatform stdenv.platform; From 97c5b934021121864bfb4072b6778584b24cc548 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 5 Nov 2012 20:39:29 +0100 Subject: [PATCH 042/306] linux-3.4: kernel 3.4.18, contains fix for recent ext4 corruption --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index af1c8c2d512..8c413c3db31 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -239,7 +239,7 @@ in import ./generic.nix ( rec { - version = "3.4.16"; + version = "3.4.18"; testing = false; preConfigure = '' @@ -248,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1dg8zy33vri71yv6zavyfyr5dg2wl4xz5ll8gqa4kjlq8hn8d5s2"; + sha256 = "196m681612k6xq62bf9ryii0vzmj23z605s0xc35x0cqhhx1wq16"; }; config = configWithPlatform stdenv.platform; From b56a899320f65060d09aceac72d4b4764a7af785 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 5 Nov 2012 20:39:57 +0100 Subject: [PATCH 043/306] linux-3.6: upgrade to 3.6.6, contains fix for recent ext4 corruption --- pkgs/os-specific/linux/kernel/linux-3.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.6.nix b/pkgs/os-specific/linux/kernel/linux-3.6.nix index 02a509e7df2..b395050c061 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.6.nix @@ -244,7 +244,7 @@ in import ./generic.nix ( rec { - version = "3.6.4"; + version = "3.6.6"; testing = false; preConfigure = '' @@ -253,7 +253,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0y64hd9cdrg9fpkwsww8s7dvq7z55k55a5pd06kkr1kwgjxqnj4a"; + sha256 = "0fdkfxsfrr5by8l51hr5s7x0294pdb5fr58f923wsd64z1m1x283"; }; config = configWithPlatform stdenv.platform; From 31ca4356fbe6640710426ab1cf542026743371f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 20:36:17 +0100 Subject: [PATCH 044/306] boost: update to version 1.52.0 --- .../libraries/boost/1.52-headers.nix | 26 ++++++ pkgs/development/libraries/boost/1.52.nix | 86 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +- 3 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/boost/1.52-headers.nix create mode 100644 pkgs/development/libraries/boost/1.52.nix diff --git a/pkgs/development/libraries/boost/1.52-headers.nix b/pkgs/development/libraries/boost/1.52-headers.nix new file mode 100644 index 00000000000..b89273fdd30 --- /dev/null +++ b/pkgs/development/libraries/boost/1.52-headers.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "boost-1.52.0-headers"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; + sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/include + tar xf $src -C $out/include --strip-components=1 ./boost_1_52_0/boost + ''; + + meta = { + homepage = "http://boost.org/"; + description = "Boost C++ Library Collection"; + license = "boost-license"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.viric stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/development/libraries/boost/1.52.nix b/pkgs/development/libraries/boost/1.52.nix new file mode 100644 index 00000000000..0de11aaed87 --- /dev/null +++ b/pkgs/development/libraries/boost/1.52.nix @@ -0,0 +1,86 @@ +{ stdenv, fetchurl, icu, expat, zlib, bzip2, python +, enableRelease ? true +, enableDebug ? false +, enableSingleThreaded ? false +, enableMultiThreaded ? true +, enableShared ? true +, enableStatic ? false +, enablePIC ? false +, enableExceptions ? false +, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) +}: + +let + + variant = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableRelease "release" ++ + stdenv.lib.optional enableDebug "debug"); + + threading = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableSingleThreaded "single" ++ + stdenv.lib.optional enableMultiThreaded "multi"); + + link = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableShared "shared" ++ + stdenv.lib.optional enableStatic "static"); + + # To avoid library name collisions + layout = if taggedLayout then "tagged" else "system"; + + cflags = if (enablePIC && enableExceptions) then + "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" + else if (enablePIC) then + "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" + else if (enableExceptions) then + "cflags=-fexceptions" + else + ""; +in + +stdenv.mkDerivation { + name = "boost-1.52.0"; + + meta = { + homepage = "http://boost.org/"; + description = "Boost C++ Library Collection"; + license = "boost-license"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; + sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; + }; + + enableParallelBuilding = true; + + buildInputs = [icu expat zlib bzip2 python]; + + configureScript = "./bootstrap.sh"; + configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; + + buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; + + installPhase = ":"; + + crossAttrs = rec { + buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ]; + # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to + # override them. + propagatedBuildInputs = buildInputs; + # We want to substitute the contents of configureFlags, removing thus the + # usual --build and --host added on cross building. + preConfigure = '' + export configureFlags="--prefix=$out --without-icu" + ''; + buildPhase = '' + set -x + cat << EOF > user-config.jam + using gcc : cross : $crossConfig-g++ ; + EOF + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cc10a68968..bb9359fd25c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3331,11 +3331,13 @@ let boost147 = callPackage ../development/libraries/boost/1.47.nix { }; boost149 = callPackage ../development/libraries/boost/1.49.nix { }; boost151 = callPackage ../development/libraries/boost/1.51.nix { }; - boost = boost151; + boost152 = callPackage ../development/libraries/boost/1.52.nix { }; + boost = boost152; boostHeaders149 = callPackage ../development/libraries/boost/1.49-headers.nix { }; boostHeaders151 = callPackage ../development/libraries/boost/1.51-headers.nix { }; - boostHeaders = boostHeaders151; + boostHeaders152 = callPackage ../development/libraries/boost/1.52-headers.nix { }; + boostHeaders = boostHeaders152; botan = callPackage ../development/libraries/botan { }; From 11094a79607d37c08378f3b441b276a2ba93bf95 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 22:31:30 +0100 Subject: [PATCH 045/306] pinentry: update to version 0.8.2 --- pkgs/tools/security/pinentry/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 524a582fcb0..ba4ce8a3e22 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -6,11 +6,11 @@ assert useGtk || useNcurses || useQt4; stdenv.mkDerivation rec { - name = "pinentry-0.8.0"; + name = "pinentry-0.8.2"; src = fetchurl { - url = "mirror://gnupg/pinentry/${name}.tar.gz"; - sha256 = "06phs3gbs6gf0z9g28z3jgsw312dhhpdgzrx4hhps53xrbwpyv22"; + url = "mirror://gnupg/pinentry/${name}.tar.bz2"; + sha256 = "1c9r99ck8072y7nkirddg3p372xadl95y65hyc1m6wn5mavbg12h"; }; buildInputs = let opt = stdenv.lib.optional; in [] @@ -27,14 +27,13 @@ stdenv.mkDerivation rec { buildNativeInputs = [ pkgconfig ]; meta = { + homepage = "http://gnupg.org/aegypten2/"; description = "GnuPG's interface to passphrase input"; + license = "GPLv2+"; longDescription = '' Pinentry provides a console and a GTK+ GUI that allows users to enter a passphrase when `gpg' or `gpg2' is run and needs it. ''; - - homepage = http://gnupg.org/aegypten2/; - license = "GPLv2+"; }; } From bb3b603ea70926816fdd8a803bccdcec846ff30d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 6 Nov 2012 00:16:13 +0100 Subject: [PATCH 046/306] mips linux: Adding a patch to fix an ext3 bug in 3.5 and 3.6 I made it apply to all Mips, although the bug works only for n32 and o32 ABIs. We don't support any n64 by now. --- .../linux/kernel/mips-ext3-n32.patch | 17 +++++++++++++++++ pkgs/os-specific/linux/kernel/patches.nix | 5 +++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 24 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/mips-ext3-n32.patch diff --git a/pkgs/os-specific/linux/kernel/mips-ext3-n32.patch b/pkgs/os-specific/linux/kernel/mips-ext3-n32.patch new file mode 100644 index 00000000000..fcb6f9177c7 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/mips-ext3-n32.patch @@ -0,0 +1,17 @@ +Dirty patch that makes ext3 work again on 3.5 and 3.6 kernels, +on mips n32. + +http://www.linux-mips.org/archives/linux-mips/2012-11/msg00030.html + +diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c +index 92490e9..bf63d7b 100644 +--- a/fs/ext3/dir.c ++++ b/fs/ext3/dir.c +@@ -228,6 +228,7 @@ out: + + static inline int is_32bit_api(void) + { ++ return 1; + #ifdef CONFIG_COMPAT + return is_compat_task(); + #else diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 4fb7563c9a1..0699f09c505 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -262,6 +262,11 @@ rec { patch = ./mips-fpu-sigill.patch; }; + mips_ext3_n32 = + { name = "mips-ext3-n32"; + patch = ./mips-ext3-n32.patch; + }; + guruplug_defconfig = { # Default configuration for the GuruPlug. From # . diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb9359fd25c..49f0918faff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5871,6 +5871,7 @@ let ] ++ lib.optionals (platform.kernelArch == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 ]; }; @@ -5883,6 +5884,7 @@ let ] ++ lib.optionals (platform.kernelArch == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 ]; }; From 2658eccaea9163e8a1ad5f1977db549bc388605d Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 6 Nov 2012 11:23:34 +0100 Subject: [PATCH 047/306] zip: Add extra source URL --- pkgs/tools/archivers/zip/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index c7bddfd6de2..2e3f111aba4 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -6,7 +6,10 @@ stdenv.mkDerivation { name = "zip-3.0"; src = fetchurl { - url = ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz; + urls = [ + ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz + http://pkgs.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz + ]; sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"; }; From 43c9c791e03aaa4a481e17ec1c214b1f3c5b4114 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 6 Nov 2012 11:23:48 +0100 Subject: [PATCH 048/306] file: Add extra source URL --- pkgs/tools/misc/file/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 01a674fe227..38fb0b78cb1 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation { name = "file-5.04"; src = fetchurl { - url = ftp://ftp.astron.com/pub/file/file-5.04.tar.gz; + urls = [ + ftp://ftp.astron.com/pub/file/file-5.04.tar.gz + http://pkgs.fedoraproject.org/repo/pkgs/file/file-5.04.tar.gz/accade81ff1cc774904b47c72c8aeea0/file-5.04.tar.gz + ]; sha256 = "0316lj3jxmp2g8azv0iykmmwjsnjanq93bklccwb6k77jiwnx7jc"; }; From 3751271d25d655e7af5113141f95e8f6bcbd903f Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Tue, 6 Nov 2012 11:51:27 +0100 Subject: [PATCH 049/306] Update Haskell Platform 2012.4.0.0 Cabal file to final version. (Typos only.) --- .../haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal index 23af64e4489..23d1f7a0a7d 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal +++ b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal @@ -108,6 +108,6 @@ library -- hscolour ==1.19 -- ??? -- haddock ==2.11.0 -- need to use the one shipped with ghc --- N.B.: The begin/end comment annocations are used to build the source +-- N.B.: The begin/end comment annotations are used to build the source -- installer: Packages that are part of the core are checked at build time. -- Source of packages that are part of the platform are included in the tarball. From 629420841bffb675e93688028cdcf81a4841f897 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Nov 2012 11:44:37 +0100 Subject: [PATCH 050/306] haskell-OpenGL: add version 2.6.0.1 --- .../haskell/OpenGL/{2.6.0.0.nix => 2.6.0.1.nix} | 5 ++--- pkgs/top-level/haskell-packages.nix | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) rename pkgs/development/libraries/haskell/OpenGL/{2.6.0.0.nix => 2.6.0.1.nix} (82%) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.6.0.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix similarity index 82% rename from pkgs/development/libraries/haskell/OpenGL/2.6.0.0.nix rename to pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix index 6ea45f6d08c..318bdf19748 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.6.0.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix @@ -4,11 +4,10 @@ cabal.mkDerivation (self: { pname = "OpenGL"; - version = "2.6.0.0"; - sha256 = "0rbdx73gcjx4ksqdjishlnn1ibxj21cqg5pxphy8bsphlygzc76l"; + version = "2.6.0.1"; + sha256 = "1fpabhpjfl1bj0dhlj2sg8zsn3l6py4zw1arplwmqalz3xbkkgdi"; buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ]; extraLibraries = [ libX11 mesa ]; - noHaddock = true; meta = { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL graphics system"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 45308dc66e4..a2d57d4e4cc 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -130,7 +130,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HUnit = self.HUnit_1_2_5_1; # 7.6 ok mtl = self.mtl_2_1_2; # 7.6 ok network = self.network_2_4_0_1; # 7.6 ok - OpenGL = self.OpenGL_2_6_0_0; # 7.6 ok + OpenGL = self.OpenGL_2_6_0_1; # 7.6 ok parallel = self.parallel_3_2_0_3; # 7.6 ok parsec = self.parsec_3_1_3; # 7.6 ok QuickCheck = self.QuickCheck_2_5_1_1; # 7.6 ok @@ -828,7 +828,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {}; gloss = callPackage ../development/libraries/haskell/gloss { - OpenGL = self.OpenGL_2_6_0_0; + OpenGL = self.OpenGL_2_6_0_1; GLUT = self.GLUT_2_3_1_0; }; @@ -843,7 +843,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGL = self.OpenGL_2_4_0_2; }; GLUT_2_3_1_0 = callPackage ../development/libraries/haskell/GLUT/2.3.1.0.nix { - OpenGL = self.OpenGL_2_6_0_0; + OpenGL = self.OpenGL_2_6_0_1; }; GLUT = self.GLUT_2_3_1_0; @@ -1234,8 +1234,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {}; OpenGL_2_2_3_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.1.nix {}; OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {}; - OpenGL_2_6_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.0.nix {}; - OpenGL = self.OpenGL_2_6_0_0; + OpenGL_2_6_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.1.nix {}; + OpenGL = self.OpenGL_2_6_0_1; OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {}; From 713976591b25e85f978cc52024f177e0204b8621 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Nov 2012 13:30:44 +0100 Subject: [PATCH 051/306] haskell-conduit: update to version 0.5.3 --- pkgs/development/libraries/haskell/conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 6da1b8db34d..d6c7ccd2cce 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "0.5.2.7"; - sha256 = "14bn755f25cin0wv775na85ngfx8ack31s15982zkqfva88xg48i"; + version = "0.5.3"; + sha256 = "1gqxfvgdlv0sn145v232rcfddds1sgw9yazwi7hhqjdsgdyk3x5m"; buildDepends = [ liftedBase monadControl resourcet text transformers transformersBase void From 730b5c828ff977ac38347ec5fd3954148b126d67 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Nov 2012 13:30:44 +0100 Subject: [PATCH 052/306] haskell-hinotify: update to version 0.3.4 --- pkgs/development/libraries/haskell/hinotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hinotify/default.nix b/pkgs/development/libraries/haskell/hinotify/default.nix index 3767fe635f0..0d3392b4e59 100644 --- a/pkgs/development/libraries/haskell/hinotify/default.nix +++ b/pkgs/development/libraries/haskell/hinotify/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hinotify"; - version = "0.3.3"; - sha256 = "0z8pd5zva25zii5kkh807kdkn4j9w9z74f2dw4kyflwidn0063fr"; + version = "0.3.4"; + sha256 = "05iqy4llf42k20a4hdc7p3hx30v030ljwi469ps8xxx36c9c5kmf"; meta = { homepage = "https://github.com/kolmodin/hinotify.git"; description = "Haskell binding to inotify"; From b759abeb39586d1584249857c47795fae017e5eb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Nov 2012 13:30:44 +0100 Subject: [PATCH 053/306] haskell-lrucache: update to version 1.1.1.2 --- pkgs/development/libraries/haskell/lrucache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lrucache/default.nix b/pkgs/development/libraries/haskell/lrucache/default.nix index 2a93ee4af33..337603258aa 100644 --- a/pkgs/development/libraries/haskell/lrucache/default.nix +++ b/pkgs/development/libraries/haskell/lrucache/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "lrucache"; - version = "1.1.1.1"; - sha256 = "0w310wsvin5hw3awpicnzddyifcq0844h52jwjcqnin81l2lqrfw"; + version = "1.1.1.2"; + sha256 = "1s4yrjfmndsrxbfrn8xcxyif65nsdx4b34ki3ajznrsvsl1cc137"; meta = { homepage = "http://github.com/chowells79/lrucache"; description = "a simple, pure LRU cache"; From 47945f80b8d252e843e9123017e3ab3b4afd053f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Nov 2012 13:30:44 +0100 Subject: [PATCH 054/306] haskell-resourcet: update to version 0.4.1 --- pkgs/development/libraries/haskell/resourcet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index 95e051a3eec..fe62434d99b 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "0.4.0.2"; - sha256 = "0w4hm29dig6m4jm6y9zmyfnhwii7b88hqjqlvl6xmk5zxp1q7hc2"; + version = "0.4.1"; + sha256 = "1s9j9nrqnq2qrc3c10cjqxrxajh9qayqzh8j73zwpy5kqkma80sp"; buildDepends = [ liftedBase monadControl mtl transformers transformersBase ]; From 7d11823819d19e17696d3ea4c7e219886e6fa9d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Nov 2012 13:30:44 +0100 Subject: [PATCH 055/306] haskell-semigroupoids: update to version 3.0.0.1 --- pkgs/development/libraries/haskell/semigroupoids/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix index 4ffc3c2badc..c2e8deefbad 100644 --- a/pkgs/development/libraries/haskell/semigroupoids/default.nix +++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "semigroupoids"; - version = "3.0"; - sha256 = "0wsax14ck363nby0xrhcpvdzf0pzspayl7gsm0br0lr6ipmpcrag"; + version = "3.0.0.1"; + sha256 = "0ilqmpywiwp9m1k8lrw0mxb0pzc9l8bs2hgzrp8k5iln1yq1fh6i"; buildDepends = [ comonad contravariant semigroups transformers ]; meta = { homepage = "http://github.com/ekmett/semigroupoids"; From 0ae5d8fd0541b974e63600b7e3a4181354837caa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Nov 2012 13:38:34 +0100 Subject: [PATCH 056/306] haskell: drop noHaddock from some packages which build fine in their respective latest version --- pkgs/development/libraries/haskell/filestore/default.nix | 1 - pkgs/development/libraries/haskell/ghc-events/default.nix | 1 - pkgs/development/libraries/haskell/srcloc/default.nix | 1 - pkgs/development/tools/haskell/BNFC-meta/default.nix | 1 - pkgs/development/tools/haskell/alex-meta/default.nix | 1 - 5 files changed, 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index 887d06e2b07..f56db649fc7 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -11,7 +11,6 @@ cabal.mkDerivation (self: { buildDepends = [ Diff filepath HUnit mtl parsec split time utf8String xml ]; - noHaddock = true; meta = { description = "Interface for versioning file stores"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix index 4cba5ed74e9..7eb49668e3c 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -7,7 +7,6 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ binary mtl ]; - noHaddock = true; meta = { description = "Library and tool for parsing .eventlog files from GHC"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix index aa2331cfac3..c867a353cd6 100644 --- a/pkgs/development/libraries/haskell/srcloc/default.nix +++ b/pkgs/development/libraries/haskell/srcloc/default.nix @@ -5,7 +5,6 @@ cabal.mkDerivation (self: { version = "0.3.0"; sha256 = "1ymk8k0r9ckk7dalz3virvvpyrf4nw8xvb23cs6ibdjjbzsphpiz"; buildDepends = [ syb ]; - noHaddock = true; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "Data types for managing source code locations"; diff --git a/pkgs/development/tools/haskell/BNFC-meta/default.nix b/pkgs/development/tools/haskell/BNFC-meta/default.nix index e18a63cd86c..d39544342b3 100644 --- a/pkgs/development/tools/haskell/BNFC-meta/default.nix +++ b/pkgs/development/tools/haskell/BNFC-meta/default.nix @@ -5,7 +5,6 @@ cabal.mkDerivation (self: { version = "0.4.0.1"; sha256 = "0x31a25njbgd3r8shh7rrqa9qq66iqjhh82k538p9bd2hblg30ka"; buildDepends = [ alexMeta happyMeta haskellSrcMeta syb ]; - noHaddock = true; meta = { description = "Deriving Parsers and Quasi-Quoters from BNF Grammars"; license = self.stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/tools/haskell/alex-meta/default.nix b/pkgs/development/tools/haskell/alex-meta/default.nix index e28b37aafc6..5bb298e739a 100644 --- a/pkgs/development/tools/haskell/alex-meta/default.nix +++ b/pkgs/development/tools/haskell/alex-meta/default.nix @@ -5,7 +5,6 @@ cabal.mkDerivation (self: { version = "0.3.0.5"; sha256 = "0f41q5l6z1dcpfx8rxacv4f544zcw7pgvq935mnzzha9fvsxqzk4"; buildDepends = [ haskellSrcMeta QuickCheck ]; - noHaddock = true; meta = { description = "Quasi-quoter for Alex lexers"; license = self.stdenv.lib.licenses.bsd3; From ce2e93a236bfb50a8faba375129e86ef70a5272f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Nov 2012 18:07:38 +0100 Subject: [PATCH 057/306] Update default Haskell environment to Haskell Platform 2012.4.0.0. The most significant change brought by this update is that we now use GHC version 7.4.2 by default. --- pkgs/top-level/all-packages.nix | 15 +++++++-------- pkgs/top-level/haskell-defaults.nix | 11 +---------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49f0918faff..974eb3da9b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2319,9 +2319,9 @@ let # particularly in connection with Hydra builds for all these packages. # So we enable it for selected versions only. - # Current default version: 7.4.1. - haskellPackages = haskellPackages_ghc741; - # Current Haskell platform. + # Current default version: 7.4.2. + haskellPackages = haskellPackages_ghc742; + # Current Haskell Platform: 2012.4.0.0 haskellPlatform = haskellPackages.haskellPlatform; haskellPackages_ghc6104 = recurseIntoAttrs (haskell.packages_ghc6104); @@ -2338,11 +2338,10 @@ let # The following three lines achieve that: the first two make Hydra build explicit # profiling and non-profiling versions; the final respects the user-configured # default setting. - haskellPackages_ghc741_no_profiling = recurseIntoAttrs (haskell.packages_ghc741.noProfiling); - haskellPackages_ghc741_profiling = recurseIntoAttrs (haskell.packages_ghc741.profiling); - haskellPackages_ghc741 = recurseIntoAttrs (haskell.packages_ghc741.highPrio); - haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742); - haskellPackages_ghc742_pedantic = haskell.packages_ghc742_pedantic; + haskellPackages_ghc741 = recurseIntoAttrs (haskell.packages_ghc741); + haskellPackages_ghc742_no_profiling = recurseIntoAttrs (haskell.packages_ghc741.noProfiling); + haskellPackages_ghc742_profiling = recurseIntoAttrs (haskell.packages_ghc741.profiling); + haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742.highPrio); haskellPackages_ghc761 = recurseIntoAttrs (haskell.packages_ghc761); # Reasonably current HEAD snapshot. haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index b4489fe72e5..aa43203fe53 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -22,18 +22,12 @@ extensibleExceptions = self.extensibleExceptions_0_1_1_4; }; - ghc742Prefs_pedantic = + ghc742Prefs = self : self.haskellPlatformArgs_2012_4_0_0 self // { haskellPlatform = self.haskellPlatform_2012_4_0_0; binary = null; # now a core package }; - # until the Haskell Platform for 7.4.2 is released, this works fine/better; - # mainly because the Haskell Platform 2012.4.0.0 release candidate mandates - # vector 0.10 and primitive 0.5, which at this time aren't supported widely - # by other packages - ghc742Prefs = ghc741Prefs; - ghc741Prefs = self : self.haskellPlatformArgs_2012_2_0_0 self // { haskellPlatform = self.haskellPlatform_2012_2_0_0; @@ -273,9 +267,6 @@ prefFun = ghc742Prefs; }; - packages_ghc742_pedantic = - packages_ghc742.override { prefFun = ghc742Prefs_pedantic; }; - packages_ghc761 = packages { ghcPath = ../development/compilers/ghc/7.6.1.nix; ghcBinary = ghc704Binary; From 6b40f836c78298a1c0e4932b05e286a1a55fe864 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Nov 2012 18:22:26 +0100 Subject: [PATCH 058/306] Fix Agda build. Agda won't build with recent versions of QuickCheck --- pkgs/top-level/haskell-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a2d57d4e4cc..2de6a2b573f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -429,6 +429,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Agda = callPackage ../development/libraries/haskell/Agda { haskellSrcExts = self.haskellSrcExts_1_11_1; + QuickCheck = self.QuickCheck_2_4_2; }; accelerate = callPackage ../development/libraries/haskell/accelerate {}; From f20b21ad1e0f3b164942d5d2de4a870b05fd08e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Nov 2012 18:22:46 +0100 Subject: [PATCH 059/306] Fix haskell-testpack build. Testpack won't build with recent versions of QuickCheck --- pkgs/top-level/haskell-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2de6a2b573f..663039b64ff 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1571,7 +1571,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); testFrameworkThPrime = callPackage ../development/libraries/haskell/test-framework-th-prime {}; - testpack = callPackage ../development/libraries/haskell/testpack {}; + testpack = callPackage ../development/libraries/haskell/testpack { + QuickCheck = self.QuickCheck_2_4_2; + }; texmath = callPackage ../development/libraries/haskell/texmath {}; From 4ab06e5c24de4c0cabbdc9dfc11f81eae912f94f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Nov 2012 18:31:54 +0100 Subject: [PATCH 060/306] Fix git-annex build. git-annex depends on 'testpack', which doesn't compile with Haskell Platform 2012.4.0.0. The testpack library appears to be unmaintained, so there is probably no quick solution for this issue. For the time being, we compile git-annex with GHC 7.4.1. --- .../version-management/git-and-tools/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index e12d4157ec2..98468e32bac 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -44,12 +44,11 @@ rec { gitAnnex = lib.makeOverridable (import ./git-annex) { inherit stdenv fetchurl perl coreutils git libuuid rsync findutils curl ikiwiki which openssh; - inherit (haskellPackages) ghc bloomfilter dataenc editDistance hinotify hS3 hslogger HTTP + inherit (haskellPackages_ghc741) ghc bloomfilter dataenc editDistance hinotify hS3 hslogger HTTP blazeBuilder blazeHtml caseInsensitive IfElse json liftedBase MissingH monadControl mtl - network pcreLight QuickCheck SHA stm utf8String networkInfo dbus - clientsession cryptoApi dataDefault extensibleExceptions filepath hamlet - httpTypes networkMulticast text time transformers transformersBase wai - waiLogger warp yesod yesodDefault yesodStatic testpack; + 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; }; qgit = import ./qgit { From 67bde8453f1ac559f289dc6b1ff6250082572415 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Nov 2012 22:35:51 +0400 Subject: [PATCH 061/306] Update Julia and compensat for their specification of /bin/bash as SHELL --- pkgs/development/compilers/julia/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index a01aa3aded4..4fd31d573ce 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -7,7 +7,7 @@ let in stdenv.mkDerivation rec { pname = "julia"; - date = "20120922"; + date = "20121106"; name = "${pname}-git-${date}"; grisu_ver = "1.1.1"; @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; - rev = "e1ba1ebf09da42a5bd7f4ed18f1595ae06032b4c"; - sha256 = "187e67a7c6bf44469e0e0dda41072ac8f3a40380ea9364ed07a4cadc08965663"; + rev = "8f4d073881beb42c9f272b9327efa0a5715bd31c"; + sha256 = "2df2ba800bd4fd9b0297a0b8cff53174a7c05ffbc889a7df5830a014fed8c433"; }; buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib @@ -92,14 +92,14 @@ stdenv.mkDerivation rec { sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile - export makeFlags="$makeFlags PREFIX=$out" + export makeFlags="$makeFlags PREFIX=$out SHELL=${stdenv.shell}" export dontPatchELF=1 ''; preBuild = '' - make -C test/unicode all - make -C extras glpk_h.jl GLPK_PREFIX="$GLPK_PREFIX" + make -C test/unicode all SHELL="${stdenv.shell}" + make -C extras glpk_h.jl GLPK_PREFIX="$GLPK_PREFIX" SHELL="${stdenv.shell}" ''; postInstall = '' From 577995f592130ec458b2e70963db40ae9f5ba84d Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 7 Nov 2012 00:53:19 +0100 Subject: [PATCH 062/306] updating: flake8, alot, turses --- pkgs/top-level/python-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ed352306c20..05a530c35ab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -61,13 +61,13 @@ let pythonPackages = python.modules // rec { alot = buildPythonPackage rec { - rev = "27c91058c49d8755d2813d5b78094f40f36ec905"; + rev = "5ed59825ffaeaacea90ea10be4b932c60428ed8e"; name = "alot-0.3.3_${rev}"; src = fetchurl { url = "https://github.com/pazz/alot/tarball/${rev}"; name = "${name}.tar.bz"; - sha256 = "67e1033aa91818b7fa4c3911430a4da0f73aca92c3e3832c010038cbf263eec2"; + sha256 = "1b724d47bf766ba3ca7cb6d27c7bb597dbc67dcae1347c5a0f01f80c2246ca07"; }; doCheck = false; @@ -705,11 +705,11 @@ let pythonPackages = python.modules // rec { flake8 = buildPythonPackage (rec { - name = "flake8-1.4"; + name = "flake8-1.5"; src = fetchurl { url = "http://pypi.python.org/packages/source/f/flake8/${name}.tar.gz"; - md5 = "64acc2c905178f6d6817d88574407fb5"; + md5 = "525be5c7fcaf85f6819c77752cb2ee72"; }; doCheck = false; @@ -1458,7 +1458,7 @@ let pythonPackages = python.modules // rec { sha256 = "82a38f674da1fa496c0fc4df714cbb058540bed72a30c50a2e344b0d984c4d21"; }; - propagatedBuildInputs = [ httplib2 ]; + propagatedBuildInputs = [ httplib2 ]; doCheck = false; meta = { @@ -2774,7 +2774,7 @@ let pythonPackages = python.modules // rec { }; turses = buildPythonPackage (rec { - name = "turses-0.2.5"; + name = "turses-0.2.8"; src = fetchurl { url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz"; From 8c4f5d02aa0967d70237dfdd2a12c9e37da4d3fd Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Wed, 7 Nov 2012 14:43:39 +0100 Subject: [PATCH 063/306] Updating ghc HEAD snapshot. --- pkgs/development/compilers/ghc/head.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 5487b00cef2..67f2b4f5c7e 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { - version = "7.7.20120912"; + version = "7.7.20121106"; name = "ghc-${version}"; src = fetchurl { url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2"; - sha256 = "0dilndcfs1nhs48nhi361bpffmbbyjaq1i6qnzn24vg34wckyrjg"; + sha256 = "1n3xj8arkzfvs3q1ymxsnbzs23ndsp8pl67sqirl837pkgcmq263"; }; buildInputs = [ ghc perl gmp ncurses ]; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { buildMK = '' libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" + DYNAMIC_BY_DEFAULT = NO ''; preConfigure = '' From 7afafe0b6dd019851ae0919e11fcee9d035e5698 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 7 Nov 2012 16:03:37 +0100 Subject: [PATCH 064/306] dmenu: Add option config.dmenu.enableXft for enabling xft font support (turned off by default). --- pkgs/applications/misc/dmenu/default.nix | 13 +++++++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index eae0b0ff233..048514ad4aa 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, libX11, libXinerama}: +{stdenv, fetchurl, libX11, libXinerama, enableXft, libXft, zlib}: + +with stdenv.lib; stdenv.mkDerivation rec { name = "dmenu-4.5"; @@ -8,7 +10,14 @@ stdenv.mkDerivation rec { sha256 = "0l58jpxrr80fmyw5pgw5alm5qry49aw6y049745wl991v2cdcb08"; }; - buildInputs = [ libX11 libXinerama ]; + xftPatch = fetchurl { + url = "http://tools.suckless.org/dmenu/patches/${name}-xft.diff"; + sha256 = "efb4095d65e5e86f9dde97294732174409c24f319bdd4824cc22fa1404972b4f"; + }; + + buildInputs = [ libX11 libXinerama ] ++ optionals enableXft [zlib libXft]; + + patches = optional enableXft xftPatch; preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 974eb3da9b6..8ac83442fdb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6700,7 +6700,9 @@ let djview = callPackage ../applications/graphics/djview { }; djview4 = pkgs.djview; - dmenu = callPackage ../applications/misc/dmenu { }; + dmenu = callPackage ../applications/misc/dmenu { + enableXft = config.dmenu.enableXft or false; + }; dmtx = builderDefsPackage (import ../tools/graphics/dmtx) { inherit libpng libtiff libjpeg imagemagick librsvg From 3afa95bfbae56f914b40527500b2b010ba9c3b90 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 7 Nov 2012 21:10:39 +0100 Subject: [PATCH 065/306] Added androidenv - the Android SDK, their additions and two functions that build and emulate Android Apps --- pkgs/development/androidenv/addon.xml | 893 +++++++++++++++++ pkgs/development/androidenv/addons.nix | 186 ++++ pkgs/development/androidenv/androidsdk.nix | 153 +++ pkgs/development/androidenv/build-app.nix | 41 + pkgs/development/androidenv/default.nix | 57 ++ pkgs/development/androidenv/emulate-app.nix | 87 ++ .../examples/deployment/default.nix | 13 + .../deployment/emulate-myfirstapp/default.nix | 10 + .../deployment/myfirstapp/default.nix | 13 + .../androidenv/examples/deployment/result | 1 + .../examples/src/myfirstapp/.classpath | 8 + .../examples/src/myfirstapp/.project | 33 + .../.settings/org.eclipse.jdt.core.prefs | 4 + .../src/myfirstapp/AndroidManifest.xml | 32 + .../examples/src/myfirstapp/README.txt | 6 + .../examples/src/myfirstapp/ant.properties | 17 + .../examples/src/myfirstapp/build.xml | 92 ++ .../src/myfirstapp/ic_launcher-web.png | Bin 0 -> 37099 bytes .../src/myfirstapp/proguard-project.txt | 20 + .../src/myfirstapp/project.properties | 14 + .../res/drawable-hdpi/ic_action_search.png | Bin 0 -> 3120 bytes .../res/drawable-hdpi/ic_launcher.png | Bin 0 -> 3014 bytes .../res/drawable-ldpi/ic_launcher.png | Bin 0 -> 1504 bytes .../res/drawable-mdpi/ic_action_search.png | Bin 0 -> 3030 bytes .../res/drawable-mdpi/ic_launcher.png | Bin 0 -> 1969 bytes .../res/drawable-xhdpi/ic_action_search.png | Bin 0 -> 3199 bytes .../res/drawable-xhdpi/ic_launcher.png | Bin 0 -> 4006 bytes .../res/layout/activity_display_message.xml | 14 + .../myfirstapp/res/layout/activity_main.xml | 19 + .../res/menu/activity_display_message.xml | 6 + .../src/myfirstapp/res/menu/activity_main.xml | 6 + .../src/myfirstapp/res/values-v11/styles.xml | 5 + .../src/myfirstapp/res/values-v14/styles.xml | 5 + .../src/myfirstapp/res/values/strings.xml | 11 + .../src/myfirstapp/res/values/styles.xml | 5 + .../my/first/app/DisplayMessageActivity.java | 26 + .../example/my/first/app/MainActivity.java | 35 + .../development/androidenv/generate-addons.sh | 3 + .../androidenv/generate-addons.xsl | 38 + .../androidenv/generate-platforms.sh | 4 + .../androidenv/generate-platforms.xsl | 38 + .../androidenv/generate-sysimages.sh | 3 + .../androidenv/generate-sysimages.xsl | 36 + .../development/androidenv/platform-tools.nix | 41 + .../androidenv/platforms-linux.nix | 198 ++++ .../androidenv/platforms-macosx.nix | 198 ++++ pkgs/development/androidenv/repository-7.xml | 928 ++++++++++++++++++ pkgs/development/androidenv/support.nix | 17 + pkgs/development/androidenv/sysimages.nix | 42 + pkgs/top-level/all-packages.nix | 5 + 50 files changed, 3363 insertions(+) create mode 100644 pkgs/development/androidenv/addon.xml create mode 100644 pkgs/development/androidenv/addons.nix create mode 100644 pkgs/development/androidenv/androidsdk.nix create mode 100644 pkgs/development/androidenv/build-app.nix create mode 100644 pkgs/development/androidenv/default.nix create mode 100644 pkgs/development/androidenv/emulate-app.nix create mode 100644 pkgs/development/androidenv/examples/deployment/default.nix create mode 100644 pkgs/development/androidenv/examples/deployment/emulate-myfirstapp/default.nix create mode 100644 pkgs/development/androidenv/examples/deployment/myfirstapp/default.nix create mode 120000 pkgs/development/androidenv/examples/deployment/result create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/.classpath create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/.project create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/.settings/org.eclipse.jdt.core.prefs create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/AndroidManifest.xml create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/README.txt create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/ant.properties create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/build.xml create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/ic_launcher-web.png create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/proguard-project.txt create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/project.properties create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-hdpi/ic_action_search.png create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-hdpi/ic_launcher.png create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-ldpi/ic_launcher.png create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-mdpi/ic_action_search.png create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-mdpi/ic_launcher.png create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-xhdpi/ic_action_search.png create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-xhdpi/ic_launcher.png create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/layout/activity_display_message.xml create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/layout/activity_main.xml create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/menu/activity_display_message.xml create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/menu/activity_main.xml create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/values-v11/styles.xml create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/values-v14/styles.xml create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/values/strings.xml create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/values/styles.xml create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/src/com/example/my/first/app/DisplayMessageActivity.java create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/src/com/example/my/first/app/MainActivity.java create mode 100755 pkgs/development/androidenv/generate-addons.sh create mode 100644 pkgs/development/androidenv/generate-addons.xsl create mode 100755 pkgs/development/androidenv/generate-platforms.sh create mode 100644 pkgs/development/androidenv/generate-platforms.xsl create mode 100755 pkgs/development/androidenv/generate-sysimages.sh create mode 100644 pkgs/development/androidenv/generate-sysimages.xsl create mode 100644 pkgs/development/androidenv/platform-tools.nix create mode 100644 pkgs/development/androidenv/platforms-linux.nix create mode 100644 pkgs/development/androidenv/platforms-macosx.nix create mode 100644 pkgs/development/androidenv/repository-7.xml create mode 100644 pkgs/development/androidenv/support.nix create mode 100644 pkgs/development/androidenv/sysimages.nix diff --git a/pkgs/development/androidenv/addon.xml b/pkgs/development/androidenv/addon.xml new file mode 100644 index 00000000000..7b0f69128a6 --- /dev/null +++ b/pkgs/development/androidenv/addon.xml @@ -0,0 +1,893 @@ + + + + + This is the Android Software Development Kit License Agreement. + +1. Introduction + +1.1 The Android Software Development Kit (referred to in this License Agreement as the "SDK" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK. + +1.2 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. + +2. Accepting this License Agreement + +2.1 In order to use the SDK, you must first agree to this License Agreement. You may not use the SDK if you do not accept this License Agreement. + +2.2 You can accept this License Agreement by: + +(A) clicking to accept or agree to this License Agreement, where this option is made available to you; or + +(B) by actually using the SDK. In this case, you agree that use of the SDK constitutes acceptance of the Licensing Agreement from that point onwards. + +2.3 You may not use the SDK and may not accept the Licensing Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries including the country in which you are resident or from which you use the SDK. + +2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the Licensing Agreement or use the SDK on behalf of your employer or other entity. + +3. SDK License from Google + +3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non- assignable and non-exclusive license to use the SDK solely to develop applications to run on the Android platform. + +3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you. + +3.3 Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK. Except to the extent required by applicable third party licenses, you may not load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK. + +3.4 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement. + +3.5 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you. + +3.6 Nothing in this License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. + +3.7 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK. + +4. Use of the SDK by You + +4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications. + +4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). + +4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, your must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so. + +4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier. + +4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through the Android platform and/or applications for the Android platform, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. + +4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach. + +5. Your Developer Credentials + +5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials. + +6. Privacy and Information + +6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected. + +6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy. + +7. Third Party Applications for the Android Platform + +7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources. + +7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners. + +7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties. + +8. Using Android APIs + +8.1 Google Data APIs + +8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. + +8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. + +9. Terminating this License Agreement + +9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below. + +9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials. + +9.3 Google may at any time, terminate this License Agreement with you if: + +(A) you have breached any provision of this License Agreement; or + +(B) Google is required to do so by law; or + +(C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or + +(D) Google decides to no longer providing the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable. + +9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely. + +10. DISCLAIMER OF WARRANTIES + +10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE. + +10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. + +10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. + +11. LIMITATION OF LIABILITY + +11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. + +12. Indemnification + +12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement. + +13. Changes to the License Agreement + +13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available. + +14. General Legal Terms + +14.1 This License Agreement constitute the whole legal agreement between you and Google and govern your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replace any prior agreements between you and Google in relation to the SDK. + +14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google. + +14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable. + +14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement. + +14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE. + +14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party. + +14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. + +April 10, 2009 + + + Terms and Conditions + +This is the Google TV Add-on for the Android Software Development Kit License Agreement. + +1. Introduction + +1.1 The Google TV Add-on for the Android Software Development Kit (referred to in this License Agreement as the "Google TV Add-on" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the Google TV Add-on. + +1.2 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. + +2. Accepting this License Agreement + +2.1 In order to use the Google TV Add-on, you must first agree to this License Agreement. You may not use the Google TV Add-on if you do not accept this License Agreement. + +2.2 You can accept this License Agreement by: + +(A) clicking to accept or agree to this License Agreement, where this option is made available to you; or + +(B) by actually using the Google TV Add-on. In this case, you agree that use of the Google TV Add-on constitutes acceptance of the License Agreement from that point onwards. + +2.3 You may not use the Google TV Add-on and may not accept the Licensing Agreement if you are a person barred from receiving the Google TV Add-on under the laws of the United States or other countries including the country in which you are resident or from which you use the Google TV Add-on. + +2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the Licensing Agreement or use the Google TV Add-on on behalf of your employer or other entity. + +3. Google TV Add-on License from Google + +3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non- assignable and non-exclusive license to use the Google TV Add-on solely to develop applications to run on the Google TV platform. + +3.2 You agree that Google or third parties own all legal right, title and interest in and to the Google TV Add-on, including any Intellectual Property Rights that subsist in the Google TV Add-on. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you. + +3.3 Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Google TV Add-on or any part of the Google TV Add-on. Except to the extent required by applicable third party licenses, you may not load any part of the Google TV Add-on onto a mobile handset, television, or any other hardware device except a personal computer, combine any part of the Google TV Add-on with other software, or distribute any software or device incorporating a part of the Google TV Add-on. + +3.4 Use, reproduction and distribution of components of the Google TV Add-on licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement. + +3.5 You agree that the form and nature of the Google TV Add-on that Google provides may change without prior notice to you and that future versions of the Google TV Add-on may be incompatible with applications developed on previous versions of the Google TV Add-on. You agree that Google may stop (permanently or temporarily) providing the Google TV Add-on (or any features within the Google TV Add-on) to you or to users generally at Google's sole discretion, without prior notice to you. + +3.6 Nothing in this License Agreement gives you a right to use any of Google's or it’s licensors’ trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. + +3.7 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Google TV Add-on. + +4. Use of the Google TV Add-on by You + +4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the Google TV Add-on, including any intellectual property rights that subsist in those applications. + +4.2 You agree to use the Google TV Add-on and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). + +4.3 You agree that if you use the Google TV Add-on to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, your must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you explicit permission to do so. + +4.4 You agree that you will not engage in any activity with the Google TV Add-on, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google, Multichannel Video Program Distributors or any mobile communications carrier. + +4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through the Google TV platform and/or applications for the Google TV platform, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. + +4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach. + +5. Your Developer Credentials + +5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials. + +6. Privacy and Information + +6.1 In order to continually innovate and improve the Google TV Add-on, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Google TV Add-on are being used and how they are being used. Before any of this information is collected, the Google TV Add-on will notify you and seek your consent. If you withhold consent, the information will not be collected. + +6.2 The data collected is examined in the aggregate to improve the Google TV Add-on and is maintained in accordance with Google's Privacy Policy. + +7. Third Party Applications for the Google TV Platform + +7.1 If you use the Google TV Add-on to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources. + +7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners. + +7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties. + +8. Using Google TV APIs + +8.1 If you use any Google TV API to retrieve data from Google, you acknowledge that the data (“Google TV API Content”) may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. Some portions of the Google TV API Content are licensed to Google by third parties, including but not limited to Tribune Media Services + +8.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. + +8.3 Except as explicitly permitted in Section 3 (Google TV Add-on License from Google), you must: + +(a) not modify nor format the Google TV API Content except to the extent reasonably and technically necessary to optimize the display such Google TV API Content in your application; + +(b) not edit the Google TV API Content in a manner that renders the Google TV API Content inaccurate of alters its inherent meaning (provided that displaying excerpts will not violate the foregoing); or + +(c) not create any commercial audience measurement tool or service using the Google TV API Content + +9. Terminating this License Agreement + +9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below. + +9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the Google TV Add-on and any relevant developer credentials. + +9.3 Google may at any time, terminate this License Agreement with you if: + +(A) you have breached any provision of this License Agreement; or + +(B) Google is required to do so by law; or + +(C) the partner with whom Google offered certain parts of Google TV Add-on (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the Google TV Add-on to you; or + +(D) Google decides to no longer providing the Google TV Add-on or certain parts of the Google TV Add-on to users in the country in which you are resident or from which you use the service, or the provision of the Google TV Add-on or certain Google TV Add-on services to you by Google is, in Google's sole discretion, no longer commercially viable. + +9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely. + +10. DISCLAIMER OF WARRANTIES + +10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE GOOGLE TV ADD-ON IS AT YOUR SOLE RISK AND THAT THE GOOGLE TV ADD-ON IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE. + +10.2 YOUR USE OF THE GOOGLE TV ADD-ON AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE GOOGLE TV ADD-ON IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. + +10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. + +11. LIMITATION OF LIABILITY + +11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. + +12. Indemnification + +12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the Google TV Add-on, (b) any application you develop on the Google TV Add-on that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement. + +13. Changes to the License Agreement + +13.1 Google may make changes to the License Agreement as it distributes new versions of the Google TV Add-on. + +14. General Legal Terms + +14.1 This License Agreement constitute the whole legal agreement between you and Google and govern your use of the Google TV Add-on (excluding any services which Google may provide to you under a separate written agreement), and completely replace any prior agreements between you and Google in relation to the Google TV Add-on. + +14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google. + +14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable. + +14.4 You acknowledge and agree that Google’s API data licensors and each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement. + +14.5 EXPORT RESTRICTIONS. THE GOOGLE TV ADD-ON IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE GOOGLE TV ADD-ON. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE. + +14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party. + +14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. + + +August 15, 2011 + + + + + + google + Google Inc. + google_apis + Google APIs + 3 + 03 + Android + Google APIs + http://developer.android.com/ + + + + 34908058 + 1f92abf3a76be66ae8032257fc7620acbd2b2e3a + google_apis-3-r03.zip + + + + + com.google.android.maps + API for Google Maps. + + + + + + + + google + Google Inc. + google_apis + Google APIs + 4 + 2 + Android + Google APIs, revision 2 + http://developer.android.com/ + + + + 42435735 + 9b6e86d8568558de4d606a7debc4f6049608dbd0 + google_apis-4_r02.zip + + + + + com.google.android.maps + API for Google Maps. + + + + + + + + google + Google Inc. + google_apis + Google APIs + 5 + 01 + Android + Google APIs, revision 1 + http://developer.android.com/ + + + + + 49123776 + 46eaeb56b645ee7ffa24ede8fa17f3df70db0503 + google_apis-5_r01.zip + + + + + com.google.android.maps + API for Google Maps. + + + + + + + + google + Google Inc. + google_apis + Google APIs + 6 + 1 + Android + Google APIs, revision 1 + http://developer.android.com/ + + + + + 53382941 + 5ff545d96e031e09580a6cf55713015c7d4936b2 + google_apis-6_r01.zip + + + + + com.google.android.maps + API for Google Maps. + + + + + + + + google + Google Inc. + google_apis + Google APIs + 7 + 1 + Android + Google APIs, revision 1 + http://developer.android.com/ + + + + 53691339 + 2e7f91e0fe34fef7f58aeced973c6ae52361b5ac + google_apis-7_r01.zip + + + + + com.google.android.maps + API for Google Maps. + + + + + + + + google + Google Inc. + google_apis + Google APIs + 8 + 2 + Android + Google APIs, API 8, revision 2 + http://developer.android.com/ + + + + 59505020 + 3079958e7ec87222cac1e6b27bc471b27bf2c352 + google_apis-8_r02.zip + + + + + com.google.android.maps + API for Google Maps. + + + + + + + + google + Google Inc. + google_apis + Google APIs + 9 + 2 + Android + Google APIs, API 9, revision 2 + http://developer.android.com/ + + + + 63401546 + 78664645a1e9accea4430814f8694291a7f1ea5d + google_apis-9_r02.zip + + + + + com.google.android.maps + API for Google Maps. + + + + + + + + + google + Google Inc. + google_apis + Google APIs + 10 + 2 + Android + Google APIs, API 10, revision 2 + http://developer.android.com/ + + + + 65781578 + cc0711857c881fa7534f90cf8cc09b8fe985484d + google_apis-10_r02.zip + + + + + com.google.android.maps + API for Google Maps. + + + + + + + + google + Google Inc. + google_apis + Google APIs + 11 + 1 + Android + Google APIs, API 11, revision 1 + http://developer.android.com/ + + + + 83477179 + 5eab5e81addee9f3576d456d205208314b5146a5 + google_apis-11_r01.zip + + + + + com.google.android.maps + API for Google Maps. + + + + + + + + google + Google Inc. + google_apis + Google APIs + 12 + 1 + Android + Google APIs, API 12, revision 1 + http://developer.android.com/ + + + + 86099835 + e9999f4fa978812174dfeceec0721c793a636e5d + google_apis-12_r01.zip + + + + + com.google.android.maps + API for Google Maps. + + + + + + + + google + Google Inc. + google_apis + Google APIs + 13 + 1 + Android + Google APIs, API 13, revision 1 + http://developer.android.com/ + + + + 88615525 + 3b153edd211c27dc736c893c658418a4f9041417 + google_apis-13_r01.zip + + + + + com.google.android.maps + API for Google Maps. + + + + + + + google + Google Inc. + google_apis + Google APIs + Android + Google APIs + 14 + 2 + + + + com.google.android.maps + + + com.android.future.usb.accessory + + + + + 106533714 + f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39 + google_apis-14_r02.zip + + + + + + + google + Google Inc. + google_apis + Google APIs + Android + Google APIs + 15 + 2 + + + com.google.android.maps + + + com.android.future.usb.accessory + + + com.google.android.media.effects + + + + + 106612472 + 6757c12788da0ea00c2ab58e54cb438b9f2bcf66 + google_apis-15_r02.zip + + + + + + + + google + Google Inc. + google_apis + Google APIs + Android + Google APIs + 16 + 3 + + + com.google.android.maps + + + com.android.future.usb.accessory + + + com.google.android.media.effects + + + + + 127278413 + 63467dd32f471e3e81e33e9772c22f33235aa3b3 + google_apis-16_r03.zip + + + + + + + + + google + Google Inc. + google_tv_addon + Google TV Addon + 12 + 2 + Android + Google TV, API 12, preview release + http://developer.android.com/ + + + + 78266751 + 92128a12e7e8b0fb5bac59153d7779b717e7b840 + google_tv-12_r02.zip + + + + + + + + + + 10 + Android + android + Android Support Library + support + compatibility + + + 1161015 + 7c62e542d46ac3bdb89e1b90503d6afae557cf7d + support_r10.zip + + + + + + + + google + Google Inc. + Google Play Licensing Library + play_licensing + market_licensing + 2 + Google Play Licensing client library + http://developer.android.com/guide/publishing/licensing.html + + + 75109 + 355e8dc304a92a5616db235af8ee7bd554356254 + market_licensing-r02.zip + + + + + + + google + Google Inc. + Google Play APK Expansion Library + play_apk_expansion + market_apk_expansion + 2 + Google Play APK Expansion library + http://developer.android.com/guide/market/expansion-files.html + + + 111636 + 47fa8c691fcc8cf815e7ebbf140f12e94495f73b + market_apk_expansion-r02.zip + + + + + + + google + Google Inc. + Google Play services + google_play_services + 1 + Google Play Services client library and sample code + https://developers.google.com/android/google-play-services/index + + + + 363692 + b1808a7d5f91a3ed42839b950fd254c60e9328f1 + google_play_services_1013.zip + + + + + + + google + Google Inc. + Google USB Driver + usb_driver + 7 + USB Driver for Windows, revision 7 + http://developer.android.com/ + + + + 8681704 + 147c339fde22f98ae41b15349a8303d39a2cf6e5 + usb_driver_r07-windows.zip + + + + + + google + Google Inc. + Google Play Billing Library + play_billing + market_billing + 2 + Google Play Billing sample code + http://developer.android.com/guide/market/billing/index.html + + + 55191 + 3c84c05c60a9cabb578cebce0515860be7ad23d2 + market_billing_r02.zip + + + + + + + google + Google Inc. + Google AdMob Ads SDK + admob_ads_sdk + 8 + AdMob Ads SDK + https://developers.google.com/mobile-ads-sdk/docs/ + + + 545547 + 031476aa5a491239d2624e8de8c9e46e40d93e3f + https://dl-ssl.google.com/googleadmobadssdk/googleadmobadssdkandroid-6.2.1.zip + + + + + + + google + Google Inc. + Google Analytics SDK + analytics_sdk + 2 + Analytics SDK + http://code.google.com/mobile/analytics/ + + + 53055 + 328bcdc6c241879ebb04d6edc6fec1052a171004 + https://dl.google.com/gaformobileapps/GoogleAnalyticsAndroid_1.4.2.zip + + + + + + + google + Google Inc. + Google Web Driver + webdriver + 2 + WebDriver + http://selenium.googlecode.com + + + 4055193 + 13f3a3b2670a5fc04a7342861644be9a01b07e38 + webdriver_r02.zip + + + + + + + google + Google Inc. + Google Cloud Messaging for Android Library + gcm + 3 + Google Cloud Messaging for Android library and sample code + https://developers.google.com/android/gcm/index + + + 5901400 + ad066fd0dc7fc99d8aadac09c65a3c2519fbc7bf + gcm_r03.zip + + + + + \ No newline at end of file diff --git a/pkgs/development/androidenv/addons.nix b/pkgs/development/androidenv/addons.nix new file mode 100644 index 00000000000..b995b4301e9 --- /dev/null +++ b/pkgs/development/androidenv/addons.nix @@ -0,0 +1,186 @@ + +{stdenv, fetchurl, unzip}: + +let + buildGoogleApis = args: + stdenv.mkDerivation (args // { + buildInputs = [ unzip ]; + buildCommand = '' + mkdir -p $out + cd $out + unzip $src + ''; + }); +in +{ + + google_apis_3 = buildGoogleApis { + name = "google_apis-3"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-3-r03.zip; + sha1 = "1f92abf3a76be66ae8032257fc7620acbd2b2e3a"; + }; + meta = { + description = "Android + Google APIs"; + url = http://developer.android.com/; + }; + }; + + google_apis_4 = buildGoogleApis { + name = "google_apis-4"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-4_r02.zip; + sha1 = "9b6e86d8568558de4d606a7debc4f6049608dbd0"; + }; + meta = { + description = "Android + Google APIs, revision 2"; + url = http://developer.android.com/; + }; + }; + + google_apis_5 = buildGoogleApis { + name = "google_apis-5"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-5_r01.zip; + sha1 = "46eaeb56b645ee7ffa24ede8fa17f3df70db0503"; + }; + meta = { + description = "Android + Google APIs, revision 1"; + url = http://developer.android.com/; + }; + }; + + google_apis_6 = buildGoogleApis { + name = "google_apis-6"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-6_r01.zip; + sha1 = "5ff545d96e031e09580a6cf55713015c7d4936b2"; + }; + meta = { + description = "Android + Google APIs, revision 1"; + url = http://developer.android.com/; + }; + }; + + google_apis_7 = buildGoogleApis { + name = "google_apis-7"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-7_r01.zip; + sha1 = "2e7f91e0fe34fef7f58aeced973c6ae52361b5ac"; + }; + meta = { + description = "Android + Google APIs, revision 1"; + url = http://developer.android.com/; + }; + }; + + google_apis_8 = buildGoogleApis { + name = "google_apis-8"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-8_r02.zip; + sha1 = "3079958e7ec87222cac1e6b27bc471b27bf2c352"; + }; + meta = { + description = "Android + Google APIs, API 8, revision 2"; + url = http://developer.android.com/; + }; + }; + + google_apis_9 = buildGoogleApis { + name = "google_apis-9"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-9_r02.zip; + sha1 = "78664645a1e9accea4430814f8694291a7f1ea5d"; + }; + meta = { + description = "Android + Google APIs, API 9, revision 2"; + url = http://developer.android.com/; + }; + }; + + google_apis_10 = buildGoogleApis { + name = "google_apis-10"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-10_r02.zip; + sha1 = "cc0711857c881fa7534f90cf8cc09b8fe985484d"; + }; + meta = { + description = "Android + Google APIs, API 10, revision 2"; + url = http://developer.android.com/; + }; + }; + + google_apis_11 = buildGoogleApis { + name = "google_apis-11"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-11_r01.zip; + sha1 = "5eab5e81addee9f3576d456d205208314b5146a5"; + }; + meta = { + description = "Android + Google APIs, API 11, revision 1"; + url = http://developer.android.com/; + }; + }; + + google_apis_12 = buildGoogleApis { + name = "google_apis-12"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-12_r01.zip; + sha1 = "e9999f4fa978812174dfeceec0721c793a636e5d"; + }; + meta = { + description = "Android + Google APIs, API 12, revision 1"; + url = http://developer.android.com/; + }; + }; + + google_apis_13 = buildGoogleApis { + name = "google_apis-13"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-13_r01.zip; + sha1 = "3b153edd211c27dc736c893c658418a4f9041417"; + }; + meta = { + description = "Android + Google APIs, API 13, revision 1"; + url = http://developer.android.com/; + }; + }; + + google_apis_14 = buildGoogleApis { + name = "google_apis-14"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-14_r02.zip; + sha1 = "f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39"; + }; + meta = { + description = "Android + Google APIs"; + + }; + }; + + google_apis_15 = buildGoogleApis { + name = "google_apis-15"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-15_r02.zip; + sha1 = "6757c12788da0ea00c2ab58e54cb438b9f2bcf66"; + }; + meta = { + description = "Android + Google APIs"; + + }; + }; + + google_apis_16 = buildGoogleApis { + name = "google_apis-16"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-16_r03.zip; + sha1 = "63467dd32f471e3e81e33e9772c22f33235aa3b3"; + }; + meta = { + description = "Android + Google APIs"; + + }; + }; + +} + diff --git a/pkgs/development/androidenv/androidsdk.nix b/pkgs/development/androidenv/androidsdk.nix new file mode 100644 index 00000000000..5ea05749a0e --- /dev/null +++ b/pkgs/development/androidenv/androidsdk.nix @@ -0,0 +1,153 @@ +{ stdenv, stdenv_32bit, fetchurl, unzip, shebangfix, makeWrapper +, platformTools, support, platforms, sysimages, addons +, zlib_32bit +, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit +, libX11, libXext, libXrender +, freetype, fontconfig, gtk, atk +}: +{platformVersions, useGoogleAPIs}: + +stdenv.mkDerivation { + name = "android-sdk-linux-20.0.3"; + + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") + then fetchurl { + url = http://dl.google.com/android/android-sdk_r20.0.3-linux.tgz; + sha256 = "0xfb41xsjaf7n6b9gsrxm24jwg2fi1hzn73y69rlqm55bw1vxhc1"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = http://dl.google.com/android/android-sdk_r20.0.3-macosx.zip; + sha256 = "0eecaa04950d5c540f36ab4183a4cbaef3ae6a7434467bfc32febaeb796a8ff2"; + } + else throw "platform not ${stdenv.system} supported!"; + + buildCommand = '' + mkdir -p $out + cd $out + unpackFile $src; + + cd android-sdk-*/tools + + ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") + '' + # There are a number of native binaries. We must patch them to let them find the interpreter and libstdc++ + + for i in dmtracedump emulator emulator-arm emulator-x86 hprof-conv mksdcard sqlite3 + do + patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i + patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib $i + done + + # These tools also need zlib in addition to libstdc++ + + for i in etc1tool zipalign + do + patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i + patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:${zlib_32bit}/lib $i + done + + # The emulators need additional libraries, which are not in the RPATH => let's wrap them + + for i in emulator emulator-arm emulator-x86 + do + wrapProgram `pwd`/$i \ + --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib + done + ''} + + # These are shell scripts with a reference to #!/bin/bash, which must be patched + + for i in ddms draw9patch monkeyrunner monitor lint traceview + do + shebangfix $i + done + + ${if stdenv.system == "i686-linux" then + '' + # The monitor requires some more patching + + cd lib/monitor-x86 + patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 monitor + patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so + + wrapProgram `pwd`/monitor \ + --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.gcc.gcc}/lib + + cd ../.. + '' + else if stdenv.system == "x86_64-linux" then + '' + # The monitor requires some more patching + + cd lib/monitor-x86_64 + patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 monitor + patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so + + wrapProgram `pwd`/monitor \ + --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.gcc.gcc}/lib + + cd ../.. + '' + else ""} + + # Symlink the other sub packages + + cd .. + ln -s ${platformTools}/platform-tools + ln -s ${support}/support + + # Symlink required Google API add-ons + + mkdir -p add-ons + cd add-ons + + ${if useGoogleAPIs then + stdenv.lib.concatMapStrings (platformVersion: + if (builtins.hasAttr ("google_apis_"+platformVersion) addons) then + let + googleApis = builtins.getAttr ("google_apis_"+platformVersion) addons; + in + "ln -s ${googleApis}/* addon-google_apis-${platformVersion}" + else "") platformVersions + else ""} + + cd .. + + # Symlink required platforms + + mkdir -p platforms + cd platforms + + ${stdenv.lib.concatMapStrings (platformVersion: + if (builtins.hasAttr ("platform_"+platformVersion) platforms) then + let + platform = builtins.getAttr ("platform_"+platformVersion) platforms; + in + "ln -s ${platform}/* android-${platformVersion}" + else "" + ) platformVersions} + + cd .. + + # Symlink required system images + + mkdir -p system-images + cd system-images + + ${stdenv.lib.concatMapStrings (platformVersion: + if (builtins.hasAttr ("sysimg_"+platformVersion) sysimages) then + let + sysimg = builtins.getAttr ("sysimg_"+platformVersion) sysimages; + in + '' + mkdir -p android-${platformVersion} + cd android-${platformVersion} + ln -s ${sysimg}/* + cd .. + '' + else "" + ) platformVersions} + ''; + + buildInputs = [ shebangfix unzip makeWrapper ]; +} diff --git a/pkgs/development/androidenv/build-app.nix b/pkgs/development/androidenv/build-app.nix new file mode 100644 index 00000000000..c35f7175e3d --- /dev/null +++ b/pkgs/development/androidenv/build-app.nix @@ -0,0 +1,41 @@ +{ stdenv, androidsdk, jdk, ant }: +{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false +, release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null +}: + +assert release -> keyStore != null && keyAlias != null && keyStorePassword != null && keyAliasPassword != null; + +let + platformName = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then "linux" + else if stdenv.system == "x86_64-darwin" then "macosx" + else throw "Platform: ${stdenv.system} is not supported!"; + + androidsdkComposition = androidsdk { inherit platformVersions useGoogleAPIs; }; +in +stdenv.mkDerivation { + inherit name src; + + ANDROID_HOME = "${androidsdkComposition}/android-sdk-${platformName}"; + + buildInputs = [ jdk ant ]; + + buildPhase = '' + ${stdenv.lib.optionalString release '' + + # Provide key singing attributes + ( echo "key.store=${keyStore}" + echo "key.alias=${keyAlias}" + echo "key.store.password=${keyStorePassword}" + echo "key.alias.password=${keyAliasPassword}" + ) >> ant.properties + ''} + + export ANDROID_SDK_HOME=`pwd` # Key files cannot be stored in the user's home directory. This overrides it. + ant ${if release then "release" else "debug"} + ''; + + installPhase = '' + mkdir -p $out + mv bin/*-${if release then "release" else "debug"}.apk $out + ''; +} diff --git a/pkgs/development/androidenv/default.nix b/pkgs/development/androidenv/default.nix new file mode 100644 index 00000000000..6240e264b99 --- /dev/null +++ b/pkgs/development/androidenv/default.nix @@ -0,0 +1,57 @@ +{pkgs, pkgs_i686}: + +rec { + platformTools = import ./platform-tools.nix { + inherit (pkgs) stdenv fetchurl unzip shebangfix; + inherit (pkgs_i686) zlib ncurses; + stdenv_32bit = pkgs_i686.stdenv; + }; + + support = import ./support.nix { + inherit (pkgs) stdenv fetchurl unzip; + }; + + platforms = if (pkgs.stdenv.system == "i686-linux" || pkgs.stdenv.system == "x86_64-linux") + then import ./platforms-linux.nix { + inherit (pkgs) stdenv fetchurl unzip; + } + else if pkgs.stdenv.system == "x86_64-darwin" + then import ./platforms-macosx.nix { + inherit (pkgs) stdenv fetchurl unzip; + } + else throw "Platform: ${pkgs.stdenv.system} not supported!"; + + sysimages = import ./sysimages.nix { + inherit (pkgs) stdenv fetchurl unzip; + }; + + addons = import ./addons.nix { + inherit (pkgs) stdenv fetchurl unzip; + }; + + androidsdk = import ./androidsdk.nix { + inherit (pkgs) stdenv fetchurl unzip shebangfix makeWrapper; + inherit (pkgs) freetype fontconfig gtk atk; + inherit (pkgs.xorg) libX11 libXext libXrender; + + inherit platformTools support platforms sysimages addons; + + stdenv_32bit = pkgs_i686.stdenv; + zlib_32bit = pkgs_i686.zlib; + libX11_32bit = pkgs_i686.xorg.libX11; + libxcb_32bit = pkgs_i686.xorg.libxcb; + libXau_32bit = pkgs_i686.xorg.libXau; + libXdmcp_32bit = pkgs_i686.xorg.libXdmcp; + libXext_32bit = pkgs_i686.xorg.libXext; + }; + + buildApp = import ./build-app.nix { + inherit (pkgs) stdenv jdk ant; + inherit androidsdk; + }; + + emulateApp = import ./emulate-app.nix { + inherit (pkgs) stdenv; + inherit androidsdk; + }; +} diff --git a/pkgs/development/androidenv/emulate-app.nix b/pkgs/development/androidenv/emulate-app.nix new file mode 100644 index 00000000000..df821f300d6 --- /dev/null +++ b/pkgs/development/androidenv/emulate-app.nix @@ -0,0 +1,87 @@ +{stdenv, androidsdk}: +{name, app, platformVersion ? "8", useGoogleAPIs ? false, package, activity}: + +let + androidsdkComposition = androidsdk { inherit useGoogleAPIs; platformVersions = [ platformVersion ]; }; +in +stdenv.mkDerivation { + inherit name; + + buildCommand = '' + mkdir -p $out/bin + + cat > $out/bin/run-test-emulator << "EOF" + #!/bin/sh -e + + # We need a TMPDIR + if [ "$TMPDIR" = "" ] + then + export TMPDIR=/tmp + fi + + # Store the virtual devices somewhere else, instead of polluting a user's HOME directory + export ANDROID_SDK_HOME=$(mktemp -d $TMPDIR/nix-android-vm-XXXX) + + # We have to look for a free TCP port + + echo "Looking for a free TCP port in range 5554-5584" + + for i in $(seq 5554 2 5584) + do + if [ -z "$(${androidsdkComposition}/android-sdk-*/platform-tools/adb devices | grep emulator-$i)" ] + then + port=$i + break + fi + done + + if [ -z "$port" ] + then + echo "Unfortunately, the emulator port space is exhausted!" + exit 1 + else + echo "We have a free TCP port: $port" + fi + + export ANDROID_SERIAL="emulator-$port" + + # Create a virtual android device + ${androidsdkComposition}/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} + + # Launch the emulator + ${androidsdkComposition}/android-sdk-*/tools/emulator -avd device -no-boot-anim -port $port & + + # Wait until the device has completely booted + + echo "Waiting until the emulator has booted the device and the package manager is ready..." + + ${androidsdkComposition}/android-sdk-*/platform-tools/adb -s emulator-$port wait-for-device + + echo "Device state has been reached" + + while [ -z "$(${androidsdkComposition}/android-sdk-*/platform-tools/adb -s emulator-$port shell getprop dev.bootcomplete | grep 1)" ] + do + sleep 5 + done + + echo "dev.bootcomplete property is 1" + + #while [ -z "$(${androidsdkComposition}/android-sdk-*/platform-tools/adb -s emulator-$port shell getprop sys.boot_completed | grep 1)" ] + #do + #sleep 5 + #done + + #echo "sys.boot_completed property is 1" + + echo "ready" + + # Install the App through the debugger + ${androidsdkComposition}/android-sdk-*/platform-tools/adb -s emulator-$port install ${app}/*.apk + + # Start the application + ${androidsdkComposition}/android-sdk-*/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/.${activity} + EOF + + chmod +x $out/bin/run-test-emulator + ''; +} diff --git a/pkgs/development/androidenv/examples/deployment/default.nix b/pkgs/development/androidenv/examples/deployment/default.nix new file mode 100644 index 00000000000..7ef5b1b108c --- /dev/null +++ b/pkgs/development/androidenv/examples/deployment/default.nix @@ -0,0 +1,13 @@ +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 new file mode 100644 index 00000000000..6631e380f6f --- /dev/null +++ b/pkgs/development/androidenv/examples/deployment/emulate-myfirstapp/default.nix @@ -0,0 +1,10 @@ +{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 new file mode 100644 index 00000000000..75f1f1de7b6 --- /dev/null +++ b/pkgs/development/androidenv/examples/deployment/myfirstapp/default.nix @@ -0,0 +1,13 @@ +{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/deployment/result b/pkgs/development/androidenv/examples/deployment/result new file mode 120000 index 00000000000..40f0d34dd64 --- /dev/null +++ b/pkgs/development/androidenv/examples/deployment/result @@ -0,0 +1 @@ +/nix/store/25fv9x71ljmm6vz36cj61bxmcydc5iwr-MyFirstApp \ No newline at end of file diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/.classpath b/pkgs/development/androidenv/examples/src/myfirstapp/.classpath new file mode 100644 index 00000000000..a4763d1eece --- /dev/null +++ b/pkgs/development/androidenv/examples/src/myfirstapp/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/.project b/pkgs/development/androidenv/examples/src/myfirstapp/.project new file mode 100644 index 00000000000..c066df34ea1 --- /dev/null +++ b/pkgs/development/androidenv/examples/src/myfirstapp/.project @@ -0,0 +1,33 @@ + + + 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 new file mode 100644 index 00000000000..f77b31c2d2c --- /dev/null +++ b/pkgs/development/androidenv/examples/src/myfirstapp/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,4 @@ +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 new file mode 100644 index 00000000000..12e1877a5a5 --- /dev/null +++ b/pkgs/development/androidenv/examples/src/myfirstapp/AndroidManifest.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + \ 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 new file mode 100644 index 00000000000..26263c11aca --- /dev/null +++ b/pkgs/development/androidenv/examples/src/myfirstapp/README.txt @@ -0,0 +1,6 @@ +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 new file mode 100644 index 00000000000..b0971e891ef --- /dev/null +++ b/pkgs/development/androidenv/examples/src/myfirstapp/ant.properties @@ -0,0 +1,17 @@ +# 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 new file mode 100644 index 00000000000..924742adaaa --- /dev/null +++ b/pkgs/development/androidenv/examples/src/myfirstapp/build.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/ic_launcher-web.png b/pkgs/development/androidenv/examples/src/myfirstapp/ic_launcher-web.png new file mode 100644 index 0000000000000000000000000000000000000000..c37372acb9ce85afcef436b349984adb8735347b GIT binary patch literal 37099 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 I=akR{0H7P^3jhEB literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..a301d5795aaa4bc1d6b829815ca4515f44f4b394 GIT binary patch literal 3014 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 literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..2c2a58b2fad749f79450ad87434add0c4f92a7f2 GIT binary patch literal 1504 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4mJh`hKCF@W-u_YF86eC45_$vH6qt%cBqKl zj+Z@;jGk>eI`izyZ7q$Hd8g&>I+9@~{N4RIzfpiUXLs<{i54H9dg9EHb^UvKdu1?dNy!)H7yrU-4vBCb zt!qA5a5-&rB?V8xyiy2yP%XW(|$hviI-#g>gxm9ub(TyoHzTd`HF_zG)wq-*Z)1r?%n2&-D5iGiQBi z?Kmi2qt_O)!)vLPv912DS}N zx$zOMu1CwZM&*97b-mtp)>}!rBPHY5YY`@It*P%gT(TGzWm2EVU;BkDJ&CT?-l3qN%-xS+3KVA`>45<1jptXEm}6) zd^?0T96Wed&C;^+?}rZ??sL`n<%vuc=vtQV%5G+{qkpH1lBMJK{`=Yr+smUuoIX6a zZs6r}lC0RVapT6eRV(71T)hgFLsl4^JIG*W(ZJ1N>-N>*oqoMRmYdEZp;iB?-yLea zd-38z7IA?nS9gE;7i{w8)_1;NySIz;+uerF*brTxeQ(V-+HU=SFaLYGOr16JBLiMN zg)OsQ_3K7>7w!pt9`}&H**It6<4duVPk%ccmU|$KRi?vRg~PS1tn3z3uH-SlK$@Hd$@I!23IH^EF?tiCRn79{3}}FiU&sokqTr z{)uyM%2}v3#D<5PtK{5VwQ19)+gF&+?@ki7w7t6UyOrtsYyKNcvTjV+Ay8AlwC>Vh zo8B+J-yZ1dZ#d}a@#^^J&!4$}{rWW{fA%YL#!AhK$6+71#m}#HKa;cXo%D>NopTzQ zcQjm3=H%qmH#IS_c)5t%GO{pxd+?-17v@fTdGq*NtFkV;kJ2Y!7qmTNpK-v?%d1K< z#^HtHq|&2DkIrRgX4bipDO}CKJwsJhHTJ=QojcrIva(+N{`&Q+-yQ9JrktyDXKmOt zc?$mxt}CJoEBQ@67!~|{*W)c;SyFxHm8fX~1NV#rZ0zU7Si=8bc6D_v-?e-9#kgI( zQ?Kx={$DqDvhs>Onk7}AUTo4)PS~QUG3!U~PuseCUiX%og&jQ2YS6&ylTf`?eomxI zQqrT@;p<{H^6~LKdfRY!M}DDv>_(PD!T& z{YOLl_2=^ZY|#HvqxV5e*OiOshuIWwIsivKiL~o?>-bxH?NzLeRGy_=~|tzRZ#+l;)0tRb!!fY z*BmlG&hhu{)bO*utG~-uRXZ2CJzsW(Y1`Y=@{wO!)wVq@67Qb+W%FEn-kn8C>#EME z{^+x`Y33_QWRCvPp#S5^zQf{w>ijoNQjh&InZ2)OlcK8g&W}ID`_ldE4{uA2PYsL@ z-TdOSdE}Ya_}HfRGY%WSa1b}!(8~WV`)SgN3bkKF`>wALH8hFy_V%`(KY8-yS+i$b zPn$m7-0{#3p9H@1paQMnHpe^fIsZE=9yVRxYV#&gWuwYRmFk^GKJV06w|Uy_H5^k< a*qdeOmtYTnbVDNPHb6Mw<&;$UPGu4U! literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..134d5490bd3310559cc944d44d24857eef29f2a1 GIT binary patch literal 3030 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 Snym~B3=E#GelF{r5}E+zcf7>_ literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..f91f736fe7a364fc4227627200f1f638d4e0952e GIT binary patch literal 1969 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 literal 0 HcmV?d00001 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 new file mode 100644 index 00000000000..61319561d0f --- /dev/null +++ b/pkgs/development/androidenv/examples/src/myfirstapp/res/layout/activity_display_message.xml @@ -0,0 +1,14 @@ + + + + + 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 new file mode 100644 index 00000000000..0d867aa0da0 --- /dev/null +++ b/pkgs/development/androidenv/examples/src/myfirstapp/res/layout/activity_main.xml @@ -0,0 +1,19 @@ + + + + +