From 5ded1fb645ff6acd687707e1eb404ff6082f9321 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Sun, 14 Oct 2012 23:48:46 -0700 Subject: [PATCH 01/83] - icecast-2.3.3, libshout-2.3.1 --- .../libraries/libshout/default.nix | 30 +++++++++++++++++ pkgs/servers/icecast/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 66 insertions(+) create mode 100644 pkgs/development/libraries/libshout/default.nix create mode 100644 pkgs/servers/icecast/default.nix diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix new file mode 100644 index 000000000000..45528829cc31 --- /dev/null +++ b/pkgs/development/libraries/libshout/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, pkgconfig +, libvorbis, libtheora, speex}: + +# need pkgconfig so that libshout installs ${out}/lib/pkgconfig/shout.pc + +stdenv.mkDerivation { + name = "libshout-2.3.1"; + + src = fetchurl { + url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz"; + sha256 = "cf3c5f6b4a5e3fcfbe09fb7024aa88ad4099a9945f7cb037ec06bcee7a23926e"; + }; + + buildInputs = [ libvorbis libtheora speex pkgconfig ]; + + meta = { + description = "icecast 'c' language bindings"; + + longDescription = '' + Libshout is a library for communicating with and sending data to an icecast + server. It handles the socket connection, the timing of the data, and prevents + bad data from getting to the icecast server. + ''; + + homepage = http://www.icecast.org; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; + + }; +} diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix new file mode 100644 index 000000000000..24ae245a8a07 --- /dev/null +++ b/pkgs/servers/icecast/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl +, libxml2, libxslt, curl +, libvorbis, libtheora, speex, libkate }: + +stdenv.mkDerivation rec { + name = "icecast-2.3.3"; + + src = fetchurl { + url = "http://downloads.xiph.org/releases/icecast/${name}.tar.gz"; + sha256 = "0vf38mk13z1czpbj0g8va4rzjf201slqmiwcs8y9i6iwz3shc78v"; + }; + + buildInputs = [ libxml2 libxslt curl libvorbis libtheora speex libkate ]; + + meta = { + description = "icecast is free server software for streaming multimedia."; + + longDescription = '' + Icecast is a streaming media server which currently supports Ogg Vorbis and MP3 + audio streams. It can be used to create an Internet radio station or a + privately running jukebox and many things in between. It is very versatile in + that new formats can be added relatively easily and supports open standards for + commuincation and interaction. + ''; + + + homepage = http://www.icecast.org; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bbe6bc588d6..11dd996f9279 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -907,6 +907,8 @@ let iasl = callPackage ../development/compilers/iasl { }; + icecast = callPackage ../servers/icecast { }; + icoutils = callPackage ../tools/graphics/icoutils { }; idutils = callPackage ../tools/misc/idutils { }; @@ -1000,6 +1002,8 @@ let libtirpc = callPackage ../development/libraries/ti-rpc { }; + libshout = callPackage ../development/libraries/libshout { }; + libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; logcheck = callPackage ../tools/system/logcheck { From e45d4e27227c63bb71244c5399f9cd3274c45291 Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Tue, 16 Oct 2012 17:32:22 +0200 Subject: [PATCH 02/83] 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 18671255fce1..4de3ff4237b3 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 03/83] 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 000000000000..1c08dc6db8d7 --- /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 8bbe6bc588d6..13f188cf5452 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 04/83] 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 000000000000..76cc1d5c3d29 --- /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 13f188cf5452..21dce48c780b 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 05/83] 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 000000000000..67ff2ec55411 --- /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 000000000000..e8961621cab1 --- /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 21dce48c780b..4cb5417a581a 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 06/83] 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 000000000000..b57b9884e613 --- /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 4cb5417a581a..4fddd5aaef19 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 07/83] 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 000000000000..930df87214ad --- /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 000000000000..60e4338e893d --- /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 000000000000..b5cd41a3c5b4 --- /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 4fddd5aaef19..d54970c57c84 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 08/83] 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 db7d0d77f69f..9e4816cab0af 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 8bbe6bc588d6..e5254b622cee 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 8ba64338f71fc2f60b6c25da2b58ef9c75314290 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Sun, 21 Oct 2012 21:59:23 -0700 Subject: [PATCH 09/83] as we dereference a variable in a string, the expression needs to be recursive. --- pkgs/development/libraries/libshout/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index 45528829cc31..760b8ecce09f 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -3,7 +3,7 @@ # need pkgconfig so that libshout installs ${out}/lib/pkgconfig/shout.pc -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "libshout-2.3.1"; src = fetchurl { From ccfb0562558b87dc39a695da54e5fbc33b552ad8 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Wed, 24 Oct 2012 18:15:48 -0700 Subject: [PATCH 10/83] shoutcast support for mpd --- pkgs/servers/mpd/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 0c3257d61c37..a5cc810ada8a 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -2,16 +2,18 @@ , flacSupport ? true, flac, vorbisSupport ? true, libvorbis , madSupport ? true, libmad, id3tagSupport ? true, libid3tag , mikmodSupport ? true, libmikmod, cueSupport ? true, libcue +, shoutSupport ? true, libshout }: let opt = stdenv.lib.optional; in stdenv.mkDerivation rec { - name = "mpd-0.16.3"; + name = "mpd-0.16.8"; src = fetchurl { url = "mirror://sourceforge/musicpd/${name}.tar.bz2"; - sha256 = "1liihxj58f944gapdqg15firl6phbxh3y3vjxq9m8dlvm37pkpsq"; + sha256 = "35183ae4a706391f5d739e4378b74f516952adda09a260fecfd531a58b0fff17"; }; + buildInputs = [ pkgconfig glib ] ++ opt alsaSupport alsaLib ++ opt flacSupport flac @@ -19,7 +21,9 @@ stdenv.mkDerivation rec { ++ opt madSupport libmad ++ opt id3tagSupport libid3tag ++ opt mikmodSupport libmikmod - ++ opt cueSupport libcue; + ++ opt cueSupport libcue + ++ opt shoutSupport libshout; + configureFlags = '' ${if alsaSupport then "--enable-alsa" else "--disable-alsa"} ${if flacSupport then "--enable-flac" else "--disable-flac"} @@ -28,7 +32,13 @@ stdenv.mkDerivation rec { ${if mikmodSupport then "--enable-mikmod" else "--disable-mikmod"} ${if id3tagSupport then "--enable-id3" else "--disable-id3"} ${if cueSupport then "--enable-cue" else "--disable-cue"} + ${if shoutSupport then "--enable-shout" else "--disable-shout"} ''; + + NIX_LDFLAGS = '' + ${if shoutSupport then "-lshout" else ""} + ''; + meta = { description = "A flexible, powerful daemon for playing music"; longDescription = '' From 78db9a8cb1db2dcac7ed14a657a74334733cfe76 Mon Sep 17 00:00:00 2001 From: Michael Ashton Date: Sat, 27 Oct 2012 15:13:56 -0700 Subject: [PATCH 11/83] 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 000000000000..ae187043e6c5 --- /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 58cada65fb8d..000000000000 --- 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 e7da594e4bc6..e8c37d25694e 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 f5ab75f4bb96..000000000000 --- 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 70474000ddd4..000000000000 --- 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 bd39ea9464cd..3ee43ba3bee0 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 905b7b0ae401..3d20787dedee 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 0604ae46e4f8..18e21a6f309c 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 6299baeb88cdeaa19275b0a2386e552e6347e93f Mon Sep 17 00:00:00 2001 From: Malcolm Matalka Date: Thu, 15 Nov 2012 23:19:32 +0100 Subject: [PATCH 12/83] Support installing topfind now --- pkgs/development/tools/ocaml/findlib/default.nix | 4 ++-- .../tools/ocaml/findlib/install_topfind.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/tools/ocaml/findlib/install_topfind.patch diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 3170712b9baf..0291e47f6127 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation { buildInputs = [m4 ncurses ocaml]; - patches = [ ./ldconf.patch ]; + patches = [ ./ldconf.patch ./install_topfind.patch ]; + patchFlags = "-p0"; dontAddPrefix=true; @@ -24,7 +25,6 @@ stdenv.mkDerivation { -mandir $out/share/man -sitelib $out/lib/ocaml/${ocaml_version}/site-lib -config $out/etc/findlib.conf - -no-topfind ) ''; diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/pkgs/development/tools/ocaml/findlib/install_topfind.patch new file mode 100644 index 000000000000..03eefb54cb14 --- /dev/null +++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch @@ -0,0 +1,12 @@ +--- src/findlib/Makefile ++++ src/findlib/Makefile +@@ -82,7 +82,7 @@ clean: + install: all + mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)" + mkdir -p "$(prefix)$(OCAMLFIND_BIN)" +- test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)" ++ test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)" + files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a META` && \ + cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" + f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ + From 5ff6be922416a738eed6480c24c75309fdb07ef3 Mon Sep 17 00:00:00 2001 From: Malcolm Matalka Date: Thu, 15 Nov 2012 23:21:14 +0100 Subject: [PATCH 13/83] Support installing findlib --- pkgs/development/tools/ocaml/findlib/default.nix | 1 - pkgs/development/tools/ocaml/findlib/install_topfind.patch | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 0291e47f6127..aee0040f8159 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation { buildInputs = [m4 ncurses ocaml]; patches = [ ./ldconf.patch ./install_topfind.patch ]; - patchFlags = "-p0"; dontAddPrefix=true; diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/pkgs/development/tools/ocaml/findlib/install_topfind.patch index 03eefb54cb14..4729885bcefe 100644 --- a/pkgs/development/tools/ocaml/findlib/install_topfind.patch +++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch @@ -1,5 +1,5 @@ ---- src/findlib/Makefile -+++ src/findlib/Makefile +--- findlib-1.3.3/src/findlib/Makefile ++++ findlib-1.3.3/src/findlib/Makefile @@ -82,7 +82,7 @@ clean: install: all mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)" From a034c4b9353b3bbd07d99f9726198791fc3554bb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 20 Nov 2012 11:19:42 +0100 Subject: [PATCH 14/83] androidenv: Remove examples directory As discussed on nix-dev, it's better to use fetchurl to obtain the source of the examples. --- .../examples/deployment/default.nix | 13 --- .../deployment/emulate-myfirstapp/default.nix | 10 -- .../deployment/myfirstapp/default.nix | 13 --- .../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 37099 -> 0 bytes .../src/myfirstapp/proguard-project.txt | 20 ---- .../src/myfirstapp/project.properties | 14 --- .../res/drawable-hdpi/ic_action_search.png | Bin 3120 -> 0 bytes .../res/drawable-hdpi/ic_launcher.png | Bin 3014 -> 0 bytes .../res/drawable-ldpi/ic_launcher.png | Bin 1504 -> 0 bytes .../res/drawable-mdpi/ic_action_search.png | Bin 3030 -> 0 bytes .../res/drawable-mdpi/ic_launcher.png | Bin 1969 -> 0 bytes .../res/drawable-xhdpi/ic_action_search.png | Bin 3199 -> 0 bytes .../res/drawable-xhdpi/ic_launcher.png | Bin 4006 -> 0 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 ------- 30 files changed, 394 deletions(-) delete mode 100644 pkgs/development/androidenv/examples/deployment/default.nix delete mode 100644 pkgs/development/androidenv/examples/deployment/emulate-myfirstapp/default.nix delete mode 100644 pkgs/development/androidenv/examples/deployment/myfirstapp/default.nix delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/.classpath delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/.project delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/.settings/org.eclipse.jdt.core.prefs delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/AndroidManifest.xml delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/README.txt delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/ant.properties delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/build.xml delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/ic_launcher-web.png delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/proguard-project.txt delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/project.properties delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-hdpi/ic_action_search.png delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-hdpi/ic_launcher.png delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-ldpi/ic_launcher.png delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-mdpi/ic_action_search.png delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-mdpi/ic_launcher.png delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-xhdpi/ic_action_search.png delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-xhdpi/ic_launcher.png delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/layout/activity_display_message.xml delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/layout/activity_main.xml delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/menu/activity_display_message.xml delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/menu/activity_main.xml delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/values-v11/styles.xml delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/values-v14/styles.xml delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/values/strings.xml delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/values/styles.xml delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/src/com/example/my/first/app/DisplayMessageActivity.java delete mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/src/com/example/my/first/app/MainActivity.java diff --git a/pkgs/development/androidenv/examples/deployment/default.nix b/pkgs/development/androidenv/examples/deployment/default.nix deleted file mode 100644 index 7ef5b1b108c4..000000000000 --- a/pkgs/development/androidenv/examples/deployment/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -let - pkgs = import {}; -in -rec { - myfirstapp = import ./myfirstapp { - inherit (pkgs) androidenv; - }; - - emulate_myfirstapp = import ./emulate-myfirstapp { - inherit (pkgs) androidenv; - inherit myfirstapp; - }; -} diff --git a/pkgs/development/androidenv/examples/deployment/emulate-myfirstapp/default.nix b/pkgs/development/androidenv/examples/deployment/emulate-myfirstapp/default.nix deleted file mode 100644 index 6631e380f6f9..000000000000 --- a/pkgs/development/androidenv/examples/deployment/emulate-myfirstapp/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{androidenv, myfirstapp}: - -androidenv.emulateApp { - name = "MyFirstApp"; - app = myfirstapp; - platformVersion = "16"; - useGoogleAPIs = true; - package = "com.example.my.first.app"; - activity = "MainActivity"; -} diff --git a/pkgs/development/androidenv/examples/deployment/myfirstapp/default.nix b/pkgs/development/androidenv/examples/deployment/myfirstapp/default.nix deleted file mode 100644 index 75f1f1de7b6c..000000000000 --- a/pkgs/development/androidenv/examples/deployment/myfirstapp/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{androidenv}: - -androidenv.buildApp { - name = "MyFirstApp"; - src = ../../src/myfirstapp; - platformVersions = [ "16" ]; - useGoogleAPIs = true; - /*release = true; - keyStore = /home/sander/keystore; - keyAlias = "sander"; - keyStorePassword = "foobar"; - keyAliasPassword = "foobar";*/ -} diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/.classpath b/pkgs/development/androidenv/examples/src/myfirstapp/.classpath deleted file mode 100644 index a4763d1eeced..000000000000 --- a/pkgs/development/androidenv/examples/src/myfirstapp/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/.project b/pkgs/development/androidenv/examples/src/myfirstapp/.project deleted file mode 100644 index c066df34ea1b..000000000000 --- a/pkgs/development/androidenv/examples/src/myfirstapp/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - My First App - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/.settings/org.eclipse.jdt.core.prefs b/pkgs/development/androidenv/examples/src/myfirstapp/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f77b31c2d2c0..000000000000 --- a/pkgs/development/androidenv/examples/src/myfirstapp/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/AndroidManifest.xml b/pkgs/development/androidenv/examples/src/myfirstapp/AndroidManifest.xml deleted file mode 100644 index 12e1877a5a58..000000000000 --- a/pkgs/development/androidenv/examples/src/myfirstapp/AndroidManifest.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/README.txt b/pkgs/development/androidenv/examples/src/myfirstapp/README.txt deleted file mode 100644 index 26263c11acad..000000000000 --- a/pkgs/development/androidenv/examples/src/myfirstapp/README.txt +++ /dev/null @@ -1,6 +0,0 @@ -This is the example application taken from the Goole Android development -introduction: "Building Your First App": - -http://developer.android.com/training/basics/firstapp/index.html - - diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/ant.properties b/pkgs/development/androidenv/examples/src/myfirstapp/ant.properties deleted file mode 100644 index b0971e891efd..000000000000 --- a/pkgs/development/androidenv/examples/src/myfirstapp/ant.properties +++ /dev/null @@ -1,17 +0,0 @@ -# This file is used to override default values used by the Ant build system. -# -# This file must be checked into Version Control Systems, as it is -# integral to the build system of your project. - -# This file is only used by the Ant script. - -# You can use this to override default values such as -# 'source.dir' for the location of your java source folder and -# 'out.dir' for the location of your output folder. - -# You can also use it define how the release builds are signed by declaring -# the following properties: -# 'key.store' for the location of your keystore and -# 'key.alias' for the name of the key to use. -# The password will be asked during the build when you use the 'release' target. - diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/build.xml b/pkgs/development/androidenv/examples/src/myfirstapp/build.xml deleted file mode 100644 index 924742adaaa2..000000000000 --- a/pkgs/development/androidenv/examples/src/myfirstapp/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/ic_launcher-web.png b/pkgs/development/androidenv/examples/src/myfirstapp/ic_launcher-web.png deleted file mode 100644 index c37372acb9ce85afcef436b349984adb8735347b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37099 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 Tg=wXY0yNxQD9#TYgIWIq5)D5s diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/proguard-project.txt b/pkgs/development/androidenv/examples/src/myfirstapp/proguard-project.txt deleted file mode 100644 index f2fe1559a217..000000000000 --- a/pkgs/development/androidenv/examples/src/myfirstapp/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/project.properties b/pkgs/development/androidenv/examples/src/myfirstapp/project.properties deleted file mode 100644 index 9b84a6b4bf98..000000000000 --- a/pkgs/development/androidenv/examples/src/myfirstapp/project.properties +++ /dev/null @@ -1,14 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-16 diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-hdpi/ic_action_search.png b/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-hdpi/ic_action_search.png deleted file mode 100644 index 67de12decbd60613f6716de113daae46dc7d6ff9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3120 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 E59N2f#Q*>R diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-mdpi/ic_launcher.png b/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index f91f736fe7a364fc4227627200f1f638d4e0952e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1969 zcmV;i2Tu5jP)O5=i@P>wl#SALn zX0ursBsrW!)fyWee_)~=m0DVNQ^P5qkFj^vT{f~ixqt|DP!~2}E2Q8xH8pc}I$eds z;ow@h)8e4tYxOiYUrkfaJ@%<{SeZSnY=`AZUD$vv*bH_c;R=Ofd}n88fdI}LlTI`m z>D@~zzu;1x#p)b;VB~BFfxtF=1S62}s;a6*Y#eLR{SXry3v0_Xy#|-+cM1&|?M@+A z2tME|kU>1x*x0z)YPH&hq%<>!E9IU2h8J`Nvt_aieL)0Y@Co1jg&)8S9kSb9>|B?x zFV_SNUeNDZvOf)h2tMH(41I2S)|F^^63dxpQ^4T`J*_mk`GRjS^ra`luV25u$ZR&- z#RhdYC%u1J9kc-6yQC(q)#(-l7{Jn-oCwd&&7H_*1dWief*ibO2pYVg`|AyEKEVJM zF!eNuh`PGEBJsHAra2bNg2MKo2k^11o%2PKd;k;J{EmB>O!k%0Xe6oJ)7gR!FKDgS z*3Cbdz~(O>p08&jEL37S*<=b?09YKQ0w%D5(d*bhb?VeojYdPB7Dbyh%z`=!VetN}X2@FoIQ@%n^Bcc?a0G)@#MA`^Jz3aPYptD+d_C zDxFdX7Z(@*%~n0H70WuTAq(J!+Uk`9j9>+`IDkmD4{wq#UShGZ)kVDTpUM>b`KymD z0nrZ&)UI=a#o_eI0Y+` zIDlbn*Jtw=K%?GHZ=HAV?z7FNe!;hy9Ig%Go6PnDz1?pBURt z#&K^%Wp>cgYftSgENUl%-RZX;7{MwHU|4>B{zG5Ws92N+JI$8dKulxZzw3^k^fuoR z$j{5IX6|-Es0&+-dV9}$jWL2%I)tKfa&pRiEo9wyr*@iurTg|8<9T=BugqXM5`V$- z|B0nt)NXO~*dN%y2v+GdIyfaIWj&jo$lGSlt5K$fk1THE*`J~pWNl`0_A=?g21c+- z7qW=>`1scf3JR=Rt+r1y3SjPNY?NN7r&a%SaYF;iJ(KkSp7Cxk`>(3Y)@yJ&rx%v3ZrHIb(S&9fFTfenmc^>i|e+_GiMM!8&027|%BLFbbeH`|?khC*Fj z_&R!E0!&~7qjdbc4m3=ov$L~Xef2`C(LukmS!N!;cfp13zPko`XtehjyoHs;?SpU` z`~myL6x`y)hS2(81Ea?S4c{d%un5x%3k$j9n|MaTln5tpUr>3SaXw|MDppfmP{~ym zy3M9iD4y{S|DnvZ^PZC%wtr?vSA%FR0RvdT1U4}GI@sgD9Fv}&UdNVeT(ojV?y`A0 z6jv&Oej;mk-AsT1EMNkguS31i3sLOIwkRtr%UoYyPdD21+!i-f@PfX>X0Vb+2HZpt zSir;L4KaHVVUtv07+TvBov%c9}Jv%AIG5^OuXyLA7l(7FCEz2&Vl_yK+ zi_;2D@r-x)4`ommbx;>JV2igol=l(b@5TIHB#Pgc#4?$an3$Nhb?eqE$;rv}si~>z zw6rwZxpOC{c*Z;YhcYOOI(&;q^R@OZ!ljrAPM>}xJV^INE=-800000NkvXXu0mjf DIrYBm diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-xhdpi/ic_action_search.png b/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-xhdpi/ic_action_search.png deleted file mode 100644 index d699c6b37e0dcb1d636ebdd6733ab6d576d97ab5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3199 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 ReC-u>pr>W5S)<|b@_%^e3*P_$ diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-xhdpi/ic_launcher.png b/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 96095ec84ba3819f01c064af82c87cfede3b73ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4006 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 - - - - diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/res/layout/activity_main.xml b/pkgs/development/androidenv/examples/src/myfirstapp/res/layout/activity_main.xml deleted file mode 100644 index 0d867aa0da0f..000000000000 --- a/pkgs/development/androidenv/examples/src/myfirstapp/res/layout/activity_main.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - -