From 3c2091276e92039e44b38a5d6ca91afbd7111472 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 3 Jan 2013 16:13:55 +0100 Subject: vlada/ipe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adding the ipe editor. Signed-off-by: Vladimír Čunát --- pkgs/applications/graphics/ipe/default.nix | 47 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/graphics/ipe/default.nix (limited to 'pkgs') diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix new file mode 100644 index 000000000000..df50dd5bd793 --- /dev/null +++ b/pkgs/applications/graphics/ipe/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, pkgconfig, zlib, qt4, freetype, cairo, lua5, texLive, ghostscriptX +, makeWrapper }: +let ghostscript = ghostscriptX; in +stdenv.mkDerivation rec { + name = "ipe-7.1.2"; + + src = fetchurl { + url = "mirror://sourceforge/ipe7/ipe/7.1.0/${name}-src.tar.gz"; + sha256 = "04fs5slci3bmpgz8d038h3hnzzdw57xykcpsmisdxci2xrkxx41k"; + }; + + # changes taken from Gentoo portage + preConfigure = '' + cd src + sed -i \ + -e 's/fpic/fPIC/' \ + -e 's/moc-qt4/moc/' \ + config.mak || die + sed -i -e 's/install -s/install/' common.mak || die + ''; + + IPEPREFIX="$$out"; + URWFONTDIR="${texLive}/texmf-dist/fonts/type1/urw/"; + + buildInputs = [ + pkgconfig zlib qt4 freetype cairo lua5 texLive ghostscript makeWrapper + ]; + + postInstall = '' + for prog in $out/bin/*; do + wrapProgram "$prog" --prefix PATH : "${texLive}/bin" + done + ''; + + #TODO: make .desktop entry + + meta = { + description = "An editor for drawing figures"; + homepage = http://ipe7.sourceforge.net; + license = "GPLv3+"; + longDescription = '' + Ipe is an extensible drawing editor for creating figures in PDF and Postscript format. + It supports making small figures for inclusion into LaTeX-documents + as well as presentations in PDF. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 807032672176..24a87b4f88ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7316,6 +7316,8 @@ let lua = lua5; }; + ipe = callPackage ../applications/graphics/ipe { }; + iptraf = callPackage ../applications/networking/iptraf { }; irssi = callPackage ../applications/networking/irc/irssi { }; -- cgit 1.4.1 From 846c1f58de8065b494bbabca94611ad0dd8c8fc7 Mon Sep 17 00:00:00 2001 From: Cillian de Róiste Date: Sat, 5 Jan 2013 17:00:38 +0100 Subject: bristol: fix JACK audio support --- pkgs/applications/audio/bristol/default.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pkgs') diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index 81d44fdcb74a..0978b15bfaf0 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { xlibs.xproto ]; + preInstall = '' + sed -e "s@\`which bristol\`@$out/bin/bristol@g" -i bin/startBristol + sed -e "s@\`which brighton\`@$out/bin/brighton@g" -i bin/startBristol + ''; + meta = with stdenv.lib; { description = "A range of synthesiser, electric piano and organ emulations"; homepage = http://bristol.sourceforge.net; -- cgit 1.4.1 From e2d6154fff01d61f8338487d2836bd1d1d1fd74c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 5 Jan 2013 18:57:33 +0100 Subject: nix: Update to 1.3 Also, use /etc/nix as the default configuration directory. This way $NIX_CONF_DIR no longer needs to be set in most cases. --- pkgs/tools/package-management/nix/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e6f15b7a5e5d..5448c9f5ba38 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.2"; + name = "nix-1.3"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "2f7c2d27e240b6a43ebfba330127072e3fb1473c17dbfc5e9662ea589dfd16e5"; + sha256 = "32cba96df0e02d6627f5625a441fdd4ea0db718dd5bfd50044cdfd3c606d4852"; }; buildNativeInputs = [ perl pkgconfig ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { configureFlags = '' - --with-store-dir=${storeDir} --localstatedir=${stateDir} + --with-store-dir=${storeDir} --localstatedir=${stateDir} --sysconfdir=/etc --with-dbi=${perlPackages.DBI}/${perl.libPrefix} --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix} --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} @@ -35,6 +35,10 @@ stdenv.mkDerivation rec { CFLAGS=-O3 CXXFLAGS=-O3 ''; + makeFlags = "profiledir=$(out)/etc/profile.d"; + + installFlags = "sysconfdir=$(out)/etc"; + doInstallCheck = true; crossAttrs = { -- cgit 1.4.1 From 8a50276bd46bc66eaf0b1e4d8a6329398dc17a14 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Sun, 6 Jan 2013 09:02:29 +0100 Subject: libmicrohttpd: update; the old url didn't work They take out old versions from the file server --- pkgs/development/libraries/libmicrohttpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 90888ce09616..42f7c60610ec 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, curl}: stdenv.mkDerivation rec { - name = "libmicrohttpd-0.9.9"; + name = "libmicrohttpd-0.9.24"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; - sha256 = "0059isy80cmxv44dhngnsc4g25kwxdcfis5yrva199r0vnb8ab6c"; + sha256 = "0cp2ac6wbk493zslbvbmb5z96h18k496f9id8d2ji7hbdrwzfk6h"; }; buildInputs = [ curl ]; -- cgit 1.4.1 From 91ece6f0ddf84a3dcc5e230781df14414f71a757 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Sun, 6 Jan 2013 09:15:38 +0100 Subject: gnunet: update to 0.9.5 --- pkgs/applications/networking/p2p/gnunet/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index f2fbf7046492..02f782c75a10 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt , zlib, gmp, curl, libtool, adns, sqlite, pkgconfig -, libxml2, ncurses, gettext, libunistring +, libxml2, ncurses, gettext, libunistring, libidn , makeWrapper }: stdenv.mkDerivation rec { - name = "gnunet-0.9.3"; + name = "gnunet-0.9.5"; src = fetchurl { url = "mirror://gnu/gnunet/${name}.tar.gz"; - sha256 = "0ppirvwjb7w7270g0w83z6wyk984cnxv2ydxj7qr0j1cz2j6nn2h"; + sha256 = "162bahbskhzc0b2pda7v36dckm3p5p9rnbv2w0fbl0xl2gln63aa"; }; buildInputs = [ libextractor libmicrohttpd libgcrypt gmp curl libtool - zlib adns sqlite libxml2 ncurses + zlib adns sqlite libxml2 ncurses libidn pkgconfig gettext libunistring makeWrapper ]; @@ -36,6 +36,10 @@ stdenv.mkDerivation rec { echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..." substituteInPlace "$i" --replace "/tmp" "$TMPDIR" done + + # Ensure NSS installation works fine + configureFlags="$configureFlags --with-nssdir=$out/lib" + patchShebangs src/gns/nss/install-nss-plugin.sh ''; doCheck = false; @@ -72,7 +76,7 @@ stdenv.mkDerivation rec { license = "GPLv2+"; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = with stdenv.lib.maintainers; [ ludo viric ]; platforms = stdenv.lib.platforms.gnu; }; } -- cgit 1.4.1 From c7f30ac377ef2698c725a7572e29bafe808abec2 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Sat, 29 Dec 2012 18:54:18 +0100 Subject: update atop --- pkgs/os-specific/linux/atop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index 0e2df1e25fb0..39ba5dc3973e 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, zlib, ncurses}: stdenv.mkDerivation rec { - version = "1.27-3"; + version = "2.0.2"; name = "atop-${version}"; src = fetchurl { url = "http://www.atoptool.nl/download/atop-${version}.tar.gz"; - sha256 = "bce36e0b50f0e03995d86d25dbc9ab4a289f6755ce3558844f96d41b0bba563f"; + sha256 = "029lfa2capz1lg3m3rnyrgb8v6jm4znin84vjh2f0zkwvvhdn856"; }; buildInputs = [zlib ncurses]; -- cgit 1.4.1 From fbeb84b28895f941fe414ef06df1274f30e469cf Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 6 Jan 2013 18:15:04 +0100 Subject: bup: optionally depend on par2cmdline The default is to use it from path when available, as this is an optional feature. --- pkgs/tools/backup/bup/default.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index eef465bd142c..7ba5175d550b 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchgit, python, pyxattr, pylibacl, setuptools, fuse, git, perl, pandoc, makeWrapper }: +{ stdenv, fetchgit, python, pyxattr, pylibacl, setuptools, fuse, git, perl, pandoc, makeWrapper +, par2cmdline, par2Support ? false }: + +assert par2Support -> par2cmdline != null; with stdenv.lib; @@ -26,6 +29,8 @@ stdenv.mkDerivation { substituteInPlace $f --replace "/usr/bin/env python" "${python}/bin/python" done substituteInPlace Makefile --replace "./format-subst.pl" "perl ./format-subst.pl" + '' + optionalString par2Support '' + substituteInPlace cmd/fsck-cmd.py --replace "['par2'" "['${par2cmdline}/bin/par2'" ''; makeFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ccd6b8d15e09..65a59e08f7a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -513,6 +513,7 @@ let bup = callPackage ../tools/backup/bup { inherit (pythonPackages) pyxattr pylibacl setuptools fuse; inherit (haskellPackages) pandoc; + par2Support = (config.bup.par2Support or false); }; atool = callPackage ../tools/archivers/atool { }; -- cgit 1.4.1 From 6e482a673d78cbb34055f28f7921182843a3d824 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 7 Jan 2013 01:35:44 +0400 Subject: SBCL: Update to 1.1.3 --- pkgs/development/compilers/sbcl/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 607e1da81178..794a97b205fa 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -4,11 +4,11 @@ let s= # Generated upstream information rec { baseName="sbcl"; - version="1.1.2"; - name="sbcl-1.1.2"; - hash="04vp68cf0jfpjwx64iys7hi7qxbk2h7277wiym7k4jgirka08yhc"; - url="mirror://sourceforge/project/sbcl/sbcl/1.1.2/sbcl-1.1.2-source.tar.bz2"; - sha256="04vp68cf0jfpjwx64iys7hi7qxbk2h7277wiym7k4jgirka08yhc"; + version="1.1.3"; + name="${baseName}-${version}"; + hash="1qy64fy0nvjdgzlmasswgvzg1b2h2rygnnjvlf9vj7wg16i5383i"; + url="mirror://sourceforge/project/sbcl/sbcl/1.1.3/sbcl-1.1.3-source.tar.bz2"; + sha256="1qy64fy0nvjdgzlmasswgvzg1b2h2rygnnjvlf9vj7wg16i5383i"; }; buildInputs = with a; [ clisp makeWrapper -- cgit 1.4.1 From 029d4fd1dbf4af006e6b6d9fc20ed8a4ad4bd2f6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 7 Jan 2013 01:35:58 +0400 Subject: Wine: Update to 1.5.21 --- pkgs/misc/emulators/wine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 401c9da575bf..f4968158dd28 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "0c14paj2j3sswl6mpjjmy9bxnpijk095ks58x9dsycx9c8x0gqvm"; + sha256 = "0l5kr3iq1lkv3gcw8ljzfjcfnsh9b5crdd4i0dzwdk1i3bfw2xxc"; }; gecko = fetchurl { @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - version = "1.5.20"; + version = "1.5.21"; homepage = "http://www.winehq.org/"; license = "LGPL"; description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; -- cgit 1.4.1 From 53efca69468acf8c73f9e9185c02d970b21c611b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 6 Jan 2013 22:29:16 +0100 Subject: nzbget: Update to 9.0 --- pkgs/tools/networking/nzbget/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index 7ff1ab4a5d32..c5386553f4f1 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -2,20 +2,18 @@ , gnutls, libgcrypt }: stdenv.mkDerivation rec { - name = "nzbget-0.8.0"; + name = "nzbget-9.0"; src = fetchurl { url = "mirror://sourceforge/nzbget/${name}.tar.gz"; - sha256 = "15bxsxdbkml9cqpy6zxgv78ff69l8qrv8r201gmzvylpc1ckjsb4"; + sha256 = "1r4ys5nmcz1ilkdjdh3r8lawaf96i8spk6hl02h823q9rppvmya0"; }; buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls libgcrypt ]; - postInstall = - '' - mkdir -p $out/etc - cp nzbget.conf.example $out/etc/ - ''; + enableParallelBuilding = true; + + NIX_LDFLAGS = "-lz"; meta = { homepage = http://nzbget.sourceforge.net/; -- cgit 1.4.1 From 1e9e2cb2bbd96b323e4c51e7525b2e01dc3e57ad Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 6 Jan 2013 22:30:23 +0100 Subject: samba, imagemagick: Add missing meta info --- pkgs/applications/graphics/ImageMagick/default.nix | 4 +++- pkgs/servers/samba/default.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/release.nix | 2 -- 4 files changed, 10 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index cbab2da551a9..d66db51a4de3 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -46,6 +46,8 @@ stdenv.mkDerivation rec { '' else ""; meta = { - homepage = http://www.imagemagick.org; + homepage = http://www.imagemagick.org/; + description = "A software suite to create, edit, compose, or convert bitmap images"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 08c53182dd5d..059b1c1a217d 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -75,4 +75,10 @@ stdenv.mkDerivation rec { cp ../examples/LDAP/samba.schema $out/etc/openldap/schema '' # */ + stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf"; + + meta = { + homepage = http://www.samba.org/; + description = "The standard Windows interoperability suite of programs for Linux and Unix"; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65a59e08f7a0..b16846cf0762 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6758,7 +6758,7 @@ let cuneiform = builderDefsPackage (import ../tools/graphics/cuneiform) { inherit cmake patchelf; - imagemagick=imagemagick; + imagemagick = imagemagick; }; cvs = callPackage ../applications/version-management/cvs { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index e4efb2cbd9cc..75d5ab72d62b 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -146,7 +146,6 @@ with (import ./release-lib.nix); icewm = linux; idutils = all; ifplugd = linux; - imagemagick = allBut "i686-cygwin"; impressive = linux; inetutils = linux; inkscape = linux; @@ -252,7 +251,6 @@ with (import ./release-lib.nix); rubber = allBut "i686-cygwin"; ruby = all; rxvt_unicode = linux; - samba = linux; screen = linux ++ darwin; scrot = linux; sdparm = linux; -- cgit 1.4.1 From 2c219adf4d09b3d3dd237cf52b3acbc586abba4d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:04:35 +0100 Subject: haskell-hashable: update (unused) 1.2.x version to 1.2.0.3 --- pkgs/development/libraries/haskell/hashable/1.2.0.2.nix | 15 --------------- pkgs/development/libraries/haskell/hashable/1.2.0.3.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/hashable/1.2.0.2.nix create mode 100644 pkgs/development/libraries/haskell/hashable/1.2.0.3.nix (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/hashable/1.2.0.2.nix b/pkgs/development/libraries/haskell/hashable/1.2.0.2.nix deleted file mode 100644 index 10f9c0ec6206..000000000000 --- a/pkgs/development/libraries/haskell/hashable/1.2.0.2.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ cabal, text }: - -cabal.mkDerivation (self: { - pname = "hashable"; - version = "1.2.0.2"; - sha256 = "1l827sh7v2jls2gcbxgbvz5hacwi43bcrxwmd3wp92hfwy1yza65"; - buildDepends = [ text ]; - meta = { - homepage = "http://github.com/tibbe/hashable"; - description = "A class for types that can be converted to a hash value"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/hashable/1.2.0.3.nix b/pkgs/development/libraries/haskell/hashable/1.2.0.3.nix new file mode 100644 index 000000000000..43d99b63d5a4 --- /dev/null +++ b/pkgs/development/libraries/haskell/hashable/1.2.0.3.nix @@ -0,0 +1,15 @@ +{ cabal, text }: + +cabal.mkDerivation (self: { + pname = "hashable"; + version = "1.2.0.3"; + sha256 = "0q4zl2mry6qfp9vln6pxmgqik7szv1sh7if55gydnxln1ybvvgmp"; + buildDepends = [ text ]; + meta = { + homepage = "http://github.com/tibbe/hashable"; + description = "A class for types that can be converted to a hash value"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 85a672c350fe..3c193a0b6c27 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -911,7 +911,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); happstackHamlet = callPackage ../development/libraries/haskell/happstack/happstack-hamlet.nix {}; hashable_1_1_2_5 = callPackage ../development/libraries/haskell/hashable/1.1.2.5.nix {}; - hashable_1_3_0_2 = callPackage ../development/libraries/haskell/hashable/1.2.0.2.nix {}; + hashable_1_2_0_3 = callPackage ../development/libraries/haskell/hashable/1.2.0.3.nix {}; hashable = self.hashable_1_1_2_5; hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {}; -- cgit 1.4.1 From c8e152b91510f1f86297806347fb74606f2df375 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:05:16 +0100 Subject: haskell-nats: add version 0.1 --- pkgs/development/libraries/haskell/nats/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/nats/default.nix (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/nats/default.nix b/pkgs/development/libraries/haskell/nats/default.nix new file mode 100644 index 000000000000..02f5c289836e --- /dev/null +++ b/pkgs/development/libraries/haskell/nats/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "nats"; + version = "0.1"; + sha256 = "08gh7jjmws70919hmqqmvnfqcpxr34f03jmg3lzmmhqvr15gm1vy"; + meta = { + homepage = "http://github.com/ekmett/nats/"; + description = "Haskell 98 natural numbers"; + 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 3c193a0b6c27..d11c5c6ad704 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1242,6 +1242,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {}; + nats = callPackage ../development/libraries/haskell/nats {}; + netlist = callPackage ../development/libraries/haskell/netlist {}; netlistToVhdl = callPackage ../development/libraries/haskell/netlist-to-vhdl {}; -- cgit 1.4.1 From 8dd292c32f8ddcc6bfb4960de0e419e1345233e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:05:25 +0100 Subject: haskell-transformers-compat: add version 0.1 --- .../libraries/haskell/transformers-compat/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/transformers-compat/default.nix (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/transformers-compat/default.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix new file mode 100644 index 000000000000..d36ace0eb299 --- /dev/null +++ b/pkgs/development/libraries/haskell/transformers-compat/default.nix @@ -0,0 +1,15 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "transformers-compat"; + version = "0.1"; + sha256 = "100xw00h2l6iipg6lq5bbncpil3bl6w3frak99klpi8gn6ihd8ah"; + buildDepends = [ transformers ]; + noHaddock = true; + meta = { + homepage = "http://github.com/ekmett/transformers-compat/"; + description = "Lenses, Folds and Traversals"; + 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 d11c5c6ad704..9713f8f94dc6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1680,6 +1680,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); transformersBase = callPackage ../development/libraries/haskell/transformers-base {}; + transformersCompat = callPackage ../development/libraries/haskell/transformers-compat {}; + tuple = callPackage ../development/libraries/haskell/tuple {}; typeEquality = callPackage ../development/libraries/haskell/type-equality {}; -- cgit 1.4.1 From 750ed5b8da910785755c3e4280568498c8084d17 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:14:33 +0100 Subject: wxHaskell: patch wxc to fix build error --- .../haskell/wxHaskell/fix-bogus-pointer-assignment.patch | 13 +++++++++++++ pkgs/development/libraries/haskell/wxHaskell/wxc.nix | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/wxHaskell/fix-bogus-pointer-assignment.patch (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/wxHaskell/fix-bogus-pointer-assignment.patch b/pkgs/development/libraries/haskell/wxHaskell/fix-bogus-pointer-assignment.patch new file mode 100644 index 000000000000..38551d24d43f --- /dev/null +++ b/pkgs/development/libraries/haskell/wxHaskell/fix-bogus-pointer-assignment.patch @@ -0,0 +1,13 @@ +diff -ubr wxc-0.90.0.4-orig/src/cpp/eljpen.cpp wxc-0.90.0.4/src/cpp/eljpen.cpp +--- wxc-0.90.0.4-orig/src/cpp/eljpen.cpp 2012-07-03 12:12:17.000000000 +0200 ++++ wxc-0.90.0.4/src/cpp/eljpen.cpp 2013-01-07 12:09:50.296417007 +0100 +@@ -156,7 +156,7 @@ + EWXWEXPORT(void,wxPen_GetStipple)(void* self,wxBitmap* _ref) + { + #if defined(__WXGTK__) +- *_ref = NULL; ++ _ref = NULL; + #else + *_ref = *(((wxPen*)self)->GetStipple()); + #endif +Only in wxc-0.90.0.4/src/cpp: eljpen.cpp.orig diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix index f439b9e1594a..74ca4f91d70f 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix @@ -10,7 +10,7 @@ cabal.mkDerivation (self: { postInstall = '' cp -v dist/build/libwxc.so.${self.version} $out/lib/libwxc.so ''; - + patches = [ ./fix-bogus-pointer-assignment.patch ]; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell C++ wrapper"; -- cgit 1.4.1 From e891d62a6c91f8bd00947ec9769efdc3806e9c1e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:16:48 +0100 Subject: Jailbreak Haskell packages to deal with update of semigroups. --- pkgs/development/libraries/haskell/active/default.nix | 1 + pkgs/development/libraries/haskell/diagrams/core.nix | 1 + pkgs/development/libraries/haskell/diagrams/lib.nix | 1 + pkgs/development/libraries/haskell/dual-tree/default.nix | 1 + pkgs/development/libraries/haskell/lens/default.nix | 3 +++ pkgs/development/libraries/haskell/monoid-extras/default.nix | 1 + 6 files changed, 8 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix index 5c563ad9cd73..732000e74824 100644 --- a/pkgs/development/libraries/haskell/active/default.nix +++ b/pkgs/development/libraries/haskell/active/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.1.0.2"; sha256 = "1iymh3sd21ba7ijwv5afphn5vhmwchk6725hbcsdwk2d2x2gd674"; buildDepends = [ newtype semigroupoids semigroups vectorSpace ]; + jailbreak = true; meta = { description = "Abstractions for animation"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index 3f4942086627..2acf784e8812 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { dualTree MemoTrie monoidExtras newtype semigroups vectorSpace vectorSpacePoints ]; + jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Core libraries for diagrams EDSL"; diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 472657b2df71..727a7156a9b8 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { active colour dataDefault diagramsCore monoidExtras newtype NumInstances semigroups vectorSpace ]; + jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative graphics"; diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix index f1206fd822ee..741fcbce1c9b 100644 --- a/pkgs/development/libraries/haskell/dual-tree/default.nix +++ b/pkgs/development/libraries/haskell/dual-tree/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.1.0.0"; sha256 = "0av525gjxzd2hhrg5da647chwbv4j30gccaff2b3n5qijzy8l167"; buildDepends = [ monoidExtras newtype semigroups ]; + jailbreak = true; meta = { description = "Rose trees with cached and accumulating monoidal annotations"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index dd9966a0d58d..88ce9fe32cf5 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -12,6 +12,9 @@ cabal.mkDerivation (self: { parallel semigroups split text transformers unorderedContainers vector ]; + patchPhase = '' + sed -i -e 's|semigroups.*,|semigroups,|' lens.cabal + ''; meta = { homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals"; diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix index a86bdce38397..4e8a4154ae1e 100644 --- a/pkgs/development/libraries/haskell/monoid-extras/default.nix +++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.2.2.1"; sha256 = "0n2zwkwwq8kg9m6qr79mrhlxsfsrjzbyg96gfhcgk21zgc09zary"; buildDepends = [ semigroups ]; + jailbreak = true; meta = { description = "Various extra monoid-related definitions and utilities"; license = self.stdenv.lib.licenses.bsd3; -- cgit 1.4.1 From 8437ef7a180f209059fb4c4ef78c3a7af29b18ec Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:18:33 +0100 Subject: haskell-comonad-transformers: update to version 3.0.1 --- pkgs/development/libraries/haskell/comonad-transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix index bc378235b91a..3a56b37edf9b 100644 --- a/pkgs/development/libraries/haskell/comonad-transformers/default.nix +++ b/pkgs/development/libraries/haskell/comonad-transformers/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "comonad-transformers"; - version = "3.0"; - sha256 = "1bjix61rdzmqcd1irh6p91jwy4sz1617sj4zic07p7ng9h7fsz24"; + version = "3.0.1"; + sha256 = "1lmcz01zsgy0lfzsznqbdq83vlk6h10zs7i41nav8qhzzhjn095j"; buildDepends = [ comonad contravariant distributive semigroupoids semigroups transformers -- cgit 1.4.1 From 493a5736ac039c28495ae96baf84f810e63e6948 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:18:33 +0100 Subject: haskell-comonad: update to version 3.0.1.1 --- pkgs/development/libraries/haskell/comonad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix index 3394de012060..b37ffdf596e1 100644 --- a/pkgs/development/libraries/haskell/comonad/default.nix +++ b/pkgs/development/libraries/haskell/comonad/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "comonad"; - version = "3.0.0.2"; - sha256 = "01q71b446mdbdj81qjrxjl5bshbg4bjih5zpw9fd4y5431bclfhi"; + version = "3.0.1.1"; + sha256 = "01zqxrqxy6x6nf6rynzmncbhlgbbpshhw10pkimnw5isg3b8qhc2"; buildDepends = [ semigroups transformers ]; meta = { homepage = "http://github.com/ekmett/comonad/"; -- cgit 1.4.1 From eb3448ddcf5e4ba494867338e3663bb60fe69512 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:18:33 +0100 Subject: haskell-comonads-fd: update to version 3.0.1 --- pkgs/development/libraries/haskell/comonads-fd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/comonads-fd/default.nix b/pkgs/development/libraries/haskell/comonads-fd/default.nix index 26a18c667a2b..5921d8b07d39 100644 --- a/pkgs/development/libraries/haskell/comonads-fd/default.nix +++ b/pkgs/development/libraries/haskell/comonads-fd/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "comonads-fd"; - version = "3.0"; - sha256 = "1j5ymj711c49fsk2ilxfpzqr0jr117z8kb5ggyh5nlwjy16m32in"; + version = "3.0.1"; + sha256 = "0ap9sw7h130bza43091mbl9a5bsin6342zawgycdcsag49wm3dyy"; buildDepends = [ comonad comonadTransformers mtl semigroups transformers ]; -- cgit 1.4.1 From 18df74561d6281b61fbd3bcc7a9c09a0caef0f01 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:18:33 +0100 Subject: haskell-distributive: update to version 0.3 --- pkgs/development/libraries/haskell/distributive/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/distributive/default.nix b/pkgs/development/libraries/haskell/distributive/default.nix index a8b07c608d8a..6709569b0540 100644 --- a/pkgs/development/libraries/haskell/distributive/default.nix +++ b/pkgs/development/libraries/haskell/distributive/default.nix @@ -1,10 +1,10 @@ -{ cabal, transformers }: +{ cabal, transformers, transformersCompat }: cabal.mkDerivation (self: { pname = "distributive"; - version = "0.2.2"; - sha256 = "13wvr2wb3h2nr1qd3dwjqx0b6g4igjqm3q2cyi4mc41gwihkbhr2"; - buildDepends = [ transformers ]; + version = "0.3"; + sha256 = "0z6vwak2n91vpx9ps9j1pbiw0zlh9jmds84yx1yqssbqx8npi32f"; + buildDepends = [ transformers transformersCompat ]; meta = { homepage = "http://github.com/ekmett/distributive/"; description = "Haskell 98 Distributive functors -- Dual to Traversable"; -- cgit 1.4.1 From 98067f47bf39594f46387b5278e035409d03ad0b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:18:33 +0100 Subject: haskell-either: update to version 3.0.3 --- pkgs/development/libraries/haskell/either/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix index 3d293d3b86e6..cbfa53b6d001 100644 --- a/pkgs/development/libraries/haskell/either/default.nix +++ b/pkgs/development/libraries/haskell/either/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "either"; - version = "3.0.2"; - sha256 = "1s3rpxxqc9052hrmiznwqwxhl4826qzbgpivpv5acxfhm0w06lhg"; + version = "3.0.3"; + sha256 = "02kpb8xd19n00ll61haqr6k3hy8qmbdf73gr4zs59q9xh0739qxc"; buildDepends = [ semigroupoids semigroups transformers ]; meta = { homepage = "http://github.com/ekmett/either/"; -- cgit 1.4.1 From d5971b4e2d8f2b9d8a7e4ba0f34a7298a3d3faf3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:18:34 +0100 Subject: haskell-fsnotify: update to version 0.0.6 --- pkgs/development/libraries/haskell/fsnotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/fsnotify/default.nix b/pkgs/development/libraries/haskell/fsnotify/default.nix index 34a3c13b9fb1..80b6760a3b7b 100644 --- a/pkgs/development/libraries/haskell/fsnotify/default.nix +++ b/pkgs/development/libraries/haskell/fsnotify/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fsnotify"; - version = "0.0.5"; - sha256 = "1pi1dpm48igcc8n5cn8hdml8bknxl18kqhjbh6jan839fgmwagb9"; + version = "0.0.6"; + sha256 = "0ib6ansj3vaq9hxxbsq5jw14w2b61wp4jfahzb3c3x46mdb1bqw5"; buildDepends = [ hinotify systemFileio systemFilepath text time ]; meta = { description = "Cross platform library for file creation, modification, and deletion notification"; -- cgit 1.4.1 From 4ef1cb39ed5e072c503ce9a27a90544a6b492165 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:18:34 +0100 Subject: haskell-hakyll: update to version 3.5.2.1 --- pkgs/development/libraries/haskell/hakyll/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 093a92dd16ec..50ff535d874b 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -5,14 +5,13 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.5.2.0"; - sha256 = "088qhzycpz003qa4b7hnn6frgmidk6219icii04ap964fkw0mqn0"; + version = "3.5.2.1"; + sha256 = "1fp7jak2sfznvg3lfyjqy13m1iq9821mdq6n5qmqz5dh5b960iv4"; buildDepends = [ binary blazeHtml blazeMarkup citeprocHs cryptohash filepath hamlet lrucache mtl pandoc parsec regexBase regexTdfa snapCore snapServer tagsoup text time ]; - jailbreak = true; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; -- cgit 1.4.1 From 0931bf92c152c657df696e77a1069cd46ddddf7b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:18:34 +0100 Subject: haskell-highlighting-kate: update to version 0.5.3.4 --- pkgs/development/libraries/haskell/highlighting-kate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index 4b2e32d23520..cc591acf2022 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.3.3"; - sha256 = "08jxl2ba0kb4vj1qbdf4sas8bwbxzayzwsxnjvq358x57i5l302n"; + version = "0.5.3.4"; + sha256 = "1xm9dr71qna1w65vzaf63hbchpvshfjvvs5038sy04x2ddwdix77"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcre ]; -- cgit 1.4.1 From 407ee56a617b677d0641f773c6edb4e54aafdcd8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:18:34 +0100 Subject: haskell-http-conduit: update to version 1.8.6.2 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 7ac2a551fc4a..aada13af06ae 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.8.6.1"; - sha256 = "1vkfld5kn8fql78mw8zwsp524m07kr4a10c411rzpv6xqx92azy7"; + version = "1.8.6.2"; + sha256 = "0b9iw8gq0kyfmnpv1jba2dx8rik9136zx5q9xdyvy0lczdgb8i09"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie -- cgit 1.4.1 From 305485b2792ad13e6e779d1c37166b90a487b9a3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:18:34 +0100 Subject: haskell-http-reverse-proxy: update to version 0.1.1.1 --- pkgs/development/libraries/haskell/http-reverse-proxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index 62bc2ebac184..e30a30fc7aa3 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.1.1"; - sha256 = "0p04zpw1v0zhzri7wpikc0b8g7n21kgl8j8238vv7xqxapkal0pc"; + version = "0.1.1.1"; + sha256 = "0xg6xw0j61db75smys2fgjn0nzv2dy8c1ha4m828ssnxlic98lk2"; buildDepends = [ blazeBuilder caseInsensitive classyPreludeConduit conduit dataDefault httpConduit httpTypes liftedBase monadControl network -- cgit 1.4.1 From 7025e237100d1d97821c95a90dba7c0142e678f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:18:34 +0100 Subject: haskell-lens: update to version 3.7.2 --- pkgs/development/libraries/haskell/lens/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 88ce9fe32cf5..92375e9f14a9 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "3.7.1.2"; - sha256 = "1hapcnmyqyc3645gsy1ikwzm2srbbznps6yrfr02y2lcbnjpn3g6"; + version = "3.7.2"; + sha256 = "14kc9yhq7niv49gpdcl55priwnvisawa9jsp8hnplk48p11i2xs3"; buildDepends = [ comonad comonadsFd comonadTransformers filepath hashable mtl parallel semigroups split text transformers unorderedContainers -- cgit 1.4.1 From 351c10751ead3736024d6359e72ef0013c08a56e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:18:35 +0100 Subject: haskell-network-conduit: update to version 0.6.2.2 --- pkgs/development/libraries/haskell/network-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix index 1b2187daaafb..a56c35a214ba 100644 --- a/pkgs/development/libraries/haskell/network-conduit/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "network-conduit"; - version = "0.6.2.1"; - sha256 = "1pkqkkj18yn31dmxcc8xfq2drg2jm9169my0s3jsxjbyxsyq58l6"; + version = "0.6.2.2"; + sha256 = "1v8abhw977hr78hkshrbxy04abbbhafvvnhr4xxgqc0phwch02mc"; buildDepends = [ conduit liftedBase monadControl network transformers ]; -- cgit 1.4.1 From 6fa197d6e4acd11a24e2154e580c356e92735fa5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:18:35 +0100 Subject: haskell-pretty-show: update to version 1.5 --- pkgs/development/libraries/haskell/pretty-show/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/pretty-show/default.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix index 791d8c59b749..5fedd0aca292 100644 --- a/pkgs/development/libraries/haskell/pretty-show/default.nix +++ b/pkgs/development/libraries/haskell/pretty-show/default.nix @@ -1,15 +1,15 @@ -{ cabal, haskellLexer }: +{ cabal, filepath, haskellLexer }: cabal.mkDerivation (self: { pname = "pretty-show"; - version = "1.3.2"; - sha256 = "0m3kw4d68gd1mhlgi5vy3k2cqi9f0i4s502m2sgy4pww45fjllxy"; + version = "1.5"; + sha256 = "1n04f9aypgbhkq0lbji9czv1mjfwv4f80w1c6hqs55gmzwif63m4"; isLibrary = true; isExecutable = true; - buildDepends = [ haskellLexer ]; + buildDepends = [ filepath haskellLexer ]; meta = { homepage = "http://wiki.github.com/yav/pretty-show"; - description = "Tools for working with derived Show instances"; + description = "Tools for working with derived `Show` instances and generic inspection of values"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; -- cgit 1.4.1 From ae9e14ae136da74136de7dae5c69c008140a463e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:18:35 +0100 Subject: haskell-semigroupoids: update to version 3.0.1 --- pkgs/development/libraries/haskell/semigroupoids/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix index c2e8deefbad5..7e25fa5913e2 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.0.1"; - sha256 = "0ilqmpywiwp9m1k8lrw0mxb0pzc9l8bs2hgzrp8k5iln1yq1fh6i"; + version = "3.0.1"; + sha256 = "12k2yryr31lxhwq42cx05kswljmbli8p8c2wknigzkkam63d8k5h"; buildDepends = [ comonad contravariant semigroups transformers ]; meta = { homepage = "http://github.com/ekmett/semigroupoids"; -- cgit 1.4.1 From cbd23de696a5734a730d7f8d3d47515c6d8677c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:18:36 +0100 Subject: haskell-semigroups: update to version 0.9 --- pkgs/development/libraries/haskell/semigroups/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index 1a412aec908b..ea0f2813b55f 100644 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, nats }: cabal.mkDerivation (self: { pname = "semigroups"; - version = "0.8.5"; - sha256 = "0dnxqqxfyxj0mpy524nvgwagsp6ynadmh2yr4k5159rzbg2xgz90"; + version = "0.9"; + sha256 = "0cwyjjlr9zgpxryzdf26pb58dmad0cp8d0493rarhh5zmgighh90"; + buildDepends = [ nats ]; meta = { homepage = "http://github.com/ekmett/semigroups/"; description = "Haskell 98 semigroups"; -- cgit 1.4.1 From 87e992ad623a7b4cc1225a26060c3f2f60182564 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:18:36 +0100 Subject: haskell-texmath: update to version 0.6.1.2 --- pkgs/development/libraries/haskell/texmath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index 65d9da1548fd..78ec99da8db5 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "texmath"; - version = "0.6.1.1"; - sha256 = "06yk19jvpj7di1njybk1hdc7hp6c9h3yb4gvi7ljna6wqrh6zqaz"; + version = "0.6.1.2"; + sha256 = "1izsjy30saz2il16dwx8sh2s30b1pfgcpq6023v135w1bdrzrnmq"; isLibrary = true; isExecutable = true; buildDepends = [ parsec syb xml ]; -- cgit 1.4.1 From e1ee00d67b3f22b4514c45f735ff008e355aee62 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:18:36 +0100 Subject: haskell-uu-parsinglib: update to version 2.7.4.1 --- pkgs/development/libraries/haskell/uu-parsinglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix index 02356789bc30..d28eb827dabf 100644 --- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix +++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uu-parsinglib"; - version = "2.7.4"; - sha256 = "1cznyn09a3glfkvvzqma3bhjinddkp6v2xwiy5x403v0wy8y565j"; + version = "2.7.4.1"; + sha256 = "1aya95j7dd0yal0ygy6d4w4wmlhgn5ddy3c5f6ncl4k3kg7hjxd1"; buildDepends = [ ListLike time ]; meta = { homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; -- cgit 1.4.1 From 2666c6f94ce431002b481cab215c9cc539ba9c80 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:18:36 +0100 Subject: haskell-void: update to version 0.5.11 --- pkgs/development/libraries/haskell/void/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix index 5cd54a3e0e77..cdf21c782334 100644 --- a/pkgs/development/libraries/haskell/void/default.nix +++ b/pkgs/development/libraries/haskell/void/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "void"; - version = "0.5.10"; - sha256 = "0adykqns7vvzgrjg7waaklfj3dl1h7vk5rwlfx0f18js6di9zrh4"; + version = "0.5.11"; + sha256 = "0fi8ccnhg0ckz5v3cgxhdd67p0v3g9yawin917ik4vxfbwz5j3v6"; buildDepends = [ semigroups ]; meta = { homepage = "http://github.com/ekmett/void"; -- cgit 1.4.1 From a547de1ecb14853487d864f70ad5e6a1cb3ce08d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Jan 2013 12:18:36 +0100 Subject: haskell-hlint: update to version 1.8.40 --- pkgs/development/tools/haskell/hlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index bb6d64e54f08..4cbd57a8c5f9 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.8.39"; - sha256 = "009qf441nri8pxzz22xvpz44dhspr9bkh5diaz29abimj10fm375"; + version = "1.8.40"; + sha256 = "18w4dhxv7c1y4x1agdjq99ss5i77jnm8p9vg3jp9gvhk2arhcl0x"; isLibrary = true; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From 5b0ca88d97d005a73a2be38e7a521af70875a718 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 7 Jan 2013 16:52:42 +0100 Subject: - Added xcodeenv: experimental support to build iOS apps through Nix - Moved mobile development tools into a separate folder --- pkgs/development/androidenv/addon.xml | 950 ------------------ pkgs/development/androidenv/addons.nix | 198 ---- pkgs/development/androidenv/androidsdk.nix | 194 ---- pkgs/development/androidenv/build-app.nix | 41 - pkgs/development/androidenv/default.nix | 62 -- pkgs/development/androidenv/emulate-app.nix | 87 -- pkgs/development/androidenv/generate-addons.sh | 3 - pkgs/development/androidenv/generate-addons.xsl | 38 - pkgs/development/androidenv/generate-platforms.sh | 4 - pkgs/development/androidenv/generate-platforms.xsl | 38 - pkgs/development/androidenv/generate-sysimages.sh | 3 - pkgs/development/androidenv/generate-sysimages.xsl | 36 - pkgs/development/androidenv/platform-tools.nix | 41 - pkgs/development/androidenv/platforms-linux.nix | 210 ---- pkgs/development/androidenv/platforms-macosx.nix | 210 ---- pkgs/development/androidenv/repository-7.xml | 1030 -------------------- pkgs/development/androidenv/support.nix | 17 - pkgs/development/androidenv/sysimages.nix | 50 - pkgs/development/libraries/apr-util/default.nix | 2 +- pkgs/development/libraries/v8/default.nix | 7 +- pkgs/development/mobile/androidenv/addon.xml | 950 ++++++++++++++++++ pkgs/development/mobile/androidenv/addons.nix | 198 ++++ pkgs/development/mobile/androidenv/androidsdk.nix | 194 ++++ pkgs/development/mobile/androidenv/build-app.nix | 41 + pkgs/development/mobile/androidenv/default.nix | 62 ++ pkgs/development/mobile/androidenv/emulate-app.nix | 87 ++ .../mobile/androidenv/generate-addons.sh | 3 + .../mobile/androidenv/generate-addons.xsl | 38 + .../mobile/androidenv/generate-platforms.sh | 4 + .../mobile/androidenv/generate-platforms.xsl | 38 + .../mobile/androidenv/generate-sysimages.sh | 3 + .../mobile/androidenv/generate-sysimages.xsl | 36 + .../mobile/androidenv/platform-tools.nix | 41 + .../mobile/androidenv/platforms-linux.nix | 210 ++++ .../mobile/androidenv/platforms-macosx.nix | 210 ++++ .../development/mobile/androidenv/repository-7.xml | 1030 ++++++++++++++++++++ pkgs/development/mobile/androidenv/support.nix | 17 + pkgs/development/mobile/androidenv/sysimages.nix | 50 + pkgs/development/mobile/xcodeenv/build-app.nix | 92 ++ pkgs/development/mobile/xcodeenv/default.nix | 15 + pkgs/development/mobile/xcodeenv/simulate-app.nix | 17 + pkgs/development/mobile/xcodeenv/xcodewrapper.nix | 24 + pkgs/development/web/nodejs/default.nix | 15 +- pkgs/top-level/all-packages.nix | 4 +- 44 files changed, 3379 insertions(+), 3221 deletions(-) delete mode 100644 pkgs/development/androidenv/addon.xml delete mode 100644 pkgs/development/androidenv/addons.nix delete mode 100644 pkgs/development/androidenv/androidsdk.nix delete mode 100644 pkgs/development/androidenv/build-app.nix delete mode 100644 pkgs/development/androidenv/default.nix delete mode 100644 pkgs/development/androidenv/emulate-app.nix delete mode 100755 pkgs/development/androidenv/generate-addons.sh delete mode 100644 pkgs/development/androidenv/generate-addons.xsl delete mode 100755 pkgs/development/androidenv/generate-platforms.sh delete mode 100644 pkgs/development/androidenv/generate-platforms.xsl delete mode 100755 pkgs/development/androidenv/generate-sysimages.sh delete mode 100644 pkgs/development/androidenv/generate-sysimages.xsl delete mode 100644 pkgs/development/androidenv/platform-tools.nix delete mode 100644 pkgs/development/androidenv/platforms-linux.nix delete mode 100644 pkgs/development/androidenv/platforms-macosx.nix delete mode 100644 pkgs/development/androidenv/repository-7.xml delete mode 100644 pkgs/development/androidenv/support.nix delete mode 100644 pkgs/development/androidenv/sysimages.nix create mode 100644 pkgs/development/mobile/androidenv/addon.xml create mode 100644 pkgs/development/mobile/androidenv/addons.nix create mode 100644 pkgs/development/mobile/androidenv/androidsdk.nix create mode 100644 pkgs/development/mobile/androidenv/build-app.nix create mode 100644 pkgs/development/mobile/androidenv/default.nix create mode 100644 pkgs/development/mobile/androidenv/emulate-app.nix create mode 100755 pkgs/development/mobile/androidenv/generate-addons.sh create mode 100644 pkgs/development/mobile/androidenv/generate-addons.xsl create mode 100755 pkgs/development/mobile/androidenv/generate-platforms.sh create mode 100644 pkgs/development/mobile/androidenv/generate-platforms.xsl create mode 100755 pkgs/development/mobile/androidenv/generate-sysimages.sh create mode 100644 pkgs/development/mobile/androidenv/generate-sysimages.xsl create mode 100644 pkgs/development/mobile/androidenv/platform-tools.nix create mode 100644 pkgs/development/mobile/androidenv/platforms-linux.nix create mode 100644 pkgs/development/mobile/androidenv/platforms-macosx.nix create mode 100644 pkgs/development/mobile/androidenv/repository-7.xml create mode 100644 pkgs/development/mobile/androidenv/support.nix create mode 100644 pkgs/development/mobile/androidenv/sysimages.nix create mode 100644 pkgs/development/mobile/xcodeenv/build-app.nix create mode 100644 pkgs/development/mobile/xcodeenv/default.nix create mode 100644 pkgs/development/mobile/xcodeenv/simulate-app.nix create mode 100644 pkgs/development/mobile/xcodeenv/xcodewrapper.nix (limited to 'pkgs') diff --git a/pkgs/development/androidenv/addon.xml b/pkgs/development/androidenv/addon.xml deleted file mode 100644 index fb5d324d7789..000000000000 --- a/pkgs/development/androidenv/addon.xml +++ /dev/null @@ -1,950 +0,0 @@ - - - - - Terms and Conditions - -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 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time. - -1.3 "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 By clicking to accept, you hereby agree to the terms of this License Agreement. - -2.3 You may not use the SDK and may not accept the License 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 License 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 You may not use the SDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) 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; or (b) 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 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the SDK. - -3.5 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.6 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.7 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.8 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, you 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 Android and/or applications for Android, 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 - - -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 provide 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 constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces 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. - -November 13, 2012 - - - 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 - - - - - - - - google - Google Inc. - google_apis - Google APIs - Android + Google APIs - 17 - 1 - - - com.google.android.maps - - - com.android.future.usb.accessory - - - com.google.android.media.effects - - - - - 132568033 - 62cb086f11e15713878c8834d58ef1a2454c19a4 - google_apis-17_r01.zip - - - - - - - - - - 11 - Android - android - Android Support Library - support - compatibility - - - 1264808 - d30d182d8e4c86bb4464c03a83ccffce7bc84ecd - support_r11.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 - 4 - Google Play Services client library and sample code - https://developers.google.com/android/google-play-services/index - - - - 3732458 - bbb3d11225fcf60a0bae75afa2c4737010468bf6 - google_play_services_2012110_r04.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 - 3 - Google Play Billing files and sample code - http://developer.android.com/google/play/billing/index.html - - - 435718 - a133d454c992ef2a18e62fa810e8185f1be4b054 - play_billing_r03.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 - - - - - diff --git a/pkgs/development/androidenv/addons.nix b/pkgs/development/androidenv/addons.nix deleted file mode 100644 index f26db5c2cb73..000000000000 --- a/pkgs/development/androidenv/addons.nix +++ /dev/null @@ -1,198 +0,0 @@ - -{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"; - - }; - }; - - google_apis_17 = buildGoogleApis { - name = "google_apis-17"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-17_r01.zip; - sha1 = "62cb086f11e15713878c8834d58ef1a2454c19a4"; - }; - meta = { - description = "Android + Google APIs"; - - }; - }; - -} - \ No newline at end of file diff --git a/pkgs/development/androidenv/androidsdk.nix b/pkgs/development/androidenv/androidsdk.nix deleted file mode 100644 index e8e1f919fe4e..000000000000 --- a/pkgs/development/androidenv/androidsdk.nix +++ /dev/null @@ -1,194 +0,0 @@ -{ stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper -, platformTools, support, platforms, sysimages, addons -, zlib_32bit -, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit -, libX11, libXext, libXrender, libxcb, libXau, libXdmcp -, freetype, fontconfig, gtk, atk -}: -{platformVersions, useGoogleAPIs}: - -stdenv.mkDerivation { - name = "android-sdk-21"; - - src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") - then fetchurl { - url = http://dl.google.com/android/android-sdk_r21-linux.tgz; - md5 = "7f8d73b629f808cdcfc9f9900bbd7580"; - } - else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://dl.google.com/android/android-sdk_r21-macosx.zip; - md5 = "67e46adca90dd18d7291443f6c15d6af"; - } - else throw "platform not ${stdenv.system} supported!"; - - buildCommand = '' - mkdir -p $out/libexec - cd $out/libexec - 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-mips 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 - - ${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' - # We must also patch the 64-bit emulator instances, if needed - - for i in emulator64-arm emulator64-mips emulator64-x86 - do - patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 $i - patchelf --set-rpath ${stdenv.gcc.gcc}/lib64 $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-mips 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 - - ${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' - for i in emulator64-arm emulator64-mips emulator64-x86 - do - wrapProgram `pwd`/$i \ - --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib - done - ''} - ''} - - patchShebangs . - - ${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} - - # Create wrappers to the most important tools and platform tools so that we can run them if the SDK is in our PATH - - ensureDir $out/bin - - for i in $out/libexec/android-sdk-*/tools/* - do - if [ ! -d $i ] && [ -x $i ] - then - ( echo '#! ${stdenv.shell} -e' - echo "cd $out/libexec/android-sdk-*/tools" - echo "exec ./$(basename $i) \"\$@\"" ) > $out/bin/$(basename $i) - - chmod +x $out/bin/$(basename $i) - fi - done - - for i in $out/libexec/android-sdk-*/platform-tools/* - do - if [ ! -d $i ] && [ -x $i ] - then - ( echo '#! ${stdenv.shell} -e' - echo "cd $out/libexec/android-sdk-*/platform-tools" - echo "exec ./$(basename $i) \"\$@\"") > $out/bin/$(basename $i) - - chmod +x $out/bin/$(basename $i) - fi - done - ''; - - buildInputs = [ unzip makeWrapper ]; -} diff --git a/pkgs/development/androidenv/build-app.nix b/pkgs/development/androidenv/build-app.nix deleted file mode 100644 index 571cd2be6232..000000000000 --- a/pkgs/development/androidenv/build-app.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ 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}/libexec/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 deleted file mode 100644 index a76deb98b6ee..000000000000 --- a/pkgs/development/androidenv/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{pkgs, pkgs_i686}: - -rec { - platformTools = import ./platform-tools.nix { - inherit (pkgs) stdenv fetchurl unzip; - 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 makeWrapper; - inherit (pkgs) freetype fontconfig gtk atk; - inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp; - - 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; - }; - - androidsdk_4_1 = androidsdk { - platformVersions = [ "16" ]; - useGoogleAPIs = true; - }; - - 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 deleted file mode 100644 index 3cbe57238066..000000000000 --- a/pkgs/development/androidenv/emulate-app.nix +++ /dev/null @@ -1,87 +0,0 @@ -{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}/libexec/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}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} - - # Launch the emulator - ${androidsdkComposition}/libexec/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}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port wait-for-device - - echo "Device state has been reached" - - while [ -z "$(${androidsdkComposition}/libexec/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}/libexec/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}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install ${app}/*.apk - - # Start the application - ${androidsdkComposition}/libexec/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/generate-addons.sh b/pkgs/development/androidenv/generate-addons.sh deleted file mode 100755 index 9b2cf34eabcc..000000000000 --- a/pkgs/development/androidenv/generate-addons.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -e - -xsltproc generate-addons.xsl addon.xml > addons.nix diff --git a/pkgs/development/androidenv/generate-addons.xsl b/pkgs/development/androidenv/generate-addons.xsl deleted file mode 100644 index 0100b980a4ef..000000000000 --- a/pkgs/development/androidenv/generate-addons.xsl +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - -{stdenv, fetchurl, unzip}: - -let - buildGoogleApis = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ - - google_apis_ = buildGoogleApis { - name = "-"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/; - sha1 = ""; - }; - meta = { - description = ""; - url = ; - }; - }; - -} - - - diff --git a/pkgs/development/androidenv/generate-platforms.sh b/pkgs/development/androidenv/generate-platforms.sh deleted file mode 100755 index 983d8bde87b9..000000000000 --- a/pkgs/development/androidenv/generate-platforms.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -e - -xsltproc --stringparam os linux generate-platforms.xsl repository-7.xml > platforms-linux.nix -xsltproc --stringparam os macosx generate-platforms.xsl repository-7.xml > platforms-macosx.nix diff --git a/pkgs/development/androidenv/generate-platforms.xsl b/pkgs/development/androidenv/generate-platforms.xsl deleted file mode 100644 index 1802ae63efe1..000000000000 --- a/pkgs/development/androidenv/generate-platforms.xsl +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - -{stdenv, fetchurl, unzip}: - -let - buildPlatform = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ - - platform_ = buildPlatform { - name = "android-platform-"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/; - sha1 = ""; - }; - meta = { - description = ""; - url = ; - }; - }; - -} - - diff --git a/pkgs/development/androidenv/generate-sysimages.sh b/pkgs/development/androidenv/generate-sysimages.sh deleted file mode 100755 index dc28c27f45f0..000000000000 --- a/pkgs/development/androidenv/generate-sysimages.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -e - -xsltproc generate-sysimages.xsl repository-7.xml > sysimages.nix diff --git a/pkgs/development/androidenv/generate-sysimages.xsl b/pkgs/development/androidenv/generate-sysimages.xsl deleted file mode 100644 index 1224ebbd4e8d..000000000000 --- a/pkgs/development/androidenv/generate-sysimages.xsl +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - -{stdenv, fetchurl, unzip}: - -let - buildSystemImage = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ - - sysimg_ = buildSystemImage { - name = "-"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/; - sha1 = ""; - }; - }; - -} - - - diff --git a/pkgs/development/androidenv/platform-tools.nix b/pkgs/development/androidenv/platform-tools.nix deleted file mode 100644 index 554996082909..000000000000 --- a/pkgs/development/androidenv/platform-tools.nix +++ /dev/null @@ -1,41 +0,0 @@ -{stdenv, stdenv_32bit, fetchurl, unzip, zlib, ncurses}: - -stdenv.mkDerivation { - name = "android-platform-tools-r16"; - src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") - then fetchurl { - url = https://dl-ssl.google.com/android/repository/platform-tools_r16-linux.zip; - sha1 = "84d563ae5e324f223f335f11bf511bf6207c05fb"; - } - else if stdenv.system == "x86_64-darwin" then fetchurl { - url = https://dl-ssl.google.com/android/repository/platform-tools_r16-macosx.zip; - sha1 = "fbb0f8d2786a83b8c3eb6df402e706e136db8fed"; - } - else throw "System ${stdenv.system} not supported!"; - - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - cd platform-tools - - ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") - '' - for i in aapt adb aidl dexdump fastboot llvm-rs-cc - do - patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i - done - - patchelf --set-rpath ${zlib}/lib:${stdenv_32bit.gcc.gcc}/lib aapt - patchelf --set-rpath ${ncurses}/lib:${stdenv_32bit.gcc.gcc}/lib adb - patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib aidl - patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib fastboot - patchelf --set-rpath ${zlib}/lib:${stdenv_32bit.gcc.gcc}/lib dexdump - patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib llvm-rs-cc - ''} - - patchShebangs . - ''; - - buildInputs = [ unzip ]; -} diff --git a/pkgs/development/androidenv/platforms-linux.nix b/pkgs/development/androidenv/platforms-linux.nix deleted file mode 100644 index f544fcc08bed..000000000000 --- a/pkgs/development/androidenv/platforms-linux.nix +++ /dev/null @@ -1,210 +0,0 @@ - -{stdenv, fetchurl, unzip}: - -let - buildPlatform = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ - - platform_2 = buildPlatform { - name = "android-platform-1.1"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-1.1_r1-linux.zip; - sha1 = "c054d25c9b4c6251fa49c2f9c54336998679d3fe"; - }; - meta = { - description = "Android SDK Platform 1.1_r1"; - url = http://developer.android.com/sdk/android-1.1.html; - }; - }; - - platform_3 = buildPlatform { - name = "android-platform-1.5"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-1.5_r04-linux.zip; - sha1 = "5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c"; - }; - meta = { - description = "Android SDK Platform 1.5_r3"; - url = http://developer.android.com/sdk/android-1.5.html; - }; - }; - - platform_4 = buildPlatform { - name = "android-platform-1.6"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-1.6_r03-linux.zip; - sha1 = "483ed088e45bbdf3444baaf9250c8b02e5383cb0"; - }; - meta = { - description = "Android SDK Platform 1.6_r2"; - url = http://developer.android.com/sdk/android-1.6.html; - }; - }; - - platform_5 = buildPlatform { - name = "android-platform-2.0"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-2.0_r01-linux.zip; - sha1 = "be9be6a99ca32875c96ec7f91160ca9fce7e3c7d"; - }; - meta = { - description = "Android SDK Platform 2.0, revision 1"; - url = http://developer.android.com/sdk/android-2.0.html; - }; - }; - - platform_6 = buildPlatform { - name = "android-platform-2.0.1"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-2.0.1_r01-linux.zip; - sha1 = "ce2c971dce352aa28af06bda92a070116aa5ae1a"; - }; - meta = { - description = "Android SDK Platform 2.0.1_r1"; - url = http://developer.android.com/sdk/android-2.0.1.html; - }; - }; - - platform_7 = buildPlatform { - name = "android-platform-2.1"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-2.1_r03-linux.zip; - sha1 = "5ce51b023ac19f8738500b1007a1da5de2349a1e"; - }; - meta = { - description = "Android SDK Platform 2.1_r3"; - url = http://developer.android.com/sdk/; - }; - }; - - platform_8 = buildPlatform { - name = "android-platform-2.2"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-2.2_r03-linux.zip; - sha1 = "231262c63eefdff8fd0386e9ccfefeb27a8f9202"; - }; - meta = { - description = "Android SDK Platform 2.2_r3"; - url = http://developer.android.com/sdk/; - }; - }; - - platform_9 = buildPlatform { - name = "android-platform-2.3.1"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-2.3.1_r02-linux.zip; - sha1 = "209f8a7a8b2cb093fce858b8b55fed3ba5206773"; - }; - meta = { - description = "Android SDK Platform 2.3.1_r2"; - url = http://developer.android.com/sdk/; - }; - }; - - platform_10 = buildPlatform { - name = "android-platform-2.3.3"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-2.3.3_r02-linux.zip; - sha1 = "887e37783ec32f541ea33c2c649dda648e8e6fb3"; - }; - meta = { - description = "Android SDK Platform 2.3.3._r2"; - url = http://developer.android.com/sdk/; - }; - }; - - platform_11 = buildPlatform { - name = "android-platform-3.0"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-3.0_r02-linux.zip; - sha1 = "2c7d4bd13f276e76f6bbd87315fe27aba351dd37"; - }; - meta = { - description = "Android SDK Platform 3.0, revision 2"; - url = http://developer.android.com/sdk/; - }; - }; - - platform_12 = buildPlatform { - name = "android-platform-3.1"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-3.1_r03-linux.zip; - sha1 = "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf"; - }; - meta = { - description = "Android SDK Platform 3.1, revision 3"; - url = http://developer.android.com/sdk/; - }; - }; - - platform_13 = buildPlatform { - name = "android-platform-3.2"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-3.2_r01-linux.zip; - sha1 = "6189a500a8c44ae73a439604363de93591163cd9"; - }; - meta = { - description = "Android SDK Platform 3.2, revision 1"; - url = http://developer.android.com/sdk/; - }; - }; - - platform_14 = buildPlatform { - name = "android-platform-4.0"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-14_r03.zip; - sha1 = "41ba83b51e886461628c41b1b4d47762e0688ed5"; - }; - meta = { - description = "Android SDK Platform 4.0"; - - }; - }; - - platform_15 = buildPlatform { - name = "android-platform-4.0.3"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-15_r03.zip; - sha1 = "23da24610a8da51054c5391001c51ce43a778b97"; - }; - meta = { - description = "Android SDK Platform 4.0.3"; - - }; - }; - - platform_16 = buildPlatform { - name = "android-platform-4.1.2"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-16_r03.zip; - sha1 = "80d9ffef58168f9bccd862830e2ee51f686b167e"; - }; - meta = { - description = "Android SDK Platform 4.1"; - - }; - }; - - platform_17 = buildPlatform { - name = "android-platform-4.2"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-17_r01.zip; - sha1 = "c2e7c8c8db40e06b804ddb1725ac2c3555b55025"; - }; - meta = { - description = "Android SDK Platform 4.2"; - - }; - }; - -} - \ No newline at end of file diff --git a/pkgs/development/androidenv/platforms-macosx.nix b/pkgs/development/androidenv/platforms-macosx.nix deleted file mode 100644 index a1434bbe56c1..000000000000 --- a/pkgs/development/androidenv/platforms-macosx.nix +++ /dev/null @@ -1,210 +0,0 @@ - -{stdenv, fetchurl, unzip}: - -let - buildPlatform = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ - - platform_2 = buildPlatform { - name = "android-platform-1.1"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-1.1_r1-macosx.zip; - sha1 = "e21dbcff45b7356657449ebb3c7e941be2bb5ebe"; - }; - meta = { - description = "Android SDK Platform 1.1_r1"; - url = http://developer.android.com/sdk/android-1.1.html; - }; - }; - - platform_3 = buildPlatform { - name = "android-platform-1.5"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-1.5_r04-macosx.zip; - sha1 = "d3a67c2369afa48b6c3c7624de5031c262018d1e"; - }; - meta = { - description = "Android SDK Platform 1.5_r3"; - url = http://developer.android.com/sdk/android-1.5.html; - }; - }; - - platform_4 = buildPlatform { - name = "android-platform-1.6"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-1.6_r03-macosx.zip; - sha1 = "bdafad44f5df9f127979bdb21a1fdd87ee3cd625"; - }; - meta = { - description = "Android SDK Platform 1.6_r2"; - url = http://developer.android.com/sdk/android-1.6.html; - }; - }; - - platform_5 = buildPlatform { - name = "android-platform-2.0"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-2.0_r01-macosx.zip; - sha1 = "2a866d0870dbba18e0503cd41e5fae988a21b314"; - }; - meta = { - description = "Android SDK Platform 2.0, revision 1"; - url = http://developer.android.com/sdk/android-2.0.html; - }; - }; - - platform_6 = buildPlatform { - name = "android-platform-2.0.1"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-2.0.1_r01-macosx.zip; - sha1 = "c3096f80d75a6fc8cb38ef8a18aec920e53d42c0"; - }; - meta = { - description = "Android SDK Platform 2.0.1_r1"; - url = http://developer.android.com/sdk/android-2.0.1.html; - }; - }; - - platform_7 = buildPlatform { - name = "android-platform-2.1"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-2.1_r03-linux.zip; - sha1 = "5ce51b023ac19f8738500b1007a1da5de2349a1e"; - }; - meta = { - description = "Android SDK Platform 2.1_r3"; - url = http://developer.android.com/sdk/; - }; - }; - - platform_8 = buildPlatform { - name = "android-platform-2.2"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-2.2_r03-linux.zip; - sha1 = "231262c63eefdff8fd0386e9ccfefeb27a8f9202"; - }; - meta = { - description = "Android SDK Platform 2.2_r3"; - url = http://developer.android.com/sdk/; - }; - }; - - platform_9 = buildPlatform { - name = "android-platform-2.3.1"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-2.3.1_r02-linux.zip; - sha1 = "209f8a7a8b2cb093fce858b8b55fed3ba5206773"; - }; - meta = { - description = "Android SDK Platform 2.3.1_r2"; - url = http://developer.android.com/sdk/; - }; - }; - - platform_10 = buildPlatform { - name = "android-platform-2.3.3"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-2.3.3_r02-linux.zip; - sha1 = "887e37783ec32f541ea33c2c649dda648e8e6fb3"; - }; - meta = { - description = "Android SDK Platform 2.3.3._r2"; - url = http://developer.android.com/sdk/; - }; - }; - - platform_11 = buildPlatform { - name = "android-platform-3.0"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-3.0_r02-linux.zip; - sha1 = "2c7d4bd13f276e76f6bbd87315fe27aba351dd37"; - }; - meta = { - description = "Android SDK Platform 3.0, revision 2"; - url = http://developer.android.com/sdk/; - }; - }; - - platform_12 = buildPlatform { - name = "android-platform-3.1"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-3.1_r03-linux.zip; - sha1 = "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf"; - }; - meta = { - description = "Android SDK Platform 3.1, revision 3"; - url = http://developer.android.com/sdk/; - }; - }; - - platform_13 = buildPlatform { - name = "android-platform-3.2"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-3.2_r01-linux.zip; - sha1 = "6189a500a8c44ae73a439604363de93591163cd9"; - }; - meta = { - description = "Android SDK Platform 3.2, revision 1"; - url = http://developer.android.com/sdk/; - }; - }; - - platform_14 = buildPlatform { - name = "android-platform-4.0"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-14_r03.zip; - sha1 = "41ba83b51e886461628c41b1b4d47762e0688ed5"; - }; - meta = { - description = "Android SDK Platform 4.0"; - - }; - }; - - platform_15 = buildPlatform { - name = "android-platform-4.0.3"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-15_r03.zip; - sha1 = "23da24610a8da51054c5391001c51ce43a778b97"; - }; - meta = { - description = "Android SDK Platform 4.0.3"; - - }; - }; - - platform_16 = buildPlatform { - name = "android-platform-4.1.2"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-16_r03.zip; - sha1 = "80d9ffef58168f9bccd862830e2ee51f686b167e"; - }; - meta = { - description = "Android SDK Platform 4.1"; - - }; - }; - - platform_17 = buildPlatform { - name = "android-platform-4.2"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-17_r01.zip; - sha1 = "c2e7c8c8db40e06b804ddb1725ac2c3555b55025"; - }; - meta = { - description = "Android SDK Platform 4.2"; - - }; - }; - -} - \ No newline at end of file diff --git a/pkgs/development/androidenv/repository-7.xml b/pkgs/development/androidenv/repository-7.xml deleted file mode 100644 index 7bbbaf1e3620..000000000000 --- a/pkgs/development/androidenv/repository-7.xml +++ /dev/null @@ -1,1030 +0,0 @@ - - - - - Terms and Conditions - -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 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time. - -1.3 "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 By clicking to accept, you hereby agree to the terms of this License Agreement. - -2.3 You may not use the SDK and may not accept the License 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 License 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 You may not use the SDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) 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; or (b) 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 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the SDK. - -3.5 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.6 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.7 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.8 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, you 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 Android and/or applications for Android, 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 - - -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 provide 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 constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces 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. - -November 13, 2012 - - - - - - 1.1 - 2 - 1 - Android SDK Platform 1.1_r1 - http://developer.android.com/sdk/android-1.1.html - - - - 46828615 - a4060f29ed39fc929c302836d488998c53c3002e - android-1.1_r1-windows.zip - - - 45584305 - e21dbcff45b7356657449ebb3c7e941be2bb5ebe - android-1.1_r1-macosx.zip - - - 45476658 - c054d25c9b4c6251fa49c2f9c54336998679d3fe - android-1.1_r1-linux.zip - - - - 4 - - - - - - - - 1.5 - 3 - 04 - - 6 - - Android SDK Platform 1.5_r3 - http://developer.android.com/sdk/android-1.5.html - - - 54624370 - 5bb106d2e40d481edd337b0833093843e15fe49a - android-1.5_r04-windows.zip - - - 52440607 - d3a67c2369afa48b6c3c7624de5031c262018d1e - android-1.5_r04-macosx.zip - - - 53348669 - 5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c - android-1.5_r04-linux.zip - - - - 4 - - - - - - 1.6 - 4 - - 03 - - 6 - - Android SDK Platform 1.6_r2 - http://developer.android.com/sdk/android-1.6.html - - - 63454485 - 483ed088e45bbdf3444baaf9250c8b02e5383cb0 - android-1.6_r03-linux.zip - - - 62418496 - bdafad44f5df9f127979bdb21a1fdd87ee3cd625 - android-1.6_r03-macosx.zip - - - 64654625 - ce0b5e4ffaf12ca4fd07c2da71a8a1ab4a03dc22 - android-1.6_r03-windows.zip - - - - 4 - - - - - - - - 2.0 - 5 - - 01 - - 3 - - Android SDK Platform 2.0, revision 1 - http://developer.android.com/sdk/android-2.0.html - - - - 75095268 - be9be6a99ca32875c96ec7f91160ca9fce7e3c7d - android-2.0_r01-linux.zip - - - 74956356 - 2a866d0870dbba18e0503cd41e5fae988a21b314 - android-2.0_r01-macosx.zip - - - 76288040 - aeb623217ff88b87216d6eb7dbc846ed53f68f57 - android-2.0_r01-windows.zip - - - - 4 - - - - - - - - 2.0.1 - 6 - - 01 - - 4 - - Android SDK Platform 2.0.1_r1 - http://developer.android.com/sdk/android-2.0.1.html - - - - 79192618 - ce2c971dce352aa28af06bda92a070116aa5ae1a - android-2.0.1_r01-linux.zip - - - 79035527 - c3096f80d75a6fc8cb38ef8a18aec920e53d42c0 - android-2.0.1_r01-macosx.zip - - - 80385601 - 255781ebe4509d9707d0e77edda2815e2bc216e6 - android-2.0.1_r01-windows.zip - - - - 4 - - - - - - - - 2.1 - 7 - - 03 - - 8 - - Android SDK Platform 2.1_r3 - http://developer.android.com/sdk/ - - - 70142829 - 5ce51b023ac19f8738500b1007a1da5de2349a1e - android-2.1_r03-linux.zip - - - - 4 - - - - - - - - 2.2 - 8 - - 03 - - 8 - - Android SDK Platform 2.2_r3 - http://developer.android.com/sdk/ - - - 74652366 - 231262c63eefdff8fd0386e9ccfefeb27a8f9202 - android-2.2_r03-linux.zip - - - - 4 - - - - - - - - 2.3.1 - 9 - - 02 - - 8 - - Android SDK Platform 2.3.1_r2 - http://developer.android.com/sdk/ - - - - 78732563 - 209f8a7a8b2cb093fce858b8b55fed3ba5206773 - android-2.3.1_r02-linux.zip - - - - 4 - - - - - - - - 2.3.3 - 10 - - 02 - - 8 - - Android SDK Platform 2.3.3._r2 - http://developer.android.com/sdk/ - - - 85470907 - 887e37783ec32f541ea33c2c649dda648e8e6fb3 - android-2.3.3_r02-linux.zip - - - - 4 - - - - - - - - 3.0 - 11 - - 02 - - 10 - - Android SDK Platform 3.0, revision 2 - http://developer.android.com/sdk/ - - - 104513908 - 2c7d4bd13f276e76f6bbd87315fe27aba351dd37 - android-3.0_r02-linux.zip - - - - 4 - - - - - - - - 3.1 - 12 - - 03 - - 11 - - Android SDK Platform 3.1, revision 3 - http://developer.android.com/sdk/ - - - 106472351 - 4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf - android-3.1_r03-linux.zip - - - - 4 - - - - - - - - 3.2 - 13 - - 01 - - 12 - - Android SDK Platform 3.2, revision 1 - http://developer.android.com/sdk/ - - - 108426536 - 6189a500a8c44ae73a439604363de93591163cd9 - android-3.2_r01-linux.zip - - - - 4 - - - - - - - 3 - Android SDK Platform 4.0 - 4.0 - 14 - - 7 - 1 - - - - 45919570 - 41ba83b51e886461628c41b1b4d47762e0688ed5 - android-14_r03.zip - - - - - - - - 3 - Android SDK Platform 4.0.3 - 4.0.3 - 15 - - 15 - - - 7 - 1 - - - - 44414679 - 23da24610a8da51054c5391001c51ce43a778b97 - android-15_r03.zip - - - - - - - - 3 - Android SDK Platform 4.1 - 4.1.2 - 16 - - 20 - - - 8 - 1 - - - - 47995505 - 80d9ffef58168f9bccd862830e2ee51f686b167e - android-16_r03.zip - - - - - - - - 1 - Android SDK Platform 4.2 - 4.2 - 17 - - 21 - - - 9 - 1 - - - - 47886130 - c2e7c8c8db40e06b804ddb1725ac2c3555b55025 - android-17_r01.zip - - - - - - - - - - 2 - Android SDK Platform 4.0 - 14 - armeabi-v7a - - - 99621822 - d8991b0c06b18d7d6ed4169d67460ee1add6661b - sysimg_armv7a-14_r02.zip - - - - - - - - 2 - Android SDK Platform 4.0.3 - 15 - armeabi-v7a - - - 96227377 - 1bf977d6cb4e0ad38dceac0c4863d1caa21f326e - sysimg_armv7a-15_r02.zip - - - - - - - - 3 - Android SDK Platform 4.1 - 16 - armeabi-v7a - - - 112528368 - d1cddb23f17aad5821a089c403d4cddad2cf9ef7 - sysimg_armv7a-16_r03.zip - - - - - - - - 1 - Android SDK Platform 4.2 - 17 - armeabi-v7a - - - 116831648 - 45b9344473e0a6d063c2b1fe58d8cd47d307905e - sysimg_armv7a-17_r01.zip - - - - - - - - - - - 7 - - 01 - Android SDK Samples for Android API 7, revision 1 - http://developer.android.com/sdk/ - - - 7677831 - 51e4907f60f248ede5c58b54ce7b6ae0b473e0ca - samples-2.1_r01-linux.zip - - - - - - - - - 8 - - 01 - Android SDK Samples for Android API 8, revision 1 - http://developer.android.com/sdk/ - - - 7969716 - d16d8bf2dd84cedf73b98b948d66461c8f19d6fb - samples-2.2_r01-linux.zip - - - - - - - - - 9 - - 01 - Android SDK Samples for Android API 9, revision 1 - http://developer.android.com/sdk/ - - - - 8516326 - 36f7dd6c8b5dbb50b3cf3e3ac5209f3fe55db2aa - samples-2.3_r01-linux.zip - - - - - - - - - 10 - - 01 - Android SDK Samples for Android API 10, revision 1 - http://developer.android.com/sdk/ - - - 8539583 - 93b0c3f3bdf5b07f1f115100b4954f0665297a0d - samples-2.3.3_r01-linux.zip - - - - - - - - - 11 - - 01 - Android SDK Samples for Android API 11, revision 1 - http://developer.android.com/sdk/ - - - 11976920 - 3749ace584631270268d65bb1d0ad61b0d691682 - samples-3.0_r01-linux.zip - - - - - - - - - 12 - - 01 - Android SDK Samples for Android API 12, revision 1 - http://developer.android.com/sdk/ - - - 12150514 - df0ace37cbca73373fe94080f94c71557cac73a7 - samples-3.1_r01-linux.zip - - - - - - - - - 13 - - 01 - Android SDK Samples for Android API 13, revision 1 - http://developer.android.com/sdk/ - - - 12193502 - 078bcf1abc1cb8921f3fa482c252963a782bed60 - samples-3.2_r01-linux.zip - - - - - - - - 2 - 14 - - - 16253619 - 1312c22ab0b650e26835cc3945d4ff8cea183416 - samples-14_r02.zip - - - - - - - - 2 - 15 - - - 16366656 - 042f368c5b09eca4d278264e6dbf9c12c5f73d1f - samples-15_r02.zip - - - - - - - - 1 - 16 - - - 14729945 - dce3a2d41db50a381ef47ee8bddbe928520e685e - samples-16_r01.zip - - - - - - - - 1 - 17 - - - 14840030 - 12d58cb26503610fc05bd7618c434cc6f983bc41 - samples-17_r01.zip - - - - - - - - - - - 16 - - - - 11938435 - 0d6245b685c7d303cf4a054a3d373c4427b7ad01 - platform-tools_r16-windows.zip - - - 12676089 - 84d563ae5e324f223f335f11bf511bf6207c05fb - platform-tools_r16-linux.zip - - - 13147351 - fbb0f8d2786a83b8c3eb6df402e706e136db8fed - platform-tools_r16-macosx.zip - - - - - - - - - - - 21 - - - 16 - - - - 98982670 - 57bbfadcedbef44fc322e5e037666393668cf3fe - tools_r21-windows.zip - - - 91495104 - 013b9c04407a9d73b8bf3c574327fbe870acd264 - tools_r21-linux.zip - - - 65767130 - fcfa3a6932f2ed0d970a0ca959bb2b4972f7d46d - tools_r21-macosx.zip - - - - - - - - - 21 - 0 - 1 - 1 - - - 16 - - - - 98998088 - 1503aaf2c91cb07c0240a2db3af0de027941a4f6 - tools_r21.0.1_rc1-windows.zip - - - 91510079 - 183670a7f9878d8d3693d5fcf32e1357b69f0fed - tools_r21.0.1_rc1-linux.zip - - - 65777178 - 109d4f287904875f067e021be3fd1f549e6afb67 - tools_r21.0.1_rc1-macosx.zip - - - - - - - - - - 1 - 17 - - - 171564393 - fb988cdd2beaac0dd47dc630821ccc30557c67e5 - docs-17_r01.zip - - - - - - - - - - 1 - 14 - - - 16152383 - eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555 - sources-14_r01.zip - - - - - - - - 2 - 15 - - - 16468746 - e5992a5747c9590783fbbdd700337bf0c9f6b1fa - sources-15_r02.zip - - - - - - - - 2 - 16 - - - 17876720 - 0f83c14ed333c45d962279ab5d6bc98a0269ef84 - sources-16_r02.zip - - - - - - - - 1 - 17 - - - 18976816 - 6f1f18cd2d2b1852d7f6892df9cee3823349d43a - sources-17_r01.zip - - - - - diff --git a/pkgs/development/androidenv/support.nix b/pkgs/development/androidenv/support.nix deleted file mode 100644 index 2e9690de7a26..000000000000 --- a/pkgs/development/androidenv/support.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, fetchurl, unzip}: - -stdenv.mkDerivation { - name = "android-support-r11"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/support_r11.zip; - sha1 = "d30d182d8e4c86bb4464c03a83ccffce7bc84ecd"; - }; - - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - - buildInputs = [ unzip ]; -} \ No newline at end of file diff --git a/pkgs/development/androidenv/sysimages.nix b/pkgs/development/androidenv/sysimages.nix deleted file mode 100644 index b35b42989838..000000000000 --- a/pkgs/development/androidenv/sysimages.nix +++ /dev/null @@ -1,50 +0,0 @@ - -{stdenv, fetchurl, unzip}: - -let - buildSystemImage = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ - - sysimg_14 = buildSystemImage { - name = "armeabi-v7a-14"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-14_r02.zip; - sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b"; - }; - }; - - sysimg_15 = buildSystemImage { - name = "armeabi-v7a-15"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-15_r02.zip; - sha1 = "1bf977d6cb4e0ad38dceac0c4863d1caa21f326e"; - }; - }; - - sysimg_16 = buildSystemImage { - name = "armeabi-v7a-16"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-16_r03.zip; - sha1 = "d1cddb23f17aad5821a089c403d4cddad2cf9ef7"; - }; - }; - - sysimg_17 = buildSystemImage { - name = "armeabi-v7a-17"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-17_r01.zip; - sha1 = "45b9344473e0a6d063c2b1fe58d8cd47d307905e"; - }; - }; - -} - \ No newline at end of file diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index ad02f9b84cce..be3a83975e5d 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, apr, expat , sslSupport ? true, openssl , bdbSupport ? false, db4 -, ldapSupport ? true, openldap +, ldapSupport ? false, openldap }: assert sslSupport -> openssl != null; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 5cd083a7e330..34026806a52a 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { }; configurePhase = '' + ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "export PATH=/usr/bin:$PATH"} mkdir build/gyp ln -sv ${gyp}/bin/gyp build/gyp/gyp ''; @@ -37,7 +38,11 @@ stdenv.mkDerivation rec { mkdir -p $out/bin mkdir -p $out/lib mv -v out/${arch}.release/d8 $out/bin - mv -v out/${arch}.release/lib.target/libv8.so $out/lib + + ${if stdenv.system == "x86_64-darwin" then + "mv -v out/${arch}.release/libv8.dylib $out/lib" + else + "mv -v out/${arch}.release/lib.target/libv8.so $out/lib"} mv -v include $out/ ''; } diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml new file mode 100644 index 000000000000..fb5d324d7789 --- /dev/null +++ b/pkgs/development/mobile/androidenv/addon.xml @@ -0,0 +1,950 @@ + + + + + Terms and Conditions + +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 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time. + +1.3 "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 By clicking to accept, you hereby agree to the terms of this License Agreement. + +2.3 You may not use the SDK and may not accept the License 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 License 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 You may not use the SDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) 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; or (b) 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 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the SDK. + +3.5 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.6 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.7 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.8 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, you 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 Android and/or applications for Android, 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 + + +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 provide 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 constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces 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. + +November 13, 2012 + + + 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 + + + + + + + + google + Google Inc. + google_apis + Google APIs + Android + Google APIs + 17 + 1 + + + com.google.android.maps + + + com.android.future.usb.accessory + + + com.google.android.media.effects + + + + + 132568033 + 62cb086f11e15713878c8834d58ef1a2454c19a4 + google_apis-17_r01.zip + + + + + + + + + + 11 + Android + android + Android Support Library + support + compatibility + + + 1264808 + d30d182d8e4c86bb4464c03a83ccffce7bc84ecd + support_r11.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 + 4 + Google Play Services client library and sample code + https://developers.google.com/android/google-play-services/index + + + + 3732458 + bbb3d11225fcf60a0bae75afa2c4737010468bf6 + google_play_services_2012110_r04.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 + 3 + Google Play Billing files and sample code + http://developer.android.com/google/play/billing/index.html + + + 435718 + a133d454c992ef2a18e62fa810e8185f1be4b054 + play_billing_r03.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 + + + + + diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix new file mode 100644 index 000000000000..f26db5c2cb73 --- /dev/null +++ b/pkgs/development/mobile/androidenv/addons.nix @@ -0,0 +1,198 @@ + +{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"; + + }; + }; + + google_apis_17 = buildGoogleApis { + name = "google_apis-17"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-17_r01.zip; + sha1 = "62cb086f11e15713878c8834d58ef1a2454c19a4"; + }; + meta = { + description = "Android + Google APIs"; + + }; + }; + +} + \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix new file mode 100644 index 000000000000..e8e1f919fe4e --- /dev/null +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -0,0 +1,194 @@ +{ stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper +, platformTools, support, platforms, sysimages, addons +, zlib_32bit +, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit +, libX11, libXext, libXrender, libxcb, libXau, libXdmcp +, freetype, fontconfig, gtk, atk +}: +{platformVersions, useGoogleAPIs}: + +stdenv.mkDerivation { + name = "android-sdk-21"; + + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") + then fetchurl { + url = http://dl.google.com/android/android-sdk_r21-linux.tgz; + md5 = "7f8d73b629f808cdcfc9f9900bbd7580"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = http://dl.google.com/android/android-sdk_r21-macosx.zip; + md5 = "67e46adca90dd18d7291443f6c15d6af"; + } + else throw "platform not ${stdenv.system} supported!"; + + buildCommand = '' + mkdir -p $out/libexec + cd $out/libexec + 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-mips 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 + + ${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' + # We must also patch the 64-bit emulator instances, if needed + + for i in emulator64-arm emulator64-mips emulator64-x86 + do + patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 $i + patchelf --set-rpath ${stdenv.gcc.gcc}/lib64 $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-mips 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 + + ${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' + for i in emulator64-arm emulator64-mips emulator64-x86 + do + wrapProgram `pwd`/$i \ + --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib + done + ''} + ''} + + patchShebangs . + + ${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} + + # Create wrappers to the most important tools and platform tools so that we can run them if the SDK is in our PATH + + ensureDir $out/bin + + for i in $out/libexec/android-sdk-*/tools/* + do + if [ ! -d $i ] && [ -x $i ] + then + ( echo '#! ${stdenv.shell} -e' + echo "cd $out/libexec/android-sdk-*/tools" + echo "exec ./$(basename $i) \"\$@\"" ) > $out/bin/$(basename $i) + + chmod +x $out/bin/$(basename $i) + fi + done + + for i in $out/libexec/android-sdk-*/platform-tools/* + do + if [ ! -d $i ] && [ -x $i ] + then + ( echo '#! ${stdenv.shell} -e' + echo "cd $out/libexec/android-sdk-*/platform-tools" + echo "exec ./$(basename $i) \"\$@\"") > $out/bin/$(basename $i) + + chmod +x $out/bin/$(basename $i) + fi + done + ''; + + buildInputs = [ unzip makeWrapper ]; +} diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix new file mode 100644 index 000000000000..571cd2be6232 --- /dev/null +++ b/pkgs/development/mobile/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}/libexec/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/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix new file mode 100644 index 000000000000..a76deb98b6ee --- /dev/null +++ b/pkgs/development/mobile/androidenv/default.nix @@ -0,0 +1,62 @@ +{pkgs, pkgs_i686}: + +rec { + platformTools = import ./platform-tools.nix { + inherit (pkgs) stdenv fetchurl unzip; + 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 makeWrapper; + inherit (pkgs) freetype fontconfig gtk atk; + inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp; + + 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; + }; + + androidsdk_4_1 = androidsdk { + platformVersions = [ "16" ]; + useGoogleAPIs = true; + }; + + 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/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix new file mode 100644 index 000000000000..3cbe57238066 --- /dev/null +++ b/pkgs/development/mobile/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}/libexec/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}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} + + # Launch the emulator + ${androidsdkComposition}/libexec/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}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port wait-for-device + + echo "Device state has been reached" + + while [ -z "$(${androidsdkComposition}/libexec/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}/libexec/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}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install ${app}/*.apk + + # Start the application + ${androidsdkComposition}/libexec/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/mobile/androidenv/generate-addons.sh b/pkgs/development/mobile/androidenv/generate-addons.sh new file mode 100755 index 000000000000..9b2cf34eabcc --- /dev/null +++ b/pkgs/development/mobile/androidenv/generate-addons.sh @@ -0,0 +1,3 @@ +#!/bin/sh -e + +xsltproc generate-addons.xsl addon.xml > addons.nix diff --git a/pkgs/development/mobile/androidenv/generate-addons.xsl b/pkgs/development/mobile/androidenv/generate-addons.xsl new file mode 100644 index 000000000000..0100b980a4ef --- /dev/null +++ b/pkgs/development/mobile/androidenv/generate-addons.xsl @@ -0,0 +1,38 @@ + + + + + + +{stdenv, fetchurl, unzip}: + +let + buildGoogleApis = args: + stdenv.mkDerivation (args // { + buildInputs = [ unzip ]; + buildCommand = '' + mkdir -p $out + cd $out + unzip $src + ''; + }); +in +{ + + google_apis_ = buildGoogleApis { + name = "-"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/; + sha1 = ""; + }; + meta = { + description = ""; + url = ; + }; + }; + +} + + + diff --git a/pkgs/development/mobile/androidenv/generate-platforms.sh b/pkgs/development/mobile/androidenv/generate-platforms.sh new file mode 100755 index 000000000000..983d8bde87b9 --- /dev/null +++ b/pkgs/development/mobile/androidenv/generate-platforms.sh @@ -0,0 +1,4 @@ +#!/bin/sh -e + +xsltproc --stringparam os linux generate-platforms.xsl repository-7.xml > platforms-linux.nix +xsltproc --stringparam os macosx generate-platforms.xsl repository-7.xml > platforms-macosx.nix diff --git a/pkgs/development/mobile/androidenv/generate-platforms.xsl b/pkgs/development/mobile/androidenv/generate-platforms.xsl new file mode 100644 index 000000000000..1802ae63efe1 --- /dev/null +++ b/pkgs/development/mobile/androidenv/generate-platforms.xsl @@ -0,0 +1,38 @@ + + + + + + + +{stdenv, fetchurl, unzip}: + +let + buildPlatform = args: + stdenv.mkDerivation (args // { + buildInputs = [ unzip ]; + buildCommand = '' + mkdir -p $out + cd $out + unzip $src + ''; + }); +in +{ + + platform_ = buildPlatform { + name = "android-platform-"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/; + sha1 = ""; + }; + meta = { + description = ""; + url = ; + }; + }; + +} + + diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.sh b/pkgs/development/mobile/androidenv/generate-sysimages.sh new file mode 100755 index 000000000000..dc28c27f45f0 --- /dev/null +++ b/pkgs/development/mobile/androidenv/generate-sysimages.sh @@ -0,0 +1,3 @@ +#!/bin/sh -e + +xsltproc generate-sysimages.xsl repository-7.xml > sysimages.nix diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.xsl b/pkgs/development/mobile/androidenv/generate-sysimages.xsl new file mode 100644 index 000000000000..1224ebbd4e8d --- /dev/null +++ b/pkgs/development/mobile/androidenv/generate-sysimages.xsl @@ -0,0 +1,36 @@ + + + + + + + +{stdenv, fetchurl, unzip}: + +let + buildSystemImage = args: + stdenv.mkDerivation (args // { + buildInputs = [ unzip ]; + buildCommand = '' + mkdir -p $out + cd $out + unzip $src + ''; + }); +in +{ + + sysimg_ = buildSystemImage { + name = "-"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/; + sha1 = ""; + }; + }; + +} + + + diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix new file mode 100644 index 000000000000..554996082909 --- /dev/null +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -0,0 +1,41 @@ +{stdenv, stdenv_32bit, fetchurl, unzip, zlib, ncurses}: + +stdenv.mkDerivation { + name = "android-platform-tools-r16"; + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") + then fetchurl { + url = https://dl-ssl.google.com/android/repository/platform-tools_r16-linux.zip; + sha1 = "84d563ae5e324f223f335f11bf511bf6207c05fb"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = https://dl-ssl.google.com/android/repository/platform-tools_r16-macosx.zip; + sha1 = "fbb0f8d2786a83b8c3eb6df402e706e136db8fed"; + } + else throw "System ${stdenv.system} not supported!"; + + buildCommand = '' + mkdir -p $out + cd $out + unzip $src + cd platform-tools + + ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") + '' + for i in aapt adb aidl dexdump fastboot llvm-rs-cc + do + patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i + done + + patchelf --set-rpath ${zlib}/lib:${stdenv_32bit.gcc.gcc}/lib aapt + patchelf --set-rpath ${ncurses}/lib:${stdenv_32bit.gcc.gcc}/lib adb + patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib aidl + patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib fastboot + patchelf --set-rpath ${zlib}/lib:${stdenv_32bit.gcc.gcc}/lib dexdump + patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib llvm-rs-cc + ''} + + patchShebangs . + ''; + + buildInputs = [ unzip ]; +} diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix new file mode 100644 index 000000000000..f544fcc08bed --- /dev/null +++ b/pkgs/development/mobile/androidenv/platforms-linux.nix @@ -0,0 +1,210 @@ + +{stdenv, fetchurl, unzip}: + +let + buildPlatform = args: + stdenv.mkDerivation (args // { + buildInputs = [ unzip ]; + buildCommand = '' + mkdir -p $out + cd $out + unzip $src + ''; + }); +in +{ + + platform_2 = buildPlatform { + name = "android-platform-1.1"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-1.1_r1-linux.zip; + sha1 = "c054d25c9b4c6251fa49c2f9c54336998679d3fe"; + }; + meta = { + description = "Android SDK Platform 1.1_r1"; + url = http://developer.android.com/sdk/android-1.1.html; + }; + }; + + platform_3 = buildPlatform { + name = "android-platform-1.5"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-1.5_r04-linux.zip; + sha1 = "5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c"; + }; + meta = { + description = "Android SDK Platform 1.5_r3"; + url = http://developer.android.com/sdk/android-1.5.html; + }; + }; + + platform_4 = buildPlatform { + name = "android-platform-1.6"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-1.6_r03-linux.zip; + sha1 = "483ed088e45bbdf3444baaf9250c8b02e5383cb0"; + }; + meta = { + description = "Android SDK Platform 1.6_r2"; + url = http://developer.android.com/sdk/android-1.6.html; + }; + }; + + platform_5 = buildPlatform { + name = "android-platform-2.0"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-2.0_r01-linux.zip; + sha1 = "be9be6a99ca32875c96ec7f91160ca9fce7e3c7d"; + }; + meta = { + description = "Android SDK Platform 2.0, revision 1"; + url = http://developer.android.com/sdk/android-2.0.html; + }; + }; + + platform_6 = buildPlatform { + name = "android-platform-2.0.1"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-2.0.1_r01-linux.zip; + sha1 = "ce2c971dce352aa28af06bda92a070116aa5ae1a"; + }; + meta = { + description = "Android SDK Platform 2.0.1_r1"; + url = http://developer.android.com/sdk/android-2.0.1.html; + }; + }; + + platform_7 = buildPlatform { + name = "android-platform-2.1"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-2.1_r03-linux.zip; + sha1 = "5ce51b023ac19f8738500b1007a1da5de2349a1e"; + }; + meta = { + description = "Android SDK Platform 2.1_r3"; + url = http://developer.android.com/sdk/; + }; + }; + + platform_8 = buildPlatform { + name = "android-platform-2.2"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-2.2_r03-linux.zip; + sha1 = "231262c63eefdff8fd0386e9ccfefeb27a8f9202"; + }; + meta = { + description = "Android SDK Platform 2.2_r3"; + url = http://developer.android.com/sdk/; + }; + }; + + platform_9 = buildPlatform { + name = "android-platform-2.3.1"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-2.3.1_r02-linux.zip; + sha1 = "209f8a7a8b2cb093fce858b8b55fed3ba5206773"; + }; + meta = { + description = "Android SDK Platform 2.3.1_r2"; + url = http://developer.android.com/sdk/; + }; + }; + + platform_10 = buildPlatform { + name = "android-platform-2.3.3"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-2.3.3_r02-linux.zip; + sha1 = "887e37783ec32f541ea33c2c649dda648e8e6fb3"; + }; + meta = { + description = "Android SDK Platform 2.3.3._r2"; + url = http://developer.android.com/sdk/; + }; + }; + + platform_11 = buildPlatform { + name = "android-platform-3.0"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-3.0_r02-linux.zip; + sha1 = "2c7d4bd13f276e76f6bbd87315fe27aba351dd37"; + }; + meta = { + description = "Android SDK Platform 3.0, revision 2"; + url = http://developer.android.com/sdk/; + }; + }; + + platform_12 = buildPlatform { + name = "android-platform-3.1"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-3.1_r03-linux.zip; + sha1 = "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf"; + }; + meta = { + description = "Android SDK Platform 3.1, revision 3"; + url = http://developer.android.com/sdk/; + }; + }; + + platform_13 = buildPlatform { + name = "android-platform-3.2"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-3.2_r01-linux.zip; + sha1 = "6189a500a8c44ae73a439604363de93591163cd9"; + }; + meta = { + description = "Android SDK Platform 3.2, revision 1"; + url = http://developer.android.com/sdk/; + }; + }; + + platform_14 = buildPlatform { + name = "android-platform-4.0"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-14_r03.zip; + sha1 = "41ba83b51e886461628c41b1b4d47762e0688ed5"; + }; + meta = { + description = "Android SDK Platform 4.0"; + + }; + }; + + platform_15 = buildPlatform { + name = "android-platform-4.0.3"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-15_r03.zip; + sha1 = "23da24610a8da51054c5391001c51ce43a778b97"; + }; + meta = { + description = "Android SDK Platform 4.0.3"; + + }; + }; + + platform_16 = buildPlatform { + name = "android-platform-4.1.2"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-16_r03.zip; + sha1 = "80d9ffef58168f9bccd862830e2ee51f686b167e"; + }; + meta = { + description = "Android SDK Platform 4.1"; + + }; + }; + + platform_17 = buildPlatform { + name = "android-platform-4.2"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-17_r01.zip; + sha1 = "c2e7c8c8db40e06b804ddb1725ac2c3555b55025"; + }; + meta = { + description = "Android SDK Platform 4.2"; + + }; + }; + +} + \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix new file mode 100644 index 000000000000..a1434bbe56c1 --- /dev/null +++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix @@ -0,0 +1,210 @@ + +{stdenv, fetchurl, unzip}: + +let + buildPlatform = args: + stdenv.mkDerivation (args // { + buildInputs = [ unzip ]; + buildCommand = '' + mkdir -p $out + cd $out + unzip $src + ''; + }); +in +{ + + platform_2 = buildPlatform { + name = "android-platform-1.1"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-1.1_r1-macosx.zip; + sha1 = "e21dbcff45b7356657449ebb3c7e941be2bb5ebe"; + }; + meta = { + description = "Android SDK Platform 1.1_r1"; + url = http://developer.android.com/sdk/android-1.1.html; + }; + }; + + platform_3 = buildPlatform { + name = "android-platform-1.5"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-1.5_r04-macosx.zip; + sha1 = "d3a67c2369afa48b6c3c7624de5031c262018d1e"; + }; + meta = { + description = "Android SDK Platform 1.5_r3"; + url = http://developer.android.com/sdk/android-1.5.html; + }; + }; + + platform_4 = buildPlatform { + name = "android-platform-1.6"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-1.6_r03-macosx.zip; + sha1 = "bdafad44f5df9f127979bdb21a1fdd87ee3cd625"; + }; + meta = { + description = "Android SDK Platform 1.6_r2"; + url = http://developer.android.com/sdk/android-1.6.html; + }; + }; + + platform_5 = buildPlatform { + name = "android-platform-2.0"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-2.0_r01-macosx.zip; + sha1 = "2a866d0870dbba18e0503cd41e5fae988a21b314"; + }; + meta = { + description = "Android SDK Platform 2.0, revision 1"; + url = http://developer.android.com/sdk/android-2.0.html; + }; + }; + + platform_6 = buildPlatform { + name = "android-platform-2.0.1"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-2.0.1_r01-macosx.zip; + sha1 = "c3096f80d75a6fc8cb38ef8a18aec920e53d42c0"; + }; + meta = { + description = "Android SDK Platform 2.0.1_r1"; + url = http://developer.android.com/sdk/android-2.0.1.html; + }; + }; + + platform_7 = buildPlatform { + name = "android-platform-2.1"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-2.1_r03-linux.zip; + sha1 = "5ce51b023ac19f8738500b1007a1da5de2349a1e"; + }; + meta = { + description = "Android SDK Platform 2.1_r3"; + url = http://developer.android.com/sdk/; + }; + }; + + platform_8 = buildPlatform { + name = "android-platform-2.2"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-2.2_r03-linux.zip; + sha1 = "231262c63eefdff8fd0386e9ccfefeb27a8f9202"; + }; + meta = { + description = "Android SDK Platform 2.2_r3"; + url = http://developer.android.com/sdk/; + }; + }; + + platform_9 = buildPlatform { + name = "android-platform-2.3.1"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-2.3.1_r02-linux.zip; + sha1 = "209f8a7a8b2cb093fce858b8b55fed3ba5206773"; + }; + meta = { + description = "Android SDK Platform 2.3.1_r2"; + url = http://developer.android.com/sdk/; + }; + }; + + platform_10 = buildPlatform { + name = "android-platform-2.3.3"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-2.3.3_r02-linux.zip; + sha1 = "887e37783ec32f541ea33c2c649dda648e8e6fb3"; + }; + meta = { + description = "Android SDK Platform 2.3.3._r2"; + url = http://developer.android.com/sdk/; + }; + }; + + platform_11 = buildPlatform { + name = "android-platform-3.0"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-3.0_r02-linux.zip; + sha1 = "2c7d4bd13f276e76f6bbd87315fe27aba351dd37"; + }; + meta = { + description = "Android SDK Platform 3.0, revision 2"; + url = http://developer.android.com/sdk/; + }; + }; + + platform_12 = buildPlatform { + name = "android-platform-3.1"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-3.1_r03-linux.zip; + sha1 = "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf"; + }; + meta = { + description = "Android SDK Platform 3.1, revision 3"; + url = http://developer.android.com/sdk/; + }; + }; + + platform_13 = buildPlatform { + name = "android-platform-3.2"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-3.2_r01-linux.zip; + sha1 = "6189a500a8c44ae73a439604363de93591163cd9"; + }; + meta = { + description = "Android SDK Platform 3.2, revision 1"; + url = http://developer.android.com/sdk/; + }; + }; + + platform_14 = buildPlatform { + name = "android-platform-4.0"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-14_r03.zip; + sha1 = "41ba83b51e886461628c41b1b4d47762e0688ed5"; + }; + meta = { + description = "Android SDK Platform 4.0"; + + }; + }; + + platform_15 = buildPlatform { + name = "android-platform-4.0.3"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-15_r03.zip; + sha1 = "23da24610a8da51054c5391001c51ce43a778b97"; + }; + meta = { + description = "Android SDK Platform 4.0.3"; + + }; + }; + + platform_16 = buildPlatform { + name = "android-platform-4.1.2"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-16_r03.zip; + sha1 = "80d9ffef58168f9bccd862830e2ee51f686b167e"; + }; + meta = { + description = "Android SDK Platform 4.1"; + + }; + }; + + platform_17 = buildPlatform { + name = "android-platform-4.2"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-17_r01.zip; + sha1 = "c2e7c8c8db40e06b804ddb1725ac2c3555b55025"; + }; + meta = { + description = "Android SDK Platform 4.2"; + + }; + }; + +} + \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/repository-7.xml b/pkgs/development/mobile/androidenv/repository-7.xml new file mode 100644 index 000000000000..7bbbaf1e3620 --- /dev/null +++ b/pkgs/development/mobile/androidenv/repository-7.xml @@ -0,0 +1,1030 @@ + + + + + Terms and Conditions + +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 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time. + +1.3 "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 By clicking to accept, you hereby agree to the terms of this License Agreement. + +2.3 You may not use the SDK and may not accept the License 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 License 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 You may not use the SDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) 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; or (b) 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 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the SDK. + +3.5 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.6 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.7 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.8 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, you 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 Android and/or applications for Android, 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 + + +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 provide 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 constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces 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. + +November 13, 2012 + + + + + + 1.1 + 2 + 1 + Android SDK Platform 1.1_r1 + http://developer.android.com/sdk/android-1.1.html + + + + 46828615 + a4060f29ed39fc929c302836d488998c53c3002e + android-1.1_r1-windows.zip + + + 45584305 + e21dbcff45b7356657449ebb3c7e941be2bb5ebe + android-1.1_r1-macosx.zip + + + 45476658 + c054d25c9b4c6251fa49c2f9c54336998679d3fe + android-1.1_r1-linux.zip + + + + 4 + + + + + + + + 1.5 + 3 + 04 + + 6 + + Android SDK Platform 1.5_r3 + http://developer.android.com/sdk/android-1.5.html + + + 54624370 + 5bb106d2e40d481edd337b0833093843e15fe49a + android-1.5_r04-windows.zip + + + 52440607 + d3a67c2369afa48b6c3c7624de5031c262018d1e + android-1.5_r04-macosx.zip + + + 53348669 + 5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c + android-1.5_r04-linux.zip + + + + 4 + + + + + + 1.6 + 4 + + 03 + + 6 + + Android SDK Platform 1.6_r2 + http://developer.android.com/sdk/android-1.6.html + + + 63454485 + 483ed088e45bbdf3444baaf9250c8b02e5383cb0 + android-1.6_r03-linux.zip + + + 62418496 + bdafad44f5df9f127979bdb21a1fdd87ee3cd625 + android-1.6_r03-macosx.zip + + + 64654625 + ce0b5e4ffaf12ca4fd07c2da71a8a1ab4a03dc22 + android-1.6_r03-windows.zip + + + + 4 + + + + + + + + 2.0 + 5 + + 01 + + 3 + + Android SDK Platform 2.0, revision 1 + http://developer.android.com/sdk/android-2.0.html + + + + 75095268 + be9be6a99ca32875c96ec7f91160ca9fce7e3c7d + android-2.0_r01-linux.zip + + + 74956356 + 2a866d0870dbba18e0503cd41e5fae988a21b314 + android-2.0_r01-macosx.zip + + + 76288040 + aeb623217ff88b87216d6eb7dbc846ed53f68f57 + android-2.0_r01-windows.zip + + + + 4 + + + + + + + + 2.0.1 + 6 + + 01 + + 4 + + Android SDK Platform 2.0.1_r1 + http://developer.android.com/sdk/android-2.0.1.html + + + + 79192618 + ce2c971dce352aa28af06bda92a070116aa5ae1a + android-2.0.1_r01-linux.zip + + + 79035527 + c3096f80d75a6fc8cb38ef8a18aec920e53d42c0 + android-2.0.1_r01-macosx.zip + + + 80385601 + 255781ebe4509d9707d0e77edda2815e2bc216e6 + android-2.0.1_r01-windows.zip + + + + 4 + + + + + + + + 2.1 + 7 + + 03 + + 8 + + Android SDK Platform 2.1_r3 + http://developer.android.com/sdk/ + + + 70142829 + 5ce51b023ac19f8738500b1007a1da5de2349a1e + android-2.1_r03-linux.zip + + + + 4 + + + + + + + + 2.2 + 8 + + 03 + + 8 + + Android SDK Platform 2.2_r3 + http://developer.android.com/sdk/ + + + 74652366 + 231262c63eefdff8fd0386e9ccfefeb27a8f9202 + android-2.2_r03-linux.zip + + + + 4 + + + + + + + + 2.3.1 + 9 + + 02 + + 8 + + Android SDK Platform 2.3.1_r2 + http://developer.android.com/sdk/ + + + + 78732563 + 209f8a7a8b2cb093fce858b8b55fed3ba5206773 + android-2.3.1_r02-linux.zip + + + + 4 + + + + + + + + 2.3.3 + 10 + + 02 + + 8 + + Android SDK Platform 2.3.3._r2 + http://developer.android.com/sdk/ + + + 85470907 + 887e37783ec32f541ea33c2c649dda648e8e6fb3 + android-2.3.3_r02-linux.zip + + + + 4 + + + + + + + + 3.0 + 11 + + 02 + + 10 + + Android SDK Platform 3.0, revision 2 + http://developer.android.com/sdk/ + + + 104513908 + 2c7d4bd13f276e76f6bbd87315fe27aba351dd37 + android-3.0_r02-linux.zip + + + + 4 + + + + + + + + 3.1 + 12 + + 03 + + 11 + + Android SDK Platform 3.1, revision 3 + http://developer.android.com/sdk/ + + + 106472351 + 4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf + android-3.1_r03-linux.zip + + + + 4 + + + + + + + + 3.2 + 13 + + 01 + + 12 + + Android SDK Platform 3.2, revision 1 + http://developer.android.com/sdk/ + + + 108426536 + 6189a500a8c44ae73a439604363de93591163cd9 + android-3.2_r01-linux.zip + + + + 4 + + + + + + + 3 + Android SDK Platform 4.0 + 4.0 + 14 + + 7 + 1 + + + + 45919570 + 41ba83b51e886461628c41b1b4d47762e0688ed5 + android-14_r03.zip + + + + + + + + 3 + Android SDK Platform 4.0.3 + 4.0.3 + 15 + + 15 + + + 7 + 1 + + + + 44414679 + 23da24610a8da51054c5391001c51ce43a778b97 + android-15_r03.zip + + + + + + + + 3 + Android SDK Platform 4.1 + 4.1.2 + 16 + + 20 + + + 8 + 1 + + + + 47995505 + 80d9ffef58168f9bccd862830e2ee51f686b167e + android-16_r03.zip + + + + + + + + 1 + Android SDK Platform 4.2 + 4.2 + 17 + + 21 + + + 9 + 1 + + + + 47886130 + c2e7c8c8db40e06b804ddb1725ac2c3555b55025 + android-17_r01.zip + + + + + + + + + + 2 + Android SDK Platform 4.0 + 14 + armeabi-v7a + + + 99621822 + d8991b0c06b18d7d6ed4169d67460ee1add6661b + sysimg_armv7a-14_r02.zip + + + + + + + + 2 + Android SDK Platform 4.0.3 + 15 + armeabi-v7a + + + 96227377 + 1bf977d6cb4e0ad38dceac0c4863d1caa21f326e + sysimg_armv7a-15_r02.zip + + + + + + + + 3 + Android SDK Platform 4.1 + 16 + armeabi-v7a + + + 112528368 + d1cddb23f17aad5821a089c403d4cddad2cf9ef7 + sysimg_armv7a-16_r03.zip + + + + + + + + 1 + Android SDK Platform 4.2 + 17 + armeabi-v7a + + + 116831648 + 45b9344473e0a6d063c2b1fe58d8cd47d307905e + sysimg_armv7a-17_r01.zip + + + + + + + + + + + 7 + + 01 + Android SDK Samples for Android API 7, revision 1 + http://developer.android.com/sdk/ + + + 7677831 + 51e4907f60f248ede5c58b54ce7b6ae0b473e0ca + samples-2.1_r01-linux.zip + + + + + + + + + 8 + + 01 + Android SDK Samples for Android API 8, revision 1 + http://developer.android.com/sdk/ + + + 7969716 + d16d8bf2dd84cedf73b98b948d66461c8f19d6fb + samples-2.2_r01-linux.zip + + + + + + + + + 9 + + 01 + Android SDK Samples for Android API 9, revision 1 + http://developer.android.com/sdk/ + + + + 8516326 + 36f7dd6c8b5dbb50b3cf3e3ac5209f3fe55db2aa + samples-2.3_r01-linux.zip + + + + + + + + + 10 + + 01 + Android SDK Samples for Android API 10, revision 1 + http://developer.android.com/sdk/ + + + 8539583 + 93b0c3f3bdf5b07f1f115100b4954f0665297a0d + samples-2.3.3_r01-linux.zip + + + + + + + + + 11 + + 01 + Android SDK Samples for Android API 11, revision 1 + http://developer.android.com/sdk/ + + + 11976920 + 3749ace584631270268d65bb1d0ad61b0d691682 + samples-3.0_r01-linux.zip + + + + + + + + + 12 + + 01 + Android SDK Samples for Android API 12, revision 1 + http://developer.android.com/sdk/ + + + 12150514 + df0ace37cbca73373fe94080f94c71557cac73a7 + samples-3.1_r01-linux.zip + + + + + + + + + 13 + + 01 + Android SDK Samples for Android API 13, revision 1 + http://developer.android.com/sdk/ + + + 12193502 + 078bcf1abc1cb8921f3fa482c252963a782bed60 + samples-3.2_r01-linux.zip + + + + + + + + 2 + 14 + + + 16253619 + 1312c22ab0b650e26835cc3945d4ff8cea183416 + samples-14_r02.zip + + + + + + + + 2 + 15 + + + 16366656 + 042f368c5b09eca4d278264e6dbf9c12c5f73d1f + samples-15_r02.zip + + + + + + + + 1 + 16 + + + 14729945 + dce3a2d41db50a381ef47ee8bddbe928520e685e + samples-16_r01.zip + + + + + + + + 1 + 17 + + + 14840030 + 12d58cb26503610fc05bd7618c434cc6f983bc41 + samples-17_r01.zip + + + + + + + + + + + 16 + + + + 11938435 + 0d6245b685c7d303cf4a054a3d373c4427b7ad01 + platform-tools_r16-windows.zip + + + 12676089 + 84d563ae5e324f223f335f11bf511bf6207c05fb + platform-tools_r16-linux.zip + + + 13147351 + fbb0f8d2786a83b8c3eb6df402e706e136db8fed + platform-tools_r16-macosx.zip + + + + + + + + + + + 21 + + + 16 + + + + 98982670 + 57bbfadcedbef44fc322e5e037666393668cf3fe + tools_r21-windows.zip + + + 91495104 + 013b9c04407a9d73b8bf3c574327fbe870acd264 + tools_r21-linux.zip + + + 65767130 + fcfa3a6932f2ed0d970a0ca959bb2b4972f7d46d + tools_r21-macosx.zip + + + + + + + + + 21 + 0 + 1 + 1 + + + 16 + + + + 98998088 + 1503aaf2c91cb07c0240a2db3af0de027941a4f6 + tools_r21.0.1_rc1-windows.zip + + + 91510079 + 183670a7f9878d8d3693d5fcf32e1357b69f0fed + tools_r21.0.1_rc1-linux.zip + + + 65777178 + 109d4f287904875f067e021be3fd1f549e6afb67 + tools_r21.0.1_rc1-macosx.zip + + + + + + + + + + 1 + 17 + + + 171564393 + fb988cdd2beaac0dd47dc630821ccc30557c67e5 + docs-17_r01.zip + + + + + + + + + + 1 + 14 + + + 16152383 + eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555 + sources-14_r01.zip + + + + + + + + 2 + 15 + + + 16468746 + e5992a5747c9590783fbbdd700337bf0c9f6b1fa + sources-15_r02.zip + + + + + + + + 2 + 16 + + + 17876720 + 0f83c14ed333c45d962279ab5d6bc98a0269ef84 + sources-16_r02.zip + + + + + + + + 1 + 17 + + + 18976816 + 6f1f18cd2d2b1852d7f6892df9cee3823349d43a + sources-17_r01.zip + + + + + diff --git a/pkgs/development/mobile/androidenv/support.nix b/pkgs/development/mobile/androidenv/support.nix new file mode 100644 index 000000000000..2e9690de7a26 --- /dev/null +++ b/pkgs/development/mobile/androidenv/support.nix @@ -0,0 +1,17 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation { + name = "android-support-r11"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/support_r11.zip; + sha1 = "d30d182d8e4c86bb4464c03a83ccffce7bc84ecd"; + }; + + buildCommand = '' + mkdir -p $out + cd $out + unzip $src + ''; + + buildInputs = [ unzip ]; +} \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix new file mode 100644 index 000000000000..b35b42989838 --- /dev/null +++ b/pkgs/development/mobile/androidenv/sysimages.nix @@ -0,0 +1,50 @@ + +{stdenv, fetchurl, unzip}: + +let + buildSystemImage = args: + stdenv.mkDerivation (args // { + buildInputs = [ unzip ]; + buildCommand = '' + mkdir -p $out + cd $out + unzip $src + ''; + }); +in +{ + + sysimg_14 = buildSystemImage { + name = "armeabi-v7a-14"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-14_r02.zip; + sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b"; + }; + }; + + sysimg_15 = buildSystemImage { + name = "armeabi-v7a-15"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-15_r02.zip; + sha1 = "1bf977d6cb4e0ad38dceac0c4863d1caa21f326e"; + }; + }; + + sysimg_16 = buildSystemImage { + name = "armeabi-v7a-16"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-16_r03.zip; + sha1 = "d1cddb23f17aad5821a089c403d4cddad2cf9ef7"; + }; + }; + + sysimg_17 = buildSystemImage { + name = "armeabi-v7a-17"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-17_r01.zip; + sha1 = "45b9344473e0a6d063c2b1fe58d8cd47d307905e"; + }; + }; + +} + \ No newline at end of file diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix new file mode 100644 index 000000000000..3ac9e4bb9581 --- /dev/null +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -0,0 +1,92 @@ +{stdenv, xcodewrapper}: +{ name +, src +, target ? null +, configuration ? null +, scheme ? null +, sdk ? null +, arch ? null +, xcodeFlags ? "" +, release ? false +, codeSignIdentity ? null +, certificateFile ? null +, certificatePassword ? null +, provisioningProfile ? null +, generateIPA ? false +, generateXCArchive ? false +}: + +assert release -> codeSignIdentity != null && certificateFile != null && certificatePassword != null && provisioningProfile != null; + +let + # Set some default values here + + _target = if target == null then name else target; + _scheme = if scheme == null then name else scheme; + + _configuration = if configuration == null + then + if release then "Release" else "Debug" + else configuration; + + _arch = if arch == null + then + if release then "armv7" else "i386" + else arch; + + _sdk = if sdk == null + then + if release then "iphoneos6.0" else "iphonesimulator6.0" + else sdk; + + # The following is to prevent repetition + deleteKeychain = "security delete-keychain $keychainName"; +in +stdenv.mkDerivation { + inherit name src; + buildInputs = [ xcodewrapper ]; + buildPhase = '' + ${stdenv.lib.optionalString release '' + export HOME=/Users/$(whoami) + keychainName="$(basename $out)" + + # Create a keychain + security create-keychain -p "" $keychainName + security default-keychain -s $keychainName + security unlock-keychain -p "" $keychainName + + # Import the certificate into the keychain + security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A + + # Determine provisioning ID + PROVISIONING_PROFILE=$(grep UUID -A1 -a ${provisioningProfile} | grep -o "[-A-Z0-9]\{36\}") + + if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$PROVISIONING_PROFILE.mobileprovision" ] + then + # Copy provisioning profile into the home directory + mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles" + cp ${provisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$PROVISIONING_PROFILE.mobileprovision" + fi + + # Check whether the identity can be found + security find-identity -p codesigning $keychainName + ''} + + # Do the building + xcodebuild -target ${_target} -configuration ${_configuration} -scheme ${_scheme} -sdk ${_sdk} -arch ${_arch} ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName"'' else ""} + + ${stdenv.lib.optionalString release '' + ${stdenv.lib.optionalString generateIPA '' + # Produce an IPA file + xcrun -sdk iphoneos PackageApplication -v $out/*.app -o $out/${name}.ipa + ''} + + # Delete our temp keychain + ${deleteKeychain} + ''} + ''; + + failureHook = stdenv.lib.optionalString release deleteKeychain; + + installPhase = "true"; +} diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix new file mode 100644 index 000000000000..7f834688e636 --- /dev/null +++ b/pkgs/development/mobile/xcodeenv/default.nix @@ -0,0 +1,15 @@ +{stdenv}: + +rec { + xcodewrapper = import ./xcodewrapper.nix { + inherit stdenv; + }; + + buildApp = import ./build-app.nix { + inherit stdenv xcodewrapper; + }; + + simulateApp = import ./simulate-app.nix { + inherit stdenv xcodewrapper; + }; +} diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix new file mode 100644 index 000000000000..456732abe1f4 --- /dev/null +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -0,0 +1,17 @@ +{stdenv, xcodewrapper}: +{name, app, device ? "iPhone", baseDir ? ""}: + +stdenv.mkDerivation { + inherit name; + buildCommand = '' + ensureDir $out/bin + cat > $out/bin/run-test-simulator << "EOF" + #! ${stdenv.shell} -e + + cd ${app}/${baseDir}/${name}.app + "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication ./${name} -SimulateDevice '${device}' + EOF + chmod +x $out/bin/run-test-simulator + ''; +} + diff --git a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix new file mode 100644 index 000000000000..39804b1a248b --- /dev/null +++ b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix @@ -0,0 +1,24 @@ +{stdenv}: + +let + version = "4.5.2"; +in +stdenv.mkDerivation { + name = "xcode-wrapper-"+version; + buildCommand = '' + ensureDir $out/bin + cd $out/bin + ln -s /usr/bin/xcode-select + ln -s /usr/bin/xcodebuild + ln -s /usr/bin/xcrun + ln -s /usr/bin/security + ln -s "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app/Contents/MacOS/iPhone Simulator" + + # Check if we have the xcodebuild version that we want + if [ -z "$($out/bin/xcodebuild -version | grep ${version})" ] + then + echo "We require xcodebuild version: ${version}" + exit 1 + fi + ''; +} diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 48d1c3069932..4e00e39fc3d5 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -12,20 +12,23 @@ stdenv.mkDerivation rec { configureFlags = [ "--openssl-includes=${openssl}/include" "--openssl-libpath=${openssl}/lib" - "--shared-v8" - "--shared-v8-includes=${v8}/includes" - "--shared-v8-libpath=${v8}/lib" + #"--shared-v8" + #"--shared-v8-includes=${v8}/includes" + #"--shared-v8-libpath=${v8}/lib" ]; - patches = stdenv.lib.optional stdenv.isDarwin ./no-arch-flag.patch; + #patches = stdenv.lib.optional stdenv.isDarwin ./no-arch-flag.patch; prePatch = '' - sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} configure + sed=$(type -p sed) + export PATH=/usr/bin:$PATH + + $sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} configure ''; postInstall = '' - sed -e 's|^#!/usr/bin/env node$|#!'$out'/bin/node|' -i $out/lib/node_modules/npm/bin/npm-cli.js + $sed -e 's|^#!/usr/bin/env node$|#!'$out'/bin/node|' -i $out/lib/node_modules/npm/bin/npm-cli.js '' + stdenv.lib.optionalString stdenv.isDarwin '' install_name_tool -change libv8.dylib ${v8}/lib/libv8.dylib $out/bin/node ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b16846cf0762..c00b3c0608c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -411,10 +411,12 @@ let client = true; }); - androidenv = import ../development/androidenv { + androidenv = import ../development/mobile/androidenv { inherit pkgs; pkgs_i686 = pkgsi686Linux; }; + + xcodeenv = callPackage ../development/mobile/xcodeenv { }; inherit (androidenv) androidsdk_4_1; -- cgit 1.4.1 From eecb135cad6ff4e02f49241a7d370280a838ff94 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 7 Jan 2013 16:58:09 +0100 Subject: apr-util: Reenabling openldap support again --- pkgs/development/libraries/apr-util/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index be3a83975e5d..ad02f9b84cce 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, apr, expat , sslSupport ? true, openssl , bdbSupport ? false, db4 -, ldapSupport ? false, openldap +, ldapSupport ? true, openldap }: assert sslSupport -> openssl != null; -- cgit 1.4.1 From 03621d4cd8ff005342363148b81050af86f77888 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 7 Jan 2013 17:01:50 +0100 Subject: Remove my darwin workarounds for node.js --- pkgs/development/libraries/v8/default.nix | 1 - pkgs/development/web/nodejs/default.nix | 11 ++++------- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 34026806a52a..1fd6179183fd 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { }; configurePhase = '' - ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "export PATH=/usr/bin:$PATH"} mkdir build/gyp ln -sv ${gyp}/bin/gyp build/gyp/gyp ''; diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 4e00e39fc3d5..42fad7d7deb4 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -12,18 +12,15 @@ stdenv.mkDerivation rec { configureFlags = [ "--openssl-includes=${openssl}/include" "--openssl-libpath=${openssl}/lib" - #"--shared-v8" - #"--shared-v8-includes=${v8}/includes" - #"--shared-v8-libpath=${v8}/lib" + "--shared-v8" + "--shared-v8-includes=${v8}/includes" + "--shared-v8-libpath=${v8}/lib" ]; #patches = stdenv.lib.optional stdenv.isDarwin ./no-arch-flag.patch; prePatch = '' - sed=$(type -p sed) - export PATH=/usr/bin:$PATH - - $sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} configure + sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} configure ''; postInstall = '' -- cgit 1.4.1 From 805561e4aa7de17c1a45b45d6666c5adae721286 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 7 Jan 2013 17:36:00 +0100 Subject: libuuid: pass `--disable-libmount-mount' on GNU/Hurd. --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c00b3c0608c5..458041fe4250 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5702,6 +5702,7 @@ let # `libblkid' fails to build on GNU/Hurd. configureFlags = args.configureFlags + " --disable-libblkid --disable-mount --disable-libmount" + + " --disable-libmount-mount" + " --disable-fsck --enable-static --disable-partx"; doCheck = false; CPPFLAGS = # ugly hack for ugly software! -- cgit 1.4.1 From 563416500ebb1f4f9d49b45f0befc4867ec6358b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 7 Jan 2013 17:37:51 +0100 Subject: zile: remove `help2man' from the cross-build inputs --- pkgs/applications/editors/zile/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs') diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index a64561b10996..13a36e258fde 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses boehmgc ]; buildNativeInputs = [ help2man perl ]; + # `help2man' wants to run Zile, which fails when cross-compiling. + crossAttrs.buildNativeInputs = []; + # Tests can't be run because most of them rely on the ability to # fiddle with the terminal. doCheck = false; -- cgit 1.4.1 From c6ff338e279a7eb63bddaa38388b4351c3536bc8 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 7 Jan 2013 18:22:10 +0100 Subject: Added package + build functions for Titanium SDK, a cross-platform mobile development kit --- pkgs/development/mobile/titaniumenv/build-app.nix | 87 ++++++++++++++++++++++ pkgs/development/mobile/titaniumenv/default.nix | 18 +++++ .../mobile/titaniumenv/examples/default.nix | 38 ++++++++++ .../examples/emulate-kitchensink/default.nix | 10 +++ .../titaniumenv/examples/kitchensink/default.nix | 24 ++++++ .../examples/simulate-kitchensink/default.nix | 8 ++ .../mobile/titaniumenv/fixnativelibs.sed | 1 + .../mobile/titaniumenv/fixselfruntimev8.sed | 1 + .../development/mobile/titaniumenv/fixtiverify.sed | 1 + .../development/mobile/titaniumenv/titaniumsdk.nix | 57 ++++++++++++++ pkgs/top-level/all-packages.nix | 6 +- 11 files changed, 250 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/mobile/titaniumenv/build-app.nix create mode 100644 pkgs/development/mobile/titaniumenv/default.nix create mode 100644 pkgs/development/mobile/titaniumenv/examples/default.nix create mode 100644 pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix create mode 100644 pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix create mode 100644 pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix create mode 100644 pkgs/development/mobile/titaniumenv/fixnativelibs.sed create mode 100644 pkgs/development/mobile/titaniumenv/fixselfruntimev8.sed create mode 100644 pkgs/development/mobile/titaniumenv/fixtiverify.sed create mode 100644 pkgs/development/mobile/titaniumenv/titaniumsdk.nix (limited to 'pkgs') diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix new file mode 100644 index 000000000000..0fd4929bda76 --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -0,0 +1,87 @@ +{stdenv, androidsdk, titaniumsdk, xcodewrapper}: +{ appId, name, src, target, androidPlatformVersions ? [ "8" ] +, release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null +, iosKeyFile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null +}: + +assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null; +assert (release && target == "iphone") -> iosKeyFile != null && iosCertificateName != null && iosCertificate != null && iosCertificatePassword != null; + +let + androidsdkComposition = androidsdk { + platformVersions = androidPlatformVersions; + useGoogleAPIs = true; + }; +in +stdenv.mkDerivation { + inherit name src; + + buildInputs = [] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; + + buildPhase = '' + export HOME=$TMPDIR + + mkdir -p $out + + ${if target == "android" then + if release then + "${titaniumsdk}/mobilesdk/*/*/android/builder.py distribute ${name} ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId} ${androidKeyStore} ${androidKeyStorePassword} ${androidKeyAlias} $out" + else + "${titaniumsdk}/mobilesdk/*/*/android/builder.py build ${name} ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}" + + else if target == "iphone" then + if release then + '' + export HOME=/Users/$(whoami) + export keychainName=$(basename $out) + + # Create a keychain with the component hash name (should always be unique) + security create-keychain -p "" $keychainName + security default-keychain -s $keychainName + security unlock-keychain -p "" $keychainName + security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A + + provisioningId=$(grep UUID -A1 -a ${iosKeyFile} | grep -o "[-A-Z0-9]\{36\}") + + # Ensure that the requested provisioning profile can be found + + if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles" ] + then + mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles" + cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" + fi + + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} ${name} "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName" + + # Remove our generated keychain + + security delete-keychain $keychainName + '' + else + '' + # Copy all sources to the output store directory. + # Why? Debug application include *.js files, which are symlinked into their + # sources. If they are not copied, we have dangling references to the + # temp folder. + + cp -av * $out + cd $out + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} ${name} + '' + + else throw "Target: ${target} is not supported!"} + ''; + + installPhase = '' + mkdir -p $out + + ${if target == "android" && release then "" + else + if target == "android" then + ''cp $(ls build/android/bin/*.apk | grep -v '\-unsigned.apk') $out'' + else if target == "iphone" && release then + "cp -av build/iphone/build/* $out" + else if target == "iphone" then "" + else throw "Target: ${target} is not supported!"} + ''; +} diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix new file mode 100644 index 000000000000..8117b452d70b --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -0,0 +1,18 @@ +{pkgs, pkgs_i686}: + +rec { + androidenv = pkgs.androidenv; + + xcodeenv = if pkgs.stdenv.system == "x86_64-darwin" then pkgs.xcodeenv else null; + + titaniumsdk = import ./titaniumsdk.nix { + inherit (pkgs) stdenv fetchurl unzip makeWrapper python jdk; + }; + + buildApp = import ./build-app.nix { + inherit (pkgs) stdenv; + inherit (androidenv) androidsdk; + inherit (xcodeenv) xcodewrapper; + inherit titaniumsdk; + }; +} diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix new file mode 100644 index 000000000000..1526d4c43590 --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -0,0 +1,38 @@ +let + pkgs = import {}; + pkgs_i686 = import { system = "i686-linux"; }; +in +rec { + titaniumenv = import ./.. { + inherit pkgs pkgs_i686; + }; + + kitchensink_android = import ./kitchensink { + inherit titaniumenv; + inherit (pkgs) fetchgit; + target = "android"; + }; + + kitchensink_iphone = import ./kitchensink { + inherit titaniumenv; + inherit (pkgs) fetchgit; + target = "iphone"; + }; + + emulate_kitchensink = import ./emulate-kitchensink { + inherit (titaniumenv) androidenv; + kitchensink = kitchensink_android; + }; + + simulate_kitchensink_iphone = import ./simulate-kitchensink { + inherit (titaniumenv) xcodeenv; + kitchensink = kitchensink_iphone; + device = "iPhone"; + }; + + simulate_kitchensink_ipad = import ./simulate-kitchensink { + inherit (titaniumenv) xcodeenv; + kitchensink = kitchensink_iphone; + device = "iPad"; + }; +} diff --git a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix new file mode 100644 index 000000000000..817aa5ab37f5 --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix @@ -0,0 +1,10 @@ +{androidenv, kitchensink}: + +androidenv.emulateApp { + name = "kitchensink"; + app = kitchensink; + platformVersion = "8"; + useGoogleAPIs = true; + package = "com.appcelerator.kitchensink"; + activity = "KitchensinkActivity"; +} diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix new file mode 100644 index 000000000000..8e2b1df264a6 --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix @@ -0,0 +1,24 @@ +{titaniumenv, fetchgit, target, androidPlatformVersions ? [ "8" ]}: + +titaniumenv.buildApp { + name = "KitchenSink"; + appId = "com.appcelerator.kitchensink"; + src = fetchgit { + url = https://github.com/appcelerator/KitchenSink.git; + rev = "0f2c0b818034cc4e6867f0aa2afc98bf77dbff02"; + sha256 = "de31496cfb5625d7a193bbbc32a8021e4094ffab20ae13ef2e1583b0394d7c60"; + }; + + inherit target androidPlatformVersions; + + /*release = true; + androidKeyStore = /home/sander/keystore; + androidKeyAlias = "sander"; + androidKeyStorePassword = "foobar";*/ + + /*release = true; + iosKeyFile = /Users/sander/Downloads/profile.mobileprovision; + iosCertificateName = "My Company"; + iosCertificate = /Users/sander/Downloads/c.p12; + iosCertificatePassword = "";*/ +} diff --git a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix new file mode 100644 index 000000000000..70ec534f6ae2 --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix @@ -0,0 +1,8 @@ +{xcodeenv, kitchensink, device}: + +xcodeenv.simulateApp { + name = "kitchensink"; + app = kitchensink; + inherit device; + baseDir = "build/iphone/build/Debug-iphonesimulator"; +} diff --git a/pkgs/development/mobile/titaniumenv/fixnativelibs.sed b/pkgs/development/mobile/titaniumenv/fixnativelibs.sed new file mode 100644 index 000000000000..76b330136b66 --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/fixnativelibs.sed @@ -0,0 +1 @@ +s|\t\t\t\t\t\t\t\tapk_zip.write(native_lib, path_in_zip)|\t\t\t\t\t\t\t\tinfo = zipfile.ZipInfo(path_in_zip)\n\t\t\t\t\t\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\t\t\t\t\t\tinfo.create_system = 3\n\t\t\t\t\t\t\t\tf = open(native_lib)\n\t\t\t\t\t\t\t\tapk_zip.writestr(info, f.read())\n\t\t\t\t\t\t\t\tf.close()| diff --git a/pkgs/development/mobile/titaniumenv/fixselfruntimev8.sed b/pkgs/development/mobile/titaniumenv/fixselfruntimev8.sed new file mode 100644 index 000000000000..c849aaa611c6 --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/fixselfruntimev8.sed @@ -0,0 +1 @@ +s|apk_zip.write(os.path.join(lib_source_dir, fname), lib_dest_dir + fname)|info = zipfile.ZipInfo(lib_dest_dir + fname)\n\t\t\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\t\t\tinfo.create_system = 3\n\t\t\t\t\tf = open(os.path.join(lib_source_dir, fname))\n\t\t\t\t\tapk_zip.writestr(info, f.read())\n\t\t\t\t\tf.close()| diff --git a/pkgs/development/mobile/titaniumenv/fixtiverify.sed b/pkgs/development/mobile/titaniumenv/fixtiverify.sed new file mode 100644 index 000000000000..8e1114769c89 --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/fixtiverify.sed @@ -0,0 +1 @@ +s|apk_zip.write(os.path.join(lib_source_dir, 'libtiverify.so'), lib_dest_dir + 'libtiverify.so')|info = zipfile.ZipInfo(lib_dest_dir + 'libtiverify.so')\n\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\tinfo.create_system = 3\n\t\t\tf = open(os.path.join(lib_source_dir, 'libtiverify.so'))\n\t\t\tapk_zip.writestr(info, f.read())\n\t\t\tf.close()| diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix new file mode 100644 index 000000000000..5e1943b1bdc0 --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix @@ -0,0 +1,57 @@ +{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: + +stdenv.mkDerivation { + name = "titanium-mobilesdk-2.1.5.v20121112144658"; + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { + url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-linux.zip; + sha1 = "79f073d11ee893c508c5aa675a3126501dd385fd"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-osx.zip; + sha1 = "6a9a726882222d1615de332aa1ca608c15564e1c"; + } + else throw "Platform: ${stdenv.system} not supported!"; + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out + cd $out + yes y | unzip $src + + # Fix shebang header for python scripts + + find . -name \*.py | while read i + do + sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i + done + + # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that + # Yes, I know it's nasty :-) + + cd mobilesdk/*/*/android + + sed -i -f ${./fixtiverify.sed} builder.py + sed -i -f ${./fixselfruntimev8.sed} builder.py + sed -i -f ${./fixnativelibs.sed} builder.py + + # Patch some executables + + ${if stdenv.system == "i686-linux" then + '' + patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32 + '' + else if stdenv.system == "x86_64-linux" then + '' + patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64 + '' + else ""} + + # Wrap builder script + + wrapProgram `pwd`/builder.py \ + --prefix PYTHONPATH : ${python.modules.sqlite3}/lib/python*/site-packages \ + --prefix PATH : ${jdk}/bin \ + --prefix JAVA_HOME : ${jdk} + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 458041fe4250..cfd51dcf8033 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -417,6 +417,11 @@ let }; xcodeenv = callPackage ../development/mobile/xcodeenv { }; + + titaniumenv = import ../development/mobile/titaniumenv { + inherit pkgs; + pkgs_i686 = pkgsi686Linux; + }; inherit (androidenv) androidsdk_4_1; @@ -5702,7 +5707,6 @@ let # `libblkid' fails to build on GNU/Hurd. configureFlags = args.configureFlags + " --disable-libblkid --disable-mount --disable-libmount" - + " --disable-libmount-mount" + " --disable-fsck --enable-static --disable-partx"; doCheck = false; CPPFLAGS = # ugly hack for ugly software! -- cgit 1.4.1 From d6571f932f73724b9fa333a5f98a9489385f534b Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 7 Jan 2013 21:30:57 +0100 Subject: Fix nodejs --- pkgs/development/web/nodejs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 42fad7d7deb4..533411b92de3 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postInstall = '' - $sed -e 's|^#!/usr/bin/env node$|#!'$out'/bin/node|' -i $out/lib/node_modules/npm/bin/npm-cli.js + sed -e 's|^#!/usr/bin/env node$|#!'$out'/bin/node|' -i $out/lib/node_modules/npm/bin/npm-cli.js '' + stdenv.lib.optionalString stdenv.isDarwin '' install_name_tool -change libv8.dylib ${v8}/lib/libv8.dylib $out/bin/node ''; -- cgit 1.4.1 From eda055ded2b92b01ee9816cfeba7be10782913c8 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 8 Jan 2013 09:29:19 +0100 Subject: nvidia-x11: Install missing libs. Several libs from the Nvidia distribution was not copied to the nix store during installation. Therefore, OpenCL was not working, for example. The various nvidia-legacy packages are probably also missing libs, this commit does not touch them, though. --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 30 ++++++++++++++++------------ 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 124c8955e26d..98a03002fc2a 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -27,19 +27,23 @@ buildPhase() { installPhase() { # Install libGL and friends. - mkdir -p $out/lib - cp -prd libcuda.* libGL.* libnvidia-cfg.* libnvidia-compiler.* libnvidia-tls.* libnvidia-glcore.* libOpenCL.* libvdpau_nvidia* tls $out/lib/ - - ln -snf libnvidia-glcore.so.$versionNumber $out/lib/libnvidia-glcore.so - ln -snf libnvidia-glcore.so.$versionNumber $out/lib/libnvidia-glcore.so.1 - ln -snf libGL.so.$versionNumber $out/lib/libGL.so - ln -snf libGL.so.$versionNumber $out/lib/libGL.so.1 - ln -snf libnvidia-cfg.so.$versionNumber $out/lib/libnvidia-cfg.so.1 - ln -snf libnvidia-tls.so.$versionNumber $out/lib/libnvidia-tls.so.1 - ln -snf libnvidia-tls.so.$versionNumber $out/lib/tls/libnvidia-tls.so.1 - ln -snf libcuda.so.$versionNumber $out/lib/libcuda.so.1 - ln -snf libcuda.so.1 $out/lib/libcuda.so - ln -snf libvdpau_nvidia.so.$versionNumber $out/lib/libvdpau_nvidia.so + mkdir -p $out/lib/vendors + + for f in \ + libcuda libGL libnvcuvid libnvidia-cfg libnvidia-compiler \ + libnvidia-encode libnvidia-glcore libnvidia-ml libnvidia-opencl \ + libnvidia-tls libOpenCL libnvidia-tls libvdpau_nvidia + do + cp -prd $f.* $out/lib/ + ln -snf $f.so.$versionNumber $out/lib/$f.so + ln -snf $f.so.$versionNumber $out/lib/$f.so.1 + done + + cp -p nvidia.icd $out/lib/vendors/ + cp -prd tls $out/lib/ + cp -prd libOpenCL.so.1.0.0 $out/lib/ + ln -snf libOpenCL.so.1.0.0 $out/lib/libOpenCL.so + ln -snf libOpenCL.so.1.0.0 $out/lib/libOpenCL.so.1 patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.* -- cgit 1.4.1 From 5391395e681bff280a0a0d9f81a00ddfa21e8f73 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:36:31 +0100 Subject: cryptsetup: Update to 1.5.1 --- pkgs/os-specific/linux/cryptsetup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 9e762f649041..6d612f8cdbdc 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt }: stdenv.mkDerivation rec { - name = "cryptsetup-1.5.0"; + name = "cryptsetup-1.5.1"; src = fetchurl { url = "http://cryptsetup.googlecode.com/files/${name}.tar.bz2"; - sha256 = "1l7qcmaq092k28k8sbw845hs6jwn0f05h68rmb7iwh52232m8wa0"; + sha256 = "0dib3nw6ifd7d7hr9k4iyaha3hz0pkzairqa38l3fndkr9w3zlhn"; }; configureFlags = "--enable-cryptsetup-reencrypt"; -- cgit 1.4.1 From d906239fe3fb1df20f635982bbc13be5a12e27c9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:37:01 +0100 Subject: systemd: Update to 197 --- pkgs/os-specific/linux/systemd/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index a207213d12d5..bab65600da64 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -6,11 +6,11 @@ assert stdenv.gcc.libc or null != null; stdenv.mkDerivation rec { - name = "systemd-196"; + name = "systemd-197"; src = fetchurl { url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; - sha256 = "1gz4an5havzwzp7xsinn01prwvf51hgipb8pbciri0fxlmcadm3b"; + sha256 = "1dbljyyc3w4a1af99f15f3sqnfx7mfmc5x5hwxb70kg23ai7x1g6"; }; patches = @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" - "--with-distro=other" "--with-rootprefix=$(out)" "--with-rootprefix=$(out)" "--with-dbusinterfacedir=$(out)/share/dbus-1/interfaces" @@ -55,6 +54,8 @@ stdenv.mkDerivation rec { --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/ ''; + PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python + NIX_CFLAGS_COMPILE = [ "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\"" "-DKBD_SETFONT=\"${kbd}/bin/setfont\"" -- cgit 1.4.1 From 30201193eab7832b05a962743591d5ee8bdda503 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 16:05:04 +0100 Subject: systemd: Generate patches from my systemd Git repo --- ...ctl-daemon-reexec-do-the-right-thing-on-N.patch | 26 ++++++++ ...Ignore-duplicate-paths-in-systemctl-start.patch | 30 +++++++++ ...e-units-for-uninitialised-encrypted-devic.patch | 32 ++++++++++ ...tch-to-configuration-hints-for-some-units.patch | 74 ++++++++++++++++++++++ ...get-Drop-the-dependency-on-local-fs.targe.patch | 33 ++++++++++ .../linux/systemd/crypt-devices-are-ready.patch | 22 ------- pkgs/os-specific/linux/systemd/default.nix | 8 ++- .../linux/systemd/ignore-duplicates.patch | 20 ------ pkgs/os-specific/linux/systemd/reexec.patch | 15 ----- 9 files changed, 200 insertions(+), 60 deletions(-) create mode 100644 pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch create mode 100644 pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch create mode 100644 pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch create mode 100644 pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch create mode 100644 pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch delete mode 100644 pkgs/os-specific/linux/systemd/crypt-devices-are-ready.patch delete mode 100644 pkgs/os-specific/linux/systemd/ignore-duplicates.patch delete mode 100644 pkgs/os-specific/linux/systemd/reexec.patch (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch b/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch new file mode 100644 index 000000000000..dda9bea7674c --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch @@ -0,0 +1,26 @@ +From 0085f49cd0ba889e3db9102f328f6044ae3a2c18 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Tue, 8 Jan 2013 15:44:33 +0100 +Subject: [PATCH 1/5] Make "systemctl daemon-reexec" do the right thing on + NixOS + +--- + src/core/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/main.c b/src/core/main.c +index 1ee3c9c..1686f60 100644 +--- a/src/core/main.c ++++ b/src/core/main.c +@@ -1858,7 +1858,7 @@ finish: + char_array_0(sfd); + + i = 0; +- args[i++] = SYSTEMD_BINARY_PATH; ++ args[i++] = "/run/current-system/systemd/lib/systemd/systemd"; + if (switch_root_dir) + args[i++] = "--switched-root"; + args[i++] = arg_running_as == SYSTEMD_SYSTEM ? "--system" : "--user"; +-- +1.8.0.1 + diff --git a/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch b/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch new file mode 100644 index 000000000000..14795e521112 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch @@ -0,0 +1,30 @@ +From 2b0a9106d3aabb365af0cc34b595a1e697120f37 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Tue, 8 Jan 2013 15:45:01 +0100 +Subject: [PATCH 2/5] Ignore duplicate paths in "systemctl start" + +--- + src/systemctl/systemctl.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c +index 2ebfff8..9f99df5 100644 +--- a/src/systemctl/systemctl.c ++++ b/src/systemctl/systemctl.c +@@ -1591,8 +1591,11 @@ static int start_unit_one( + + r = set_put(s, p); + if (r < 0) { +- log_error("Failed to add path to set."); +- return r; ++ free(p); ++ if (r != -EEXIST) { ++ log_error("Failed to add path %s to set.", p); ++ return r; ++ } + } + + p = NULL; +-- +1.8.0.1 + diff --git a/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch new file mode 100644 index 000000000000..63de58f97d5a --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -0,0 +1,32 @@ +From a013beb84f135cebf1c8c9363d5676c1c0a6be7a Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Tue, 8 Jan 2013 15:46:30 +0100 +Subject: [PATCH 3/5] Start device units for uninitialised encrypted devices + +This is necessary because the NixOS service that initialises the +filesystem depends on the appearance of the device unit. Also, this +makes more sense to me: the device is ready; it's the filesystem +that's not, but taking care of that is the responsibility of the mount +unit. (However, this ignores the fsck unit, so it's not perfect...) +--- + rules/99-systemd.rules.in | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in +index d17bdd9..040b10e 100644 +--- a/rules/99-systemd.rules.in ++++ b/rules/99-systemd.rules.in +@@ -14,10 +14,6 @@ KERNEL=="vport*", TAG+="systemd" + SUBSYSTEM=="block", KERNEL!="ram*|loop*", TAG+="systemd" + SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0" + +-# Ignore encrypted devices with no identified superblock on it, since +-# we are probably still calling mke2fs or mkswap on it. +-SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0" +- + # Ignore raid devices that are not yet assembled and started + SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0" + SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0" +-- +1.8.0.1 + diff --git a/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch b/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch new file mode 100644 index 000000000000..f819d1640e83 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch @@ -0,0 +1,74 @@ +From b40d8783f94666035baae567882c0d4be82cda01 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Tue, 8 Jan 2013 15:48:19 +0100 +Subject: [PATCH 4/5] Set switch-to-configuration hints for some units +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Target units like local-fs.target need ‘X-StopOnReconfiguration=yes’ +to ensure dependencies *on* that target properly take into account the +dependencies *of* the target. + +‘X-RestartIfChanged=no’ is necessary for systemd-journald.service +because restarting it causes services connected to journald to stop +logging. + +‘X-RestartIfChanged=no’ is necessary for systemd-user-sessions.service +to prevent all user sessions from being killed when this unit changes. +--- + units/local-fs.target | 2 ++ + units/remote-fs.target | 2 ++ + units/systemd-journald.service.in | 5 +++++ + units/systemd-user-sessions.service.in | 3 +++ + 4 files changed, 12 insertions(+) + +diff --git a/units/local-fs.target b/units/local-fs.target +index dd92b17..dfcbc7b 100644 +--- a/units/local-fs.target ++++ b/units/local-fs.target +@@ -10,3 +10,5 @@ Description=Local File Systems + Documentation=man:systemd.special(7) + OnFailure=emergency.target + OnFailureIsolate=yes ++ ++X-StopOnReconfiguration=yes +diff --git a/units/remote-fs.target b/units/remote-fs.target +index 9e68878..85a53d7 100644 +--- a/units/remote-fs.target ++++ b/units/remote-fs.target +@@ -9,5 +9,7 @@ + Description=Remote File Systems + Documentation=man:systemd.special(7) + ++X-StopOnReconfiguration=yes ++ + [Install] + WantedBy=multi-user.target +diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in +index ab2e50c..9563a7d 100644 +--- a/units/systemd-journald.service.in ++++ b/units/systemd-journald.service.in +@@ -24,3 +24,8 @@ CapabilityBoundingSet=CAP_SYS_ADMIN CAP_DAC_OVERRIDE CAP_SYS_PTRACE CAP_SYSLOG C + # Increase the default a bit in order to allow many simultaneous + # services being run since we keep one fd open per service. + LimitNOFILE=16384 ++ ++# Don't restart journald, since that causes services connected to ++# journald to stop logging (see ++# https://bugs.freedesktop.org/show_bug.cgi?id=56043). ++X-RestartIfChanged=no +diff --git a/units/systemd-user-sessions.service.in b/units/systemd-user-sessions.service.in +index 0869e73..b6ed958 100644 +--- a/units/systemd-user-sessions.service.in ++++ b/units/systemd-user-sessions.service.in +@@ -15,3 +15,6 @@ Type=oneshot + RemainAfterExit=yes + ExecStart=@rootlibexecdir@/systemd-user-sessions start + ExecStop=@rootlibexecdir@/systemd-user-sessions stop ++ ++# Restart kills all active sessions. ++X-RestartIfChanged=no +-- +1.8.0.1 + diff --git a/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch b/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch new file mode 100644 index 000000000000..54009f2e7fc7 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch @@ -0,0 +1,33 @@ +From c5c8ac3a0420fb42ba2f629368fd5bd6ea1e753b Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Tue, 8 Jan 2013 15:56:03 +0100 +Subject: [PATCH 5/5] sysinit.target: Drop the dependency on local-fs.target + and swap.target + +Having all services with DefaultDependencies=yes depend on +local-fs.target is annoying, because some of those services might be +necessary to mount local filesystems. For instance, Charon's +send-keys feature requires sshd to be running in order to receive LUKS +encryption keys, which in turn requires dhcpcd, and so on. So we drop +this dependency (and swap.target as well for consistency). If +services require a specific mount, they should use RequiresMountsFor +in any case. +--- + units/sysinit.target | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/units/sysinit.target b/units/sysinit.target +index 8f4fb8f..e0f0147 100644 +--- a/units/sysinit.target ++++ b/units/sysinit.target +@@ -9,6 +9,5 @@ + Description=System Initialization + Documentation=man:systemd.special(7) + Conflicts=emergency.service emergency.target +-Wants=local-fs.target swap.target +-After=local-fs.target swap.target emergency.service emergency.target ++After=emergency.service emergency.target + RefuseManualStart=yes +-- +1.8.0.1 + diff --git a/pkgs/os-specific/linux/systemd/crypt-devices-are-ready.patch b/pkgs/os-specific/linux/systemd/crypt-devices-are-ready.patch deleted file mode 100644 index 4646ed0e44ca..000000000000 --- a/pkgs/os-specific/linux/systemd/crypt-devices-are-ready.patch +++ /dev/null @@ -1,22 +0,0 @@ -Do start device units for uninitialised encrypted devices, because the -service that initialises the filesystem depends on the appearance of -the device unit. Also, this makes more sense to me: the device is -ready; it's the filesystem that's not, but taking care of that is the -responsibility of the mount unit. (However, this ignores the fsck -unit, so it's not perfect...) - -diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in -index d17bdd9..040b10e 100644 ---- a/rules/99-systemd.rules.in -+++ b/rules/99-systemd.rules.in -@@ -14,10 +14,6 @@ KERNEL=="vport*", TAG+="systemd" - SUBSYSTEM=="block", KERNEL!="ram*|loop*", TAG+="systemd" - SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0" - --# Ignore encrypted devices with no identified superblock on it, since --# we are probably still calling mke2fs or mkswap on it. --SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0" -- - # Ignore raid devices that are not yet assembled and started - SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0" - SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0" diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index bab65600da64..975a37fffce0 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -14,9 +14,11 @@ stdenv.mkDerivation rec { }; patches = - [ ./reexec.patch - ./ignore-duplicates.patch - ./crypt-devices-are-ready.patch + [ ./0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch + ./0002-Ignore-duplicate-paths-in-systemctl-start.patch + ./0003-Start-device-units-for-uninitialised-encrypted-devic.patch + ./0004-Set-switch-to-configuration-hints-for-some-units.patch + ./0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch ]; buildInputs = diff --git a/pkgs/os-specific/linux/systemd/ignore-duplicates.patch b/pkgs/os-specific/linux/systemd/ignore-duplicates.patch deleted file mode 100644 index 764eead54eac..000000000000 --- a/pkgs/os-specific/linux/systemd/ignore-duplicates.patch +++ /dev/null @@ -1,20 +0,0 @@ -Ignore duplicate paths in "systemctl start". - -diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index a4290c4..d3ac3ad 100644 ---- a/src/systemctl/systemctl.c -+++ b/src/systemctl/systemctl.c -@@ -1596,8 +1596,11 @@ static int start_unit_one( - - r = set_put(s, p); - if (r < 0) { -- log_error("Failed to add path to set."); -- return r; -+ free(p); -+ if (r != -EEXIST) { -+ log_error("Failed to add path %s to set.", p); -+ return r; -+ } - } - - p = NULL; diff --git a/pkgs/os-specific/linux/systemd/reexec.patch b/pkgs/os-specific/linux/systemd/reexec.patch deleted file mode 100644 index ff13a44ca0b2..000000000000 --- a/pkgs/os-specific/linux/systemd/reexec.patch +++ /dev/null @@ -1,15 +0,0 @@ -Make "systemctl daemon-reexec" do the right thing on NixOS. - -diff --git a/src/core/main.c b/src/core/main.c -index 04fc0b3..0f5b0e9 100644 ---- a/src/core/main.c -+++ b/src/core/main.c -@@ -1819,7 +1819,7 @@ finish: - char_array_0(sfd); - - i = 0; -- args[i++] = SYSTEMD_BINARY_PATH; -+ args[i++] = "/run/current-system/systemd/lib/systemd/systemd"; - if (switch_root_dir) - args[i++] = "--switched-root"; - args[i++] = arg_running_as == SYSTEMD_SYSTEM ? "--system" : "--user"; -- cgit 1.4.1 From cdb2f64a3553ac20824c4fd5b40c1115cbaf06e3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 18:11:56 +0100 Subject: systemd: Get rescue.service and emergency.service to work --- pkgs/os-specific/linux/systemd/default.nix | 9 ++++++--- pkgs/os-specific/linux/sysvinit/default.nix | 11 ++++++----- 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 975a37fffce0..e605b998c4a6 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod , xz, pam, acl, cryptsetup, libuuid, m4, utillinux -, glib, kbd, libxslt, coreutils, libgcrypt +, glib, kbd, libxslt, coreutils, libgcrypt, sysvtools }: assert stdenv.gcc.libc or null != null; @@ -42,14 +42,17 @@ stdenv.mkDerivation rec { preConfigure = '' # FIXME: patch this in systemd properly (and send upstream). - for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c; do + # FIXME: use sulogin from util-linux once updated. + for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.m4.in; do test -e $i substituteInPlace $i \ --replace /bin/mount ${utillinux}/bin/mount \ --replace /bin/umount ${utillinux}/bin/umount \ --replace /sbin/swapon ${utillinux}/sbin/swapon \ --replace /sbin/swapoff ${utillinux}/sbin/swapoff \ - --replace /sbin/fsck ${utillinux}/sbin/fsck + --replace /sbin/fsck ${utillinux}/sbin/fsck \ + --replace /bin/echo ${coreutils}/bin/echo \ + --replace /sbin/sulogin ${sysvtools}/sbin/sulogin done substituteInPlace src/journal/catalog.c \ diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index 7b3ea62ea2df..99aebd11667c 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -4,12 +4,12 @@ let version = "2.88dsf"; in stdenv.mkDerivation { name = (if withoutInitTools then "sysvtools" else "sysvinit") + "-" + version; - + src = fetchurl { url = "mirror://savannah/sysvinit/sysvinit-${version}.tar.bz2"; sha256 = "068mvzaz808a673zigyaqb63xc8bndh2klk16zi5c83rw70wifv0"; }; - + prePatch = '' # Patch some minimal hard references, so halt/shutdown work sed -i -e "s,/sbin/,$out/sbin/," src/halt.c src/init.c src/paths.h @@ -27,16 +27,17 @@ stdenv.mkDerivation { ''; postInstall = stdenv.lib.optionalString withoutInitTools - '' + '' mv $out/sbin/killall5 $out/bin ln -sf killall5 $out/bin/pidof - rm -rf $out/sbin + shopt -s extglob + rm -rf $out/sbin/!(sulogin) rm -rf $out/include rm -rf $out/share/man/man5 rm $(for i in $out/share/man/man8/*; do echo $i; done | grep -v 'pidof\|killall5') rm $out/bin/{mountpoint,wall} $out/share/man/man1/{mountpoint.1,wall.1} ''; - + meta = { homepage = http://www.nongnu.org/sysvinit/; description = "Utilities related to booting and shutdown"; -- cgit 1.4.1 From 74c92f5f4aa4123e778e8e6e329976c69ab76fbc Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 8 Jan 2013 12:32:47 -0500 Subject: First attempt at packaging dd-agent --- pkgs/tools/networking/dd-agent/default.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/tools/networking/dd-agent/default.nix (limited to 'pkgs') diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix new file mode 100644 index 000000000000..6e46174bd108 --- /dev/null +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "dd-agent-ab14fde6f9"; + + src = fetchgit { + url = git://github.com/DataDog/dd-agent.git; + rev = "ab14fde6f9b9f6cb3544f643cece97ef18a0d770"; + sha256 = "2615a2f122ac97363eba8973dfc6c2ce81cb61a26eb61c2988faad2abd05efc5"; + }; + + postUnpack = "export sourceRoot=$sourceRoot/packaging"; + + makeFlags = [ "BUILD=$(out)" ]; + + installTargets = [ "install_base" "install_full" ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e674e081e487..446921881012 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6782,6 +6782,8 @@ let inherit (gnome) GConf libglade; }; + "dd-agent" = callPackage ../tools/networking/dd-agent { }; + dia = callPackage ../applications/graphics/dia { inherit (pkgs.gnome) libart_lgpl libgnomeui; }; -- cgit 1.4.1 From 4b2632e54a2f5ce725094dda36f0213ea2c59d68 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 8 Jan 2013 12:35:41 -0500 Subject: dd-agent: Move /usr stuff to directly --- pkgs/tools/networking/dd-agent/default.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pkgs') diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 6e46174bd108..36b46e5e4ccb 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -14,4 +14,9 @@ stdenv.mkDerivation rec { makeFlags = [ "BUILD=$(out)" ]; installTargets = [ "install_base" "install_full" ]; + + postInstall = '' + mv $out/usr/* $out + rmdir $out/usr + ''; } -- cgit 1.4.1 From 5a79974c8197b04948cb57789a3ffbdd8b5dba8e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 18:41:21 +0100 Subject: systemd: Remove some plymouth calls --- ...ctl-daemon-reexec-do-the-right-thing-on-N.patch | 2 +- ...Ignore-duplicate-paths-in-systemctl-start.patch | 2 +- ...e-units-for-uninitialised-encrypted-devic.patch | 2 +- ...tch-to-configuration-hints-for-some-units.patch | 2 +- ...get-Drop-the-dependency-on-local-fs.targe.patch | 2 +- .../systemd/0006-Don-t-call-plymouth-quit.patch | 38 ++++++++++++++++++++++ pkgs/os-specific/linux/systemd/default.nix | 1 + 7 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch b/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch index dda9bea7674c..9afa7543e571 100644 --- a/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch +++ b/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch @@ -1,7 +1,7 @@ From 0085f49cd0ba889e3db9102f328f6044ae3a2c18 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:44:33 +0100 -Subject: [PATCH 1/5] Make "systemctl daemon-reexec" do the right thing on +Subject: [PATCH 1/6] Make "systemctl daemon-reexec" do the right thing on NixOS --- diff --git a/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch b/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch index 14795e521112..76160a1f7cc1 100644 --- a/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch +++ b/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch @@ -1,7 +1,7 @@ From 2b0a9106d3aabb365af0cc34b595a1e697120f37 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:45:01 +0100 -Subject: [PATCH 2/5] Ignore duplicate paths in "systemctl start" +Subject: [PATCH 2/6] Ignore duplicate paths in "systemctl start" --- src/systemctl/systemctl.c | 7 +++++-- diff --git a/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch index 63de58f97d5a..a16a2672feb5 100644 --- a/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch +++ b/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -1,7 +1,7 @@ From a013beb84f135cebf1c8c9363d5676c1c0a6be7a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:46:30 +0100 -Subject: [PATCH 3/5] Start device units for uninitialised encrypted devices +Subject: [PATCH 3/6] Start device units for uninitialised encrypted devices This is necessary because the NixOS service that initialises the filesystem depends on the appearance of the device unit. Also, this diff --git a/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch b/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch index f819d1640e83..beab35d63a06 100644 --- a/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch +++ b/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch @@ -1,7 +1,7 @@ From b40d8783f94666035baae567882c0d4be82cda01 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:48:19 +0100 -Subject: [PATCH 4/5] Set switch-to-configuration hints for some units +Subject: [PATCH 4/6] Set switch-to-configuration hints for some units MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch b/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch index 54009f2e7fc7..4403e6f56aaf 100644 --- a/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch +++ b/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch @@ -1,7 +1,7 @@ From c5c8ac3a0420fb42ba2f629368fd5bd6ea1e753b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:56:03 +0100 -Subject: [PATCH 5/5] sysinit.target: Drop the dependency on local-fs.target +Subject: [PATCH 5/6] sysinit.target: Drop the dependency on local-fs.target and swap.target Having all services with DefaultDependencies=yes depend on diff --git a/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch b/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch new file mode 100644 index 000000000000..250a751fe0c0 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch @@ -0,0 +1,38 @@ +From d3caa154098e215145679f38fa92a8bd482107be Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Tue, 8 Jan 2013 18:36:28 +0100 +Subject: [PATCH 6/6] Don't call "plymouth quit" + +NixOS doesn't use Plymouth (yet). +--- + units/emergency.service.in | 1 - + units/rescue.service.m4.in | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/units/emergency.service.in b/units/emergency.service.in +index 442f0e0..6b7eafd 100644 +--- a/units/emergency.service.in ++++ b/units/emergency.service.in +@@ -15,7 +15,6 @@ Before=shutdown.target + [Service] + Environment=HOME=/root + WorkingDirectory=/root +-ExecStartPre=-/bin/plymouth quit + ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" to try again\\nto boot into default mode.' + ExecStart=-/sbin/sulogin + ExecStopPost=@SYSTEMCTL@ --fail --no-block default +diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in +index 269797a..2c640f4 100644 +--- a/units/rescue.service.m4.in ++++ b/units/rescue.service.m4.in +@@ -16,7 +16,6 @@ Before=shutdown.target + [Service] + Environment=HOME=/root + WorkingDirectory=/root +-ExecStartPre=-/bin/plymouth quit + ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! Type "systemctl default" or ^D to enter default mode.\\nType "journalctl -xb" to view system logs. Type "systemctl reboot" to reboot.' + ExecStart=-/sbin/sulogin + ExecStopPost=-@SYSTEMCTL@ --fail --no-block default +-- +1.8.0.1 + diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index e605b998c4a6..93471d497c6e 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { ./0003-Start-device-units-for-uninitialised-encrypted-devic.patch ./0004-Set-switch-to-configuration-hints-for-some-units.patch ./0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch + ./0006-Don-t-call-plymouth-quit.patch ]; buildInputs = -- cgit 1.4.1 From bc2e9573084ab39ba5e04a9a758dd01a96ad3ebc Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 8 Jan 2013 12:42:11 -0500 Subject: dd-agent: Add python so patchShebangs can patch python scripts --- pkgs/tools/networking/dd-agent/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 36b46e5e4ccb..bda5719d278d 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchgit, python }: stdenv.mkDerivation rec { name = "dd-agent-ab14fde6f9"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "2615a2f122ac97363eba8973dfc6c2ce81cb61a26eb61c2988faad2abd05efc5"; }; + buildInputs = [ python ]; + postUnpack = "export sourceRoot=$sourceRoot/packaging"; makeFlags = [ "BUILD=$(out)" ]; -- cgit 1.4.1 From 76076ea9cf7612a5666c5180986c6aa4f759f97f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 8 Jan 2013 12:48:24 -0500 Subject: dd-agent: Propagate sysstat --- pkgs/tools/networking/dd-agent/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index bda5719d278d..c63056d5b67c 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, python }: +{ stdenv, fetchgit, python, sysstat }: stdenv.mkDerivation rec { name = "dd-agent-ab14fde6f9"; @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ python ]; + propagatedUserEnvPkgs = [ sysstat ]; + postUnpack = "export sourceRoot=$sourceRoot/packaging"; makeFlags = [ "BUILD=$(out)" ]; -- cgit 1.4.1 From a23c70c4929920eb90efe2180b38526f02af6e81 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 8 Jan 2013 12:55:55 -0500 Subject: dd-agent: Add meta --- pkgs/tools/networking/dd-agent/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'pkgs') diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index c63056d5b67c..db53df6dd7bd 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -23,4 +23,16 @@ stdenv.mkDerivation rec { mv $out/usr/* $out rmdir $out/usr ''; + + meta = { + description = "Event collector for the DataDog analysis service"; + + homepage = http://www.datadoghq.com; + + maintainers = [ stdenv.lib.maintainers.shlevy ]; + + license = stdenv.lib.licenses.bsd3; + + platforms = stdenv.lib.platforms.all; + }; } -- cgit 1.4.1 From 0347868151a21c0e7258424381bcc93dc8e994b2 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Tue, 8 Jan 2013 20:39:30 +0100 Subject: Updating libvdpau. This fixes an annoying bug in nvidia hw accelerated video, where all colors are messed. http://cgit.freedesktop.org/~aplattner/libvdpau/commit/?id=ca9e637c61e80145f0625a590c91429db67d0a40 --- pkgs/development/libraries/libvdpau/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index bf9927c93072..92ab8d67c91e 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libX11 }: stdenv.mkDerivation rec { - name = "libvdpau-0.4.1"; + name = "libvdpau-0.5"; src = fetchurl { url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz"; - sha256 = "16zmmbawfnvrxjqvgfwxjfd1wh3vyz2cmvxza6cgf4j9qs36y6q6"; + sha256 = "0k2ydz4yp7zynlkpd1llfwax30xndwbca36z83ah1i4ldjw2gfhx"; }; buildInputs = [ pkgconfig libX11 ]; -- cgit 1.4.1 From e87d99f0239d29f34fb9d09031f1e21c416830b0 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Tue, 8 Jan 2013 20:40:18 +0100 Subject: Enabling libvdpau in flashplayer That enables hw accelerated video --- .../networking/browsers/mozilla-plugins/flashplayer-11/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 3496097b86dd..7e2bfb692a3e 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -13,6 +13,7 @@ , libXrender , libXcursor , libXt +, libvdpau , gtk , glib , pango @@ -78,6 +79,7 @@ stdenv.mkDerivation { rpath = stdenv.lib.makeLibraryPath [ zlib alsaLib curl nss nspr fontconfig freetype expat libX11 libXext libXrender libXcursor libXt gtk glib pango atk cairo gdk_pixbuf + libvdpau ]; buildPhase = ":"; -- cgit 1.4.1 From e11365c0a5ee8439e858e1410e4ce4724043b425 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 8 Jan 2013 16:17:21 -0500 Subject: dd-agent: No need to propagate sysstat, dd-agent doesn't belong in user profiles anyway --- pkgs/tools/networking/dd-agent/default.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index db53df6dd7bd..e83ad7933f10 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { buildInputs = [ python ]; - propagatedUserEnvPkgs = [ sysstat ]; - postUnpack = "export sourceRoot=$sourceRoot/packaging"; makeFlags = [ "BUILD=$(out)" ]; -- cgit 1.4.1 From 8de96cb04d181861540bbee294d15f92dde77beb Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Tue, 8 Jan 2013 22:07:01 +0100 Subject: boinc: updating to 7.0.44 now it builds. I started to use fetchgit instead of fetchsvn, because the upstream doc pages talk about git more than svn. --- pkgs/applications/science/misc/boinc/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 5cc79469b769..8134d57589ba 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -1,14 +1,14 @@ -{ fetchsvn, stdenv, autoconf, automake, pkgconfig, m4, curl, +{ fetchgit, stdenv, autoconf, automake, pkgconfig, m4, curl, mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11 }: stdenv.mkDerivation rec { - name = "boinc-6.12.39"; + name = "boinc-7.0.44"; - src = fetchsvn { - url = "http://boinc.berkeley.edu/svn/tags/boinc_core_release_6_12_39"; - rev = 24341; - sha256 = "158fkm4mr7wljsy8gav20km8jamf00mxjk1wsiqw6kx62bih37yb"; + src = fetchgit { + url = "git://boinc.berkeley.edu/boinc.git"; + rev = "7c449b1fb8a681ceb27d6895751b62a2b3adf0f2"; + sha256 = "0hdramyl9nip3gadp7xiaz8ngyld15i93d8ai1nsd04bmrvdfqia"; }; buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi -- cgit 1.4.1 From 430957b0204591d8d3bd8ad1607d2f987164e2cb Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Tue, 8 Jan 2013 23:26:24 +0100 Subject: boinc: fix it; the binaries didn't start. --- pkgs/applications/science/misc/boinc/default.nix | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 8134d57589ba..9d8bc705fa47 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -1,6 +1,6 @@ { fetchgit, stdenv, autoconf, automake, pkgconfig, m4, curl, -mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, -sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11 }: +mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil, +sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: stdenv.mkDerivation rec { name = "boinc-7.0.44"; @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi - freeglut libjpeg wxGTK sqlite gtk libXScrnSaver libnotify patchelf libX11 ]; + freeglut libjpeg wxGTK sqlite gtk libXScrnSaver libnotify patchelf libX11 + libxcb xcbutil + ]; postConfigure = '' sed -i -e s,/etc,$out/etc, client/scripts/Makefile @@ -27,17 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = "--disable-server --disable-fast-install"; - - postInstall = " - # Remove a leading rpath to /tmp/... I don't know how it got there - # I could not manage to get rid of that through autotools. - for a in $out/bin/*; do - RPATH=$(patchelf --print-rpath $a) - NEWRPATH=$(echo $RPATH | sed 's/^[^:]*://') - patchelf --set-rpath $out/lib:$NEWRPATH $a - done - "; + configureFlags = "--disable-server"; meta = { description = "Free software for distributed and grid computing"; -- cgit 1.4.1 From 5ce7642487d622177dd18903970db851b3fa32bf Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Wed, 9 Jan 2013 00:53:51 +0100 Subject: Lyx: a bug-fix update. --- pkgs/applications/misc/lyx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 4c24f149f005..798b0e5162f3 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "2.0.5"; + version = "2.0.5.1"; name = "lyx-${version}"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${name}.tar.xz"; - sha256 = "00pv2d9p8j1p6x87kalbn1bgxg9l4zqh65zcajrnh10a76isv6nk"; + sha256 = "18k9qbz40v6lqmkfcg98wvcv4wi4p36ach1jz3z2b15gbmv2gr9n"; }; configureFlags = [ -- cgit 1.4.1 From 33006071769a9a04f3bfb6286977cc92799b4707 Mon Sep 17 00:00:00 2001 From: Tim Dysinger Date: Sat, 29 Dec 2012 17:46:53 -1000 Subject: Upgrade VirtualBox Guest Additions to 4.2.6 --- .../virtualization/virtualbox/guest-additions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 9483868bc5e3..7a79a73c6b95 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -2,14 +2,14 @@ , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor , dbus }: -let version = "4.2.4"; in +let version = "4.2.6"; in stdenv.mkDerivation { name = "VirtualBox-GuestAdditions-${version}-${kernel.version}"; src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "3d7d909a0fe9ac5ffcca6afdd4142b88bad116d2ffed6e95588dbfbcf00ca5e9"; + sha256 = "1lry4hjjk8p69km1bi3mpmyarlnxz9izs2c0s8pq5rjzv1bd7bxr"; }; KERN_DIR = "${kernel}/lib/modules/*/build"; -- cgit 1.4.1 From 0d3ad0d78631cb3c77472696906c87fb33d27bd5 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 06:53:44 +0100 Subject: bsd-games: fix some paths, pager and typo --- pkgs/games/bsdgames/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix index 38a32da9537d..59423d7a5a66 100644 --- a/pkgs/games/bsdgames/default.nix +++ b/pkgs/games/bsdgames/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, openssl, flex, bison, miscfiles}: +{stdenv, fetchurl, ncurses, openssl, flex, bison, less, miscfiles}: stdenv.mkDerivation { name = "bsd-games-2.17"; @@ -26,12 +26,19 @@ stdenv.mkDerivation { bsd_games_cfg_fortune_dir=$out/share/games/fortune bsd_games_cfg_quiz_dir=$out/share/games/quiz bsd_games_cfg_gamesdir=$out/bin + bsd_games_cfg_sbindir=$out/bin + bsd_games_cfg_usrbindir=$out/bin + bsd_games_cfg_libexecdir=$out/lib/games/dm + bsd_games_cfg_docdir=$out/share/doc/bsd-games + bsd_games_cfg_sharedir=$out/share/games + bsd_games_cfg_varlibdir=. bsd_games_cfg_non_interactive=y bsd_games_cfg_no_build_dirs="dab hack phantasia sail" bsd_games_cfg_dictionary_src=${miscfiles}/share/dict/words + bsd_games_cfg_pager=${less} EOF - sed -e s/getline/sdgames_local_getline/g -i $(grep getline -rl .) + sed -e s/getline/bsdgames_local_getline/g -i $(grep getline -rl .) ''; postConfigure = '' -- cgit 1.4.1 From 56517508d8e74e8d37f2c655d25c86333e9330ab Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 08:06:46 +0100 Subject: python-2.6.8: long overdue --- pkgs/development/interpreters/python/2.6/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 6fa27c23525c..e8d79cec4f6a 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -9,11 +9,13 @@ with stdenv.lib; let majorVersion = "2.6"; - version = "${majorVersion}.7"; + version = "${majorVersion}.8"; + # http://www.python.org/download/releases/2.6.8/ + # md5 taken from webpage, python 2.6 will receive security fixes until Oct 2013 src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; - sha256 = "0p0fd8i533zsdm6gc0jmhmdifccx4v064mh0i1hl2s6fcjhc20j5"; + md5 = "c6e0420a21d8b23dee8b0195c9b9a125"; }; patches = -- cgit 1.4.1 From a37cabdbb7ad9adaf9f6da226e6ed2ec74813961 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 08:26:15 +0100 Subject: fix python-2.6 build: purity for systems with stdenv.gcc.libc On other systems python26 will continue to look for /usr/include/netinet/in.h among others. I don't know whether/what to do about that. --- pkgs/development/interpreters/python/2.6/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index e8d79cec4f6a..3fe753a5a6fe 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -53,6 +53,10 @@ let for i in /usr /sw /opt /pkg; do substituteInPlace ./setup.py --replace $i /no-such-path done + '' + optionalString (stdenv ? gcc && stdenv.gcc.libc != null) '' + for i in Lib/plat-*/regen; do + substituteInPlace $i --replace /usr/include/ ${stdenv.gcc.libc}/include/ + done ''; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; -- cgit 1.4.1 From cfdf35d6f92d66cbcf468ea09e7100b69b848c99 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 9 Jan 2013 15:44:48 +0100 Subject: Add preInstall ot buildPythonPackage (postInstall already existed) to allow selenium to work properly again. --- pkgs/development/python-modules/generic/default.nix | 3 ++- pkgs/top-level/python-packages.nix | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 8da833b0dc1a..e007795105fc 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -37,6 +37,7 @@ runHook postCheck '' +, preInstall ? "" , postInstall ? "" , ... } @ attrs: @@ -63,7 +64,7 @@ python.stdenv.mkDerivation (attrs // { ${preConfigure} ''; - installPhase = '' + installPhase = preInstall + '' mkdir -p "$out/lib/${python.libPrefix}/site-packages" echo "installing \`${name}' with \`easy_install'..." diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc336a2c8029..41b545a68623 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2599,7 +2599,6 @@ let pythonPackages = python.modules // rec { sha256 = "1wif9r6307qhlcp2zbg6n05yvxxn9ppkxh8gpsplcbyh22zi7bcd"; }; - preInstallPhases = "preInstall"; preInstall = '' cp ${x_ignore_nofocus}/* . sed -i 's|dlopen(library,|dlopen("libX11.so.6",|' x_ignore_nofocus.c -- cgit 1.4.1 From 59aa248876637b4bf74eebebfc432d879827cbea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:44:11 +0100 Subject: haskell-nat: add version 0.3 --- pkgs/development/libraries/haskell/nat/default.nix | 12 ++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/nat/default.nix (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/nat/default.nix b/pkgs/development/libraries/haskell/nat/default.nix new file mode 100644 index 000000000000..3ad4240e2892 --- /dev/null +++ b/pkgs/development/libraries/haskell/nat/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "nat"; + version = "0.3"; + sha256 = "1v43c1dr72qn8mymnwcq6an8sqxjaxhac037k4gbv8z8bg18zmf5"; + meta = { + description = "Lazy binary natural numbers"; + 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 9713f8f94dc6..74099e9493d9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1242,6 +1242,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {}; + nat = callPackage ../development/libraries/haskell/nat {}; + nats = callPackage ../development/libraries/haskell/nats {}; netlist = callPackage ../development/libraries/haskell/netlist {}; -- cgit 1.4.1 From 90952495db0794dabae6d3595b7ae729cb43c921 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:44:25 +0100 Subject: haskell-naturals: add version 0.2.0.2 --- pkgs/development/libraries/haskell/naturals/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/naturals/default.nix (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/naturals/default.nix b/pkgs/development/libraries/haskell/naturals/default.nix new file mode 100644 index 000000000000..787ac70ffa96 --- /dev/null +++ b/pkgs/development/libraries/haskell/naturals/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "naturals"; + version = "0.2.0.2"; + sha256 = "1ay291833dcah411zc3r4qjilaw8x13ljlnb5z40d1s7784djm16"; + meta = { + homepage = "frigidcode.com"; + description = "Constructors and related functions for natural numbers"; + 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 74099e9493d9..730dbd6b27c0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1246,6 +1246,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); nats = callPackage ../development/libraries/haskell/nats {}; + naturals = callPackage ../development/libraries/haskell/naturals {}; + netlist = callPackage ../development/libraries/haskell/netlist {}; netlistToVhdl = callPackage ../development/libraries/haskell/netlist-to-vhdl {}; -- cgit 1.4.1 From d80bf38daf7539265013499455c10546a4ff5d00 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:52:02 +0100 Subject: haskell-xmonad-extras: update to version 0.11 --- pkgs/applications/window-managers/xmonad/xmonad-extras.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix index eebb07c0aa1c..025bab67e968 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "xmonad-extras"; - version = "0.10.1.2"; - sha256 = "1v0yhi3sw7qks8d13amps0qs5p90j3prjh5abm02wblcd0bm1xay"; + version = "0.11"; + sha256 = "09r64z09mfdz86k7v5c6zds9ng0fjcp44kd8f5qg1sz40yblrny5"; buildDepends = [ hint libmpd mtl network parsec random regexPosix split X11 xmonad xmonadContrib -- cgit 1.4.1 From 3b4b0d56beef45ad7d471eba13a7bf3bbacc7d6f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:52:02 +0100 Subject: haskell-active: update to version 0.1.0.3 --- pkgs/development/libraries/haskell/active/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix index 732000e74824..d3307d0a30d3 100644 --- a/pkgs/development/libraries/haskell/active/default.nix +++ b/pkgs/development/libraries/haskell/active/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "active"; - version = "0.1.0.2"; - sha256 = "1iymh3sd21ba7ijwv5afphn5vhmwchk6725hbcsdwk2d2x2gd674"; + version = "0.1.0.3"; + sha256 = "0jarc270z6raak1vz30jy2gl0pkj9a2x3ib5hq7vsl2ljbvbgyqi"; buildDepends = [ newtype semigroupoids semigroups vectorSpace ]; jailbreak = true; meta = { -- cgit 1.4.1 From ef4706675ca316e156300b5d9c44b0b9bcd305d1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:52:02 +0100 Subject: haskell-diagrams-core: update to version 0.6.0.1 --- pkgs/development/libraries/haskell/diagrams/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index 2acf784e8812..c087e27d025d 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "diagrams-core"; - version = "0.6"; - sha256 = "15frd5jdzkgpdcvyyhd0mbi5d4a69ajcnxawa1gafl4c3byz1778"; + version = "0.6.0.1"; + sha256 = "0kw0rxk9a2zkpnbx4bfd0japm75y29ldvdn7i3c93kvz0p6jc2wa"; buildDepends = [ dualTree MemoTrie monoidExtras newtype semigroups vectorSpace vectorSpacePoints -- cgit 1.4.1 From be8637c1f7cdc53f4bad782968ee6b2700ad8539 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:52:02 +0100 Subject: haskell-diagrams-lib: update to version 0.6.0.1 --- pkgs/development/libraries/haskell/diagrams/lib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 727a7156a9b8..1bd77db85803 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "diagrams-lib"; - version = "0.6"; - sha256 = "05nfp5ggjk4fviwvwiblmzzw5dbzbi1w8dx5dimvah7wxb0km3lf"; + version = "0.6.0.1"; + sha256 = "00ysdppl2jv0kspj0pjy8qj8shc9gg6g10lkq62vlvr39wnxx6yj"; buildDepends = [ active colour dataDefault diagramsCore monoidExtras newtype NumInstances semigroups vectorSpace -- cgit 1.4.1 From 8d1e639df22cc096080dcb1c3fa260c356f22f0c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:52:02 +0100 Subject: haskell-dual-tree: update to version 0.1.0.1 --- pkgs/development/libraries/haskell/dual-tree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix index 741fcbce1c9b..ebca3b5a3be6 100644 --- a/pkgs/development/libraries/haskell/dual-tree/default.nix +++ b/pkgs/development/libraries/haskell/dual-tree/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dual-tree"; - version = "0.1.0.0"; - sha256 = "0av525gjxzd2hhrg5da647chwbv4j30gccaff2b3n5qijzy8l167"; + version = "0.1.0.1"; + sha256 = "09bdid65frccpbh1bs01f7vprq0vfgqsb5bfa4j8yi3q773mycb2"; buildDepends = [ monoidExtras newtype semigroups ]; jailbreak = true; meta = { -- cgit 1.4.1 From c080c855721975e57ac639834364fbdcf701a01b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:52:02 +0100 Subject: haskell-lens: update to version 3.7.3 --- pkgs/development/libraries/haskell/lens/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 92375e9f14a9..ab634ea70e95 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -1,16 +1,16 @@ { cabal, comonad, comonadsFd, comonadTransformers, filepath -, hashable, mtl, parallel, semigroups, split, text, transformers -, unorderedContainers, vector +, hashable, mtl, nats, parallel, semigroups, split, text +, transformers, transformersCompat, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "lens"; - version = "3.7.2"; - sha256 = "14kc9yhq7niv49gpdcl55priwnvisawa9jsp8hnplk48p11i2xs3"; + version = "3.7.3"; + sha256 = "0mvwczviszfv52ylymvrz3zk6s05ngmqc2g1k4r6pym8s9cmgmzz"; buildDepends = [ - comonad comonadsFd comonadTransformers filepath hashable mtl - parallel semigroups split text transformers unorderedContainers - vector + comonad comonadsFd comonadTransformers filepath hashable mtl nats + parallel semigroups split text transformers transformersCompat + unorderedContainers vector ]; patchPhase = '' sed -i -e 's|semigroups.*,|semigroups,|' lens.cabal -- cgit 1.4.1 From 7004eced8302e68291244448e25dcc0ecd5c6bb4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:52:02 +0100 Subject: haskell-monoid-extras: update to version 0.2.2.2 --- pkgs/development/libraries/haskell/monoid-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix index 4e8a4154ae1e..a67017298a83 100644 --- a/pkgs/development/libraries/haskell/monoid-extras/default.nix +++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monoid-extras"; - version = "0.2.2.1"; - sha256 = "0n2zwkwwq8kg9m6qr79mrhlxsfsrjzbyg96gfhcgk21zgc09zary"; + version = "0.2.2.2"; + sha256 = "1fz93hm0sswisvwvbygxvbwmmnzqcxmz9h82i4361wzychf2si22"; buildDepends = [ semigroups ]; jailbreak = true; meta = { -- cgit 1.4.1 From 65fe988502c9e60490bc0128f62e6a5bbff55450 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:52:02 +0100 Subject: haskell-multiarg: update to version 0.8.0.0 --- pkgs/development/libraries/haskell/multiarg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix index 8b2871c3ce4f..74254a4c591e 100644 --- a/pkgs/development/libraries/haskell/multiarg/default.nix +++ b/pkgs/development/libraries/haskell/multiarg/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "multiarg"; - version = "0.6.0.0"; - sha256 = "1qrw1rajdvrvd297a7lpfkxm5qqhwmnnl5jiagjwzb9lckgpy87y"; + version = "0.8.0.0"; + sha256 = "17zfrm9zjf7c8g7q9vqj1srk0g766ifhwqp7gm4ql890541q5lv5"; buildDepends = [ explicitException utf8String ]; meta = { homepage = "https://github.com/massysett/multiarg"; description = "Combinators to build command line parsers"; - license = self.stdenv.lib.licenses.mit; + license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; -- cgit 1.4.1 From aeef9a1ed49257872a4bd34667e282004739ac60 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:52:03 +0100 Subject: haskell-warp: update to version 1.3.7 --- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 0620fc7f88b9..edd1dfd19924 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.6"; - sha256 = "0aw5m7apj7l6fjb0w59bmgiy4j0rmdwjil4ppgp5qz2q2njqbbnj"; + version = "1.3.7"; + sha256 = "06648wqiwlcsvd41qdqdbgn1zcq890iq39zsxi24vf4s8q7jnzyf"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile -- cgit 1.4.1 From 490085a81172360c1bf74147682770ef47577193 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:52:14 +0100 Subject: git-annex: update to version 3.20130107 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') 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 28a917d51e79..aef86c06cfb7 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -12,14 +12,14 @@ }: let - version = "3.20130102"; + version = "3.20130107"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}"; - sha256 = "0aga3i7rzq21vyj2wq87n4yl5aljzxc69vbzw43nxx9sr2f3xyh5"; + sha256 = "15x4rmpxv3mgp8r4gb6jana5262nvyl6rm5p8slc5z5ijl0qwbzq"; name = "git-annex-${version}.tar.gz"; }; -- cgit 1.4.1 From 029439c0f6d3ac6d10b6b0ecd551a808e89106fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:57:46 +0100 Subject: haskell-type-level-natural-number: add version 1.1.1 --- .../libraries/haskell/type-level-natural-number/default.nix | 12 ++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/type-level-natural-number/default.nix (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/type-level-natural-number/default.nix b/pkgs/development/libraries/haskell/type-level-natural-number/default.nix new file mode 100644 index 000000000000..8dff0ffd58fc --- /dev/null +++ b/pkgs/development/libraries/haskell/type-level-natural-number/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "type-level-natural-number"; + version = "1.1.1"; + sha256 = "1zc26nckpcixxp1m818jhzi3dj1ysnjfc2xliq4rpmf5583k6mjw"; + meta = { + description = "Simple, Haskell 2010-compatible type level natural numbers"; + 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 730dbd6b27c0..ff591439dfbc 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1690,6 +1690,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); typeEquality = callPackage ../development/libraries/haskell/type-equality {}; + typeLlevelNaturalNumber = callPackage ../development/libraries/haskell/type-level-natural-number {}; + unbound = callPackage ../development/libraries/haskell/unbound {}; uniplate = callPackage ../development/libraries/haskell/uniplate {}; -- cgit 1.4.1 From 9e1df1ada3d5d8544ee12f0331fc679001c07fc7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 17:08:17 +0100 Subject: haskell-numtype-tf: add version 0.1 --- pkgs/development/libraries/haskell/numtype-tf/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/numtype-tf/default.nix (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/numtype-tf/default.nix b/pkgs/development/libraries/haskell/numtype-tf/default.nix new file mode 100644 index 000000000000..76f57daca385 --- /dev/null +++ b/pkgs/development/libraries/haskell/numtype-tf/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "numtype-tf"; + version = "0.1"; + sha256 = "1hvnqgjg7yifxdsji9v0wqwbp4syhdc97pa3nrn4p96g7kmvw25v"; + meta = { + homepage = "http://dimensional.googlecode.com/"; + description = "Type-level (low cardinality) integers, implemented using type families"; + 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 ff591439dfbc..04052458738a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1287,6 +1287,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OneTuple = callPackage ../development/libraries/haskell/OneTuple {}; + numtypeTf = callPackage ../development/libraries/haskell/numtype-tf {}; + ObjectName = callPackage ../development/libraries/haskell/ObjectName {}; oeis = callPackage ../development/libraries/haskell/oeis {}; -- cgit 1.4.1 From 1036942197eafec1048f8fb68b23b1d4f8eb5f89 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 17:08:51 +0100 Subject: haskell-dimensional-tf: add version 0.1.1 --- .../libraries/haskell/dimensional-tf/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 6 ++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/dimensional-tf/default.nix (limited to 'pkgs') diff --git a/pkgs/development/libraries/haskell/dimensional-tf/default.nix b/pkgs/development/libraries/haskell/dimensional-tf/default.nix new file mode 100644 index 000000000000..70995ecb3ce7 --- /dev/null +++ b/pkgs/development/libraries/haskell/dimensional-tf/default.nix @@ -0,0 +1,14 @@ +{ cabal, numtypeTf, time }: + +cabal.mkDerivation (self: { + pname = "dimensional-tf"; + version = "0.1.1"; + sha256 = "0hhp2nx8xyk5ms3mzg1d3jhzm1b0bxz7aijxqasrxjq9p04jr2ci"; + buildDepends = [ numtypeTf time ]; + meta = { + homepage = "http://dimensional.googlecode.com/"; + description = "Statically checked physical dimensions, implemented using type families"; + 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 04052458738a..6f2db83c1941 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -711,6 +711,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dimensional = callPackage ../development/libraries/haskell/dimensional {}; + dimensionalTf = callPackage ../development/libraries/haskell/dimensional-tf {}; + directoryTree = callPackage ../development/libraries/haskell/directory-tree {}; distributedProcess = callPackage ../development/libraries/haskell/distributed-process {}; @@ -1285,10 +1287,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); numtype = callPackage ../development/libraries/haskell/numtype {}; - OneTuple = callPackage ../development/libraries/haskell/OneTuple {}; - numtypeTf = callPackage ../development/libraries/haskell/numtype-tf {}; + OneTuple = callPackage ../development/libraries/haskell/OneTuple {}; + ObjectName = callPackage ../development/libraries/haskell/ObjectName {}; oeis = callPackage ../development/libraries/haskell/oeis {}; -- cgit 1.4.1 From a628b4b0e47968d7c78db63fc7c7b410d0ef8b8a Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Wed, 9 Jan 2013 17:29:39 +0100 Subject: firefox: adding 18.0 I had to disable it using some nixpkgs, because they were considered 'too old'. They are simply commented in the code. --- .../networking/browsers/firefox/18.0.nix | 176 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 + 2 files changed, 183 insertions(+) create mode 100644 pkgs/applications/networking/browsers/firefox/18.0.nix (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/firefox/18.0.nix b/pkgs/applications/networking/browsers/firefox/18.0.nix new file mode 100644 index 000000000000..4e0b4194257f --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/18.0.nix @@ -0,0 +1,176 @@ +{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL +, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs +, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify +, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite + +, # If you want the resulting program to call itself "Firefox" instead + # of "Shiretoko" or whatever, enable this option. However, those + # binaries may not be distributed without permission from the + # Mozilla Foundation, see + # http://www.mozilla.org/foundation/trademarks/. + enableOfficialBranding ? false +}: + +assert stdenv.gcc ? libc && stdenv.gcc.libc != null; + +rec { + + firefoxVersion = "18.0"; + + xulVersion = "18.0"; # this attribute is used by other packages + + + src = fetchurl { + urls = [ + # It is better to use this url for official releases, to take load off Mozilla's ftp server. + "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" + # Fall back to this url for versions not available at releases.mozilla.org. + "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" + ]; + sha1 = "3356562e69d699e5901df5a4da4e2e59dd1e7f57"; + }; + + commonConfigureFlags = + [ "--enable-optimize" + #"--enable-profiling" + "--disable-debug" + "--enable-strip" + # "--with-system-jpeg" # Too old in nixpkgs + "--with-system-zlib" + "--with-system-bz2" + "--with-system-nspr" + # "--with-system-nss" # Too old in nixpkgs + # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" + # "--enable-system-cairo" # disabled for the moment because our Cairo is too old + "--enable-system-sqlite" + "--disable-crashreporter" + "--disable-tests" + "--disable-necko-wifi" # maybe we want to enable this at some point + "--disable-installer" + "--disable-updater" + ]; + + + xulrunner = stdenv.mkDerivation rec { + name = "xulrunner-${xulVersion}"; + + inherit src; + + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 + python dbus dbus_glib pango freetype fontconfig xlibs.libXi + xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file + alsaLib nspr nss libnotify xlibs.pixman yasm mesa + xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite + xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + ]; + + configureFlags = + [ "--enable-application=xulrunner" + "--disable-javaxpcom" + ] ++ commonConfigureFlags; + + enableParallelBuilding = true; + + preConfigure = + '' + export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" + + mkdir ../objdir + cd ../objdir + configureScript=../mozilla-release/configure + ''; # */ + + #installFlags = "SKIP_GRE_REGISTRATION=1"; + + postInstall = '' + # Fix run-mozilla.sh search + libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) + echo libDir: $libDir + test -n "$libDir" + cd $out/bin + rm xulrunner + + for i in $out/lib/$libDir/*; do + file $i; + if file $i | grep executable &>/dev/null; then + echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; + chmod a+x "$out/bin/$(basename "$i")"; + fi; + done + for i in $out/lib/$libDir/*.so; do + patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true + done + for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do + wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir" + done + rm -f $out/bin/run-mozilla.sh + ''; # */ + + meta = { + description = "Mozilla Firefox XUL runner"; + homepage = http://www.mozilla.com/en-US/firefox/; + }; + + passthru = { inherit gtk; version = xulVersion; }; + }; + + + firefox = stdenv.mkDerivation rec { + name = "firefox-${firefoxVersion}"; + + inherit src; + + enableParallelBuilding = true; + + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python + dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify + xlibs.pixman yasm mesa sqlite file unzip pysqlite + ]; + + propagatedBuildInputs = [xulrunner]; + + configureFlags = + [ "--enable-application=browser" + "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" + "--enable-chrome-format=jar" + "--disable-elf-hack" + ] + ++ commonConfigureFlags + ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; + + makeFlags = [ + "SYSTEM_LIBXUL=1" + ]; + + # Hack to work around make's idea of -lbz2 dependency + preConfigure = + '' + find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ + stdenv.lib.concatStringsSep ":" + (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) + }' ';' + ''; + + postInstall = + '' + ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner + cd "$out/lib/"firefox-* + rm firefox + echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox + chmod a+x firefox + ''; # */ + + meta = { + description = "Mozilla Firefox - the browser, reloaded"; + homepage = http://www.mozilla.com/en-US/firefox/; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; + + passthru = { + inherit gtk xulrunner nspr; + isFirefox3Like = true; + }; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 446921881012..e5bf3e136a59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7079,6 +7079,13 @@ let firefox17Wrapper = lowPrio (wrapFirefox { browser = firefox17Pkgs.firefox; }); + firefox18Pkgs = callPackage ../applications/networking/browsers/firefox/18.0.nix { + inherit (gnome) libIDL; + inherit (pythonPackages) pysqlite; + }; + + firefox18Wrapper = lowPrio (wrapFirefox { browser = firefox18Pkgs.firefox; }); + flac = callPackage ../applications/audio/flac { }; flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 { -- cgit 1.4.1 From 260cdd582e993d8985a28374233f82416eb06b07 Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Wed, 9 Jan 2013 18:11:20 +0100 Subject: xfce4-notifyd: add new package --- pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix | 18 ++++++++++++++++++ pkgs/desktops/xfce-4.8/default.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix (limited to 'pkgs') diff --git a/pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix b/pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix new file mode 100644 index 000000000000..598e6eb414d1 --- /dev/null +++ b/pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gtk, xfce }: + +stdenv.mkDerivation rec { + name = "xfce4-notifyd-0.2.2"; + + src = fetchurl { + url = "http://archive.xfce.org/src/apps/xfce4-notifyd/0.2/${name}.tar.bz2"; + sha256 = "0s4ilc36sl5k5mg5727rmqims1l3dy5pwg6dk93wyjqnqbgnhvmn"; + }; + + buildInputs = [ intltool pkgconfig gtk xfce.libxfce4util xfce.libxfce4ui xfce.xfconf ]; + + meta = { + homepage = http://goodies.xfce.org/projects/applications/xfce4-notifyd; + description = "The Xfce Notify Daemon"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/desktops/xfce-4.8/default.nix b/pkgs/desktops/xfce-4.8/default.nix index c20e42d20196..bfe7fddd7381 100644 --- a/pkgs/desktops/xfce-4.8/default.nix +++ b/pkgs/desktops/xfce-4.8/default.nix @@ -73,6 +73,8 @@ rec { ristretto = callPackage ./applications/ristretto.nix { }; + xfce4_notifyd = callPackage ./applications/xfce4-notifyd.nix { }; + xfce4_power_manager = callPackage ./applications/xfce4-power-manager.nix { }; xfce4mixer = callPackage ./applications/xfce4-mixer.nix { }; -- cgit 1.4.1 From fdf11fdb7e5879b8444160c449067d37e7c060ce Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Wed, 9 Jan 2013 19:45:56 +0100 Subject: firefox18: adding it to release.nix --- pkgs/top-level/release.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 75d5ab72d62b..55def41ca8aa 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -352,6 +352,7 @@ with (import ./release-lib.nix); firefox36Pkgs.firefox = linux; firefox17Pkgs.firefox = linux; + firefox18Pkgs.firefox = linux; gnome = { gnome_panel = linux; -- cgit 1.4.1 From acb6290eedf30a800a7aed64a2ad626d132c244f Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 10 Jan 2013 02:21:02 +0100 Subject: virtualbox: Update to new upstream version 4.2.6. Fortunately this time the upstream package was packaged correctly and we no longer need the patch to remove the reference to the fa_IR locale. In addition we need to add lvm2 to dependencies because VirtualBox now requires libdevmapper with its default configuration. We could disable it but in order to gain DM support I think it's necessary and at least could avoid some confusion from users if it's not working "out of the box" :-) This is a bugfix release, upstream changes are: * VMM: don't inject stale VT-x events to prevent crashes after VM reset * VMM: workaround for buggy BIOSes which enable MONITOR only for certain CPUs * GUI: fixed trimming of anti-aliased text in details-view element headers * GUI: fixed create-settings-file-alias functionality on Mac hosts * GUI: fixed take-guest-screenshot functionality on Windows hosts * GUI: several minor fixes, including palette fixes * GUI: fixed Windows 2012 OS type * GUI: allow to terminate the VM even if VBoxSVC crashed * API: fixed cancelling of snapshots, previously this could lead to inconsistent VM configs * API: fixed identifying disk images by UUID * 3D Support: several fixes * VRDP: fixed occasional crash with external authentication * VGA: fix for double scan text modes * USB: fixed invalid pending request count at the time of service of DEVICE POWER requests (Windows hosts only) * USB keyboard: Korean keyboard workaround * Storage: fixed hang with QCOW images and asynchronous I/O enabled * Storage: fixed hang with newer VHD images * Storage: actually write the non-rotational flag to the VM settings (4.2.0 regression) * Virtio-net: fixed the problem with network statistics counters in Session Information dialog (GUI) * Metrics: introduced network rate and disk usage metrics * Metrics: fixed a crash under certain conditions on Solaris hosts * BIOS: fix for El Torito * Shared Folders: if the host folder of a shared folder mapping does not exist, keep it active but mark it as invalid to prevent inconsistent saved states * VBoxManage: fixed converting disks from raw images * VBoxManage: show snapshot description in the VM or snapshot information * VBoxManage: make implicit opening of media consistent in all places dealing with media * VBoxManage: the iSCSI initiator name was not stored in the settings file when doing storageattach * VBoxManage: metrics collect now properly handles 'CPU/MHz' and 'Net/*/LinkSpeed' metrics * VBoxManage: changing the image UUID or parent UUID as part of storageattach works now in all safe cases * VBoxManage: introduced storageattach --medium additions as a shortcut to mount the additions image * OVF: fixed importing OVF files cerated by recent VMware products * Linux hosts / Bridged Networking: fixed the problem with leaking connections in conntrack * Linux Additions: added support for ConsoleKit sessions in the vminfo service of VBoxService * Linux Additions: don't crash during remount under certain conditions * Linux/Solaris Additions: fixed guest memory metrics collection * Solaris hosts: added a dependency to ensure that the user directories are reachable when starting VBox services * Windows host installer: integrated user-contributed translations, thanks to all contributors! * Windows Additions: fixed auto-logon installation for Windows 8 * Windows Additions: don't fail if the shared folders host service is not available * Windows Additions: fixed Guest Additions startup on Windows 2000 guests * Windows Additions: auto-resize fixes for Windows 8 guests Upstream changelist with bug ids can be found here: https://www.virtualbox.org/wiki/Changelog Signed-off-by: aszlig --- .../virtualization/virtualbox/default.nix | 16 +++++------- .../virtualization/virtualbox/remove_fa_ir.patch | 30 ---------------------- 2 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch (limited to 'pkgs') diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 87eb0020c1df..f699119c5f04 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext -, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel +, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2 , which, alsaLib, curl, gawk , xorriso, makeself, perl, pkgconfig , javaBindings ? false, jdk ? null @@ -11,8 +11,8 @@ with stdenv.lib; let - version = "4.2.4"; - extpackRevision = "81684"; + version = "4.2.6"; + extpackRevision = "82870"; forEachModule = action: '' for mod in \ @@ -35,7 +35,7 @@ let name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}" + ".vbox-extpack"; # Has to be base16 because it's used as an input to VBoxExtPackHelperApp! - sha256 = "62078e057a4ab56aec5ac086746522b3d94787333d0444169471fa5152c609ed"; + sha256 = "f0113688a76efa0426c27c5541c78506b18637025c35aa682ecc6eeed5d56582"; url = "https://www.virtualbox.org/wiki/Downloads"; }; @@ -44,19 +44,17 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "a7c607523c1c10b7b978ab39a92bb646517316548aa4a1a74b6e434ac2bf0adc"; + sha256 = "54526091bc2aa66b88ca878dd9ecc4466f96d607db2f6678a9d673ecf6646ae3"; }; buildInputs = [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL - libcap glib kernel python alsaLib curl pam xorriso makeself perl + libcap glib kernel lvm2 python alsaLib curl pam xorriso makeself perl pkgconfig which libXmu ] ++ optional javaBindings jdk ++ optional pythonBindings python; - patches = [ ./remove_fa_ir.patch ]; - - postPatch = '' + prePatch = '' set -x MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build` sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \ diff --git a/pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch b/pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch deleted file mode 100644 index 0d7a83421927..000000000000 --- a/pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch +++ /dev/null @@ -1,30 +0,0 @@ -This patch is for VirtualBox-4.2.2, to temporarily remove references to the -fa_IR language file from the source tree, as it somehow got lost during tarball -creation. For more information on this subject please have a look at: - -https://www.virtualbox.org/pipermail/vbox-dev/2012-October/005408.html - -diff --git a/src/VBox/Frontends/VirtualBox/VBoxUI.pro b/src/VBox/Frontends/VirtualBox/VBoxUI.pro -index ffeb410..37ac56a 100644 ---- a/src/VBox/Frontends/VirtualBox/VBoxUI.pro -+++ b/src/VBox/Frontends/VirtualBox/VBoxUI.pro -@@ -63,7 +63,6 @@ TRANSLATIONS = \ - nls/VirtualBox_es.ts \ - nls/VirtualBox_eu.ts \ - nls/VirtualBox_fi.ts \ -- nls/VirtualBox_fa_IR.ts \ - nls/VirtualBox_fr.ts \ - nls/VirtualBox_gl_ES.ts \ - nls/VirtualBox_hu.ts \ -diff --git a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk -index 66f0ec3..2fc19b9 100644 ---- a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk -+++ b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk -@@ -23,7 +23,6 @@ VBOX_APPROVED_GUI_LANGUAGES := \ - de \ - en \ - es \ -- fa_IR \ - hu \ - it \ - ja \ -- cgit 1.4.1 From e2a429584406a9e233493c032a6068ca1e3fa450 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 10 Jan 2013 03:10:40 +0100 Subject: chromium: Add pulse_audio_fix.patch to nixpkgs. The patch previously was fetched from an Arch Linux contributor but is no longer available there anymore. So, this is only an intermediate fix until channels get updated (very soon I hope, even though chromium 25 could get quite messy). Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/default.nix | 6 ++---- .../networking/browsers/chromium/pulse_audio_fix.patch | 11 +++++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/networking/browsers/chromium/pulse_audio_fix.patch (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 30234c92f6b1..44c283cc75fa 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -79,10 +79,8 @@ let post23 = !versionOlder sourceInfo.version "24.0.0.0"; post24 = !versionOlder sourceInfo.version "25.0.0.0"; - maybeFixPulseAudioBuild = optional (post23 && pulseSupport) (fetchurl { - url = http://archrepo.jeago.com/sources/chromium-dev/pulse_audio_fix.patch; - sha256 = "1w91mirrkqigdhsj892mqxlc0nlv1dsp5shc46w9xf8nl96jxgfb"; - }); + maybeFixPulseAudioBuild = optional (post23 && pulseSupport) + ./pulse_audio_fix.patch; in stdenv.mkDerivation rec { name = "${packageName}-${version}"; diff --git a/pkgs/applications/networking/browsers/chromium/pulse_audio_fix.patch b/pkgs/applications/networking/browsers/chromium/pulse_audio_fix.patch new file mode 100644 index 000000000000..01ff89a9a63b --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/pulse_audio_fix.patch @@ -0,0 +1,11 @@ +--- chromium-build/media/audio/pulse/pulse_output.cc.orig 2012-10-26 09:44:38.509209905 -0700 ++++ chromium-build/media/audio/pulse/pulse_output.cc 2012-10-26 09:45:32.178819603 -0700 +@@ -86,7 +86,7 @@ + + // All channel maps have the same size array of channel positions. + for (unsigned int channel = 0; channel != CHANNELS_MAX; ++channel) { +- int channel_position = kChannelOrderings[channel_layout][channel]; ++ int channel_position = ChannelOrder(channel_layout, static_cast(channel)); + if (channel_position > -1) { + channel_map.map[channel_position] = ChromiumToPAChannelPosition( + static_cast(channel)); -- cgit 1.4.1 From 86f293a1e50f0a46adff8a3d3265229b02bf81ff Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 10 Jan 2013 03:18:05 +0100 Subject: xf86-video-nouveau: Add pixman to buildInputs. Well, either this build is only broken on my system or noone actually uses nouveau? Even when looking into the source tree it seems to require pixman, so I suppose it didn't work for anyone prior to this commit. Signed-off-by: aszlig --- pkgs/os-specific/linux/xf86-video-nouveau/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/xf86-video-nouveau/default.nix b/pkgs/os-specific/linux/xf86-video-nouveau/default.nix index e92b7f8003d8..876daa7a1ecb 100644 --- a/pkgs/os-specific/linux/xf86-video-nouveau/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nouveau/default.nix @@ -3,7 +3,7 @@ , autoconf , automake , libtool -, xorgserver, xproto, fontsproto, xf86driproto, renderproto, videoproto +, xorgserver, xproto, fontsproto, xf86driproto, renderproto, videoproto, pixman , utilmacros , libdrm , pkgconfig }: @@ -21,12 +21,14 @@ stdenv.mkDerivation { autoconf automake libtool - xorgserver xproto fontsproto xf86driproto renderproto videoproto + xorgserver xproto fontsproto xf86driproto renderproto videoproto pixman utilmacros libdrm pkgconfig ]; + NIX_CFLAGS_COMPILE = "-I${pixman}/include/pixman-1"; + preConfigure = "autoreconf -vfi"; meta = { -- cgit 1.4.1 From abe2993c4bef1ecde7cb2d0ed29049eee181c812 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 10 Jan 2013 03:22:45 +0100 Subject: chromium: Add myself to maintainers. Might come in handy to actually know when things going to break. In case you're wondering: Yes, "aszlig" is the name everyone uses in real life (even my family uses it) and is my pending stage name (not _yet_ officially). Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/default.nix | 2 +- pkgs/lib/maintainers.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 44c283cc75fa..62a4c6cc211a 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -195,7 +195,7 @@ in stdenv.mkDerivation rec { meta = { description = "Chromium, an open source web browser"; homepage = http://www.chromium.org/; - maintainers = with maintainers; [ goibhniu chaoflow ]; + maintainers = with maintainers; [ goibhniu chaoflow aszlig ]; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index b065a50ce004..bff4ffa3b196 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -10,6 +10,7 @@ andres = "Andres Loeh "; antono = "Antono Vasiljev "; astsmtl = "Alexander Tsamutali "; + aszlig = "aszlig "; bbenoist = "Baptist BENOIST "; bjg = "Brian Gough "; bluescreen303 = "Mathijs Kwik "; -- cgit 1.4.1 From 7242b4994e98a0d88b17eb40e7393bb8340bf0e3 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 10 Jan 2013 13:39:24 +0100 Subject: Added optparse: A node.js option parsing library --- pkgs/top-level/node-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'pkgs') diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 907f747ef7e2..791eb43358ca 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -742,6 +742,19 @@ let self = { ]; }; + "optparse" = self."optparse-1.0.3"; + + "optparse-1.0.3" = self.buildNodePackage rec { + name = "optparse-1.0.3"; + src = fetchurl { + url = "http://registry.npmjs.org/optparse/-/${name}.tgz"; + sha256 = "1cg99i4rq8azxikzqz0ykw4q971azbj49d3m7slj041yscb6m883"; + }; + deps = [ + + ]; + }; + "osenv" = self."osenv-0"; "osenv-0" = self.buildNodePackage rec { -- cgit 1.4.1 From 7e1d0c12a3e9e8cc2d4a78ba9a6039c20f3eca32 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Thu, 10 Jan 2013 15:10:27 +0100 Subject: stuntrally: updating from 1.4 to 1.8 I updated ogre and mygui, too. Now myguiSvn is older than mygui. We should check if this commit breaks other games that use ogre (ror?) --- pkgs/development/libraries/mygui/default.nix | 10 ++++----- pkgs/development/libraries/ogre/default.nix | 6 +++--- pkgs/games/stuntrally/default.nix | 32 ++++++++++++++++++++++------ 3 files changed, 33 insertions(+), 15 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index f692c14a6df1..0a2df0003847 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchurl, unzip, ogre, cmake, ois, freetype, libuuid, boost}: +{stdenv, fetchurl, unzip, ogre, cmake, ois, freetype, libuuid, boost, pkgconfig}: stdenv.mkDerivation rec { - name = "mygui-3.0.1"; + name = "mygui-3.2.0"; src = fetchurl { - url = mirror://sourceforge/my-gui/MyGUI_3.0.1_source.zip; - sha256 = "1n56kl8ykzgv4k2nm9317jg9b9x2qa3l9hamz11hzn1qqjn2z4ig"; + url = mirror://sourceforge/my-gui/MyGUI_3.2.0.zip; + sha256 = "16m1xrhx13qbwnp9gds2amlwycq8q5npr0665hnknwsb6rph010p"; }; enableParallelBuilding = true; - buildInputs = [ unzip ogre cmake ois freetype libuuid boost ]; + buildInputs = [ unzip ogre cmake ois freetype libuuid boost pkgconfig ]; meta = { homepage = http://mygui.info/; diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 3a8e1c4ae556..6bb1916ed0fb 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -8,11 +8,11 @@ , nvidia_cg_toolkit }: stdenv.mkDerivation { - name = "ogre-1.7.2"; + name = "ogre-1.8.1"; src = fetchurl { - url = "mirror://sourceforge/ogre/1.7/ogre_src_v1-7-2.tar.bz2"; - sha256 = "10q8jx842s4aws9py6q67rb4dh5vli5vvg54jl8manjb4f388jh5"; + url = "mirror://sourceforge/ogre/1.8.1/ogre_src_v1-8-1.tar.bz2"; + sha256 = "1avadx87sdfdk8165wlffnd5dzks694dcdnkg3ijap966k4qm46s"; }; cmakeFlags = [ "-DOGRE_INSTALL_SAMPLES=yes" ] diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 69609b1bbfb4..31fd25a5150f 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -1,15 +1,33 @@ -{ fetchurl, stdenv, cmake, boost, ogre, myguiSvn, ois, SDL, libvorbis, pkgconfig -, makeWrapper }: +{ fetchgit, stdenv, cmake, boost, ogre, mygui, ois, SDL, libvorbis, pkgconfig +, makeWrapper, enet, libXcursor }: stdenv.mkDerivation rec { - name = "stunt-rally-1.4"; + name = "stunt-rally-1.8"; - src = fetchurl { - url = mirror://sourceforge/stuntrally/StuntRally-1.4-sources.tar.bz2; - sha256 = "1am5af4l1qliyrq1183sqvwzqwcjx0v6gkzsxhfmk6ygp7yhw7kq"; + src = fetchgit { + url = git://github.com/stuntrally/stuntrally.git; + rev = "refs/tags/1.8"; + sha256 = "0p8p83xx8q33kymsqnmxqca4jdfyg9rwrsac790z56gdbc7gnahm"; }; - buildInputs = [ cmake boost ogre myguiSvn ois SDL libvorbis pkgconfig makeWrapper ]; + tracks = fetchgit { + url = git://github.com/stuntrally/tracks.git; + rev = "refs/tags/1.8"; + sha256 = "1gcrs21nn0v3hvhrw8dc0wh1knn5qh66cjx7a1igiciiadmi2s3l"; + }; + + patchPhase = '' + sed -i 's/materials/materials material_templates/' data/CMakeLists.txt + ''; + + preConfigure = '' + mkdir data/tracks + cp -R $tracks/* data/tracks + ''; + + buildInputs = [ cmake boost ogre mygui ois SDL libvorbis pkgconfig makeWrapper enet + libXcursor + ]; # I think they suppose cmake should give them OGRE_PLUGIN_DIR defined, but # the cmake code I saw is not ready for that. Therefore, we use the env var. -- cgit 1.4.1 From ce705aa9982a402ad88d9c07f3e455d0a57848d1 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Thu, 10 Jan 2013 20:55:46 +0100 Subject: supertuxkart: updating to 0.8 --- pkgs/games/super-tux-kart/default.nix | 23 +++++++++++++---------- pkgs/top-level/all-packages.nix | 7 +------ 2 files changed, 14 insertions(+), 16 deletions(-) (limited to 'pkgs') diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 0c92ffbcdbb1..46f22d332ccb 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -1,24 +1,27 @@ -{ fetchurl, stdenv, plib, SDL, openal, freealut, mesa -, libvorbis, libogg, gettext, irrlicht3843, libXxf86vm, curl, pkgconfig -, fribidi }: +{ fetchurl, cmake, stdenv, plib, SDL, openal, freealut, mesa +, libvorbis, libogg, gettext, libXxf86vm, curl, pkgconfig +, fribidi, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "supertuxkart-0.7.3"; + name = "supertuxkart-0.8"; src = fetchurl { url = "mirror://sourceforge/supertuxkart/${name}-src.tar.bz2"; - sha256 = "0njrs2qyhbiqdbsqk9jx0sl8nhdwmipf1i91k23rv1biwrim9yq7"; + sha256 = "12sbml4wxg2x2wgnnkxfisj96a9gcsaj3fj27kdk8yj524ikv7xr"; }; buildInputs = [ - plib SDL openal freealut mesa libvorbis libogg gettext irrlicht3843 - libXxf86vm curl pkgconfig fribidi + plib SDL openal freealut mesa libvorbis libogg gettext + libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake ]; - configureFlags = [ "--with-irrlicht=${irrlicht3843}" ]; + enableParallelBuilding = true; - postInstall = '' - mv $out/games $out/bin + preConfigure = '' + echo Building internal Irrlicht + cd lib/irrlicht/source/Irrlicht/ + NDEBUG=1 make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} + cd - ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5bf3e136a59..7a820350dc9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8374,12 +8374,7 @@ let superTux = callPackage ../games/super-tux { }; - superTuxKart = callPackage ../games/super-tux-kart { - /* With GNU Make 3.82, the build process is stuck in the `data' - directory, after displaying "Making all in tracks", and `pstree' - indicates that `make' doesn't launch any new process. */ - stdenv = overrideInStdenv stdenv [ gnumake381 ]; - }; + superTuxKart = callPackage ../games/super-tux-kart { }; tbe = callPackage ../games/the-butterfly-effect {}; -- cgit 1.4.1 From 6f1aad769f4dab42e9542c079fa43184388b074f Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 10 Jan 2013 22:34:05 +0100 Subject: Libertine fonts: update and cleanup. --- pkgs/data/fonts/libertine/default.nix | 21 ++++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) (limited to 'pkgs') diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix index a0ed5f757974..514690cb0cd2 100644 --- a/pkgs/data/fonts/libertine/default.nix +++ b/pkgs/data/fonts/libertine/default.nix @@ -1,25 +1,24 @@ -args : with args; -rec { +args: with args; rec { + name = "linux-libertine-5.3.0"; + src = fetchurl { - url = http://downloads.sourceforge.net/linuxlibertine/5.0.0/LinLibertineSRC_2011_05_22.tgz; - sha256 = "1cr0kvvlqrcmaxfl6szfp3m93mcnhmypx33dxmdm3xdxxkab74vg"; + url = mirror://sf/linuxlibertine/5.3.0/LinLibertineSRC_5.3.0_2012_07_02.tgz; + sha256 = "0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v"; }; - buildInputs = [fontforge]; - configureFlags = []; + buildInputs = [ fontforge ]; /* doConfigure should be specified separately */ phaseNames = ["doUnpack" "generateFontsFromSFD" "installFonts"]; - + extraFontForgeCommands = '' ScaleToEm(1000); ''; - doUnpack = fullDepEntry '' - tar xf ${src} - '' ["minInit"]; + doUnpack = lib.fullDepEntry '' + tar xf ${src} + '' ["minInit"]; - name = "linux-libertine-5.0.0"; meta = { description = "Linux Libertine Fonts"; homepage = http://linuxlibertine.sf.net; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a820350dc9b..b59a8a63deae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6519,7 +6519,7 @@ let liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { }; libertine = builderDefsPackage (import ../data/fonts/libertine) { - inherit fontforge; + inherit fetchurl fontforge lib; }; lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {}; -- cgit 1.4.1 From abd6be85e1254905406fbe97ed070271a101ce85 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 11 Jan 2013 15:02:15 +0100 Subject: lxc: update to version 0.8.0 --- pkgs/os-specific/linux/lxc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index be943f5df9e0..8f60ff2554bf 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, libcap, perl, docbook2x, docbook_xml_dtd_45 }: +{ stdenv, fetchurl, libcap, apparmor, perl, docbook2x, docbook_xml_dtd_45 }: stdenv.mkDerivation rec { - name = "lxc-0.8.0-rc2"; + name = "lxc-0.8.0"; src = fetchurl { url = "http://lxc.sf.net/download/lxc/${name}.tar.gz"; - sha256 = "1f0ee0464507d26e494784e841b68c765ecd3abc5976012e226f69d1aa361bef"; + sha256 = "0b3912mal1n56i1v5f3aplm7shqnlz24p0znpva27r4l1drk7j7a"; }; - buildInputs = [ libcap perl docbook2x ]; + buildInputs = [ libcap apparmor perl docbook2x ]; patches = [ ./dont-run-ldconfig.patch -- cgit 1.4.1