From 1bf18a589c1bbe0f405e353592201caeef084125 Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Wed, 28 Nov 2012 04:55:24 +0300 Subject: [PATCH 001/140] arduino-core libraries +inotool --- .../arduino/arduino-core/default.nix | 41 +++++++++++++++++++ pkgs/development/arduino/ino/default.nix | 27 ++++++++++++ pkgs/top-level/all-packages.nix | 7 ++++ 3 files changed, 75 insertions(+) create mode 100644 pkgs/development/arduino/arduino-core/default.nix create mode 100644 pkgs/development/arduino/ino/default.nix diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix new file mode 100644 index 000000000000..27d712274245 --- /dev/null +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, jdk, jre, ant, coreutils, gnugrep }: + +stdenv.mkDerivation rec { + + version = "1.0.2"; + name = "arduino-core"; + + src = fetchurl { + url = "http://arduino.googlecode.com/files/arduino-${version}-src.tar.gz"; + sha256 = "0nszl2hdjjgxk87gyk0xi0ww9grbq83hch3iqmpaf9yp4y9bra0x"; + }; + + buildInputs = [ jdk ant ]; + + phases = "unpackPhase patchPhase buildPhase installPhase"; + + patchPhase = '' + # + ''; + + buildPhase = '' + cd ./core && ant + cd ../build && ant + cd .. + ''; + + installPhase = '' + mkdir -p $out/share/arduino + cp -r ./build/linux/work/hardware/ $out/share/arduino + cp -r ./build/linux/work/libraries/ $out/share/arduino + cp -r ./build/linux/work/tools/ $out/share/arduino + cp -r ./build/linux/work/lib/ $out/share/arduino + echo ${version} > $out/share/arduino/lib/version.txt + ''; + + meta = { + description = "Arduino libraries"; + homepage = http://arduino.cc/; + license = "GPL"; + }; +} diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix new file mode 100644 index 000000000000..d63a610666d5 --- /dev/null +++ b/pkgs/development/arduino/ino/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, buildPythonPackage, minicom, avrdude, arduino_core }: + +buildPythonPackage { + name = "ino-0.3.4"; + namePrefix = ""; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/i/ino/ino-0.3.4.tar.gz"; + sha256 = "1v7z3da31cv212k28aci269qkg92p377fm7i76rymjjpjra7payv"; + }; + + propagatedBuildInputs = [ minicom avrdude arduino_core ]; + + patchPhase = '' + echo "Patching Arduino distribution path" + sed -i 's@/usr/local/share/arduino@${arduino_core}/share/arduino@g' ino/environment.py + ''; + + doCheck = false; + + meta = { + description = "Command line toolkit for working with Arduino hardware"; + homepage = http://inotool.org/; + license = "MIT"; + maintainers = [ stdenv.lib.maintainers.antono ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5945703c6c9..e8bb9d0a07bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -373,6 +373,11 @@ let archivemount = callPackage ../tools/filesystems/archivemount { }; + arduino_core = callPackage ../development/arduino/arduino-core { + jdk = jdk; + jre = jdk; + }; + asymptote = builderDefsPackage ../tools/graphics/asymptote { inherit freeglut ghostscriptX imagemagick fftw boehmgc mesa ncurses readline gsl libsigsegv python zlib perl @@ -3164,6 +3169,8 @@ let indent = callPackage ../development/tools/misc/indent { }; + ino = callPackage ../development/arduino/ino { }; + inotifyTools = callPackage ../development/tools/misc/inotify-tools { }; intelgen4asm = callPackage ../development/misc/intelgen4asm { }; From 25f0472564d13933b36c9bbba84bda00776f0f12 Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Wed, 28 Nov 2012 17:37:11 +0300 Subject: [PATCH 002/140] Improved arduino-core and ino --- pkgs/development/arduino/arduino-core/default.nix | 1 + pkgs/development/arduino/ino/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index 27d712274245..f1be290b190e 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { description = "Arduino libraries"; homepage = http://arduino.cc/; license = "GPL"; + maintainers = [ stdenv.lib.maintainers.antono ]; }; } diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix index d63a610666d5..84961f2af59c 100644 --- a/pkgs/development/arduino/ino/default.nix +++ b/pkgs/development/arduino/ino/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, minicom, avrdude, arduino_core }: +{ stdenv, fetchurl, buildPythonPackage, minicom, avrdude, arduino_core, avrgcclibc }: buildPythonPackage { name = "ino-0.3.4"; @@ -9,7 +9,7 @@ buildPythonPackage { sha256 = "1v7z3da31cv212k28aci269qkg92p377fm7i76rymjjpjra7payv"; }; - propagatedBuildInputs = [ minicom avrdude arduino_core ]; + propagatedBuildInputs = [ minicom avrdude arduino_core avrgcclibc ]; patchPhase = '' echo "Patching Arduino distribution path" From 495f4c597f664be45049d625d7d9a6ae5dddd5ca Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Sat, 1 Dec 2012 05:00:45 +0300 Subject: [PATCH 003/140] remove avr gcc from inputs (it should be rebuit with C++ support) --- pkgs/development/arduino/ino/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix index 84961f2af59c..dc658016acb4 100644 --- a/pkgs/development/arduino/ino/default.nix +++ b/pkgs/development/arduino/ino/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, minicom, avrdude, arduino_core, avrgcclibc }: +{ stdenv, fetchurl, buildPythonPackage, minicom, avrdude, arduino_core }: buildPythonPackage { name = "ino-0.3.4"; @@ -9,7 +9,8 @@ buildPythonPackage { sha256 = "1v7z3da31cv212k28aci269qkg92p377fm7i76rymjjpjra7payv"; }; - propagatedBuildInputs = [ minicom avrdude arduino_core avrgcclibc ]; + # TODO: add avrgcclibc, it must be rebuild with C++ support + propagatedBuildInputs = [ minicom avrdude arduino_core ]; patchPhase = '' echo "Patching Arduino distribution path" From eb8884711c78935f33d6488df8399f7a5776c198 Mon Sep 17 00:00:00 2001 From: Allen Short Date: Mon, 10 Dec 2012 07:48:03 -0800 Subject: [PATCH 004/140] add missing patch for redis on OSX --- pkgs/servers/nosql/redis/darwin.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 pkgs/servers/nosql/redis/darwin.patch diff --git a/pkgs/servers/nosql/redis/darwin.patch b/pkgs/servers/nosql/redis/darwin.patch new file mode 100644 index 000000000000..002f09b36f34 --- /dev/null +++ b/pkgs/servers/nosql/redis/darwin.patch @@ -0,0 +1,12 @@ +diff -ru redis-2.4.7/deps/hiredis/Makefile redis-2.4.7.patched/deps/hiredis/Makefile +--- redis-2.4.7/deps/hiredis/Makefile 2012-02-02 14:29:24.000000000 +0000 ++++ redis-2.4.7.patched/deps/hiredis/Makefile 2012-12-07 17:14:43.000000000 +0000 +@@ -20,7 +20,7 @@ + CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF) + CCLINK?=-lm -pthread + LDFLAGS?=-L. -Wl,-rpath,. +- OBJARCH?=-arch i386 -arch x86_64 ++ #OBJARCH?=-arch i386 -arch x86_64 + DYLIBNAME?=libhiredis.dylib + DYLIB_MAKE_CMD?=libtool -dynamic -o ${DYLIBNAME} -lm ${DEBUG} - ${OBJ} + STLIBNAME?=libhiredis.a From f0997b9737394725201e1c19e8325b56eb6c694c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 13 Dec 2012 10:07:18 +0400 Subject: [PATCH 005/140] ECL: update to 12.12.1 --- pkgs/development/compilers/ecl/default.nix | 66 +++++++++---------- .../compilers/ecl/default.upstream | 4 ++ 2 files changed, 36 insertions(+), 34 deletions(-) create mode 100644 pkgs/development/compilers/ecl/default.upstream diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index fb801b6b8440..40690841965a 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -1,47 +1,45 @@ -{builderDefsPackage - , gmp, mpfr, libffi - , ...} @ x: -builderDefsPackage (a : -let - propagatedBuildInputs = with a; [ +{stdenv, fetchurl +, gmp, mpfr, libffi +, noUnicode ? false, +}: +let + s = # Generated upstream information + rec { + baseName="ecl"; + version="12.12.1"; + name="${baseName}-${version}"; + hash="15y2dgj95li6mxiz9pnllj9x88km0z8gfh46kysfllkp2pl7rrsl"; + url="mirror://sourceforge/project/ecls/ecls/12.12/ecl-12.12.1.tgz"; + sha256="15y2dgj95li6mxiz9pnllj9x88km0z8gfh46kysfllkp2pl7rrsl"; + }; + buildInputs = [ + libffi + ]; + propagatedBuildInputs = [ gmp mpfr ]; - buildInputs = [ gmp libffi mpfr ]; in -rec { - mainVersion = "12.7"; - revision = "1"; - version = "${mainVersion}.${revision}"; - - name = "ecl-${version}"; - - src = a.fetchurl { - url = "mirror://sourceforge/project/ecls/ecls/${mainVersion}/${name}.tar.gz"; - sha256 = "0k8ww142g3bybvvnlijqsbidl8clbs1pb4ympk2ds07z5swvy2ap"; - }; - +stdenv.mkDerivation { + inherit (s) name version; inherit buildInputs propagatedBuildInputs; + src = fetchurl { + inherit (s) url sha256; + }; configureFlags = [ "--enable-threads" ] ++ - (a.lib.optional (! (a.lib.attrByPath ["noUnicode"] false a)) + (stdenv.lib.optional (! noUnicode) "--enable-unicode") ; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall" "fixEclConfig"]; - - fixEclConfig = a.fullDepEntry '' + postInstall = '' sed -e 's/@[-a-zA-Z_]*@//g' -i $out/bin/ecl-config - '' ["minInit"]; - + ''; meta = { - description = "A Lisp implementation aiming to be small and fast"; - maintainers = [ - a.lib.maintainers.raskin - ]; - platforms = with a.lib.platforms; - linux; + inherit (s) version; + description = "Lisp implementation aiming to be small, fast and easy to embed"; + license = stdenv.lib.licenses.mit ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; }; -}) x +} diff --git a/pkgs/development/compilers/ecl/default.upstream b/pkgs/development/compilers/ecl/default.upstream new file mode 100644 index 000000000000..70dcb1b43442 --- /dev/null +++ b/pkgs/development/compilers/ecl/default.upstream @@ -0,0 +1,4 @@ +url http://sourceforge.net/projects/ecls/files/ecls/ +SF_version_dir +version_link '[.]tgz/download$' +SF_redirect From 0ef727ba74a8c1174b25c148615a4fc980a1d7f2 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 13 Dec 2012 08:04:49 +0100 Subject: [PATCH 006/140] audacity: update to 2.0.2 --- pkgs/applications/audio/audacity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 72b58b5b33e5..306620ca1c93 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - version = "2.0.0"; + version = "2.0.2"; name = "audacity-${version}"; src = fetchurl { url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.bz2"; - sha256 = "0spbib3f86b4qri0g13idyxvysg28hkpsglmjza681zrln62hjfq"; + sha256 = "17c7p5jww5zcg2k2fs1751mv5kbadcmgicszi1zxwj2p5b35x2mc"; }; buildInputs = [ pkgconfig wxGTK libsndfile expat alsaLib libsamplerate libvorbis libmad flac id3lib ffmpeg gettext ]; From dbb4c0a7ab4f682d3dd0935dc667ad7e14536c75 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Dec 2012 11:07:16 +0100 Subject: [PATCH 007/140] haskell-Crypto: update to version 4.2.5.1 --- pkgs/development/libraries/haskell/Crypto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Crypto/default.nix b/pkgs/development/libraries/haskell/Crypto/default.nix index f93fbdcb6796..c7d10d0160d8 100644 --- a/pkgs/development/libraries/haskell/Crypto/default.nix +++ b/pkgs/development/libraries/haskell/Crypto/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Crypto"; - version = "4.2.5"; - sha256 = "0wv48is2jqia8hda6q65y3mhabxlw9hjzmpk3dx70rzh4w44yxb8"; + version = "4.2.5.1"; + sha256 = "0rmgl0a4k6ys2lc6d607g28c2p443a46dla903rz5aha7m9y1mba"; isLibrary = true; isExecutable = true; buildDepends = [ HUnit QuickCheck random ]; From 543bc8c984e1e045120cc47b11b5a784c620c524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 13 Dec 2012 12:37:18 +0100 Subject: [PATCH 008/140] eigen: updating from eigen2 to eigen3 --- pkgs/development/libraries/eigen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 6884aca16fcb..56f66aba8f8d 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, cmake}: let - v = "2.0.16"; + v = "3.1.2"; in stdenv.mkDerivation { name = "eigen-${v}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2"; name = "eigen-${v}.tar.bz2"; - sha256 = "1akcb4g5hvc664gfc6sxb6f6jrm55fgks6017wg0smyvmm6k09v0"; + sha256 = "1hywvbn4a8f96fjn3cvd6nxzh5jvh05s1r263d9vqlgn25dxrzay"; }; buildNativeInputs = [ cmake ]; From 465f4f4e3e85e240137f1ac04d82060671b1d74f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 13 Dec 2012 12:37:52 +0100 Subject: [PATCH 009/140] freecad: updating to git master --- .../applications/graphics/freecad/default.nix | 22 ++++++------------- .../graphics/freecad/pythonpath.patch | 18 +++++++++------ pkgs/top-level/all-packages.nix | 1 - 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index cfe97e12476d..c681bc415e32 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,17 +1,15 @@ -{ fetchsvn, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts, +{ fetchgit, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts, boost, zlib, python, swig, gfortran, soqt, libf2c, pyqt4, makeWrapper }: -# It builds but fails to install - stdenv.mkDerivation rec { name = "freecad-${version}"; - version = "svn-${src.rev}"; + version = "git-20121213"; - src = fetchsvn { - url = https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk; - rev = "4184"; - sha256 = "26bd8407ce38f070b81ef39145aed093eed3c200d165a605b8169162d66568ce"; + src = fetchgit { + url = git://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad; + rev = "d3949cedc7e3c924d426660515e06eaf55d1a67f"; + sha256 = "0a07ih0z5d8m69zasmvi7z4lgq0pa67k2g7r1l6nz2d0b30py61w"; }; buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost @@ -19,12 +17,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # The freecad people are used to boost 1.42, and we have newer boost that - # require the -DBOOST_FILESYSTEM_VERSION=2 for freecad to build - # For zlib to build in i686-linux, as g++ plus glibc defines _LARGEFILE64_SOURCE, - # we need the -D-FILE_OFFSET_BITS=64 indication for zlib headers to work. - NIX_CFLAGS_COMPILE = "-DBOOST_FILESYSTEM_VERSION=2 -D_FILE_OFFSET_BITS=64"; - # This should work on both x86_64, and i686 linux preBuild = '' export NIX_LDFLAGS="-L${gfortran.gcc}/lib64 -L${gfortran.gcc}/lib $NIX_LDFLAGS"; @@ -35,7 +27,7 @@ stdenv.mkDerivation rec { --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1 ''; - patches = [ ./cmakeinstall.patch ./pythonpath.patch ]; + patches = [ ./pythonpath.patch ]; meta = { homepage = http://free-cad.sourceforge.net/; diff --git a/pkgs/applications/graphics/freecad/pythonpath.patch b/pkgs/applications/graphics/freecad/pythonpath.patch index 849c778aedba..8b09a5748071 100644 --- a/pkgs/applications/graphics/freecad/pythonpath.patch +++ b/pkgs/applications/graphics/freecad/pythonpath.patch @@ -1,14 +1,18 @@ -http://sourceforge.net/apps/phpbb/free-cad/viewtopic.php?f=4&t=847&p=6364 - -Index: src/Main/MainGui.cpp -=================================================================== ---- a/src/Main/MainGui.cpp (revision 4193) -+++ a/src/Main/MainGui.cpp (working copy) -@@ -149,10 +149,10 @@ +diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp +index 03407c5..b029384 100644 +--- a/src/Main/MainGui.cpp ++++ b/src/Main/MainGui.cpp +@@ -190,15 +190,15 @@ int main( int argc, char ** argv ) // http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559846 putenv("LANG=C"); putenv("LC_ALL=C"); - putenv("PYTHONPATH="); ++ //putenv("PYTHONPATH="); + #elif defined(FC_OS_MACOSX) + (void)QLocale::system(); + putenv("LANG=C"); + putenv("LC_ALL=C"); +- putenv("PYTHONPATH="); + //putenv("PYTHONPATH="); #else setlocale(LC_NUMERIC, "C"); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec1bb773c09d..b93c6c588216 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7020,7 +7020,6 @@ let }; freecad = callPackage ../applications/graphics/freecad { - boost = boost146; }; freemind = callPackage ../applications/misc/freemind { From 215c5f0ff8c0be3ffe268943b516cab66143febd Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 13 Dec 2012 15:53:24 +0400 Subject: [PATCH 010/140] EQL: update to latest snapshot --- pkgs/development/compilers/eql/default.nix | 39 ++++++++++------------ 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/pkgs/development/compilers/eql/default.nix b/pkgs/development/compilers/eql/default.nix index 4e288824713d..5bb0a2e5f649 100644 --- a/pkgs/development/compilers/eql/default.nix +++ b/pkgs/development/compilers/eql/default.nix @@ -12,9 +12,9 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { method = "fetchgit"; - rev = "14f62c94f952104d27d920ea662c8a61b370abe8"; + rev = "9097bf98446ee33c07bb155d800395775ce0d9b2"; url = "git://gitorious.org/eql/eql"; - hash = "1ca31f0ad8cbc45d2fdf7b1e4059b1e612523c043f4688d7147c7e16fa5ba9ca"; + hash = "1fp88xmmk1sa0iqxahfiv818bp2sbf66vqrd4xq9jb731ybdvsb8"; version = rev; name = "eql-git-${version}"; }; @@ -30,7 +30,7 @@ rec { inherit (sourceInfo) name version; inherit buildInputs; - phaseNames = ["setVars" "fixPaths" "firstMetaTypeId" "buildEQLLib" "doQMake" "doMake" "doDeploy"]; + phaseNames = ["setVars" "fixPaths" "doQMake" "doMake" "doDeploy"]; setVars = a.fullDepEntry ('' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC" @@ -40,27 +40,13 @@ rec { sed -re 's@[(]in-home "gui/.command-history"[)]@(concatenate '"'"'string (ext:getenv "HOME") "/.eql-gui-command-history")@' -i gui/gui.lisp '') ["minInit" "doUnpack"]; - firstMetaTypeId = a.fullDepEntry ('' - cd src - qmake first_metatype_id.pro - make - TMP=. - TMPDIR=. - XKB_BINDIR="${xkbcomp}/bin" Xvfb -once -reset -terminate :2 -xkbdir ${xkeyboard_config}/etc/X11/xkb & - sleep 10; - DISPLAY=:2 ./first_metatype_id - '') ["doUnpack" "addInputs"]; - - buildEQLLib = a.fullDepEntry ('' - ecl -shell make-eql-lib.lisp - qmake eql_lib.pro - make - '') ["doUnpack" "addInputs" "firstMetaTypeId"]; - doQMake = a.fullDepEntry ('' + cd src qmake eql_exe.pro make - '') ["addInputs" "firstMetaTypeId" "buildEQLLib"]; + cd .. + cd src + '') ["addInputs" "doUnpack" "buildEQLLib"]; doDeploy = a.fullDepEntry ('' cd .. @@ -70,7 +56,16 @@ rec { ln -s $out/lib/eql/build-dir/src/*.h $out/include ln -s $out/lib/eql/build-dir/src/gen/*.h $out/include/gen ln -s $out/lib/eql/build-dir/libeql*.so* $out/lib - '') ["minInit" "defEnsureDir"]; + '') ["minInit"]; + + buildEQLLib = a.fullDepEntry ('' + cd src + ecl -shell make-eql-lib.lisp + qmake eql_lib.pro + make + cd .. + '') ["doUnpack" "addInputs"]; + meta = { description = "Embedded Qt Lisp (ECL+Qt)"; From a0ed4d2295f2c8d135780fba7b46a38d77500435 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 13 Dec 2012 16:24:05 +0400 Subject: [PATCH 011/140] Updating OpenSCAD to use Eigen3 --- .../graphics/openscad/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index b09a38dcaa44..9343f3ec135d 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,19 +1,24 @@ -{stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal +{stdenv, fetchgit, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal , mpfr, gmp }: stdenv.mkDerivation rec { - version = "2011.12"; + version = "git-20121213"; name = "openscad-${version}"; - src = fetchurl { - url = "https://github.com/downloads/openscad/openscad/${name}.src.tar.gz"; - sha256 = "0gaqwzxbbzc21lhb4y26j8g0g28dhrwrgkndizp5ddab5axi4zjh"; - }; + # src = fetchurl { + # url = "https://github.com/downloads/openscad/openscad/${name}.src.tar.gz"; + # sha256 = "0gaqwzxbbzc21lhb4y26j8g0g28dhrwrgkndizp5ddab5axi4zjh"; + # }; + src = fetchgit { + url = "https://github.com/openscad/openscad.git"; + rev = "c0612a9ed0899c96963e04c848a59b0164a689a2"; + sha256 = "1zqiwk1cjbj7sng9sdarbrs0zxkn9fsa84dyv8n0zlyh40s7kvw2"; + }; buildInputs = [qt4 bison flex eigen boost mesa glew opencsg cgal gmp mpfr]; configurePhase = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I ${eigen}/include/eigen2 " + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${eigen}/include/eigen*) " qmake PREFIX="$out" ''; From caf561d41abff3f364755936749a22d14797c028 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 13 Dec 2012 11:45:11 +0100 Subject: [PATCH 012/140] aufs3: upgrade to 1210 release, add linux-3.7 support --- pkgs/os-specific/linux/kernel/patches.nix | 60 ++++++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 38 insertions(+), 24 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index d42581e457ed..f886c2c49f42 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -107,13 +107,13 @@ rec { aufs3_0 = rec { name = "aufs3.0"; - version = "3.0.20120827"; + version = "3.0.20121210"; utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; patch = makeAufs3StandalonePatch { inherit version; - rev = "4bd8efe495832ec43c26cb31ddcab3bae56485da"; - sha256 = "496113f0eae1a24ae0c1998d1c73fc7c13961579c8e694b3651a8080eae7b74e"; + rev = "0627c706d69778f5c74be982f28c746153b8cdf7"; + sha256 = "7008ff64f5adc2b3a30fcbb090bcbfaac61b778af38493b6144fc7d768a6514d"; }; features.aufsBase = true; features.aufs3 = true; @@ -121,13 +121,13 @@ rec { aufs3_1 = rec { name = "aufs3.1"; - version = "3.1.20120827"; + version = "3.1.20121210"; utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; patch = makeAufs3StandalonePatch { inherit version; - rev = "9be47f1ff7c86976b0baa7847f22d75983e53922"; - sha256 = "0cd239b9aad396750a26a5cd7b0d54146f21db63fb13d3fa03c4f73b7ebce77e"; + rev = "82c9fe43d197072a82cab6f02a5fd5cc4f50306a"; + sha256 = "f03d00964c9fc9975144d315fb79a1cd56d99f8c11853ed81d34afca35cd560a"; }; features.aufsBase = true; features.aufs3 = true; @@ -135,13 +135,13 @@ rec { aufs3_2 = rec { name = "aufs3.2"; - version = "3.2.20120827"; + version = "3.2.20121210"; utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; patch = makeAufs3StandalonePatch { inherit version; - rev = "267cb1138b4724ee028ec64ace556abdf993c9f4"; - sha256 = "61f69264806cf06a05548166e2bc8fd121de9a3e524385f725d76abab22b8a0d"; + rev = "0bf50c3b82f98e2ddc4c9ba0657f28ebfa8d15cb"; + sha256 = "bc4b65cb77c62744db251da98488fdf4962f14a144c045cea6cbbbd42718ff89"; }; features.aufsBase = true; features.aufs3 = true; @@ -149,13 +149,13 @@ rec { aufs3_3 = rec { name = "aufs3.3"; - version = "3.3.20120827"; + version = "3.3.20121210"; utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; patch = makeAufs3StandalonePatch { inherit version; - rev = "ef302b8a8a2862b622cf4826d08b1e076ee6acb7"; - sha256 = "7f78783685cc3e4eb825cd5dd8dabc82bb16c275493a850e8b7955ac69048d98"; + rev = "65ab607cfb2c411d86da8fcee25c0f6dada1c4d5"; + sha256 = "55c887932f1c12aed4ee20d9e749a80e9e0412951bd0a40fa3949ba972764a0a"; }; features.aufsBase = true; features.aufs3 = true; @@ -163,13 +163,13 @@ rec { aufs3_4 = rec { name = "aufs3.4"; - version = "3.4.20120827"; + version = "3.4.20121210"; utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; patch = makeAufs3StandalonePatch { inherit version; - rev = "79d8207b22c38420757adf7eec86ee2dcec7443c"; - sha256 = "bc148aa251c6e63edca70c516c0548dc9b3e48653039df4cf693aa2bcc1b9bb0"; + rev = "2faacd9baffb37df3b9062cc554353eebe68df1e"; + sha256 = "3ecf97468f5e85970d9fd2bfc61e38c7f5ae2c6dde0045d5a17de085c411d452"; }; features.aufsBase = true; features.aufs3 = true; @@ -177,28 +177,42 @@ rec { aufs3_5 = rec { name = "aufs3.5"; - version = "3.5.20120827"; + version = "3.5.20121210"; utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; patch = makeAufs3StandalonePatch { inherit version; - rev = "18e455787597579fe144cdb2f18aa6a0a32c46a4"; - sha256 = "9649a4cb00e41e2b2e3aa57c3869c33faf90ecbd845a3ac0119922655e80a030"; + rev = "1658e9080c0e49f38feee5027cf0d32940a661ca"; + sha256 = "4577fe1dd34299520155767a7c42697d41aabc0055ae8b1e448449b8c24a1044"; + }; + features.aufsBase = true; + features.aufs3 = true; + }; + + aufs3_6 = rec { + name = "aufs3.6"; + version = "3.6.20121210"; + utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; + utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; + patch = makeAufs3StandalonePatch { + inherit version; + rev = "f541ebfd88df0f4e6f9daf55053282e4f52cc4d9"; + sha256 = "4d615a5f3c14a6a7c49bc6d65e78a2cdb89321cbd8a53f87cc8fe9edda382c3a"; }; features.aufsBase = true; features.aufs3 = true; }; # not officially released yet, but 3.x seems to work fine - aufs3_6 = rec { - name = "aufs3.6"; - version = "3.x.20120827"; + aufs3_7 = rec { + name = "aufs3.7"; + version = "3.x.20121210"; utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; patch = makeAufs3StandalonePatch { inherit version; - rev = "46660ad144289fa1f0aca59bd00d592b560d0dbb"; - sha256 = "823b7b4c011c103d63711900b3213008de3c9e408b909e0cc2b8697c1e82b67d"; + rev = "8d24d728c7eb54dd624bccd8e87afa826670142c"; + sha256 = "02dcb46e02b2a6b90c1601b5747614276074488c9308625c3a52ab74cad997a5"; }; features.aufsBase = true; features.aufs3 = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b93c6c588216..c668cca9ec1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5913,7 +5913,7 @@ let kernelPatches = [ kernelPatches.sec_perm_2_6_24 - #kernelPatches.aufs3_6 + kernelPatches.aufs3_7 ] ++ lib.optionals (platform.kernelArch == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill From 6776756882e244f9fcd1eb018e515790e70374eb Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 13 Dec 2012 13:35:39 +0100 Subject: [PATCH 013/140] mkvtoolnix: upgrade to 5.9.0 --- pkgs/applications/video/mkvtoolnix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index ca278884b708..1dc58607de06 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -16,11 +16,11 @@ }: stdenv.mkDerivation rec { - name = "mkvtoolnix-5.8.0"; + name = "mkvtoolnix-5.9.0"; src = fetchurl { url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.bz2"; - sha256 = "0q294zk5cpfh1s89n70d9b2fs14rlacdlnhchlsjmf1mq3jcg7iw"; + sha256 = "1qdxzi72w5p77brlpp7y7llsgzlvl4p8fk1kzg934cqw6cqza4yr"; }; buildInputs = [ libmatroska flac libvorbis file boost lzo xdg_utils expat wxGTK zlib ruby gettext pkgconfig curl ]; From adb2fabf8da612b2e0747b32420b0258ec26895f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 13 Dec 2012 15:12:14 +0100 Subject: [PATCH 014/140] freecad: removing a patch not needed anymore --- .../graphics/freecad/cmakeinstall.patch | 55 ------------------- 1 file changed, 55 deletions(-) delete mode 100644 pkgs/applications/graphics/freecad/cmakeinstall.patch diff --git a/pkgs/applications/graphics/freecad/cmakeinstall.patch b/pkgs/applications/graphics/freecad/cmakeinstall.patch deleted file mode 100644 index 6b8f9fb1a60f..000000000000 --- a/pkgs/applications/graphics/freecad/cmakeinstall.patch +++ /dev/null @@ -1,55 +0,0 @@ -Index: src/3rdParty/salomesmesh/CMakeLists.txt -=================================================================== ---- a/src/3rdParty/salomesmesh/CMakeLists.txt (revision 4193) -+++ a/src/3rdParty/salomesmesh/CMakeLists.txt (working copy) -@@ -191,7 +191,7 @@ - INCLUDE_DIRECTORIES(src/StdMeshers) - - ADD_LIBRARY(StdMeshers SHARED ${StdMeshers_source_files}) --TARGET_LINK_LIBRARIES(StdMeshers SMESH TKernel TKMath TKAdvTools f2c) -+TARGET_LINK_LIBRARIES(StdMeshers SMESH TKernel TKMath TKAdvTools f2c gfortran) - SET(StdMeshers_CFLAGS "") - IF(WIN32) - SET(StdMeshers_CFLAGS "-DSTDMESHERS_EXPORTS -DMEFISTO2D_EXPORTS") -@@ -218,9 +218,9 @@ - # Libraries are installed by default in /usr/local/lib/SMESH-5.1.2.7 - INSTALL(TARGETS SMDS Driver DriverSTL DriverDAT DriverUNV - SMESHDS SMESH StdMeshers -- DESTINATION /usr/local/lib/${INSTALL_PATH_NAME}) -+ DESTINATION lib) - # Headers are installed by default in /usr/local/include/SMESH-5.1.2.7 - INSTALL(DIRECTORY inc/ -- DESTINATION /usr/local/include/${INSTALL_PATH_NAME} -+ DESTINATION include - FILES_MATCHING PATTERN "*.h*") - ENDIF(UNIX) -Index: src/3rdParty/Pivy-0.5/CMakeLists.txt -=================================================================== ---- a/src/3rdParty/Pivy-0.5/CMakeLists.txt (revision 4193) -+++ a/src/3rdParty/Pivy-0.5/CMakeLists.txt (working copy) -@@ -56,6 +56,7 @@ - set_target_properties(coin PROPERTIES OUTPUT_NAME "_coin") - set_target_properties(coin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/pivy) - set_target_properties(coin PROPERTIES PREFIX "") -+ install(TARGETS coin DESTINATION bin/pivy) - endif(MSVC) - - fc_copy_sources_outpath("bin/pivy" "coin" -Index: CMakeLists.txt -=================================================================== ---- a/CMakeLists.txt (revision 4193) -+++ a/CMakeLists.txt (working copy) -@@ -57,13 +57,6 @@ - - # ================================================================================ - -- --if(WIN32) -- SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}) --else(WIN32) -- SET(CMAKE_INSTALL_PREFIX "/usr/lib/freecad") --endif(WIN32) -- - # ================================================================================ - # == Win32 is default behaviour use the LibPack copied in Source tree ============ - if(MSVC) From 591c27e58d810fcbe8ef9ddfe52ce15d6035f20b Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 13 Dec 2012 15:58:57 +0100 Subject: [PATCH 015/140] argyllcms: New package, version 1.4.0 ArgyllCMS is an ICC compatible color management system. --- pkgs/tools/graphics/argyllcms/default.nix | 85 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 87 insertions(+) create mode 100644 pkgs/tools/graphics/argyllcms/default.nix diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix new file mode 100644 index 000000000000..08cd012e0797 --- /dev/null +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -0,0 +1,85 @@ +{ stdenv, fetchurl, jam, unzip, libX11, libXxf86vm, libXrandr, libXinerama +, libXrender, libXext, libtiff, libjpeg, libXScrnSaver, writeText +, libXdmcp, libXau, lib }: + +stdenv.mkDerivation rec { + name = "argyllcms-1.4.0"; + + src = fetchurl { + url = "http://www.argyllcms.com/Argyll_V1.4.0_src.zip"; + sha256 = "1a5i0972cjp6asmawmyzih2y4bv3i0qvf7p6z5lxnr199mq38cfk"; + }; + + # The contents of this file comes from the Jamtop file from the + # root of the ArgyllCMS distribution, rewritten to pick up Nixpkgs + # library paths. When ArgyllCMS is updated, make sure that changes + # in that file is reflected here. + jamTop = writeText "argyllcms_jamtop" '' + DESTDIR = "/" ; + REFSUBDIR = "ref" ; + + # Keep this DESTDIR anchored to Jamtop. PREFIX is used literally + ANCHORED_PATH_VARS = DESTDIR ; + + # Tell standalone libraries that they are part of Argyll: + DEFINES += ARGYLLCMS ; + + # Use libusb1 rather than libusb0 & libusb0-win32 + USE_LIBUSB1 = true ; + + # Make the USB V1 library static + LIBUSB_IS_DLL = false ; + + # Set the libubs1 library name. + LIBUSB1NAME = libusb-1A ; + + JPEGLIB = ; + JPEGINC = ; + HAVE_JPEG = true ; + + TIFFLIB = ; + TIFFINC = ; + HAVE_TIFF = true ; + + LINKFLAGS += + ${lib.concatStringsSep " " (map (x: "-L${x}/lib") buildInputs)} + -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss + -ljpeg -ltiff ; + ''; + + buildNativeInputs = [ jam unzip ]; + + preConfigure = '' + cp ${jamTop} Jamtop + substituteInPlace Makefile --replace "-j 3" "-j $NIX_BUILD_CORES" + # Remove tiff and jpg to be sure the nixpkgs-provided ones are used + rm -rf tiff jpg + ''; + + buildInputs = [ + libtiff libjpeg libX11 libXxf86vm libXrandr libXinerama libXext + libXrender libXScrnSaver libXdmcp libXau + ]; + + buildFlags = "PREFIX=$(out) all"; + + installFlags = "PREFIX=$(out)"; + + # Install udev rules, but remove lines that set up the udev-acl and plugdev + # stuff, since that is handled by udev's own rules (70-udev-acl.rules) + postInstall = '' + rm -v $out/bin/License.txt + mkdir -p $out/etc/udev/rules.d + sed -i '/udev-acl/d' libusb1/55-Argyll.rules + sed -i '/plugdev/d' libusb1/55-Argyll.rules + cp -v libusb1/55-Argyll.rules $out/etc/udev/rules.d/ + ''; + + meta = with stdenv.lib; { + homepage = http://www.argyllcms.com; + description = "An ICC compatible color management system"; + license = licenses.gpl3; + maintainers = [ maintainers.rickynils ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c668cca9ec1e..d5fe25fa3339 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -373,6 +373,8 @@ let archivemount = callPackage ../tools/filesystems/archivemount { }; + argyllcms = callPackage ../tools/graphics/argyllcms {}; + ascii = callPackage ../tools/text/ascii { }; asymptote = builderDefsPackage ../tools/graphics/asymptote { From 2cdc567ff5b725dc0f04aa562c54c26019397244 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 13 Dec 2012 17:09:41 +0100 Subject: [PATCH 016/140] new package: phantomjs --- pkgs/development/tools/phantomjs/default.nix | 62 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/development/tools/phantomjs/default.nix diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix new file mode 100644 index 000000000000..5880afc3efb1 --- /dev/null +++ b/pkgs/development/tools/phantomjs/default.nix @@ -0,0 +1,62 @@ +{ stdenv, fetchurl, upx, freetype, fontconfig }: + +assert stdenv.lib.elem stdenv.system [ "i686-linux" "x86_64-linux" ]; + +stdenv.mkDerivation rec { + name = "phantomjs-1.7.0"; + + # I chose to use the binary build for now. + # The source version is quite nasty to compile + # because it has bundled a lot of external libraries (like QT and Webkit) + # and no easy/nice way to use the system versions of these + + src = if stdenv.system == "i686-linux" then + fetchurl { + url = "http://phantomjs.googlecode.com/files/${name}-linux-i686.tar.bz2"; + sha256 = "045d80lymjxnsssa0sgp5pgkahm651jk69ibk3mjczk3ykc1k91f"; + } + else # x86_64-linux + fetchurl { + url = "http://phantomjs.googlecode.com/files/${name}-linux-x86_64.tar.bz2"; + sha256 = "1m14czhi3b388didn0a881glsx8bnsg9gnxgj5lghr4l5mgqyrd7"; + }; + + buildNativeInputs = [ upx ]; + + buildPhase = '' + upx -d bin/phantomjs + patchelf \ + --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath ${freetype}/lib:${fontconfig}/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib \ + bin/phantomjs + ''; + + dontStrip = true; + + installPhase = '' + mkdir -p $out/share/doc/phantomjs + cp -a bin $out + cp -a ChangeLog examples LICENSE.BSD README.md third-party.txt $out/share/doc/phantomjs + ''; + + meta = { + description = "Headless WebKit with JavaScript API"; + longDescription = '' + PhantomJS is a headless WebKit with JavaScript API. + It has fast and native support for various web standards: + DOM handling, CSS selector, JSON, Canvas, and SVG. + + PhantomJS is an optimal solution for: + - Headless Website Testing + - Screen Capture + - Page Automation + - Network Monitoring + ''; + + homepage = http://phantomjs.org/; + license = stdenv.lib.licenses.bsd3; + + maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; + platforms = ["i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5fe25fa3339..ea33fcafa03c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3197,6 +3197,8 @@ let peg = callPackage ../development/tools/parsing/peg { }; + phantomjs = callPackage ../development/tools/phantomjs { }; + pmccabe = callPackage ../development/tools/misc/pmccabe { }; /* Make pkgconfig always return a buildDrv, never a proper hostDrv, From fbee57defb0412b270efbea61b353835c179df48 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 13 Dec 2012 17:39:16 +0100 Subject: [PATCH 017/140] new package: casperjs --- pkgs/development/tools/casperjs/default.nix | 46 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/tools/casperjs/default.nix diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix new file mode 100644 index 000000000000..f140f0d7862d --- /dev/null +++ b/pkgs/development/tools/casperjs/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchgit, python, phantomjs }: + +stdenv.mkDerivation rec { + name = "casperjs-1.0.0-RC5"; + + src = fetchgit { + url = "git://github.com/n1k0/casperjs.git"; + rev = "refs/tags/1.0.0-RC5"; + sha256 = "e7fd6b94b4b304416159196208dea7f6e8841a667df102eb378a698a92f0f2c7"; + }; + + patchPhase = '' + substituteInPlace bin/casperjs --replace "/usr/bin/env python" "${python}/bin/python" \ + --replace "'phantomjs'" "'${phantomjs}/bin/phantomjs'" + ''; + + installPhase = '' + mkdir -p $out/share/casperjs $out/bin + cp -a . $out/share/casperjs/. + ln -s $out/share/casperjs/bin/casperjs $out/bin + ''; + + meta = { + description = "Navigation scripting & testing utility for PhantomJS."; + longDescription = '' + CasperJS is a navigation scripting & testing utility for PhantomJS. + It eases the process of defining a full navigation scenario and provides useful high-level + functions, methods & syntaxic sugar for doing common tasks such as: + - defining & ordering navigation steps + - filling forms + - clicking links + - capturing screenshots of a page (or an area) + - making assertions on remote DOM + - logging & events + - downloading base64 encoded resources, even binary ones + - catching errors and react accordingly + - writing functional test suites, exporting results as JUnit XML (xUnit) + ''; + + homepage = http://casperjs.org; + license = stdenv.lib.licenses.mit; + + maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea33fcafa03c..d291708df88d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3004,6 +3004,8 @@ let byacc = callPackage ../development/tools/parsing/byacc { }; + casperjs = callPackage ../development/tools/casperjs { }; + cbrowser = callPackage ../development/tools/misc/cbrowser { }; ccache = callPackage ../development/tools/misc/ccache { }; From 639edcb82997d4f298d5fb8ca5a6195906b3aa22 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 13 Dec 2012 22:22:41 +0100 Subject: [PATCH 018/140] manual-kernel: Fix handling spaces in readConfig. The previos version did a for loop over the output of set, which spits out _all_ defined variables and their contents. This not only is dangerous if there is a variable starting with CONFIG_ but also can't handle whitespace, as the IFS is set to any (horizontal _and_ vertical) whitespace by default. So, imagine (actually don't imagine, something like this is the case in a lot of kernel configuration files) you have the following variable: CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi ..." A loop with for and the default IFS would result in the following variable pieces: 0: CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi 1: -fcall-saved-rsi 2: ..." This obviously leads to the problem that this config variable is being cut off at the first whitespace. Another downside of this approach is that set not only returns variables but functions as well. This could lead to quite a lot of unexpected behaviour and confusion. So the new approach doesn't source the kernel configuration anymore but uses `read` to parse the file line-by line, setting IFS to '=', thus splitting all configuration lines into key/value pairs. Using parameter expansion, we ensure that we only read lines starting with "CONFIG_". This particularily has the advantage of not being bash-specific, should we choose to change to a different default shell someday. Now, after we got a correct "CONFIG_" line, we're using a temporary variable to split off the first quote from the result. Particularily the reason behind this is shell compatibility again, as ${${foo#"}%"} only works in Bash, Zsh and whatnot but not in plain SH. And within the next line we obviously insert the no_firstquote variable without it's last quote removed. But, what about escaping? First of all, if we'd just eval the $val variable, we would correctly unescape the value, but this has the downside that variables within the content would be expanded, for example look at this: CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" Well, obviously this is a bad example at the Nix sense, but just to show that variables within kernel configuration entries aren't impossible. And second, which would have been a show stopper if \" would be within $val: It simply would end up being an invalid Nix expression, because \" would end up as a ploin " within a double quoted string. Signed-off-by: aszlig --- pkgs/os-specific/linux/kernel/manual-config.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 52e284827d02..44c31d824aef 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -8,16 +8,13 @@ let readConfig = configFile: let configAttrs = import "${runCommand "config.nix" {} '' - (. ${configFile} - echo "{" - for var in `set`; do - if [[ "$var" =~ ^CONFIG_ ]]; then - IFS="=" - set -- $var - echo "\"$1\" = \"''${*:2}\";" - fi - done - echo "}") > $out + echo "{" > "$out" + while IFS='=' read key val; do + [ "x''${key#CONFIG_}" != "x$key" ] || continue + no_firstquote="''${val#\"}"; + echo ' "'"$key"'" = "'"''${no_firstquote%\"}"'";' >> "$out" + done < "${configFile}" + echo "}" >> $out ''}"; config = configAttrs // rec { From 4d57a834f95f91a97fefb1fc76f4c0cfb076c9d2 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 14 Dec 2012 00:27:00 +0100 Subject: [PATCH 019/140] phantomjs: it seems upx packing is only used on x86_64 --- pkgs/development/tools/phantomjs/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index 5880afc3efb1..33b99e12de55 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -21,10 +21,11 @@ stdenv.mkDerivation rec { sha256 = "1m14czhi3b388didn0a881glsx8bnsg9gnxgj5lghr4l5mgqyrd7"; }; - buildNativeInputs = [ upx ]; + buildNativeInputs = stdenv.lib.optional (stdenv.system == "x86_64-linux") upx; - buildPhase = '' + buildPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' upx -d bin/phantomjs + '' + '' patchelf \ --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ --set-rpath ${freetype}/lib:${fontconfig}/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib \ From 0fb968823541fa96fd70a722dc7accfeda3b9ded Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 14 Dec 2012 19:47:22 +0100 Subject: [PATCH 020/140] python prefix for recursive pth loader and fix typo --- .../development/python-modules/recursive-pth-loader/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/pkgs/development/python-modules/recursive-pth-loader/default.nix index 3452c62e2168..959882be9380 100644 --- a/pkgs/development/python-modules/recursive-pth-loader/default.nix +++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix @@ -1,7 +1,7 @@ { stdenv, python }: stdenv.mkDerivation rec { - name = "resursive-pth-loader-1.0"; + name = "python-recursive-pth-loader-1.0"; unpackPhase = "true"; From 93b3d24b96049e0e0cd88ae737976d46b43993a1 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 14 Dec 2012 20:24:12 +0100 Subject: [PATCH 021/140] oauth2 tests still fail --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8a48eafacb4c..7dad6abe4194 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1542,7 +1542,7 @@ let pythonPackages = python.modules // rec { buildInputs = [ mock coverage ]; # ServerNotFoundError: Unable to find the server at oauth-sandbox.sevengoslings.net - #doCheck = false; + doCheck = false; meta = { homepage = "https://github.com/simplegeo/python-oauth2"; From b956b7742329c67b942dd04017f8b92a8ab4796f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 14 Dec 2012 12:44:24 +0100 Subject: [PATCH 022/140] eigen: adding back eigen 2.0, for kde. Kdeedu wants eigen 2.0. --- pkgs/development/libraries/eigen/2.0.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 12 ++++++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/eigen/2.0.nix diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix new file mode 100644 index 000000000000..6884aca16fcb --- /dev/null +++ b/pkgs/development/libraries/eigen/2.0.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, cmake}: + +let + v = "2.0.16"; +in +stdenv.mkDerivation { + name = "eigen-${v}"; + + src = fetchurl { + url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2"; + name = "eigen-${v}.tar.bz2"; + sha256 = "1akcb4g5hvc664gfc6sxb6f6jrm55fgks6017wg0smyvmm6k09v0"; + }; + + buildNativeInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; + license = licenses.lgpl3Plus; + homepage = http://eigen.tuxfamily.org ; + maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d291708df88d..96cf6be30e21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3515,6 +3515,8 @@ let eigen = callPackage ../development/libraries/eigen {}; + eigen2 = callPackage ../development/libraries/eigen/2.0.nix {}; + enchant = callPackage ../development/libraries/enchant { }; enet = callPackage ../development/libraries/enet { }; @@ -8425,9 +8427,15 @@ let kde4 = recurseIntoAttrs pkgs.kde47; - kde47 = kdePackagesFor (pkgs.kde47 // {boost = boost149;}) ../desktops/kde-4.7; + kde47 = kdePackagesFor (pkgs.kde47 // { + boost = boost149; + eigen = eigen2; + }) ../desktops/kde-4.7; - kde48 = kdePackagesFor (pkgs.kde48 // {boost = boost149;}) ../desktops/kde-4.8; + kde48 = kdePackagesFor (pkgs.kde48 // { + boost = boost149; + eigen = eigen2; + }) ../desktops/kde-4.8; kdePackagesFor = self: dir: let callPackageOrig = callPackage; in From 14d87a44b15f2926ebb8cd18c80ca1ed01045a20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 14 Dec 2012 12:52:34 +0100 Subject: [PATCH 023/140] Trying to fix avogadro -> kdeedu avogadro also wants eigen2. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96cf6be30e21..ac70a50d2b9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6591,7 +6591,9 @@ let avidemux = callPackage ../applications/video/avidemux { }; - avogadro = callPackage ../applications/science/chemistry/avogadro { }; + avogadro = callPackage ../applications/science/chemistry/avogadro { + eigen = eigen2; + }; awesome = callPackage ../applications/window-managers/awesome { lua = lua5; From 620171606366d034b916b21da03c6bb3589c45ee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 15 Dec 2012 11:32:47 +0100 Subject: [PATCH 024/140] haskell-aeson: update to version 0.6.1.0 --- pkgs/development/libraries/haskell/aeson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix index c1cacb9eaa35..b0f89619b1c5 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "aeson"; - version = "0.6.0.2"; - sha256 = "04vyjpp3zi2g65rrkq4x4bddw0nfclniq5hhfq7l3jhybd8jxy51"; + version = "0.6.1.0"; + sha256 = "16hjwcybmgmk1sg8x02r9bxisx4gl61rlq8w2zsxfgkxwjpfhkbx"; buildDepends = [ attoparsec blazeBuilder deepseq dlist hashable mtl syb text time unorderedContainers vector From 4a1cf1dc95c4d584914d58b38cd6faf4b8266c3c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 15 Dec 2012 11:32:47 +0100 Subject: [PATCH 025/140] haskell-attoparsec: update to version 0.10.3.0 --- pkgs/development/libraries/haskell/attoparsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/attoparsec/default.nix b/pkgs/development/libraries/haskell/attoparsec/default.nix index 6f923605b678..e7bb666e677e 100644 --- a/pkgs/development/libraries/haskell/attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "attoparsec"; - version = "0.10.2.0"; - sha256 = "0hvkx63knhxdc06lkv2avz2dblbvn0hhvckfqyr22ls1qrpgz71c"; + version = "0.10.3.0"; + sha256 = "1l4cnfgnynrprfvx0p3n6kca8arsmvb1yxb9ir782rrk537jci50"; buildDepends = [ deepseq text ]; meta = { homepage = "https://github.com/bos/attoparsec"; From cc5b72c240124f412e708e091de1391088729cbc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 15 Dec 2012 11:32:47 +0100 Subject: [PATCH 026/140] haskell-case-insensitive: update to version 0.4.0.4 --- .../libraries/haskell/case-insensitive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/case-insensitive/default.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix index 7f53773f1ab6..7f972dfd6551 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/default.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "case-insensitive"; - version = "0.4.0.3"; - sha256 = "1lpfxfwfxiimvh5nxqrnjqj2687dp7rmv9wkrpmw2zm5wkxwcmzf"; + version = "0.4.0.4"; + sha256 = "1xzpri688vbd6fvvxczqx8bv53009ygzws7vbjmj2q97wcm8nmwd"; buildDepends = [ hashable text ]; meta = { homepage = "https://github.com/basvandijk/case-insensitive"; From fc17b6d7678c4152599d314878e2d7fad4d4b4d8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 15 Dec 2012 11:32:47 +0100 Subject: [PATCH 027/140] haskell-diagrams-svg: update to version 0.6.0.1 --- pkgs/development/libraries/haskell/diagrams/svg.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix index ac2bc3f9a964..561f32118c22 100644 --- a/pkgs/development/libraries/haskell/diagrams/svg.nix +++ b/pkgs/development/libraries/haskell/diagrams/svg.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "diagrams-svg"; - version = "0.6"; - sha256 = "0yiqilpksgsy87dxx4664pgbbgqcr98j1da4krb751x0yxkglyh5"; + version = "0.6.0.1"; + sha256 = "0x4yjm1wdhicknls1y3fhdg89m8wcvfk2svabww9075w6ras79qk"; buildDepends = [ blazeSvg cmdargs colour diagramsCore diagramsLib filepath monoidExtras mtl split time vectorSpace From 565367164642d968e1b0021579eb4d6b34e150a4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 15 Dec 2012 11:32:47 +0100 Subject: [PATCH 028/140] haskell-heist: update to version 0.10.1 --- pkgs/development/libraries/haskell/heist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index a0dd216aa033..6a6d0d7ddf3b 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "heist"; - version = "0.10.0"; - sha256 = "0cabn1yw57qa7psmypqa20k4viis140al5zm31jlpmz599rkbi9z"; + version = "0.10.1"; + sha256 = "1rwik8x2bfb0474vc1wzbqlhjgas3089g1rvphs7irfbmyki1646"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors filepath hashable MonadCatchIOTransformers mtl random text time From f7cf103ee8d41960de3aafa6f7cd1b1be42ad533 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 15 Dec 2012 11:32:47 +0100 Subject: [PATCH 029/140] haskell-iproute: update to version 1.2.10 --- pkgs/development/libraries/haskell/iproute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/iproute/default.nix b/pkgs/development/libraries/haskell/iproute/default.nix index 8fbd64b40269..c342f80a6c25 100644 --- a/pkgs/development/libraries/haskell/iproute/default.nix +++ b/pkgs/development/libraries/haskell/iproute/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "iproute"; - version = "1.2.9"; - sha256 = "0r0g8dd0f5n462kil3m2lhycl84ygd0ayh900h9x8phgwzfxzv8i"; + version = "1.2.10"; + sha256 = "1ni91llvq1mfdsjmw1laqhk964y4vlpyk5s25j8klsfn27mq6c68"; buildDepends = [ appar byteorder network ]; meta = { homepage = "http://www.mew.org/~kazu/proj/iproute/"; From 4b3a48b75f42c1bebec053f5b99c85a366cf136e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 15 Dec 2012 11:32:47 +0100 Subject: [PATCH 030/140] haskell-lens: update to version 3.7.1 --- pkgs/development/libraries/haskell/lens/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 70c6041eb2b5..6a2ca0866b7c 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.0.2"; - sha256 = "19p71faxr78pis73r2ani0al0lmbq81cws1v2hlgqb4mv2fgw5kn"; + version = "3.7.1"; + sha256 = "16rgfv21f7sl7n6gqn4750i3yv7w972ybn883yr474y4xwhhyh6w"; buildDepends = [ comonad comonadsFd comonadTransformers filepath hashable mtl parallel semigroups split text transformers unorderedContainers From 06669abb0fba2429cd6cb375856de35a2ff96d1f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 15 Dec 2012 11:32:47 +0100 Subject: [PATCH 031/140] haskell-uniplate: update to version 1.6.10 --- pkgs/development/libraries/haskell/uniplate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/uniplate/default.nix b/pkgs/development/libraries/haskell/uniplate/default.nix index 6c4d3b3a4434..8519ff451b2e 100644 --- a/pkgs/development/libraries/haskell/uniplate/default.nix +++ b/pkgs/development/libraries/haskell/uniplate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uniplate"; - version = "1.6.9"; - sha256 = "1s1863w4867lz0xn70xga5nss8vvm11rr1kia4icbws6r52sqjlh"; + version = "1.6.10"; + sha256 = "0j0hsvlkml8v9f8iijcgq58qnxnmk7gzxcnl9rxx4fdr9fnaffj3"; buildDepends = [ hashable syb unorderedContainers ]; meta = { homepage = "http://community.haskell.org/~ndm/uniplate/"; From fe826eb71de4af0c99f418979110d122347a23ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 15 Dec 2012 11:32:47 +0100 Subject: [PATCH 032/140] haskell-unordered-containers: update to version 0.2.3.0 --- .../libraries/haskell/unordered-containers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix index 8ac2372d1c0d..786eb59ec104 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/default.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unordered-containers"; - version = "0.2.2.1"; - sha256 = "0ny8w7xw0ch3yp0fnskzygz61b72ln5s5ccsdlcqpp29cvfar6zy"; + version = "0.2.3.0"; + sha256 = "1vzgjr9jxdkmgq970ng9zi2j60awvx8iv1v6kzjlrkwzxx1a9dpd"; buildDepends = [ deepseq hashable ]; meta = { homepage = "https://github.com/tibbe/unordered-containers"; From 3017d35260b57cffc975ec9500c3e02958be0dd8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 15 Dec 2012 11:32:48 +0100 Subject: [PATCH 033/140] haskell-vault: update to version 0.2.0.3 --- pkgs/development/libraries/haskell/vault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix index 4d74884a1a7f..398027931038 100644 --- a/pkgs/development/libraries/haskell/vault/default.nix +++ b/pkgs/development/libraries/haskell/vault/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vault"; - version = "0.2.0.1"; - sha256 = "027wgbnmdnp98f0wvc9xsfh175n7rq8m2j9i7j1c5vxwgi61dqxq"; + version = "0.2.0.3"; + sha256 = "1ky7c5hg7spa545xhgs4ahf07w60k3x149087mla1dxl8lpcz70i"; buildDepends = [ hashable unorderedContainers ]; meta = { homepage = "https://github.com/HeinrichApfelmus/vault"; From 918b26a59e6f9aa874fc9879bad24c28778b2f88 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 15 Dec 2012 11:44:13 +0100 Subject: [PATCH 034/140] git-annex: update to version 3.20121211 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 0e9c14dc48ba..99e1f8390934 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.20121127"; + version = "3.20121211"; 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 = "bec0c2c236daf10f0ed5de1097cb31f6c2725aa856d900f782a5a07d6db1d508"; + sha256 = "1l5sffcn6mcfk0s808z490s30dbq8m4wi8a11ard35hyf599zawq"; name = "git-annex-${version}.tar.gz"; }; From e89aea5e424f21d863ac9cf278d5f8b3229d17d0 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sat, 15 Dec 2012 23:34:49 +0100 Subject: [PATCH 035/140] add luite's mirror to cabal/hackage download expression (for when hackage.haskell.org is down) --- pkgs/build-support/cabal/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index 42392aff60c4..a5884786b001 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -44,7 +44,9 @@ # the default download location for Cabal packages is Hackage, # you still have to specify the checksum src = fetchurl { - url = "http://hackage.haskell.org/packages/archive/${self.pname}/${self.version}/${self.fname}.tar.gz"; + # cannot use mirrors system because of subtly different directory structures + urls = ["http://hackage.haskell.org/packages/archive/${self.pname}/${self.version}/${self.fname}.tar.gz" + "http://hdiff.luite.com/packages/archive/${self.pname}/${self.fname}.tar.gz"]; inherit (self) sha256; }; From d068aa986167abcbf1b25f439b74136b4060f2fd Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Sun, 16 Dec 2012 14:15:04 +0100 Subject: [PATCH 036/140] Patch ghc-paths to interact better with ghcWithPackages. When the ghc-paths library is compiled, the paths of the compiler it is compiled with are being hardcoded in the library (and can then be queried from other applications using the library). But on Nix, packages are compiled with ghc-wrapper, and subsequently possibly used with a special version of ghc generated for a particular environment of packages. So one version of ghc-paths may potentially end up being used by lots of different instances of ghc. The hardcoding approach fails. As a work-around, we now patch ghc-paths so that it allows setting the paths that can be queried via environment variables. Specific GHC environments can then set these environment variables in the wrapper shell script that invokes GHC. This should at least partially solve issue #213. --- .../compilers/ghc/with-packages.nix | 7 +++- .../libraries/haskell/ghc-paths/default.nix | 1 + .../haskell/ghc-paths/ghc-paths-nix.patch | 32 +++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/ghc-paths/ghc-paths-nix.patch diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix index f4f567f30b39..07071ef8414a 100644 --- a/pkgs/development/compilers/ghc/with-packages.nix +++ b/pkgs/development/compilers/ghc/with-packages.nix @@ -79,7 +79,12 @@ stdenv.mkDerivation rec { echo -n "Generating wrappers " for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do - makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "-B$linkedTopDir" + # The NIX env-vars are picked up by our patched version of ghc-paths. + makeWrapper ${ghc}/bin/$prg $out/bin/$prg \ + --add-flags "-B$linkedTopDir" \ + --set "NIX_GHC" "$out/bin/ghc" \ + --set "NIX_GHCPKG" "$out/bin/ghc-pkg" \ + --set "NIX_GHC_LIBDIR" "$linkedTopDir" echo -n . done diff --git a/pkgs/development/libraries/haskell/ghc-paths/default.nix b/pkgs/development/libraries/haskell/ghc-paths/default.nix index 9d63c04514b4..b930e993dcc4 100644 --- a/pkgs/development/libraries/haskell/ghc-paths/default.nix +++ b/pkgs/development/libraries/haskell/ghc-paths/default.nix @@ -4,6 +4,7 @@ cabal.mkDerivation (self: { pname = "ghc-paths"; version = "0.1.0.9"; sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg"; + patches = [ ./ghc-paths-nix.patch ]; meta = { description = "Knowledge of GHC's installation directories"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/ghc-paths/ghc-paths-nix.patch b/pkgs/development/libraries/haskell/ghc-paths/ghc-paths-nix.patch new file mode 100644 index 000000000000..0b09f1fcf2e6 --- /dev/null +++ b/pkgs/development/libraries/haskell/ghc-paths/ghc-paths-nix.patch @@ -0,0 +1,32 @@ +diff -Naur ghc-paths-0.1.0.9/GHC/Paths.hs ghc-paths-0.1.0.9-new/GHC/Paths.hs +--- ghc-paths-0.1.0.9/GHC/Paths.hs 2012-12-16 13:53:45.720148396 +0100 ++++ ghc-paths-0.1.0.9-new/GHC/Paths.hs 2012-12-16 13:51:50.073070123 +0100 +@@ -4,10 +4,24 @@ + ghc, ghc_pkg, libdir, docdir + ) where + ++import Data.Maybe ++import System.Environment ++import System.IO.Unsafe ++ ++nixLibdir, nixDocdir, nixGhc, nixGhcPkg :: Maybe FilePath ++nixLibdir = unsafePerformIO (lookupEnv "NIX_GHC_LIBDIR") ++nixDocdir = unsafePerformIO (lookupEnv "NIX_GHC_DOCDIR") ++nixGhc = unsafePerformIO (lookupEnv "NIX_GHC") ++nixGhcPkg = unsafePerformIO (lookupEnv "NIX_GHCPKG") ++{-# NOINLINE nixLibdir #-} ++{-# NOINLINE nixDocdir #-} ++{-# NOINLINE nixGhc #-} ++{-# NOINLINE nixGhcPkg #-} ++ + libdir, docdir, ghc, ghc_pkg :: FilePath + +-libdir = GHC_PATHS_LIBDIR +-docdir = GHC_PATHS_DOCDIR ++libdir = fromMaybe GHC_PATHS_LIBDIR nixLibdir ++docdir = fromMaybe GHC_PATHS_DOCDIR nixDocdir + +-ghc = GHC_PATHS_GHC +-ghc_pkg = GHC_PATHS_GHC_PKG ++ghc = fromMaybe GHC_PATHS_GHC nixGhc ++ghc_pkg = fromMaybe GHC_PATHS_GHC_PKG nixGhcPkg From 5a475f72501f4fafd90342db2b22651fde40b097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 16 Dec 2012 15:42:41 +0100 Subject: [PATCH 037/140] utillinux: fixing mount/umount, for our case of /etc/mtab symlinking to /proc/mounts In systemd, without this patch, 'mount' for 'user' fstab devices works, but umount does not; it says to require root. All gets normal with this patch. --- pkgs/os-specific/linux/util-linux/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index ae5727568f2d..35d01739a2a4 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -21,10 +21,13 @@ stdenv.mkDerivation rec { # (/sbin/mount.*) through an environment variable, but that's # somewhat risky because we have to consider that mount can setuid # root... + # --enable-libmount-mount fixes the behaviour being /etc/mtab a symlink to /proc/monunts + # http://pl.digipedia.org/usenet/thread/19513/1924/ configureFlags = '' --disable-use-tty-group --enable-write --enable-fs-paths-default=/var/setuid-wrappers:/var/run/current-system/sw/sbin:/sbin + --enable-libmount-mount ${if ncurses == null then "--without-ncurses" else ""} ''; From 0f5976b599d915eca2f3ddda089237f80d3cf338 Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Sun, 16 Dec 2012 17:25:15 +0100 Subject: [PATCH 038/140] ghc-paths: Fix patch to hopefully work with older GHCs. --- .../haskell/ghc-paths/ghc-paths-nix.patch | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-paths/ghc-paths-nix.patch b/pkgs/development/libraries/haskell/ghc-paths/ghc-paths-nix.patch index 0b09f1fcf2e6..b3c75a26a035 100644 --- a/pkgs/development/libraries/haskell/ghc-paths/ghc-paths-nix.patch +++ b/pkgs/development/libraries/haskell/ghc-paths/ghc-paths-nix.patch @@ -1,19 +1,30 @@ diff -Naur ghc-paths-0.1.0.9/GHC/Paths.hs ghc-paths-0.1.0.9-new/GHC/Paths.hs --- ghc-paths-0.1.0.9/GHC/Paths.hs 2012-12-16 13:53:45.720148396 +0100 -+++ ghc-paths-0.1.0.9-new/GHC/Paths.hs 2012-12-16 13:51:50.073070123 +0100 -@@ -4,10 +4,24 @@ ++++ ghc-paths-0.1.0.9-new/GHC/Paths.hs 2012-12-16 17:22:12.765576568 +0100 +@@ -1,13 +1,35 @@ + {-# LANGUAGE CPP #-} ++{-# LANGUAGE ScopedTypeVariables #-} + + module GHC.Paths ( ghc, ghc_pkg, libdir, docdir ) where ++import Control.Exception as E +import Data.Maybe +import System.Environment +import System.IO.Unsafe + ++-- Yes, there's lookupEnv now, but we want to be compatible ++-- with older GHCs. ++checkEnv :: String -> IO (Maybe String) ++checkEnv var = E.catch (fmap Just (getEnv var)) ++ (\ (e :: IOException) -> return Nothing) ++ +nixLibdir, nixDocdir, nixGhc, nixGhcPkg :: Maybe FilePath -+nixLibdir = unsafePerformIO (lookupEnv "NIX_GHC_LIBDIR") -+nixDocdir = unsafePerformIO (lookupEnv "NIX_GHC_DOCDIR") -+nixGhc = unsafePerformIO (lookupEnv "NIX_GHC") -+nixGhcPkg = unsafePerformIO (lookupEnv "NIX_GHCPKG") ++nixLibdir = unsafePerformIO (checkEnv "NIX_GHC_LIBDIR") ++nixDocdir = unsafePerformIO (checkEnv "NIX_GHC_DOCDIR") ++nixGhc = unsafePerformIO (checkEnv "NIX_GHC") ++nixGhcPkg = unsafePerformIO (checkEnv "NIX_GHCPKG") +{-# NOINLINE nixLibdir #-} +{-# NOINLINE nixDocdir #-} +{-# NOINLINE nixGhc #-} From 62fa1b8782d582811ddea48d5f80596fdeb01bfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 16 Dec 2012 17:27:26 +0100 Subject: [PATCH 039/140] Adding ext4 to vmTools. Otherwise, nixos build-vm fails with 'useBootLoader'. --- pkgs/build-support/vm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index c12771462586..1a4560805538 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -3,7 +3,7 @@ , img ? "bzImage" , rootModules ? [ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" "ext2" "ext3" - "unix" "hmac" "md4" "ecb" "des_generic" + "ext4" "unix" "hmac" "md4" "ecb" "des_generic" ] }: From 88e43775fdf15f49208044b69c7120327aba41a9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 15 Dec 2012 20:31:57 -0500 Subject: [PATCH 040/140] fuse 2.9.2 --- pkgs/os-specific/linux/fuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index 2a0dfb220ecf..bd2507ec1bc1 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, utillinux }: stdenv.mkDerivation rec { - name = "fuse-2.8.7"; + name = "fuse-2.9.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://sourceforge/fuse/${name}.tar.gz"; - sha256 = "17dlp6p7kcd8kav3rylmn1a1rqbnri4iawl78mmcm1szllck6w90"; + sha256 = "1z6fg593hy1j7mynhckx43gqkkg2nwpmwwv860337nl77zxji9w1"; }; configureFlags = "--disable-kernel-module"; From 42b061d1188a504ef134ebe4cea0ef78dfab009c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 15 Dec 2012 20:32:10 -0500 Subject: [PATCH 041/140] Add unionfs-fuse --- pkgs/tools/filesystems/unionfs-fuse/default.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/tools/filesystems/unionfs-fuse/default.nix diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix new file mode 100644 index 000000000000..fac5265bb9dd --- /dev/null +++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -0,0 +1,13 @@ +{ stdenv, fetchurl, cmake, fuse }: + +stdenv.mkDerivation rec { + name = "unionfs-fuse-0.26"; + + src = fetchurl { + url = "http://podgorny.cz/unionfs-fuse/releases/${name}.tar.xz"; + + sha256 = "0qpnr4czgc62vsfnmv933w62nq3xwcbnvqch72qakfgca75rsp4d"; + }; + + buildInputs = [ cmake fuse ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac70a50d2b9b..3d56b671537a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -553,6 +553,8 @@ let unifdef = callPackage ../development/tools/misc/unifdef { }; + unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { }; + usb_modeswitch = callPackage ../development/tools/misc/usb-modeswitch { }; clamav = callPackage ../tools/security/clamav { }; From 6a147cfbfa9f3d78ca577ed32cc3911c6896f76b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 16 Dec 2012 16:42:45 -0500 Subject: [PATCH 042/140] Add unionfs-fuse meta --- pkgs/tools/filesystems/unionfs-fuse/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix index fac5265bb9dd..43d7a5a8d180 100644 --- a/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -10,4 +10,11 @@ stdenv.mkDerivation rec { }; buildInputs = [ cmake fuse ]; + + meta = { + description = "FUSE UnionFS implementation"; + homepage = http://podgorny.cz/moin/UnionFsFuse; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + }; } From faf821e501df62058b122c04ee0ad829620d8227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 17 Dec 2012 11:52:47 +0100 Subject: [PATCH 043/140] Adding USB cameras to linux 3.7 Details changed since the 3.6 config to get this enabled. --- pkgs/os-specific/linux/kernel/linux-3.7.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix index 7197cd780b9e..6eda20a0789e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix @@ -235,6 +235,7 @@ let # Media support MEDIA_CAMERA_SUPPORT? y MEDIA_RC_SUPPORT? y + MEDIA_USB_SUPPORT y ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} From 97389f5b1f6a4a52ab2d64e9d9f0a0579967cf12 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 17 Dec 2012 10:21:55 -0500 Subject: [PATCH 044/140] Keep nixpkgs backwards-compatible at least 1 version --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d56b671537a..e9e11d240f3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -553,7 +553,7 @@ let unifdef = callPackage ../development/tools/misc/unifdef { }; - unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { }; + "unionfs-fuse" = callPackage ../tools/filesystems/unionfs-fuse { }; usb_modeswitch = callPackage ../development/tools/misc/usb-modeswitch { }; From 59c9f406fd3df8fd266c4428538068d57afaf836 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 17 Dec 2012 17:27:13 +0100 Subject: [PATCH 045/140] darktable: Update to 1.1.1 --- pkgs/applications/graphics/darktable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index ed04ddaa84af..801fdeeaaae5 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -8,12 +8,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "1.1"; + version = "1.1.1"; name = "darktable-${version}"; src = fetchurl { url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz"; - sha256 = "8f2401422ab3e0bb038b3fedf411aaf69994d679674757ee7886b6146b9fdd4f"; + sha256 = "0k1m7nd42yn4c2jr1ps1g96fqk9pq20cxjp7dmlza61pj2j9nads"; }; buildInputs = From 45937caa2f19c0d54e1c7d494beecbcbef0f1875 Mon Sep 17 00:00:00 2001 From: Piotr Pietraszkiewicz Date: Mon, 17 Dec 2012 20:38:21 +0100 Subject: [PATCH 046/140] Bumped kadu to v0.12.2 and its dependency libgadu to v1.11.2 --- .../instant-messengers/kadu/default.nix | 14 ++++++---- .../kadu/disable_some_plugins.patch | 28 ------------------- .../development/libraries/libgadu/default.nix | 6 ++-- 3 files changed, 12 insertions(+), 36 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/kadu/disable_some_plugins.patch diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix index 7dc66886af6e..03cbb1ce0737 100644 --- a/pkgs/applications/networking/instant-messengers/kadu/default.nix +++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation { - name = "kadu-0.10.1"; + name = "kadu-0.12.2"; src = fetchurl { - url = http://download.kadu.im/stable/kadu-0.10.1.tar.bz2; - sha256 = "0j88pyp2nqpc57j38zr135ypfiv4v329gfgiz9rdbqi8j26cyp7g"; + url = http://download.kadu.im/stable/kadu-0.12.2.tar.bz2; + sha256 = "0rqhkiyn8c7jigpxmvwh7daxsgjxlvd16zjdss1azdzd9x2dbym1"; }; buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon pkgconfig @@ -21,8 +21,12 @@ stdenv.mkDerivation { patchShebangs . ''; - # because I was not able to get those working - patches = [ ./disable_some_plugins.patch ]; + # Disable the kadu plugins I wasn't able to get to work + patchPhase = '' + sed -i -e '/mpd_mediaplayer/d' \ + -e '/encryption_ng/d' \ + -e '/encryption_ng_simlite/d' Plugins.cmake + ''; NIX_LDFLAGS="-lX11"; diff --git a/pkgs/applications/networking/instant-messengers/kadu/disable_some_plugins.patch b/pkgs/applications/networking/instant-messengers/kadu/disable_some_plugins.patch deleted file mode 100644 index 0ee06c21382a..000000000000 --- a/pkgs/applications/networking/instant-messengers/kadu/disable_some_plugins.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Plugins.cmake b/Plugins.cmake -index ad63f20..c14a781 100644 ---- a/Plugins.cmake -+++ b/Plugins.cmake -@@ -30,9 +30,9 @@ set (COMPILE_PLUGINS - - # encryption - # Encrypted chat support -- encryption_ng -+ # encryption_ng - # OpenSSL encrypted chat support -- encryption_ng_simlite -+ # encryption_ng_simlite - - # docking - # Tray icon support (common part of all docking modules) -@@ -104,9 +104,9 @@ if (UNIX) - - # mediaplayer - # MPD mediaplayer support -- mpd_mediaplayer -+ # mpd_mediaplayer - # MPRIS Media Players support -- mprisplayer_mediaplayer -+ # mprisplayer_mediaplayer - ) - endif (UNIX) - diff --git a/pkgs/development/libraries/libgadu/default.nix b/pkgs/development/libraries/libgadu/default.nix index 98324c184c66..430560107702 100644 --- a/pkgs/development/libraries/libgadu/default.nix +++ b/pkgs/development/libraries/libgadu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { - name = "libgadu-1.11.0"; + name = "libgadu-1.11.2"; src = fetchurl { - url = http://toxygen.net/libgadu/files/libgadu-1.11.0.tar.gz; - sha256 = "045a0bd395k3ramdvlzyfx3878p42fv4r04rgasmdsm2n33wgm38"; + url = http://toxygen.net/libgadu/files/libgadu-1.11.2.tar.gz; + sha256 = "0kifi9blhbimihqw4kaf6wyqhlx8fpp8nq4s6y280ar9p0il2n3z"; }; propagatedBuildInputs = [ zlib ]; From f8cf626b5ec10d101cb6bab1cd548482f705f846 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 17 Dec 2012 20:36:07 +0100 Subject: [PATCH 047/140] pam_ssh_agent_auth: Update to 0.9.4 --- pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix index 346008706718..0edbb42bb237 100644 --- a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix @@ -1,15 +1,17 @@ { stdenv, fetchurl, pam, openssl, perl }: stdenv.mkDerivation rec { - name = "pam_ssh_agent_auth-0.9.3"; + name = "pam_ssh_agent_auth-0.9.4"; src = fetchurl { url = "mirror://sourceforge/pamsshagentauth/${name}.tar.bz2"; - sha256 = "19p5mzplnr9g9vlp16nipf5rjw4v8zncvimarwgix958yml7j08h"; + sha256 = "1a8cv223f30mvkxnyh9hk6kya0ynkwwkc5nhlz3rcqhxfw0fcva9"; }; buildInputs = [ pam openssl perl ]; + enableParallelBuilding = true; + meta = { homepage = http://pamsshagentauth.sourceforge.net/; description = "PAM module for authentication through the SSH agent"; From 3644f9124aaf35f2ad7b17cd05df19226d4e4d1c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 17 Dec 2012 20:58:25 +0100 Subject: [PATCH 048/140] pam_ssh_agent_auth: Allow multiple authorized keys files We need this because of https://github.com/NixOS/nixos/pull/52. --- .../linux/pam_ssh_agent_auth/default.nix | 6 + .../multiple-key-files.patch | 338 ++++++++++++++++++ 2 files changed, 344 insertions(+) create mode 100644 pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix index 0edbb42bb237..eae62c9e1973 100644 --- a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix @@ -8,6 +8,12 @@ stdenv.mkDerivation rec { sha256 = "1a8cv223f30mvkxnyh9hk6kya0ynkwwkc5nhlz3rcqhxfw0fcva9"; }; + patches = + [ # Allow multiple colon-separated authorized keys files to be + # specified in the file= option. + ./multiple-key-files.patch + ]; + buildInputs = [ pam openssl perl ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch b/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch new file mode 100644 index 000000000000..dc97b7d54f7c --- /dev/null +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch @@ -0,0 +1,338 @@ +diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/iterate_ssh_agent_keys.c pam_ssh_agent_auth-0.9.4/iterate_ssh_agent_keys.c +--- pam_ssh_agent_auth-0.9.4-orig/iterate_ssh_agent_keys.c 2012-06-28 01:47:49.000000000 +0000 ++++ pam_ssh_agent_auth-0.9.4/iterate_ssh_agent_keys.c 2012-12-17 19:29:16.014226336 +0000 +@@ -69,14 +69,14 @@ + return cookie; + } + +-int ++const char * + pamsshagentauth_find_authorized_keys(uid_t uid) + { + Identity *id; + Key *key; + AuthenticationConnection *ac; + char *comment; +- uint8_t retval = 0; ++ const char *key_file = 0; + + OpenSSL_add_all_digests(); + session_id2 = pamsshagentauth_session_id2_gen(); +@@ -90,13 +90,11 @@ + id->key = key; + id->filename = comment; + id->ac = ac; +- if(userauth_pubkey_from_id(id)) { +- retval = 1; +- } ++ key_file = userauth_pubkey_from_id(id); + pamsshagentauth_xfree(id->filename); + pamsshagentauth_key_free(id->key); + pamsshagentauth_xfree(id); +- if(retval == 1) ++ if(key_file) + break; + } + } +@@ -107,5 +105,5 @@ + } + pamsshagentauth_xfree(session_id2); + EVP_cleanup(); +- return retval; ++ return key_file; + } +diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/iterate_ssh_agent_keys.h pam_ssh_agent_auth-0.9.4/iterate_ssh_agent_keys.h +--- pam_ssh_agent_auth-0.9.4-orig/iterate_ssh_agent_keys.h 2012-06-28 01:47:49.000000000 +0000 ++++ pam_ssh_agent_auth-0.9.4/iterate_ssh_agent_keys.h 2012-12-17 19:28:57.454334806 +0000 +@@ -31,6 +31,6 @@ + #ifndef _ITERATE_SSH_AGENT_KEYS_H + #define _ITERATE_SSH_AGENT_KEYS_H + +-int pamsshagentauth_find_authorized_keys(uid_t); ++const char * pamsshagentauth_find_authorized_keys(uid_t); + + #endif +diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/pam_ssh_agent_auth.c pam_ssh_agent_auth-0.9.4/pam_ssh_agent_auth.c +--- pam_ssh_agent_auth-0.9.4-orig/pam_ssh_agent_auth.c 2012-06-28 01:47:49.000000000 +0000 ++++ pam_ssh_agent_auth-0.9.4/pam_ssh_agent_auth.c 2012-12-17 19:30:24.013830673 +0000 +@@ -60,7 +60,6 @@ + + #define strncasecmp_literal(A,B) strncasecmp( A, B, sizeof(B) - 1) + +-char *authorized_keys_file = NULL; + uint8_t allow_user_owned_authorized_keys_file = 0; + + #if ! HAVE___PROGNAME || HAVE_BUNDLE +@@ -161,15 +160,13 @@ + goto cleanexit; + } + +- if(authorized_keys_file_input && user) { +- /* +- * user is the name of the target-user, and so must be used for validating the authorized_keys file +- */ +- parse_authorized_key_file(user, authorized_keys_file_input); +- } else { +- pamsshagentauth_verbose("Using default file=/etc/security/authorized_keys"); +- authorized_keys_file = pamsshagentauth_xstrdup("/etc/security/authorized_keys"); +- } ++ if (!authorized_keys_file_input || !user) ++ authorized_keys_file_input = "/etc/security/authorized_keys"; ++ ++ /* ++ * user is the name of the target-user, and so must be used for validating the authorized_keys file ++ */ ++ parse_authorized_key_files(user, authorized_keys_file_input); + + /* + * PAM_USER and PAM_RUSER do not necessarily have to get set by the calling application, and we may be unable to divine the latter. +@@ -177,16 +174,17 @@ + */ + + if(user && strlen(ruser) > 0) { +- pamsshagentauth_verbose("Attempting authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file); ++ pamsshagentauth_verbose("Attempting authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file_input); + + /* + * this pw_uid is used to validate the SSH_AUTH_SOCK, and so must be the uid of the ruser invoking the program, not the target-user + */ +- if(pamsshagentauth_find_authorized_keys(getpwnam(ruser)->pw_uid)) { +- pamsshagentauth_logit("Authenticated: `%s' as `%s' using %s", ruser, user, authorized_keys_file); ++ const char *key_file; ++ if((key_file = pamsshagentauth_find_authorized_keys(getpwnam(ruser)->pw_uid))) { ++ pamsshagentauth_logit("Authenticated: `%s' as `%s' using %s", ruser, user, key_file); + retval = PAM_SUCCESS; + } else { +- pamsshagentauth_logit("Failed Authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file); ++ pamsshagentauth_logit("Failed Authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file_input); + } + } else { + pamsshagentauth_logit("No %s specified, cannot continue with this form of authentication", (user) ? "ruser" : "user" ); +@@ -198,7 +196,7 @@ + free(__progname); + #endif + +- free(authorized_keys_file); ++ free_authorized_key_files(); + + return retval; + } +diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/pam_ssh_agent_auth.pod pam_ssh_agent_auth-0.9.4/pam_ssh_agent_auth.pod +--- pam_ssh_agent_auth-0.9.4-orig/pam_ssh_agent_auth.pod 2012-06-28 01:47:49.000000000 +0000 ++++ pam_ssh_agent_auth-0.9.4/pam_ssh_agent_auth.pod 2012-12-17 19:52:35.968965448 +0000 +@@ -26,7 +26,7 @@ + + =item file= + +-Specify the path to the authorized_keys file(s) you would like to use for authentication. Subject to tilde and % EXPANSIONS (below) ++Specify the path(s) to the authorized_keys file(s) you would like to use for authentication. Subject to tilde and % EXPANSIONS (below). Paths are separated using colons. + + =item allow_user_owned_authorized_keys_file + +diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/pam_user_authorized_keys.c pam_ssh_agent_auth-0.9.4/pam_user_authorized_keys.c +--- pam_ssh_agent_auth-0.9.4-orig/pam_user_authorized_keys.c 2012-06-28 01:47:49.000000000 +0000 ++++ pam_ssh_agent_auth-0.9.4/pam_user_authorized_keys.c 2012-12-17 19:32:20.830157313 +0000 +@@ -79,66 +79,96 @@ + + #include "identity.h" + #include "pam_user_key_allowed2.h" ++#include "pam_user_authorized_keys.h" + +-extern char *authorized_keys_file; ++#define MAX_AUTHORIZED_KEY_FILES 16 ++ ++char *authorized_keys_files[MAX_AUTHORIZED_KEY_FILES]; ++unsigned int nr_authorized_keys_files = 0; + extern uint8_t allow_user_owned_authorized_keys_file; + uid_t authorized_keys_file_allowed_owner_uid; + + void +-parse_authorized_key_file(const char *user, const char *authorized_keys_file_input) ++parse_authorized_key_files(const char *user, const char *authorized_keys_file_input) + { +- char fqdn[HOST_NAME_MAX] = ""; ++ const char *pos = authorized_keys_file_input; + char hostname[HOST_NAME_MAX] = ""; +- char auth_keys_file_buf[4096] = ""; +- char *slash_ptr = NULL; +- char owner_uname[128] = ""; +- size_t owner_uname_len = 0; +- +- /* +- * temporary copy, so that both tilde expansion and percent expansion both get to apply to the path +- */ +- strncat(auth_keys_file_buf, authorized_keys_file_input, sizeof(auth_keys_file_buf) - 1); ++ char fqdn[HOST_NAME_MAX] = ""; ++ ++#if HAVE_GETHOSTNAME ++ *hostname = '\0'; ++ gethostname(fqdn, HOST_NAME_MAX); ++ strncat(hostname, fqdn, strcspn(fqdn,".")); ++#endif + +- if(allow_user_owned_authorized_keys_file) +- authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid; ++ while (pos) { ++ const char *colon = strchr(pos, ':'); ++ char auth_keys_file_buf[4096] = ""; ++ char *slash_ptr = NULL; ++ char owner_uname[128] = ""; ++ size_t owner_uname_len = 0; ++ ++ strncat(auth_keys_file_buf, pos, sizeof(auth_keys_file_buf) - 1); ++ if (colon) { ++ auth_keys_file_buf[colon - pos] = 0; ++ pos = colon + 1; ++ } else { ++ pos = 0; ++ } + +- if(*auth_keys_file_buf == '~') { +- if(*(auth_keys_file_buf+1) == '/') { ++ if(allow_user_owned_authorized_keys_file) + authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid; ++ ++ if(*auth_keys_file_buf == '~') { ++ if(*(auth_keys_file_buf+1) == '/') { ++ authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid; ++ } ++ else { ++ slash_ptr = strchr(auth_keys_file_buf,'/'); ++ if(!slash_ptr) ++ pamsshagentauth_fatal("cannot expand tilde in path without a `/'"); ++ ++ owner_uname_len = slash_ptr - auth_keys_file_buf - 1; ++ if(owner_uname_len > (sizeof(owner_uname) - 1) ) ++ pamsshagentauth_fatal("Username too long"); ++ ++ strncat(owner_uname, auth_keys_file_buf + 1, owner_uname_len); ++ if(!authorized_keys_file_allowed_owner_uid) ++ authorized_keys_file_allowed_owner_uid = getpwnam(owner_uname)->pw_uid; ++ } ++ char *tmp = pamsshagentauth_tilde_expand_filename(auth_keys_file_buf, authorized_keys_file_allowed_owner_uid); ++ strncpy(auth_keys_file_buf, tmp, sizeof(auth_keys_file_buf) - 1 ); ++ pamsshagentauth_xfree(tmp); + } +- else { +- slash_ptr = strchr(auth_keys_file_buf,'/'); +- if(!slash_ptr) +- pamsshagentauth_fatal("cannot expand tilde in path without a `/'"); +- +- owner_uname_len = slash_ptr - auth_keys_file_buf - 1; +- if(owner_uname_len > (sizeof(owner_uname) - 1) ) +- pamsshagentauth_fatal("Username too long"); +- +- strncat(owner_uname, auth_keys_file_buf + 1, owner_uname_len); +- if(!authorized_keys_file_allowed_owner_uid) +- authorized_keys_file_allowed_owner_uid = getpwnam(owner_uname)->pw_uid; ++ ++ if(strstr(auth_keys_file_buf, "%h")) { ++ authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid; + } +- authorized_keys_file = pamsshagentauth_tilde_expand_filename(auth_keys_file_buf, authorized_keys_file_allowed_owner_uid); +- strncpy(auth_keys_file_buf, authorized_keys_file, sizeof(auth_keys_file_buf) - 1 ); +- pamsshagentauth_xfree(authorized_keys_file) /* when we percent_expand later, we'd step on this, so free it immediately */; +- } + +- if(strstr(auth_keys_file_buf, "%h")) { +- authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid; ++ if (nr_authorized_keys_files >= MAX_AUTHORIZED_KEY_FILES) ++ pamsshagentauth_fatal("Too many authorized key files"); ++ authorized_keys_files[nr_authorized_keys_files++] = ++ pamsshagentauth_percent_expand(auth_keys_file_buf, "h", getpwnam(user)->pw_dir, "H", hostname, "f", fqdn, "u", user, NULL); + } ++} + +-#if HAVE_GETHOSTNAME +- *hostname = '\0'; +- gethostname(fqdn, HOST_NAME_MAX); +- strncat(hostname, fqdn, strcspn(fqdn,".")); +-#endif +- authorized_keys_file = pamsshagentauth_percent_expand(auth_keys_file_buf, "h", getpwnam(user)->pw_dir, "H", hostname, "f", fqdn, "u", user, NULL); ++void ++free_authorized_key_files() ++{ ++ unsigned int n; ++ for (n = 0; n < nr_authorized_keys_files; n++) ++ free(authorized_keys_files[n]); ++ nr_authorized_keys_files = 0; + } + +-int ++const char * + pam_user_key_allowed(Key * key) + { +- return pam_user_key_allowed2(getpwuid(authorized_keys_file_allowed_owner_uid), key, authorized_keys_file) +- || pam_user_key_allowed2(getpwuid(0), key, authorized_keys_file); ++ unsigned int n; ++ for (n = 0; n < nr_authorized_keys_files; n++) { ++ if (pam_user_key_allowed2(getpwuid(authorized_keys_file_allowed_owner_uid), key, authorized_keys_files[n]) ++ || pam_user_key_allowed2(getpwuid(0), key, authorized_keys_files[n])) ++ return authorized_keys_files[n]; ++ } ++ return 0; + } +diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/pam_user_authorized_keys.h pam_ssh_agent_auth-0.9.4/pam_user_authorized_keys.h +--- pam_ssh_agent_auth-0.9.4-orig/pam_user_authorized_keys.h 2010-01-13 02:17:01.000000000 +0000 ++++ pam_ssh_agent_auth-0.9.4/pam_user_authorized_keys.h 2012-12-17 19:24:34.477894517 +0000 +@@ -28,11 +28,12 @@ + */ + + +-#ifndef _PAM_USER_KEY_ALLOWED_H +-#define _PAM_USER_KEY_ALLOWED_H ++#ifndef _PAM_USER_AUTHORIZED_KEYS_H ++#define _PAM_USER_AUTHORIZED_KEYS_H + + #include "identity.h" +-int pam_user_key_allowed(Key *); +-void parse_authorized_key_file(const char *, const char *); ++const char * pam_user_key_allowed(Key *); ++void parse_authorized_key_files(const char *, const char *); ++void free_authorized_key_files(); + + #endif +diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/userauth_pubkey_from_id.c pam_ssh_agent_auth-0.9.4/userauth_pubkey_from_id.c +--- pam_ssh_agent_auth-0.9.4-orig/userauth_pubkey_from_id.c 2012-06-28 01:47:49.000000000 +0000 ++++ pam_ssh_agent_auth-0.9.4/userauth_pubkey_from_id.c 2012-12-17 19:27:30.813843933 +0000 +@@ -51,7 +51,7 @@ + extern u_char *session_id2; + extern uint8_t session_id_len; + +-int ++const char * + userauth_pubkey_from_id(Identity * id) + { + Buffer b = { 0 }; +@@ -59,11 +59,12 @@ + u_char *pkblob = NULL, *sig = NULL; + u_int blen = 0, slen = 0; + int authenticated = 0; ++ const char *key_file; + + pkalg = (char *) key_ssh_name(id->key); + + /* first test if this key is even allowed */ +- if(! pam_user_key_allowed(id->key)) ++ if(!(key_file = pam_user_key_allowed(id->key))) + goto user_auth_clean_exit; + + if(pamsshagentauth_key_to_blob(id->key, &pkblob, &blen) == 0) +@@ -96,5 +97,5 @@ + if(pkblob != NULL) + pamsshagentauth_xfree(pkblob); + CRYPTO_cleanup_all_ex_data(); +- return authenticated; ++ return authenticated ? key_file : 0; + } +diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/userauth_pubkey_from_id.h pam_ssh_agent_auth-0.9.4/userauth_pubkey_from_id.h +--- pam_ssh_agent_auth-0.9.4-orig/userauth_pubkey_from_id.h 2010-01-13 02:17:01.000000000 +0000 ++++ pam_ssh_agent_auth-0.9.4/userauth_pubkey_from_id.h 2012-12-17 19:25:54.893412987 +0000 +@@ -32,6 +32,6 @@ + #define _USERAUTH_PUBKEY_FROM_ID_H + + #include +-int userauth_pubkey_from_id(Identity *); ++const char * userauth_pubkey_from_id(Identity *); + + #endif From b264abcabb205cdc63bb2afa9ca0b0771c6899c1 Mon Sep 17 00:00:00 2001 From: Patrick John Wheeler Date: Mon, 17 Dec 2012 21:54:39 +0100 Subject: [PATCH 049/140] Turn on Python plugin for vim_configurable by default Python plugin for vim is turned on by default in ubuntu and other flavors of linux and mimicking this in NixOS will help contribut to the impression that NixOS "just works." --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9e11d240f3c..f40dae08d0b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7907,7 +7907,7 @@ let inherit (pkgs) python perl tcl ruby /*x11*/; lua = pkgs.lua5; # optional features by flags - flags = [ "X11" ]; # only flag "X11" by now + flags = [ "python" "X11" ]; # only flag "X11" by now }; virtviewer = callPackage ../applications/virtualization/virt-viewer {}; From 2fc426577b8c4071542de07e56052a802dd9c740 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 17 Dec 2012 17:16:48 -0500 Subject: [PATCH 050/140] Unmaintain aufs --- pkgs/os-specific/linux/aufs-util/3.nix | 3 +-- pkgs/os-specific/linux/aufs/3.nix | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/aufs-util/3.nix b/pkgs/os-specific/linux/aufs-util/3.nix index 8eefc1b0f4ae..d75f51d38c94 100644 --- a/pkgs/os-specific/linux/aufs-util/3.nix +++ b/pkgs/os-specific/linux/aufs-util/3.nix @@ -34,8 +34,7 @@ stdenv.mkDerivation { meta = { description = "Utilities for AUFS3"; homepage = http://aufs.sourceforge.net/; - maintainers = [ stdenv.lib.maintainers.eelco - stdenv.lib.maintainers.shlevy ]; + maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/aufs/3.nix b/pkgs/os-specific/linux/aufs/3.nix index 83de1faa8fe5..130fd5075cd5 100644 --- a/pkgs/os-specific/linux/aufs/3.nix +++ b/pkgs/os-specific/linux/aufs/3.nix @@ -37,8 +37,7 @@ stdenv.mkDerivation { description = "Another Unionfs implementation for Linux (third generation)"; homepage = http://aufs.sourceforge.net/; maintainers = [ stdenv.lib.maintainers.eelco - stdenv.lib.maintainers.raskin - stdenv.lib.maintainers.shlevy ]; + stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; }; } From cc12516cf0f8d4f881159db9ec1b2537cdc1403b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 17 Dec 2012 17:33:44 -0500 Subject: [PATCH 051/140] Linux 3.6.11 --- pkgs/os-specific/linux/kernel/linux-3.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.6.nix b/pkgs/os-specific/linux/kernel/linux-3.6.nix index e06a9e8224b5..3fb47da7be68 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.6.nix @@ -244,7 +244,7 @@ in import ./generic.nix ( rec { - version = "3.6.10"; + version = "3.6.11"; testing = false; preConfigure = '' @@ -253,7 +253,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0cqslk460yvgh3iv1m9lkdlnfy9v9ghcn4kjpf8019dsfia7pr7x"; + sha256 = "0cnbdhsgxxdl44gqfqlh8nyf6yzmdz7xkfa0xh2rzdscwqh8085h"; }; config = configWithPlatform stdenv.platform; From 55196223c759c4c6583f14c3791b7bd561759a7a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 17 Dec 2012 17:42:38 -0500 Subject: [PATCH 052/140] Linux 3.4.24 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 0291d78f4e34..a03e39508912 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -239,7 +239,7 @@ in import ./generic.nix ( rec { - version = "3.4.23"; + version = "3.4.24"; testing = false; preConfigure = '' @@ -248,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1xznslbhby6ks10sb7h6zh5647ffavpmfsxxb1c5hj4cyj4d9k2z"; + sha256 = "1vxyb68ckzgm88jj7xzmwr2hmj5vdry5irvfr89klgqr95mmhkd1"; }; config = configWithPlatform stdenv.platform; From baa5ebfbdfdf2a320fbf119d1e505532ff708000 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 17 Dec 2012 17:42:50 -0500 Subject: [PATCH 053/140] Linux 3.0.57 --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 438228c4680f..4ac4a4b263b5 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -230,7 +230,7 @@ in import ./generic.nix ( rec { - version = "3.0.56"; + version = "3.0.57"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -238,7 +238,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0dfj8nlrlwyq9jp85y8acmhpm7f5bdd9668ikafyd7rljqmkq61f"; + sha256 = "12rf48ymwsgr133d6cydsajjxb3zihrcrfhpdv185x07dbri9nbl"; }; config = configWithPlatform stdenv.platform; From 9247552a918e81ff2ab878b835a9e556950da9da Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 17 Dec 2012 17:45:01 -0500 Subject: [PATCH 054/140] Linux 3.7.1 --- pkgs/os-specific/linux/kernel/linux-3.7.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix index 6eda20a0789e..1a02910b5c80 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix @@ -245,18 +245,16 @@ in import ./generic.nix ( rec { - version = "3.7"; + version = "3.7.1"; testing = false; - modDirVersion = "3.7.0"; - preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" ''; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0n4lddghf0mvp3jrq4lckii88yvm6mwmfp0ibwsw7vkfyw5lv9k0"; + sha256 = "0mbjvrr0658gg052hbf32vfcmlzfsr777wgmaxrpkpzbfs1qpjp1"; }; config = configWithPlatform stdenv.platform; From 7503291ff99dab60e7d2bed89b1927f7b91b6238 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Fri, 14 Dec 2012 17:12:17 +0100 Subject: [PATCH 055/140] update freerdp to 1.0.1 and unstable version. --- .../networking/remote/freerdp/default.nix | 22 +++++++--- .../networking/remote/freerdp/unstable.nix | 40 ++++++++++++------- 2 files changed, 42 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 434d75bce585..d8634e31dada 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -10,16 +10,22 @@ , libXdamage , libXext , alsaLib +, ffmpeg +, libxkbfile +#, xmlto, docbook_xml_dtd_412, docbook_xml_xslt +, libXinerama +, libXv +, pulseaudioSupport ? true, pulseaudio }: assert printerSupport -> cups != null; stdenv.mkDerivation rec { name = "freerdp-${version}"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-${version}.tar.gz"; - sha256 = "df9f5f3275436f3e413824ca40f1e41733a95121f45e1ed41ab410701c5764cc"; + url = "https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"; + sha256 = "1my8gamvfrn6v9gcqxsa9cgxr42shc0l826zvxj8wpcay6gd321w"; }; buildInputs = [ @@ -32,11 +38,17 @@ stdenv.mkDerivation rec { libXdamage libXext alsaLib + ffmpeg + libxkbfile +# xmlto docbook_xml_dtd_412 docbook_xml_xslt + libXinerama + libXv ] ++ stdenv.lib.optional printerSupport cups; configureFlags = [ - "--with-x" - ] ++ stdenv.lib.optional printerSupport "--with-printer=cups"; + "--with-x" "-DWITH_MANPAGES=OFF" + ] ++ stdenv.lib.optional printerSupport "--with-printer=cups" + ++ stdenv.lib.optional pulseaudioSupport "-DWITH_PULSEAUDIO=ON"; meta = { description = "A Remote Desktop Protocol Client"; diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix index 2266f7237f61..ef8ddf8b0e3b 100644 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ b/pkgs/applications/networking/remote/freerdp/unstable.nix @@ -1,53 +1,63 @@ { stdenv , fetchgit +, cmake , openssl , printerSupport ? true, cups , pkgconfig , zlib , libX11 , libXcursor -, alsaLib -, cmake -, libxkbfile -, libXinerama +, libXdamage , libXext -, directfb -, cunit +, alsaLib +, ffmpeg +, libxkbfile +#, xmlto, docbook_xml_dtd_412, docbook_xml_xslt +, libXinerama +#, directfb +#, cunit +, libXv +, pulseaudioSupport ? true, pulseaudio }: assert printerSupport -> cups != null; -let rev = "498b88a1da748a4a2b4dbd12c795ca87fee24bab"; in +let rev = "ec6effcb1e7759551cf31f5b18d768afc67db97d"; in stdenv.mkDerivation rec { - name = "freerdp-1.0pre${rev}"; + name = "freerdp-1.1pre${rev}"; src = fetchgit { url = git://github.com/FreeRDP/FreeRDP.git; inherit rev; - sha256 = "91ef562e96db483ada28236e524326a75b6942becce4fd2a65ace386186eccf7"; + sha256 = "4e5af9a6769c4b34c6b75dffe83a385d1d86068c523ea9f62fabc651a2958455"; }; buildInputs = [ + cmake openssl pkgconfig zlib libX11 libXcursor - libxkbfile - libXinerama + libXdamage libXext - directfb +# directfb +# cunit alsaLib - cmake - cunit + ffmpeg + libxkbfile +# xmlto docbook_xml_dtd_412 docbook_xml_xslt + libXinerama + libXv ] ++ stdenv.lib.optional printerSupport cups; doCheck = false; checkPhase = ''LD_LIBRARY_PATH="libfreerdp-cache:libfreerdp-chanman:libfreerdp-common:libfreerdp-core:libfreerdp-gdi:libfreerdp-kbd:libfreerdp-rail:libfreerdp-rfx:libfreerdp-utils" cunit/test_freerdp''; - cmakeFlags = [ "-DWITH_DIRECTFB=ON" "-DWITH_CUNIT=ON" ]; + cmakeFlags = [ "-DWITH_DIRECTFB=OFF" "-DWITH_CUNIT=OFF" "-DWITH_MANPAGES=OFF" + ] ++ stdenv.lib.optional pulseaudioSupport "-DWITH_PULSEAUDIO=ON"; meta = { description = "A Remote Desktop Protocol Client"; From b643316a4275dccb4db7faca9115fb2e1bca8cfc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Dec 2012 16:57:11 +0100 Subject: [PATCH 056/140] VM builds: Use BusyBox http://hydra.nixos.org/build/3510928 --- pkgs/build-support/vm/default.nix | 36 ++++++++----------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 1a4560805538..9d9bdb2033e3 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -38,35 +38,19 @@ rec { # Copy what we need from Glibc. cp -p ${pkgs.stdenv.glibc}/lib/ld-linux*.so.? $out/lib cp -p ${pkgs.stdenv.glibc}/lib/libc.so.* $out/lib - cp -p ${pkgs.stdenv.glibc}/lib/librt.so.* $out/lib - cp -p ${pkgs.stdenv.glibc}/lib/libdl.so.* $out/lib + cp -p ${pkgs.stdenv.glibc}/lib/libm.so.* $out/lib - # Copy some utillinux stuff. - cp ${utillinux}/bin/mount ${utillinux}/bin/umount $out/bin - cp -pd ${utillinux}/lib/libblkid*.so.* $out/lib - cp -pd ${utillinux}/lib/libuuid*.so.* $out/lib - - # Copy some coreutils. - cp ${coreutils}/bin/basename $out/bin - cp ${coreutils}/bin/mkdir $out/bin - cp ${coreutils}/bin/mknod $out/bin - cp ${coreutils}/bin/cat $out/bin - cp ${coreutils}/bin/chroot $out/bin - cp ${coreutils}/bin/sleep $out/bin - cp ${coreutils}/bin/ln $out/bin - - # Copy some other tools. - cp ${bash}/bin/bash $out/bin - cp ${module_init_tools}/sbin/insmod $out/bin/insmod - cp ${nettools}/sbin/ifconfig $out/bin - cp ${sysvinit}/sbin/halt $out/bin + # Copy BusyBox. + cp -pd ${pkgs.busybox}/bin/* ${pkgs.busybox}/sbin/* $out/bin # Run patchelf to make the programs refer to the copied libraries. for i in $out/bin/* $out/lib/*; do if ! test -L $i; then nuke-refs $i; fi; done for i in $out/bin/*; do - echo "patching $i..." - patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib $i || true + if [ -f "$i" -a ! -L "$i" ]; then + echo "patching $i..." + patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib $i || true + fi done ''; # */ @@ -84,8 +68,7 @@ rec { stage1Init = writeScript "vm-run-stage1" '' - #! ${initrdUtils}/bin/bash -e - echo START + #! ${initrdUtils}/bin/ash -e export PATH=${initrdUtils}/bin @@ -167,8 +150,7 @@ rec { mount -o remount,ro dummy /fs - echo DONE - halt -d -p -f + poweroff -f ''; From 3fa853ec244f651f3538d76aa57d7d1b6678a0b0 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 18 Dec 2012 11:13:12 -0500 Subject: [PATCH 057/140] st: Use official release tarball --- pkgs/applications/misc/st/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 86b24e7e4018..70089759626f 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { name = "st-0.3"; src = fetchurl { - url = http://hg.suckless.org/st/archive/0.3.tar.gz; - sha256 = "12ypldjjpsq3nvhszgjsk4wgqkwcvz06qiqw8k5npv3rd1nbx9cl"; + url = "http://dl.suckless.org/st/${name}.tar.gz"; + sha256 = "0d0fjixiis4ixbz4l18rqhnssa7cy2bap3jkjyphqlqhl7lahv3d"; }; buildInputs = [ libX11 ncurses libXext libXft ]; From 01adc95b1381e3c70560ac33e2ec7f4541aae699 Mon Sep 17 00:00:00 2001 From: Eelis van der Weegen Date: Tue, 18 Dec 2012 21:02:36 +0100 Subject: [PATCH 058/140] Ion3 update to 20090110 --- pkgs/applications/window-managers/ion-3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix index e6714536cadd..b4dabb300c19 100644 --- a/pkgs/applications/window-managers/ion-3/default.nix +++ b/pkgs/applications/window-managers/ion-3/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, x11, lua, gettext, groff }: stdenv.mkDerivation { - name = "ion-3rc-20070902"; + name = "ion-3-20090110"; meta = { description = "Ion is a tiling tabbed window manager designed with keyboard users in mind."; homepage = http://modeemi.fi/~tuomov/ion; }; src = fetchurl { - url = http://iki.fi/tuomov/dl/ion-3rc-20070902.tar.gz; - sha256 = "062a0rgxzz4h1hih5lp7l2nfvhz095brag9fmnanzqc4dac228xl"; + url = http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz; + sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns"; }; buildInputs = [ x11 lua gettext groff ]; buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}"; From bbffdd4702446690a597256a9170fec5213ed3fd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 Dec 2012 13:16:10 +0100 Subject: [PATCH 059/140] postgresql: Add version 9.2 --- pkgs/servers/sql/postgresql/9.2.x.nix | 35 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/servers/sql/postgresql/9.2.x.nix diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix new file mode 100644 index 000000000000..6341fa952f5b --- /dev/null +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, zlib, readline }: + +let version = "9.2.2"; in + +stdenv.mkDerivation rec { + name = "postgresql-${version}"; + + src = fetchurl { + url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; + sha256 = "1wzphj8vdqpzaihqmrkm9p4wlfvgr9psg5hnrmzwp5l8m5aai9z1"; + }; + + buildInputs = [ zlib readline ]; + + enableParallelBuilding = true; + + LC_ALL = "C"; + + postInstall = + '' + mkdir -p $out/share/man + cp -rvd doc/src/sgml/man1 $out/share/man + ''; + + passthru = { + inherit readline; + psqlSchema = "9.1"; + }; + + meta = { + homepage = http://www.postgresql.org/; + description = "A powerful, open source object-relational database system"; + license = "bsd"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9e11d240f3c..1f972f19c3b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5471,6 +5471,8 @@ let postgresql91 = callPackage ../servers/sql/postgresql/9.1.x.nix { }; + postgresql92 = callPackage ../servers/sql/postgresql/9.2.x.nix { }; + postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { From ce6d4070a616554c0ca6948338b47cb192f7306a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 19 Dec 2012 22:49:21 -0500 Subject: [PATCH 060/140] Add a 'functionTo x' type. This is mainly to for the 'merge' concept, but I made a guess as to what iter and fold would mean for functions. --- pkgs/lib/types.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix index 38ae7b43630a..b99fe5a57711 100644 --- a/pkgs/lib/types.nix +++ b/pkgs/lib/types.nix @@ -176,6 +176,19 @@ rec { fold = op: nul: v: if v == null then nul else elemType.fold op nul v; }; + functionTo = elemType: mkOptionType { + name = "function that evaluates to a(n) ${elemType.name}"; + check = lib.traceValIfNot builtins.isFunction; + merge = fns: + args: elemType.merge (map (fn: fn args) fns) + # These are guesses, I don't fully understand iter, fold, delayOnGlobalEval + iter = f: path: v: + args: elemType.iter f path (v args); + fold = op: nul: v: + args: elemType.fold op nul (v args); + inherit (elemType) hasOptions delayOnGlobalEval; + }; + # !!! this should be a type constructor that takes the options as # an argument. optionSet = mkOptionType { From 95679e1344496e15219c11e0612d1b7832a9dd1a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 20 Dec 2012 00:28:12 -0500 Subject: [PATCH 061/140] Misunderstood hasOptions, I think --- pkgs/lib/types.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix index b99fe5a57711..a130caf29c41 100644 --- a/pkgs/lib/types.nix +++ b/pkgs/lib/types.nix @@ -186,7 +186,8 @@ rec { args: elemType.iter f path (v args); fold = op: nul: v: args: elemType.fold op nul (v args); - inherit (elemType) hasOptions delayOnGlobalEval; + inherit (elemType) delayOnGlobalEval; + hasOptions = false; }; # !!! this should be a type constructor that takes the options as From 2eb0c6fba59e2cbca458e89828f525b0bc2cd953 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 20 Dec 2012 00:52:51 -0500 Subject: [PATCH 062/140] D'oh --- pkgs/lib/types.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix index a130caf29c41..6bc2e0f1ecb3 100644 --- a/pkgs/lib/types.nix +++ b/pkgs/lib/types.nix @@ -180,7 +180,7 @@ rec { name = "function that evaluates to a(n) ${elemType.name}"; check = lib.traceValIfNot builtins.isFunction; merge = fns: - args: elemType.merge (map (fn: fn args) fns) + args: elemType.merge (map (fn: fn args) fns); # These are guesses, I don't fully understand iter, fold, delayOnGlobalEval iter = f: path: v: args: elemType.iter f path (v args); From 8602eeda819f10a5e5ee523836e3a11e98fd2ad8 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 20 Dec 2012 14:04:52 +0100 Subject: [PATCH 063/140] - Updated android SDK to version 21 - Updated platform-tools, addons and system-images that belong to release 21 accordingly - We must also patch 64-bit emulator instances now --- pkgs/development/androidenv/addon.xml | 153 ++++++--- pkgs/development/androidenv/addons.nix | 14 +- pkgs/development/androidenv/androidsdk.nix | 34 +- pkgs/development/androidenv/default.nix | 2 +- .../development/androidenv/platform-tools.nix | 10 +- .../androidenv/platforms-linux.nix | 14 +- .../androidenv/platforms-macosx.nix | 14 +- pkgs/development/androidenv/repository-7.xml | 298 ++++++++++++------ pkgs/development/androidenv/support.nix | 6 +- pkgs/development/androidenv/sysimages.nix | 10 +- 10 files changed, 388 insertions(+), 167 deletions(-) diff --git a/pkgs/development/androidenv/addon.xml b/pkgs/development/androidenv/addon.xml index 7b0f69128a63..fb5d324d7789 100644 --- a/pkgs/development/androidenv/addon.xml +++ b/pkgs/development/androidenv/addon.xml @@ -16,69 +16,85 @@ --> - This is the Android Software Development Kit License Agreement. + 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 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. +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 You can accept this License Agreement by: +2.2 By clicking to accept, you hereby agree to the terms of this License Agreement. -(A) clicking to accept or agree to this License Agreement, where this option is made available to you; or +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. -(B) by actually using the SDK. In this case, you agree that use of the SDK constitutes acceptance of the Licensing Agreement from that point onwards. +2.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. -2.3 You may not use the SDK and may not accept the Licensing Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries including the country in which you are resident or from which you use the SDK. - -2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the Licensing Agreement or use the SDK on behalf of your employer or other entity. 3. SDK License from Google -3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non- assignable and non-exclusive license to use the SDK solely to develop applications to run on the Android platform. -3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you. +3.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.3 Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK. Except to the extent required by applicable third party licenses, you may not load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK. +3.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.4 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement. +3.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.5 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you. +3.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.6 Nothing in this License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. +3.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. -3.7 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK. 4. Use of the SDK by You + 4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications. 4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). -4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, your must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so. +4.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 the Android platform and/or applications for the Android platform, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. +4.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 for the Android Platform + +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. @@ -86,55 +102,65 @@ 7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties. + 8. Using Android APIs + 8.1 Google Data APIs 8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. 8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. + 9. Terminating this License Agreement + 9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below. 9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials. 9.3 Google may at any time, terminate this License Agreement with you if: - (A) you have breached any provision of this License Agreement; or - (B) Google is required to do so by law; or - (C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or - -(D) Google decides to no longer providing the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable. +(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.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. + +11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. + 12. Indemnification + 12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement. + 13. Changes to the License Agreement + 13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available. + 14. General Legal Terms -14.1 This License Agreement constitute the whole legal agreement between you and Google and govern your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replace any prior agreements between you and Google in relation to the SDK. + +14.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. @@ -148,7 +174,7 @@ 14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. -April 10, 2009 +November 13, 2012 Terms and Conditions @@ -157,9 +183,9 @@ This is the Google TV Add-on for the Android Software Development Kit License Ag 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.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. +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 @@ -179,7 +205,7 @@ This is the Google TV Add-on for the Android Software Development Kit License Ag 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.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. @@ -257,7 +283,7 @@ This is the Google TV Add-on for the Android Software Development Kit License Ag 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.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. @@ -704,11 +730,41 @@ August 15, 2011 + + + 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 + + + + + - - 10 + + 11 Android android Android Support Library @@ -716,11 +772,12 @@ August 15, 2011 compatibility - 1161015 - 7c62e542d46ac3bdb89e1b90503d6afae557cf7d - support_r10.zip + 1264808 + d30d182d8e4c86bb4464c03a83ccffce7bc84ecd + support_r11.zip + @@ -768,15 +825,15 @@ August 15, 2011 Google Inc. Google Play services google_play_services - 1 + 4 Google Play Services client library and sample code https://developers.google.com/android/google-play-services/index - 363692 - b1808a7d5f91a3ed42839b950fd254c60e9328f1 - google_play_services_1013.zip + 3732458 + bbb3d11225fcf60a0bae75afa2c4737010468bf6 + google_play_services_2012110_r04.zip @@ -806,14 +863,14 @@ August 15, 2011 Google Play Billing Library play_billing market_billing - 2 - Google Play Billing sample code - http://developer.android.com/guide/market/billing/index.html + 3 + Google Play Billing files and sample code + http://developer.android.com/google/play/billing/index.html - 55191 - 3c84c05c60a9cabb578cebce0515860be7ad23d2 - market_billing_r02.zip + 435718 + a133d454c992ef2a18e62fa810e8185f1be4b054 + play_billing_r03.zip @@ -890,4 +947,4 @@ August 15, 2011 - \ No newline at end of file + diff --git a/pkgs/development/androidenv/addons.nix b/pkgs/development/androidenv/addons.nix index b995b4301e9c..f26db5c2cb73 100644 --- a/pkgs/development/androidenv/addons.nix +++ b/pkgs/development/androidenv/addons.nix @@ -182,5 +182,17 @@ in }; }; + 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 index b175266ebf7b..e8e1f919fe4e 100644 --- a/pkgs/development/androidenv/androidsdk.nix +++ b/pkgs/development/androidenv/androidsdk.nix @@ -2,22 +2,22 @@ , platformTools, support, platforms, sysimages, addons , zlib_32bit , libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit -, libX11, libXext, libXrender +, libX11, libXext, libXrender, libxcb, libXau, libXdmcp , freetype, fontconfig, gtk, atk }: {platformVersions, useGoogleAPIs}: stdenv.mkDerivation { - name = "android-sdk-20.0.3"; + 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_r20.0.3-linux.tgz; - sha256 = "0xfb41xsjaf7n6b9gsrxm24jwg2fi1hzn73y69rlqm55bw1vxhc1"; + 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_r20.0.3-macosx.zip; - sha256 = "0eecaa04950d5c540f36ab4183a4cbaef3ae6a7434467bfc32febaeb796a8ff2"; + url = http://dl.google.com/android/android-sdk_r21-macosx.zip; + md5 = "67e46adca90dd18d7291443f6c15d6af"; } else throw "platform not ${stdenv.system} supported!"; @@ -32,12 +32,22 @@ stdenv.mkDerivation { '' # There are a number of native binaries. We must patch them to let them find the interpreter and libstdc++ - for i in dmtracedump emulator emulator-arm emulator-x86 hprof-conv mksdcard sqlite3 + 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 @@ -48,11 +58,19 @@ stdenv.mkDerivation { # The emulators need additional libraries, which are not in the RPATH => let's wrap them - for i in emulator emulator-arm emulator-x86 + 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 . diff --git a/pkgs/development/androidenv/default.nix b/pkgs/development/androidenv/default.nix index d2769799df13..a76deb98b6ee 100644 --- a/pkgs/development/androidenv/default.nix +++ b/pkgs/development/androidenv/default.nix @@ -32,7 +32,7 @@ rec { androidsdk = import ./androidsdk.nix { inherit (pkgs) stdenv fetchurl unzip makeWrapper; inherit (pkgs) freetype fontconfig gtk atk; - inherit (pkgs.xorg) libX11 libXext libXrender; + inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp; inherit platformTools support platforms sysimages addons; diff --git a/pkgs/development/androidenv/platform-tools.nix b/pkgs/development/androidenv/platform-tools.nix index bc4ceb4e39da..554996082909 100644 --- a/pkgs/development/androidenv/platform-tools.nix +++ b/pkgs/development/androidenv/platform-tools.nix @@ -1,15 +1,15 @@ {stdenv, stdenv_32bit, fetchurl, unzip, zlib, ncurses}: stdenv.mkDerivation { - name = "android-platform-tools-r15_rc7"; + 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_r15_rc7-linux.zip; - sha1 = "444e12ba413341282cd810d2e4bdb49975c95758"; + 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_r15_rc7-macosx.zip; - sha1 = "974eac4afbe404278fcda8f8cd39b55c82be012d"; + url = https://dl-ssl.google.com/android/repository/platform-tools_r16-macosx.zip; + sha1 = "fbb0f8d2786a83b8c3eb6df402e706e136db8fed"; } else throw "System ${stdenv.system} not supported!"; diff --git a/pkgs/development/androidenv/platforms-linux.nix b/pkgs/development/androidenv/platforms-linux.nix index c2cff1b62a2c..f544fcc08bed 100644 --- a/pkgs/development/androidenv/platforms-linux.nix +++ b/pkgs/development/androidenv/platforms-linux.nix @@ -194,5 +194,17 @@ in }; }; + 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 index 355740c4200c..a1434bbe56c1 100644 --- a/pkgs/development/androidenv/platforms-macosx.nix +++ b/pkgs/development/androidenv/platforms-macosx.nix @@ -194,5 +194,17 @@ in }; }; + 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 index 695be1d90a74..7bbbaf1e3620 100644 --- a/pkgs/development/androidenv/repository-7.xml +++ b/pkgs/development/androidenv/repository-7.xml @@ -16,69 +16,85 @@ --> - This is the Android Software Development Kit License Agreement. + 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 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. +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 You can accept this License Agreement by: +2.2 By clicking to accept, you hereby agree to the terms of this License Agreement. -(A) clicking to accept or agree to this License Agreement, where this option is made available to you; or +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. -(B) by actually using the SDK. In this case, you agree that use of the SDK constitutes acceptance of the Licensing Agreement from that point onwards. +2.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. -2.3 You may not use the SDK and may not accept the Licensing Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries including the country in which you are resident or from which you use the SDK. - -2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the Licensing Agreement or use the SDK on behalf of your employer or other entity. 3. SDK License from Google -3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non- assignable and non-exclusive license to use the SDK solely to develop applications to run on the Android platform. -3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you. +3.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.3 Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK. Except to the extent required by applicable third party licenses, you may not load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK. +3.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.4 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement. +3.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.5 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you. +3.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.6 Nothing in this License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. +3.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. -3.7 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK. 4. Use of the SDK by You + 4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications. 4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). -4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, your must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so. +4.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 the Android platform and/or applications for the Android platform, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. +4.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 for the Android Platform + +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. @@ -86,55 +102,65 @@ 7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties. + 8. Using Android APIs + 8.1 Google Data APIs 8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. 8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. + 9. Terminating this License Agreement + 9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below. 9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials. 9.3 Google may at any time, terminate this License Agreement with you if: - (A) you have breached any provision of this License Agreement; or - (B) Google is required to do so by law; or - (C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or - -(D) Google decides to no longer providing the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable. +(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.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. + +11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. + 12. Indemnification + 12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement. + 13. Changes to the License Agreement + 13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available. + 14. General Legal Terms -14.1 This License Agreement constitute the whole legal agreement between you and Google and govern your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replace any prior agreements between you and Google in relation to the SDK. + +14.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. @@ -148,7 +174,7 @@ 14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. -April 10, 2009 +November 13, 2012 @@ -180,6 +206,7 @@ April 10, 2009 4 + @@ -213,6 +240,7 @@ April 10, 2009 4 + @@ -245,6 +273,7 @@ April 10, 2009 4 + @@ -280,6 +309,7 @@ April 10, 2009 4 + @@ -315,6 +345,7 @@ April 10, 2009 4 + @@ -339,6 +370,7 @@ April 10, 2009 4 + @@ -363,6 +395,7 @@ April 10, 2009 4 + @@ -388,6 +421,7 @@ April 10, 2009 4 + @@ -412,6 +446,7 @@ April 10, 2009 4 + @@ -436,6 +471,7 @@ April 10, 2009 4 + @@ -486,6 +523,7 @@ April 10, 2009 4 + @@ -505,6 +543,7 @@ April 10, 2009 android-14_r03.zip + @@ -527,6 +566,7 @@ April 10, 2009 android-15_r03.zip + @@ -549,6 +589,30 @@ April 10, 2009 android-16_r03.zip + + + + + + 1 + Android SDK Platform 4.2 + 4.2 + 17 + + 21 + + + 9 + 1 + + + + 47886130 + c2e7c8c8db40e06b804ddb1725ac2c3555b55025 + android-17_r01.zip + + + @@ -566,6 +630,7 @@ April 10, 2009 sysimg_armv7a-14_r02.zip + @@ -581,6 +646,7 @@ April 10, 2009 sysimg_armv7a-15_r02.zip + @@ -596,6 +662,23 @@ April 10, 2009 sysimg_armv7a-16_r03.zip + + + + + + 1 + Android SDK Platform 4.2 + 17 + armeabi-v7a + + + 116831648 + 45b9344473e0a6d063c2b1fe58d8cd47d307905e + sysimg_armv7a-17_r01.zip + + + @@ -615,6 +698,7 @@ April 10, 2009 samples-2.1_r01-linux.zip + @@ -632,6 +716,7 @@ April 10, 2009 samples-2.2_r01-linux.zip + @@ -650,6 +735,7 @@ April 10, 2009 samples-2.3_r01-linux.zip + @@ -667,6 +753,7 @@ April 10, 2009 samples-2.3.3_r01-linux.zip + @@ -684,6 +771,7 @@ April 10, 2009 samples-3.0_r01-linux.zip + @@ -701,6 +789,7 @@ April 10, 2009 samples-3.1_r01-linux.zip + @@ -718,6 +807,7 @@ April 10, 2009 samples-3.2_r01-linux.zip + @@ -731,6 +821,7 @@ April 10, 2009 samples-14_r02.zip + @@ -744,6 +835,7 @@ April 10, 2009 samples-15_r02.zip + @@ -757,132 +849,125 @@ April 10, 2009 samples-16_r01.zip + + + + + + 1 + 17 + + + 14840030 + 12d58cb26503610fc05bd7618c434cc6f983bc41 + samples-17_r01.zip + + + - + - 14 + 16 - 11159472 - 6028258d8f2fba14d8b40c3cf507afa0289aaa13 - platform-tools_r14-windows.zip + 11938435 + 0d6245b685c7d303cf4a054a3d373c4427b7ad01 + platform-tools_r16-windows.zip - 10985068 - 6e2bc329c9485eb383172cbc2cde8b0c0cd1843f - platform-tools_r14-linux.zip + 12676089 + 84d563ae5e324f223f335f11bf511bf6207c05fb + platform-tools_r16-linux.zip - 11342461 - 4a015090c6a209fc33972acdbc65745e0b3c08b9 - platform-tools_r14-macosx.zip - - - - - - - - 15 - 9 - - - - 11170483 - 853afdf5f63aaac61dcfd016a7acb930b6dac377 - platform-tools_r15_rc9-windows.zip - - - 10996592 - c1aa2bc0d6f7dac7e292151ee77752bbfb10d1c5 - platform-tools_r15_rc9-linux.zip - - - 11345162 - 22ac626ec3526b606d358193a16df10179f1d4f5 - platform-tools_r15_rc9-macosx.zip + 13147351 + fbb0f8d2786a83b8c3eb6df402e706e136db8fed + platform-tools_r16-macosx.zip + - + - 20 - 0 - 3 + 21 - 12 + 16 - 90272048 - 54fb94168e631e211910f88aa40c532205730dd4 - tools_r20.0.3-windows.zip + 98982670 + 57bbfadcedbef44fc322e5e037666393668cf3fe + tools_r21-windows.zip - 82723559 - 09bc633b406ae81981e3a0db19426acbb01ef219 - tools_r20.0.3-linux.zip + 91495104 + 013b9c04407a9d73b8bf3c574327fbe870acd264 + tools_r21-linux.zip - 58197071 - 09cee5ff3226277a6f0c07dcd29cba4ffc2e1da4 - tools_r20.0.3-macosx.zip + 65767130 + fcfa3a6932f2ed0d970a0ca959bb2b4972f7d46d + tools_r21-macosx.zip + - + 21 - 9 + 0 + 1 + 1 - 15 - 9 + 16 - 98865433 - a1379cef10f33e74061f6935fd74922b0351addb - tools_r21_rc9-windows.zip + 98998088 + 1503aaf2c91cb07c0240a2db3af0de027941a4f6 + tools_r21.0.1_rc1-windows.zip - 91377922 - dde958cb26276b632a02ca6d530506c09ce4e086 - tools_r21_rc9-linux.zip + 91510079 + 183670a7f9878d8d3693d5fcf32e1357b69f0fed + tools_r21.0.1_rc1-linux.zip - 65655657 - 43803f6179707ca6bd4a37e129bcf022ebda0043 - tools_r21_rc9-macosx.zip + 65777178 + 109d4f287904875f067e021be3fd1f549e6afb67 + tools_r21.0.1_rc1-macosx.zip + - - 3 - 16 + + 1 + 17 - 164244602 - 3168152f52f5edc0c85523c875c96e7431ab4545 - docs-16_r03.zip + 171564393 + fb988cdd2beaac0dd47dc630821ccc30557c67e5 + docs-17_r01.zip + @@ -898,6 +983,7 @@ April 10, 2009 sources-14_r01.zip + @@ -911,6 +997,7 @@ April 10, 2009 sources-15_r02.zip + @@ -924,5 +1011,20 @@ April 10, 2009 sources-16_r02.zip + - \ No newline at end of file + + + + 1 + 17 + + + 18976816 + 6f1f18cd2d2b1852d7f6892df9cee3823349d43a + sources-17_r01.zip + + + + + diff --git a/pkgs/development/androidenv/support.nix b/pkgs/development/androidenv/support.nix index 0c69bf37107e..2e9690de7a26 100644 --- a/pkgs/development/androidenv/support.nix +++ b/pkgs/development/androidenv/support.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "android-support"; + name = "android-support-r11"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/support_r10.zip; - sha1 = "7c62e542d46ac3bdb89e1b90503d6afae557cf7d"; + url = https://dl-ssl.google.com/android/repository/support_r11.zip; + sha1 = "d30d182d8e4c86bb4464c03a83ccffce7bc84ecd"; }; buildCommand = '' diff --git a/pkgs/development/androidenv/sysimages.nix b/pkgs/development/androidenv/sysimages.nix index 3add0c41444b..b35b42989838 100644 --- a/pkgs/development/androidenv/sysimages.nix +++ b/pkgs/development/androidenv/sysimages.nix @@ -38,5 +38,13 @@ in }; }; + 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 From 45635e9e0f78face155f73bd6846e0e01b850e45 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 20 Dec 2012 14:45:15 +0100 Subject: [PATCH 064/140] opera: Update to 12.12 --- .../applications/networking/browsers/opera/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index e03f07c1e23a..80b09bcd8a8e 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -13,18 +13,18 @@ let in stdenv.mkDerivation rec { - name = "opera-12.11-1661"; + name = "opera-12.12-1707"; src = if stdenv.system == "i686-linux" then fetchurl { - url = "${mirror}/linux/1211/${name}.i386.linux.tar.xz"; - sha256 = "0ax2kcnl0hb7fz56c9gcjia3dnwabxl2mq2hvszmbky4i399jlkk"; + url = "${mirror}/linux/1212/${name}.i386.linux.tar.xz"; + sha256 = "1jkrhxjxa5kz4bhyma0zlnsszdn84sq4pks3x8bfcayn12m6yxkz"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "${mirror}/linux/1211/${name}.x86_64.linux.tar.xz"; - sha256 = "1pnad4kdasrmm27kg6frldipyzcfy1y610rasbqic9frzb9q8dbp"; + url = "${mirror}/linux/1212/${name}.x86_64.linux.tar.xz"; + sha256 = "0acizxgyqblcvl91dwmvi937fi1kw6whz5qgxyl1fkygbayji90v"; } else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; From 1797d396ab9355370b4b3c8113203d6532555961 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 22 Dec 2012 00:25:37 +0100 Subject: [PATCH 065/140] python-coilmq test fails --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7dad6abe4194..9c81ffc28829 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -411,7 +411,7 @@ let pythonPackages = python.modules // rec { # ValueError: Could not parse auth file: # /tmp/nix-build-.../CoilMQ-0.6.1/coilmq/tests/resources/auth.ini - #doCheck = false; + doCheck = false; meta = { description = "Simple, lightweight, and easily extensible STOMP message broker"; From c73e54263409b267b1fd28e4ac63271f64cb262e Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 21 Dec 2012 16:30:19 -0800 Subject: [PATCH 066/140] zfs-0.6.0-rc13, spl-0.6.0-rc13 --- pkgs/os-specific/linux/spl/default.nix | 6 +++--- pkgs/os-specific/linux/zfs/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index c31fc456d44f..5943a231a85d 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }: stdenv.mkDerivation { - name = "spl-0.6.0-rc12-${kernel.version}"; + name = "spl-0.6.0-rc13-${kernel.version}"; src = fetchurl { - url = http://github.com/downloads/zfsonlinux/spl/spl-0.6.0-rc12.tar.gz; - sha256 = "166853pqa294f78mn4j4x9pri79lyv3j2h8m9fzhfy7d7gxfqljk"; + url = http://zfsonlinux.org/downloads/0.6.0-rc13/spl-0.6.0-rc13.tar.gz; + sha256 = "1frbifj1yd7pznlhsqsiksip5amx4ljvasg8h80haaxk0yvvkr9b"; }; patches = [ ./install_prefix.patch ./install_prefix_2.patch ./module_prefix.patch ]; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index f2b701695ffe..b83019ea87a0 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }: stdenv.mkDerivation { - name = "zfs-0.6.0-rc12-${kernel.version}"; + name = "zfs-0.6.0-rc13-${kernel.version}"; src = fetchurl { - url = http://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc12.tar.gz; - sha256 = "1mipy6v63y8z3c5chn813x8c2r8mwyja1v19dvars3j85105xf1y"; + url = http://zfsonlinux.org/downloads/0.6.0-rc13/zfs-0.6.0-rc13.tar.gz; + sha256 = "1kpx7sa49ir93kmlrjwjzd6v4kzmda4j9cf6bv2p4s3yrmiz3cjv"; }; patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ./no_absolute_paths_to_coreutils.patch ]; From 248d160f7cb38f1c9ab68ae8f3a883e7af0eb9cb Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 22 Dec 2012 13:59:02 +0400 Subject: [PATCH 067/140] Update-walker should use basename of .upstream file for default basename of .nix --- pkgs/build-support/upstream-updater/update-walker.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/upstream-updater/update-walker.sh b/pkgs/build-support/upstream-updater/update-walker.sh index b86216161690..3935f2a43ed3 100755 --- a/pkgs/build-support/upstream-updater/update-walker.sh +++ b/pkgs/build-support/upstream-updater/update-walker.sh @@ -88,7 +88,7 @@ ensure_version () { ensure_target () { echo "Ensuring target. CURRENT_TARGET: $CURRENT_TARGET" >&2 - [ -z "$CURRENT_TARGET" ] && target default.nix + [ -z "$CURRENT_TARGET" ] && target "$(basename "$CONFIG_NAME" .upstream).nix" } ensure_name () { @@ -227,8 +227,9 @@ do_overwrite () { process_config () { CONFIG_DIR="$(directory_of "$1")" + CONFIG_NAME="$(basename "$1")" BEGIN_EXPRESSION='# Generated upstream information'; - source "$CONFIG_DIR/$(basename "$1")" + source "$CONFIG_DIR/$CONFIG_NAME" ensure_name ensure_attribute_name retrieve_version From 8630db2b55c251c22a3140e72de44af8c0b2a08d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 22 Dec 2012 14:14:48 +0400 Subject: [PATCH 068/140] More specific tracing of a relatively tricky replace once; account for default.nix being present everywhere. --- pkgs/build-support/upstream-updater/update-walker.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/upstream-updater/update-walker.sh b/pkgs/build-support/upstream-updater/update-walker.sh index 3935f2a43ed3..c4dc7713f504 100755 --- a/pkgs/build-support/upstream-updater/update-walker.sh +++ b/pkgs/build-support/upstream-updater/update-walker.sh @@ -152,8 +152,7 @@ full_path () { target () { CURRENT_TARGET="$1" - test -e "$CURRENT_TARGET" || - { [ "$CURRENT_TARGET" = "${CURRENT_TARGET#/}" ] && CURRENT_TARGET="$CONFIG_DIR/$CURRENT_TARGET"; } + { [ "$CURRENT_TARGET" = "${CURRENT_TARGET#/}" ] && CURRENT_TARGET="$CONFIG_DIR/$CURRENT_TARGET"; } echo "Target set to: $CURRENT_TARGET" } @@ -190,6 +189,12 @@ replace_once () { replacement="$3" instance="${4:-1}" + echo "Replacing once:" + echo "file: [[$file]]" + echo "regexp: [[$regexp]]" + echo "replacement: [[$replacement]]" + echo "instance: [[$instance]]" + position="$(line_position "$file" "$regexp" "$instance")" sed -re "${position}s $regexp $replacement " -i "$file" } @@ -204,7 +209,7 @@ set_var_value () { quote='"' let "$no_quotes" && quote="" - replace_once "$file" "${var} *= *.*" "${var} = ${quote}${value}${quote};" + replace_once "$file" "${var} *= *.*" "${var} = ${quote}${value}${quote};" "$instance" } do_regenerate () { From 17a4e01c69db712f86cc97f4619250ff795cc0b1 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 22 Dec 2012 14:54:22 +0400 Subject: [PATCH 069/140] Wine: update to 1.5.20 --- pkgs/misc/emulators/wine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 8e6d22dd76ae..401c9da575bf 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 = "08qhjqia2g6pm5rnawcvfz64pm2pmjaxafmwdyn950rdwrd7kbai"; + sha256 = "0c14paj2j3sswl6mpjjmy9bxnpijk095ks58x9dsycx9c8x0gqvm"; }; gecko = fetchurl { @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - version = "1.5.19"; + version = "1.5.20"; homepage = "http://www.winehq.org/"; license = "LGPL"; description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; From d476a7eac06313a1d255dd9ade3e262e6baf15af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 22 Dec 2012 17:13:32 +0100 Subject: [PATCH 070/140] distcc: making it build --- pkgs/development/tools/misc/distcc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index a46c7a695f21..8af8e0ca8001 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation { --with${if gtk != null then "" else "out"}-gtk --without-gnome --enable-rfc2553 + --disable-Werror # a must on gcc 4.6 ) installFlags="sysconfdir=$out/etc"; ''; From c90c96572fd6d84cef58c01089f04b2ae46a6ced Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 22 Dec 2012 17:21:17 +0100 Subject: [PATCH 071/140] i3: update to 4.4 --- pkgs/applications/window-managers/i3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 042e1a323a6d..94ac84f838c2 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.3"; + version = "4.4"; src = fetchurl { url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "895bf586092535efb2bc723ba599c71a027768115e56052f111fc8bb148db925"; + sha256 = "06s8gzcxxh06zp1586kp4bxaj8yj5i9jacwg0nizbmmnx94mg1wr"; }; buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm From 03f42614e81a4d8e8701c2d6f3008fb175880fe7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Dec 2012 12:43:18 +0100 Subject: [PATCH 072/140] ikiwiki: update to version 3.20121212 --- pkgs/applications/misc/ikiwiki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index df59145e51fd..bbc8aaac49bd 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; - version = "3.20121017"; + version = "3.20121212"; lib = stdenv.lib; in @@ -32,7 +32,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; - sha256 = "c0bb6ef9340ebc7eec40812b091700b2bcfd61e7321a22f41026ce130e877028"; + sha256 = "1frsr2sqzsnagbxvyjsgk4nrl1p1048vybsd1zw1ln1mqik31ydz"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate From 4403215806855c6eaf16e9a20f7a5ebc36dc364f Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Sun, 23 Dec 2012 18:20:34 +0200 Subject: [PATCH 073/140] AVR GCC: enable C++ support (makes it usable with Arduino) - GCC version bumped, 4.6.1 had some arduino related bug --- .../misc/avr-gcc-with-avr-libc/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix index 83e800faa2c3..3c28ed04dba2 100644 --- a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix +++ b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix @@ -6,13 +6,18 @@ stdenv.mkDerivation { name = "avr-gcc-libc"; srcBinutils = fetchurl { - url = "mirror://gnu/binutils/binutils-2.21.tar.bz2"; - sha256 = "1iyhc42zfa0j2gaxy4zvpk47sdqj4rqvib0mb8597ss8yidyrav0"; + url = "mirror://gnu/binutils/binutils-2.21.1.tar.bz2"; + sha256 = "0m7nmd7gc9d9md43wbrv65hz6lbi2crqwryzpigv19ray1lzmv6d"; }; srcGCC = fetchurl { - url = "mirror://gcc/releases/gcc-4.6.1/gcc-core-4.6.1.tar.bz2"; - sha256 = "0bbb8f754a31f29013f6e9ad4c755d92bb0f154a665c4b623e86ae7174d98e33"; + url = "mirror://gcc/releases/gcc-4.6.3/gcc-core-4.6.3.tar.bz2"; + sha256 = "1hai090f0svf886nyhn4glmfw54v9lz88w2izkx5iqhd3j400gi8"; + }; + + srcGCCGPP = fetchurl { + url = "mirror://gcc/releases/gcc-4.6.3/gcc-g++-4.6.3.tar.bz2"; + sha256 = "1s199gb6p65r5k69cdfqqcz5hgifw9bhyj65n2b91s80x4rwgq5k"; }; srcAVRLibc = fetchurl { @@ -55,10 +60,11 @@ stdenv.mkDerivation { cd $TMP tar jxf $srcGCC + tar jxf $srcGCCGPP cd gcc-* mkdir obj-avr cd obj-avr - ../configure --target=avr --prefix="$prefix" --disable-nls --enable-languages=c --disable-libssp --with-dwarf2 + ../configure --target=avr --prefix="$prefix" --disable-nls --enable-languages=c,c++ --disable-libssp --with-dwarf2 make $MAKE_FLAGS make install From dde7b978d6acc6189f11dfff724c0d495457e53e Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Sun, 23 Dec 2012 18:21:51 +0200 Subject: [PATCH 074/140] inotool: add avr-gcc-libc to inputs --- pkgs/development/arduino/ino/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix index dc658016acb4..6b88a8deaea7 100644 --- a/pkgs/development/arduino/ino/default.nix +++ b/pkgs/development/arduino/ino/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, minicom, avrdude, arduino_core }: +{ stdenv, fetchurl, buildPythonPackage, minicom, avrdude, arduino_core, avrgcclibc }: buildPythonPackage { name = "ino-0.3.4"; @@ -16,7 +16,7 @@ buildPythonPackage { echo "Patching Arduino distribution path" sed -i 's@/usr/local/share/arduino@${arduino_core}/share/arduino@g' ino/environment.py ''; - + doCheck = false; meta = { From 49e4824b8aa02e6c9231f306f99f68203373423a Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Sun, 16 Dec 2012 19:29:16 +0100 Subject: [PATCH 075/140] Update HOL Light (and fix installation) --- pkgs/applications/science/logic/hol_light/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 5d9866a650bc..e62751cde9d4 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation { - name = "hol_light-20120529"; + name = "hol_light-20121213"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; - rev = "141"; - sha256 = "a11d7e5db7c6035a2debcf9e73f43c6322389aeac5bc4d123ebf58918052a57f"; + rev = "153"; + sha256 = "1n4da5k3jya8mf7dgif8cl5sr2dqf6vl21fw1fcdna215v2x1rc0"; }; buildInputs = [ ocaml findlib camlp5 ]; From 6a15e8da08a5f5fc3909f875a66d0d954674f7c6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Dec 2012 19:51:05 +0100 Subject: [PATCH 076/140] haskell-bmp: update 1.2.3.x branch to 1.2.3.4 --- .../libraries/haskell/bmp/{1.2.3.2.nix => 1.2.3.4.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/libraries/haskell/bmp/{1.2.3.2.nix => 1.2.3.4.nix} (81%) diff --git a/pkgs/development/libraries/haskell/bmp/1.2.3.2.nix b/pkgs/development/libraries/haskell/bmp/1.2.3.4.nix similarity index 81% rename from pkgs/development/libraries/haskell/bmp/1.2.3.2.nix rename to pkgs/development/libraries/haskell/bmp/1.2.3.4.nix index 64c13f15ee10..404229cf7636 100644 --- a/pkgs/development/libraries/haskell/bmp/1.2.3.2.nix +++ b/pkgs/development/libraries/haskell/bmp/1.2.3.4.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "bmp"; - version = "1.2.3.2"; - sha256 = "0lr6ys15ap3myzv48xmcy0bv17s4x2drskqz3kmbp06knrx9y1bh"; + version = "1.2.3.4"; + sha256 = "134nfchsw4q1k3kr09i5w8jxbr659as4523gs5m2dch15wrmrhf6"; buildDepends = [ binary ]; meta = { homepage = "http://code.ouroborus.net/bmp"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8cfd3f72d139..f5b29d39c4b6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -523,7 +523,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {}; bmp_1_2_2_1 = callPackage ../development/libraries/haskell/bmp/1.2.2.1.nix {}; - bmp_1_2_3_2 = callPackage ../development/libraries/haskell/bmp/1.2.3.2.nix {}; + bmp_1_2_3_4 = callPackage ../development/libraries/haskell/bmp/1.2.3.4.nix {}; bmp = self.bmp_1_2_2_1; # later versions work only with ghc 7.6 and beyond Boolean = callPackage ../development/libraries/haskell/Boolean {}; From 275cfb8a802efc138f8153cfe9fc03d8f9fa65cf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Dec 2012 20:00:08 +0100 Subject: [PATCH 077/140] haskell-hashable: add version 1.2.0.2 --- .../haskell/hashable/{default.nix => 1.1.2.5.nix} | 0 .../libraries/haskell/hashable/1.2.0.2.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 +++- 3 files changed, 18 insertions(+), 1 deletion(-) rename pkgs/development/libraries/haskell/hashable/{default.nix => 1.1.2.5.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/hashable/1.2.0.2.nix diff --git a/pkgs/development/libraries/haskell/hashable/default.nix b/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix similarity index 100% rename from pkgs/development/libraries/haskell/hashable/default.nix rename to pkgs/development/libraries/haskell/hashable/1.1.2.5.nix diff --git a/pkgs/development/libraries/haskell/hashable/1.2.0.2.nix b/pkgs/development/libraries/haskell/hashable/1.2.0.2.nix new file mode 100644 index 000000000000..10f9c0ec6206 --- /dev/null +++ b/pkgs/development/libraries/haskell/hashable/1.2.0.2.nix @@ -0,0 +1,15 @@ +{ 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/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f5b29d39c4b6..3d23010bbb61 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -910,7 +910,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); happstackHamlet = callPackage ../development/libraries/haskell/happstack/happstack-hamlet.nix {}; - hashable = callPackage ../development/libraries/haskell/hashable {}; + 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 = self.hashable_1_1_2_5; hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {}; From a5576114b6ab0dd7e08225a7b4a24daa3d564f5f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Dec 2012 20:00:48 +0100 Subject: [PATCH 078/140] haskell-heist: jailbreak to support latest version of 'hashable' --- pkgs/development/libraries/haskell/heist/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index 6a6d0d7ddf3b..4191536407e1 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { filepath hashable MonadCatchIOTransformers mtl random text time unorderedContainers vector xmlhtml ]; + jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "An Haskell template system supporting both HTML5 and XML"; From 5defad00b56b4eb531dd46772f6699afd5fd0639 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Dec 2012 20:02:48 +0100 Subject: [PATCH 079/140] haskell-snap: jailbreak to support latest version of 'hashable' --- pkgs/development/libraries/haskell/snap/snap.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index f2a90a5802cd..30a2d34a99ef 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -19,6 +19,7 @@ cabal.mkDerivation (self: { snapCore snapServer stm syb text time transformers unorderedContainers vector vectorAlgorithms xmlhtml ]; + jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; From ccdd75a394ce830f67133600f8c0099749f90ff3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Dec 2012 20:14:09 +0100 Subject: [PATCH 080/140] haskell-Boolean: update to version 0.1.2 --- pkgs/development/libraries/haskell/Boolean/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix index 45661b815b1e..4503c0fec548 100644 --- a/pkgs/development/libraries/haskell/Boolean/default.nix +++ b/pkgs/development/libraries/haskell/Boolean/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Boolean"; - version = "0.1.1"; - sha256 = "1id075slxgz67gv382vpr7cr19i59bjajvb60iv2xrhh73gp08yv"; + version = "0.1.2"; + sha256 = "07mhg9zf98hlm7qq9gdbrq68a8rpvdby1jwmgrvf3nv2k47dimx6"; meta = { description = "Generalized booleans"; license = self.stdenv.lib.licenses.bsd3; From 84b63145d24c41868252c02438294fb16848368e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Dec 2012 20:14:09 +0100 Subject: [PATCH 081/140] haskell-configurator: update to version 0.2.0.2 --- pkgs/development/libraries/haskell/configurator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/configurator/default.nix b/pkgs/development/libraries/haskell/configurator/default.nix index 3618f5980554..775c2e5027f8 100644 --- a/pkgs/development/libraries/haskell/configurator/default.nix +++ b/pkgs/development/libraries/haskell/configurator/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "configurator"; - version = "0.2.0.1"; - sha256 = "02w6f5q2xkpc3kgqz6a58g7yr0q4xd8ck1b6lr64ahvqwsjbxy6p"; + version = "0.2.0.2"; + sha256 = "011rgd48gv4idkh2dwg4mlyx3s6pgm1263xq5ixsa4sg3jqh9d8b"; buildDepends = [ attoparsec hashable text unixCompat unorderedContainers ]; From 199914f70e9e8f4d8a76956a523c81811d92ca34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Dec 2012 20:14:09 +0100 Subject: [PATCH 082/140] haskell-cryptohash: update to version 0.8.2 --- pkgs/development/libraries/haskell/cryptohash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index e0724e49ccbf..61f2f2a050d2 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cryptohash"; - version = "0.8.1"; - sha256 = "1xxnmxfpd77ahyjhy2fq3fxhiivhj6k12v1z72ndyhrd3369zqky"; + version = "0.8.2"; + sha256 = "0mym1q5sa1pqfffy0p8v12lfim1dlaczppw3c3wjhxgs222303wj"; buildDepends = [ cereal cryptoApi tagged ]; meta = { homepage = "http://github.com/vincenthz/hs-cryptohash"; From 3f1cc9ba24815d657700c3db91811c609b6df896 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Dec 2012 20:14:09 +0100 Subject: [PATCH 083/140] haskell-diagrams-contrib: update to version 0.6.0.1 --- pkgs/development/libraries/haskell/diagrams/contrib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index b31af6bd3838..c646c5e3943d 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "diagrams-contrib"; - version = "0.6"; - sha256 = "059ljwsbrkzj2wvx9q4viinz46nw5lf4yjmx2c1dmwaqfz3i7j7i"; + version = "0.6.0.1"; + sha256 = "1wrfdsfb2yj93wq2ykxjyg6g0q56bmxd2rc6r3gd0zcs8kiimaar"; buildDepends = [ colour dataDefault diagramsLib forceLayout lens mtl vectorSpace ]; From 523f5d6752ebfa9af3de4be4c26afd18e210449a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Dec 2012 20:14:09 +0100 Subject: [PATCH 084/140] haskell-hsemail: update to version 1.7.3 --- pkgs/development/libraries/haskell/hsemail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix index f69789772ace..ac22e94abb8d 100644 --- a/pkgs/development/libraries/haskell/hsemail/default.nix +++ b/pkgs/development/libraries/haskell/hsemail/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hsemail"; - version = "1.7.2"; - sha256 = "1bl017gfyvjvxs9z1fns6sknk1l55905r82i31aqbz9qyaj70gzx"; + version = "1.7.3"; + sha256 = "0i9qh4rbgcgpjiz7nj8rrmj0ai53s420dskfvwrbwl4j6z67f7la"; buildDepends = [ mtl parsec ]; meta = { homepage = "http://gitorious.org/hsemail"; From fbc7ee57b2ce2cb55c9e370ef6ff21a74709d411 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Dec 2012 20:14:09 +0100 Subject: [PATCH 085/140] haskell-hslogger-template: update to version 2.0.2 --- .../libraries/haskell/hslogger-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hslogger-template/default.nix b/pkgs/development/libraries/haskell/hslogger-template/default.nix index a7b1a51b7057..be78bea938cf 100644 --- a/pkgs/development/libraries/haskell/hslogger-template/default.nix +++ b/pkgs/development/libraries/haskell/hslogger-template/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hslogger-template"; - version = "2.0.1"; - sha256 = "1m8h4i8cxxw83vhbw61njvv86qdcff6zi3bf0nyhc4cq7pfrzqvj"; + version = "2.0.2"; + sha256 = "0qkyclj9fajvzbfcs0ik8ncy66x916r40jd85r4wi5nh482i7sp3"; buildDepends = [ hslogger mtl ]; meta = { description = "Automatic generation of hslogger functions"; From 84e30e5f2a523712fc2eb08152428e07de69262c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Dec 2012 20:14:09 +0100 Subject: [PATCH 086/140] haskell-http-conduit: update to version 1.8.5.2 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index b0755946eef9..e467d572f9d8 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.5.1"; - sha256 = "1v70rslnga063mlpfs1w03y1s4x7kfisjqwbcbczynhz15s9hymx"; + version = "1.8.5.2"; + sha256 = "0c1a6iknvi34sh97j7cfzwyikcz0kdz4vgsc47lr7c2a75gl0via"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie From 857aaa9fa9b7e751b57bc814b5d7fc352664dcc2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Dec 2012 20:14:09 +0100 Subject: [PATCH 087/140] haskell-lens: update to version 3.7.1.2 --- pkgs/development/libraries/haskell/lens/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 6a2ca0866b7c..dd9966a0d58d 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"; - sha256 = "16rgfv21f7sl7n6gqn4750i3yv7w972ybn883yr474y4xwhhyh6w"; + version = "3.7.1.2"; + sha256 = "1hapcnmyqyc3645gsy1ikwzm2srbbznps6yrfr02y2lcbnjpn3g6"; buildDepends = [ comonad comonadsFd comonadTransformers filepath hashable mtl parallel semigroups split text transformers unorderedContainers From 35e3e9a007bdb3fa6d17bda19cc963a203b878d9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Dec 2012 20:14:09 +0100 Subject: [PATCH 088/140] haskell-mime-types: update to version 0.1.0.1 --- pkgs/development/libraries/haskell/mime-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mime-types/default.nix b/pkgs/development/libraries/haskell/mime-types/default.nix index 8359d6dc181d..75eb11e6a129 100644 --- a/pkgs/development/libraries/haskell/mime-types/default.nix +++ b/pkgs/development/libraries/haskell/mime-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mime-types"; - version = "0.1.0.0"; - sha256 = "0xc36pr84nszyych3jd8sl6kj1grsyv8ci8v7ilrbpnw7ngbkw1p"; + version = "0.1.0.1"; + sha256 = "1a34ckmv8qcyk38jydxwph59zcrhnwaah1h6pzn112kysjqjgcsl"; buildDepends = [ text ]; meta = { homepage = "https://github.com/yesodweb/wai"; From 34d6fad8e751190100dfe3160c062a40c9482fc5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Dec 2012 20:14:10 +0100 Subject: [PATCH 089/140] haskell-network-conduit: update to version 0.6.2.1 --- .../development/libraries/haskell/network-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix index 8eff213c463a..1b2187daaafb 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"; - sha256 = "1v9f2x4ryqiwird60n4rkj0jlyn3lqkfs40956xi11r7p656l6q6"; + version = "0.6.2.1"; + sha256 = "1pkqkkj18yn31dmxcc8xfq2drg2jm9169my0s3jsxjbyxsyq58l6"; buildDepends = [ conduit liftedBase monadControl network transformers ]; From 4bfdfe35ec4912ae22dea6315330ea92b2adc36a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Dec 2012 20:14:10 +0100 Subject: [PATCH 090/140] haskell-semigroups: update to version 0.8.5 --- pkgs/development/libraries/haskell/semigroups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index 240062493e30..1a412aec908b 100644 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "semigroups"; - version = "0.8.4.1"; - sha256 = "05wv5amgg3nqr1if936zl330sv1k4i9p8xzdmgxsmchp4lshyr6n"; + version = "0.8.5"; + sha256 = "0dnxqqxfyxj0mpy524nvgwagsp6ynadmh2yr4k5159rzbg2xgz90"; meta = { homepage = "http://github.com/ekmett/semigroups/"; description = "Haskell 98 semigroups"; From 0a84d46d8f8b31f2f16c7fabc918bbb53cbdbe43 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Dec 2012 20:14:10 +0100 Subject: [PATCH 091/140] haskell-shelly: update to version 0.15.2 --- pkgs/development/libraries/haskell/shelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 41953629e0b4..08cbf7e5e06e 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "0.15.0"; - sha256 = "138x2c76ynv0kl0kg86pawnnlk6973dqkaapycb30rf44p1m53j2"; + version = "0.15.2"; + sha256 = "0mbbg55rv1b5xmkpdk87n6p0d7dhn5qmk7f7344cmwgvhdgfpkhg"; buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; From 31c29086510a87d4c783950020ba22da7a4a871e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Dec 2012 20:14:10 +0100 Subject: [PATCH 092/140] haskell-strptime: update to version 1.0.10 --- pkgs/development/libraries/haskell/strptime/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/strptime/default.nix b/pkgs/development/libraries/haskell/strptime/default.nix index bb30fe71cc37..c092f0c0d15b 100644 --- a/pkgs/development/libraries/haskell/strptime/default.nix +++ b/pkgs/development/libraries/haskell/strptime/default.nix @@ -1,10 +1,10 @@ -{ cabal, time }: +{ cabal, text, time }: cabal.mkDerivation (self: { pname = "strptime"; - version = "1.0.8"; - sha256 = "0cd4wzrg9zpnwrfpp6lxs1ib06h0fcsdqd3idsw663wr5lllfgdq"; - buildDepends = [ time ]; + version = "1.0.10"; + sha256 = "1f42yf49fqr2fyjfakscmmlnmw3w5rg7wyy6gjyrf0gcgsh0h9fd"; + buildDepends = [ text time ]; meta = { description = "Efficient parsing of LocalTime using a binding to C's strptime, with some extra features (i.e. fractional seconds)"; license = self.stdenv.lib.licenses.bsd3; From 38fa2ad62ad796320bb8f5ceacabf0bc1af58ff2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Dec 2012 20:14:10 +0100 Subject: [PATCH 093/140] haskell-tls: update to version 1.0.3 --- pkgs/development/libraries/haskell/tls/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 72466f5d8e83..fbd20bebdf1e 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { buildDepends = [ cereal certificate cryptoApi cryptocipher cryptohash mtl network ]; + jailbreak = true; meta = { homepage = "http://github.com/vincenthz/hs-tls"; description = "TLS/SSL protocol native implementation (Server and Client)"; From ee4812c29d3f544fece220dc90364244733345ce Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Dec 2012 20:14:10 +0100 Subject: [PATCH 094/140] haskell-unix-compat: update to version 0.4.1.0 --- pkgs/development/libraries/haskell/unix-compat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix index 7c5cb6c63c4f..582764204818 100644 --- a/pkgs/development/libraries/haskell/unix-compat/default.nix +++ b/pkgs/development/libraries/haskell/unix-compat/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unix-compat"; - version = "0.4.0.0"; - sha256 = "0xhhvqdjcmcyavf0g2q2sjghj2h4si1ijg4nc4s8kidbd957z9r8"; + version = "0.4.1.0"; + sha256 = "155m3zg692zbfyck4njx1vzvb5vgs0dkzyzlqf2x78ds6j9bzjzi"; meta = { homepage = "http://github.com/jystic/unix-compat"; description = "Portable POSIX-compatibility layer"; From 95ebd465c62ac01335421101b4215f98ee63ae75 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Dec 2012 20:14:10 +0100 Subject: [PATCH 095/140] haskell-vault: update to version 0.2.0.4 --- pkgs/development/libraries/haskell/vault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix index 398027931038..6039e7424772 100644 --- a/pkgs/development/libraries/haskell/vault/default.nix +++ b/pkgs/development/libraries/haskell/vault/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vault"; - version = "0.2.0.3"; - sha256 = "1ky7c5hg7spa545xhgs4ahf07w60k3x149087mla1dxl8lpcz70i"; + version = "0.2.0.4"; + sha256 = "1a63rarksp4waj64b9kv8q77wbhdnsnxahkixl1klp25hkp8aan3"; buildDepends = [ hashable unorderedContainers ]; meta = { homepage = "https://github.com/HeinrichApfelmus/vault"; From 3090910aa371f76d51540ccb158b9d433fe653c5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Dec 2012 20:14:10 +0100 Subject: [PATCH 096/140] haskell-yaml: update to version 0.8.1.2 --- pkgs/development/libraries/haskell/yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 0271f6874f34..6ab227a205d2 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.1.1"; - sha256 = "0n2m205f0jq8v4g84bw642vdqqr68m3jklv98rr21s8r2fyy7937"; + version = "0.8.1.2"; + sha256 = "1prk1nxzb84svqr552pgrfxg8kd34zvnh35js8l0q58y9rifxyq0"; buildDepends = [ aeson attoparsec conduit resourcet text transformers unorderedContainers vector From 4cd591fbf95c74b26a44f28545ac50d4bd5f4188 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Dec 2012 20:14:10 +0100 Subject: [PATCH 097/140] haskell-yesod-auth: update to version 1.1.3 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 7d4d208a9f54..dfa96bf2b13e 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.1.2.2"; - sha256 = "16g2lnnwp5219i77fb4pv2y8ljz4msflj38mvh0zw3x93747baf7"; + version = "1.1.3"; + sha256 = "0rlp56jsb0cwm1z303b7l9iy5hbip18vlm7fisna4agbf4rj2k0z"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup hamlet httpConduit liftedBase mimeMail network persistent persistentTemplate pureMD5 From 5bf938a635ac6f85d4520c4c01eb7cecdc31e744 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Dec 2012 11:08:52 +0100 Subject: [PATCH 098/140] lua-5.1: build liblua.so and install the pkgconfig file and the documentation --- pkgs/development/interpreters/lua-5/5.1.nix | 23 +++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index e3dfd4711a17..8b1e1529095e 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -1,5 +1,12 @@ { stdenv, fetchurl, readline}: +let + dsoPatch = fetchurl { + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/lua-arch.patch?h=packages/lua51"; + sha256 = "11fcyb4q55p4p7kdb8yp85xlw8imy14kzamp2khvcyxss4vw8ipw"; + name = "lua-arch.patch"; + }; +in stdenv.mkDerivation rec { name = "lua-5.1.5"; @@ -10,7 +17,19 @@ stdenv.mkDerivation rec { buildInputs = [ readline ]; - configurePhase = "makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux )"; + patches = [ dsoPatch ]; + + configurePhase = '' + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-O2 -fPIC" LDLAGS="-fPIC" ) + installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.5.1" INSTALL_DATA='cp -d' ) + ''; + + postInstall = '' + mkdir -p "$out/share/doc/lua" "$out/lib/pkgconfig" + mv "etc/lua.pc" "$out/lib/pkgconfig/" + mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/" + rmdir $out/{share,lib}/lua/5.1 $out/{share,lib}/lua + ''; meta = { homepage = "http://www.lua.org"; @@ -25,6 +44,6 @@ stdenv.mkDerivation rec { ''; license = "MIT"; platforms = stdenv.lib.platforms.unix; - maintainers = [ ]; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } From 591f85f17e38800aacfe6d6726b6098563927166 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Dec 2012 11:26:53 +0100 Subject: [PATCH 099/140] celestia: add version 1.6.1 --- .../science/astronomy/celestia/default.nix | 62 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++ 2 files changed, 68 insertions(+) create mode 100644 pkgs/applications/science/astronomy/celestia/default.nix diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix new file mode 100644 index 000000000000..22180e9a3f7d --- /dev/null +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -0,0 +1,62 @@ +{ stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu +, lua, mesa, pkgconfig, perl, automake, autoconf, libtool, gettext +}: + +let + name = "celestia-1.6.1"; + + gcc46Patch = fetchurl { + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/celestia-1.6.1-gcc46.patch?h=packages/celestia"; + sha256 = "1q840ip5h2q93r0d68jwrvf40ns5qzqss9vzd6xnwvs3wa77m5wp"; + name = "celestia-1.6.1-gcc46.patch"; + }; + + libpng15Patch = fetchurl { + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/celestia-1.6.1-libpng15.patch?h=packages/celestia"; + sha256 = "19yqbi5k944d3jm0q2mvcfg52kicy4j347gj62dyaijzj505x4pm"; + name = "celestia-1.6.1-libpng15.patch"; + }; + + linkingPatch = fetchurl { + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/celestia-1.6.1-linking.patch?h=packages/celestia"; + sha256 = "1qzv18b2prqbhy21js5bnf7vwkmrq1dmrq8r0wab7v10axjqdv35"; + name = "celestia-1.6.1-linking.patch"; + }; + + gcc47Patch = fetchurl { + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/gcc-4.7-fixes.diff?h=packages/celestia"; + sha256 = "1jqkafwrg1829cwqvlxxkqbf42zqfsgpqd8a5b2qlzma5napdmg5"; + name = "gcc-4.7-fixes.diff"; + }; +in +stdenv.mkDerivation { + inherit name; + + src = fetchurl { + url = "mirror://sourceforge/celestia/${name}.tar.gz"; + sha256 = "1i1lvhbgllsh2z8i6jj4mvrjak4a7r69psvk7syw03s4p7670mfk"; + }; + + buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu mesa pkgconfig lua + perl automake autoconf libtool gettext ]; + + patchPhase = '' + patch -Np0 -i "${gcc46Patch}" + patch -Np0 -i "${libpng15Patch}" + patch -Np1 -i "${linkingPatch}" + patch -Np1 -i "${gcc47Patch}" + autoreconf + configureFlagsArray=( --with-gtk --with-lua=${lua} CFLAGS="-O2 -fsigned-char" CXXFLAGS="-O2 -fsigned-char" ) + ''; + + enableParallelBuilding = true; + + meta = { + description = "Free space simulation"; + homepage = "http://www.shatters.net/celestia/"; + license = stdenv.lib.licenses.gpl2; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93eee9d91702..569aa675a8ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8585,6 +8585,12 @@ let ### SCIENCE + celestia = callPackage ../applications/science/astronomy/celestia { + lua = lua5_1; + inherit (xlibs) libXmu; + inherit (pkgs.gnome) gtkglext; + }; + xplanet = callPackage ../applications/science/astronomy/xplanet { }; gravit = callPackage ../applications/science/astronomy/gravit { }; From 8825cd6891602595410a343bc11403420cf7c90e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Dec 2012 11:34:57 +0100 Subject: [PATCH 100/140] haskell-yesod-form: the haddock documentation build errors have been fixed --- pkgs/development/libraries/haskell/yesod-form/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 69ef6b1f4923..2d0a099002cb 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -14,7 +14,6 @@ cabal.mkDerivation (self: { shakespeareJs text time transformers wai xssSanitize yesodCore yesodPersistent ]; - noHaddock = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Form handling support for Yesod Web Framework"; From 2818d6961d154e87d981c428bf9e74bdb65125d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Dec 2012 11:35:03 +0100 Subject: [PATCH 101/140] haskell-optparse-applicative: update to version 0.5.2.1 --- .../libraries/haskell/optparse-applicative/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix index 3af9dd248cb9..3e04a33990e3 100644 --- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix +++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "optparse-applicative"; - version = "0.4.3"; - sha256 = "1zsydxgq3lcgzrf9iwas3gkjy0vxn4z2cj6h3m63h0qqa26sfcwz"; + version = "0.5.2.1"; + sha256 = "0w4mk851mx8dch8lnck0g82asmzrsc47xrf34jygh0f6v4kbj40i"; buildDepends = [ transformers ]; meta = { homepage = "https://github.com/pcapriotti/optparse-applicative"; From 6cf77ad122be25e69cfeb6180220bd423ce58545 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Dec 2012 11:35:03 +0100 Subject: [PATCH 102/140] haskell-parallel-io: update to version 0.3.3 --- pkgs/development/libraries/haskell/parallel-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/parallel-io/default.nix b/pkgs/development/libraries/haskell/parallel-io/default.nix index 0672a01f361c..56c1a1306964 100644 --- a/pkgs/development/libraries/haskell/parallel-io/default.nix +++ b/pkgs/development/libraries/haskell/parallel-io/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "parallel-io"; - version = "0.3.2.2"; - sha256 = "04swl1mp704ijrpmvw800x0fpzmrbd382p45kvqzynmkgqzx33a3"; + version = "0.3.3"; + sha256 = "0i86x3bf8pjlg6mdg1zg5lcrjpg75pbqs2mrgrbp4z4bkcmw051s"; isLibrary = true; isExecutable = true; buildDepends = [ extensibleExceptions random ]; From 6974fbdfa23d79a6835ac53dc4749f3dfe48bfe3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Dec 2012 11:35:03 +0100 Subject: [PATCH 103/140] haskell-persistent-postgresql: update to version 1.1.2 --- .../libraries/haskell/persistent-postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix index 8731a83ac896..e09a9b8d161e 100644 --- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-postgresql"; - version = "1.1.1"; - sha256 = "19ywyf0d7n6z8ws7s7jc958g30aiy6il43qwvqh92q1cz8bd1mj9"; + version = "1.1.2"; + sha256 = "06ylfijm59akdzb6kd0qs5kw3qyn5ig7q9wbj0a8sgkf8hs2mmad"; buildDepends = [ aeson conduit monadControl persistent postgresqlLibpq postgresqlSimple text time transformers From 623262bebe16b9d42e56114b53431b067ca4416c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Dec 2012 11:35:03 +0100 Subject: [PATCH 104/140] haskell-persistent-sqlite: update to version 1.1.2 --- .../libraries/haskell/persistent-sqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix index 1e03cfdb0365..2da2c06a2439 100644 --- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-sqlite"; - version = "1.1.0"; - sha256 = "0ycs8qb8vksnypzpxi0ypxk7akl68hdwyxzkbchyy6zh3zv2pa4z"; + version = "1.1.2"; + sha256 = "0pb52k7a7js71s4d2mynd62i8gk99az7y72rycs0xg9r9cr081p3"; buildDepends = [ aeson conduit monadControl persistent text transformers ]; From 9621ba5f917dc04b778f8928387d22821feb76d8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Dec 2012 11:35:03 +0100 Subject: [PATCH 105/140] haskell-persistent-template: update to version 1.1.2 --- .../libraries/haskell/persistent-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 8bdf010215bf..f19a38a55f0d 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "1.1.1"; - sha256 = "18rxjqgmjzx0j0sbg9ms779pkq264vf8w0qz679xsyn98wc95i36"; + version = "1.1.2"; + sha256 = "1hz8cxx2a84c93x364vgahmv4xd3cbpjx4j7si5n0pasyq3clbvr"; buildDepends = [ aeson monadControl persistent text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; From 2d32eb9d89fceaf825794f147687fabfe84351bb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Dec 2012 11:35:03 +0100 Subject: [PATCH 106/140] haskell-persistent: update to version 1.1.2 --- pkgs/development/libraries/haskell/persistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 45b1da1ca79b..817047fd5c08 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "1.1.0.1"; - sha256 = "07b9d9fcah3k03r2pm6mfl3qsdp4s9gbb376by3122nvc26w6sjc"; + version = "1.1.2"; + sha256 = "1khzbmdw3ham8ig58srvcdsz4j5r9mg2s2ackm1f40851fa0642r"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit liftedBase monadControl monadLogger pathPieces poolConduit From ff0f2ba3c6520fe2c92550d2447ad022074a4f09 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Dec 2012 11:35:03 +0100 Subject: [PATCH 107/140] haskell-pretty-show: update to version 1.3.2 --- pkgs/development/libraries/haskell/pretty-show/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pretty-show/default.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix index 577848ab459d..791d8c59b749 100644 --- a/pkgs/development/libraries/haskell/pretty-show/default.nix +++ b/pkgs/development/libraries/haskell/pretty-show/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pretty-show"; - version = "1.2"; - sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l"; + version = "1.3.2"; + sha256 = "0m3kw4d68gd1mhlgi5vy3k2cqi9f0i4s502m2sgy4pww45fjllxy"; isLibrary = true; isExecutable = true; buildDepends = [ haskellLexer ]; From 3a8f40b2001f03b4f3cef60aa89e3ce2c37c5ad9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Dec 2012 11:35:03 +0100 Subject: [PATCH 108/140] haskell-shelly: update to version 0.15.3.3 --- pkgs/development/libraries/haskell/shelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 08cbf7e5e06e..a0ae240f6718 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "0.15.2"; - sha256 = "0mbbg55rv1b5xmkpdk87n6p0d7dhn5qmk7f7344cmwgvhdgfpkhg"; + version = "0.15.3.3"; + sha256 = "0g062rzpcksnszcjln9z39lw9cd084k0zs9pbr23s1985xkf6cj7"; buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; From da0af2a322266c138070730e44313d317b73c2fd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Dec 2012 11:35:04 +0100 Subject: [PATCH 109/140] haskell-yesod: update to version 1.1.7.1 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 72f19e5a5c20..717bba2853c9 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.1.7"; - sha256 = "1qcvmy8ichri9ivfkanj4gp687lwymgi170sbdzwf5phy34bhkc5"; + version = "1.1.7.1"; + sha256 = "01sic3s3mwn67das6cffvndpf4c6n612hd183bvw4a80h7mbaqxz"; isLibrary = true; isExecutable = true; buildDepends = [ From dc4cb4303ee84ee3b6dd79d6e46d14456af62784 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Dec 2012 11:35:04 +0100 Subject: [PATCH 110/140] haskell-zeromq3-haskell: update to version 0.2 --- .../development/libraries/haskell/zeromq3-haskell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix index 44b04397c3f4..4db350f93b52 100644 --- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zeromq3-haskell"; - version = "0.1.4"; - sha256 = "026b18ligbrfbg4x7vivk6r2gj9rj3vy6pm3h0s81571h6lk3dhx"; + version = "0.2"; + sha256 = "12qljfkcd4l9h3l80jibxgw2an6v782w0sxwvzxqmma29jv6hvky"; extraLibraries = [ zeromq ]; meta = { homepage = "http://github.com/twittner/zeromq-haskell/"; From 5827744a0e09c9f259ed23e4485f6e70209a518c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Dec 2012 11:35:04 +0100 Subject: [PATCH 111/140] haskell-splot: update to version 0.3.7 --- pkgs/development/tools/haskell/splot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix index 9f35054b4c01..dcab346aab58 100644 --- a/pkgs/development/tools/haskell/splot/default.nix +++ b/pkgs/development/tools/haskell/splot/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "splot"; - version = "0.3.6"; - sha256 = "0fxjji6b0v3hf4pn1cbh88nvp4n4bfgfkiga6l149flk5nmlapqx"; + version = "0.3.7"; + sha256 = "0mal7zphwzycxm2i0v87vn6gvdb582zy51prngj4w11xgpxd7dg1"; isLibrary = false; isExecutable = true; buildDepends = [ From b0e92ac3889de66c7c337ac5c77a696e5dcd5242 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Dec 2012 11:35:04 +0100 Subject: [PATCH 112/140] haskell-timeplot: update to version 1.0.19 --- pkgs/development/tools/haskell/timeplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix index ffdfa7869e04..d95c8cea03f3 100644 --- a/pkgs/development/tools/haskell/timeplot/default.nix +++ b/pkgs/development/tools/haskell/timeplot/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "timeplot"; - version = "1.0.18"; - sha256 = "1q4kzzqmr7bx97wfaasrkzii6b9zpxcxggshpsjv02bwb1hazxmc"; + version = "1.0.19"; + sha256 = "1mwhrcjavx56z3msdf5zqvqlx5m3hbcw85f22h8p9wvfgn79aydx"; isLibrary = false; isExecutable = true; buildDepends = [ From 1235f25426f8526d1a39051da781d5494c7b2b39 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Dec 2012 11:57:55 +0100 Subject: [PATCH 113/140] libtxc_dxtn: add version 1.0.1 The build expression was kindly provided by Arseniy Alekseyev. --- .../development/libraries/libxtc_dxtn/default.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/libxtc_dxtn/default.nix diff --git a/pkgs/development/libraries/libxtc_dxtn/default.nix b/pkgs/development/libraries/libxtc_dxtn/default.nix new file mode 100644 index 000000000000..0e7442633d77 --- /dev/null +++ b/pkgs/development/libraries/libxtc_dxtn/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl, mesa }: + +stdenv.mkDerivation rec { + name = "libtxc_dxtn-1.0.1"; + + src = fetchurl { + url = "people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2"; + sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5"; + }; + + postUnpack = '' + tar xf ${mesa.src} --wildcards '*/include/' + export NIX_CFLAGS_COMPILE="-I $NIX_BUILD_TOP/[mM]esa*/include" + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 569aa675a8ff..779916dd2bb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4492,6 +4492,8 @@ let libxslt = callPackage ../development/libraries/libxslt { }; + libxtc_dxtn = callPackage ../development/libraries/libxtc_dxtn { }; + libixp_for_wmii = lowPrio (import ../development/libraries/libixp_for_wmii { inherit fetchurl stdenv; }); From 2828729b9b258fb012b4b9d6d64ba9f94ff4d10f Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Tue, 25 Dec 2012 21:59:48 +0200 Subject: [PATCH 114/140] mu0 -> mu, version bump --- pkgs/tools/networking/mu/default.nix | 25 +++++++++++++++++++++++++ pkgs/tools/networking/mu0/default.nix | 25 ------------------------- pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 pkgs/tools/networking/mu/default.nix delete mode 100644 pkgs/tools/networking/mu0/default.nix diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix new file mode 100644 index 000000000000..7495c3bcd7f0 --- /dev/null +++ b/pkgs/tools/networking/mu/default.nix @@ -0,0 +1,25 @@ +{ fetchurl, stdenv, sqlite, pkgconfig, xapian, glib, gmime, texinfo, emacs, guile }: + +stdenv.mkDerivation rec { + version = "0.9.9"; + name = "mu-${version}"; + + src = fetchurl { + url = "https://mu0.googlecode.com/files/mu-${version}.tar.gz"; + sha256 = "04r0y05awsyb5hqwaxn1hq9jxijw20hwsgdbacqrma519f0y5y43"; + }; + + buildInputs = [ sqlite pkgconfig xapian glib gmime texinfo emacs guile ]; + + meta = { + description = "mu is a collection of utilties for indexing and searching Maildirs"; + + licenses = [ "GPLv3+" ]; + + homepage = "http://www.djcbsoftware.nl/code/mu/"; + + platforms = stdenv.lib.platforms.all; + + maintainers = [ stdenv.lib.maintainers.antono ]; + }; +} diff --git a/pkgs/tools/networking/mu0/default.nix b/pkgs/tools/networking/mu0/default.nix deleted file mode 100644 index a772f2375004..000000000000 --- a/pkgs/tools/networking/mu0/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ fetchurl, stdenv, sqlite, pkgconfig, xapian, glib, gmime }: - -stdenv.mkDerivation rec { - name = "mu0-0.9.7"; - - src = fetchurl { - url = http://mu0.googlecode.com/files/mu-0.9.7.tar.gz; - sha256 = "14nyn791ficyllj9idhiq3mncwnrg71lfxk126804dxba1l90r72"; - }; - - buildInputs = [ sqlite pkgconfig xapian glib gmime ]; - - /* The tests don't pass */ - doCheck = false; - - meta = { - description = "mu is a collection of utilties for indexing and searching Maildirs"; - - licenses = [ "GPLv3+" ]; - - homepage = http://code.google.com/p/mu0/; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93eee9d91702..1c41856d22c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1052,8 +1052,6 @@ let lzop = callPackage ../tools/compression/lzop { }; - mu0 = callPackage ../tools/networking/mu0 { }; - mailutils = callPackage ../tools/networking/mailutils { guile = guile_1_8; }; @@ -4574,6 +4572,8 @@ let mtdev = callPackage ../development/libraries/mtdev { }; + mu = callPackage ../tools/networking/mu { }; + muparser = callPackage ../development/libraries/muparser { }; mygui = callPackage ../development/libraries/mygui {}; From 3e578866201831ae1e83dcf86fec1f54de751e55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 22 Dec 2012 19:35:15 +0100 Subject: [PATCH 115/140] Adding wrappers for distcc, similar to those of ccache. --- .../development/tools/misc/distcc/default.nix | 41 +++++++++++++++---- pkgs/top-level/all-packages.nix | 17 ++++++++ 2 files changed, 51 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 8af8e0ca8001..6101650c6def 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchurl, popt, avahi, pkgconfig, python, gtk +{ stdenv, fetchurl, popt, avahi, pkgconfig, python, gtk, runCommand, gcc , sysconfDir ? "" # set this parameter to override the default value $out/etc , static ? false }: -let name = "distcc"; - version = "3.1"; -in - -stdenv.mkDerivation { +let +name = "distcc"; +version = "3.1"; +distcc = stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "http://distcc.googlecode.com/files/${name}-${version}.tar.bz2"; @@ -36,6 +35,32 @@ stdenv.mkDerivation { # The test suite fails because it uses hard-coded paths, i.e. /usr/bin/gcc. doCheck = false; + passthru = { + # A derivation that provides gcc and g++ commands, but that + # will end up calling distcc for the given cacheDir + links = extraConfig : (runCommand "distcc-links" + { inherit (gcc) langC langCC; } + '' + mkdir -p $out/bin + if [ $langC -eq 1 ]; then + cat > $out/bin/gcc << EOF + #!/bin/sh + ${extraConfig} + exec ${distcc}/bin/distcc gcc "\$@" + EOF + chmod +x $out/bin/gcc + fi + if [ $langCC -eq 1 ]; then + cat > $out/bin/g++ << EOF + #!/bin/sh + ${extraConfig} + exec ${distcc}/bin/distcc g++ "\$@" + EOF + chmod +x $out/bin/g++ + fi + ''); + }; + meta = { description = "a fast, free distributed C/C++ compiler"; homepage = "http://distcc.org"; @@ -44,4 +69,6 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; }; -} +}; +in +distcc diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b251c703e8ba..719a12695cce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3075,6 +3075,23 @@ let distcc = callPackage ../development/tools/misc/distcc { }; + # distccWrapper: wrapper that works as gcc or g++ + # It can be used by setting in nixpkgs config like this, for example: + # replaceStdenv = { pkgs }: pkgs.distccStdenv; + # But if you build in chroot, a default 'nix' will create + # a new net namespace, and won't have network access. + # You can use an override in packageOverrides to set extraConfig: + # packageOverrides = pkgs: { + # distccWrapper = pkgs.distccWrapper.override { + # extraConfig = '' + # DISTCC_HOSTS="myhost1 myhost2" + # ''; + # }; + # + distccWrapper = makeOverridable ({ extraConfig ? "" }: + wrapGCC (distcc.links extraConfig)) {}; + distccStdenv = lowPrio (overrideGCC stdenv distccWrapper); + docutils = builderDefsPackage (import ../development/tools/documentation/docutils) { inherit python pil makeWrapper; }; From ea5f15813c13fb68275e16d6296c5096335bc2d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 22 Dec 2012 20:01:05 +0100 Subject: [PATCH 116/140] distcc: Adding a derivation that prepares a masquerade for distccd --- pkgs/development/tools/misc/distcc/masq.nix | 29 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/tools/misc/distcc/masq.nix diff --git a/pkgs/development/tools/misc/distcc/masq.nix b/pkgs/development/tools/misc/distcc/masq.nix new file mode 100644 index 000000000000..1a1219aac976 --- /dev/null +++ b/pkgs/development/tools/misc/distcc/masq.nix @@ -0,0 +1,29 @@ +{ stdenv, gccRaw }: + +stdenv.mkDerivation { + name = "distcc-masq-${gccRaw.name}"; + + phases = [ "installPhase" ]; + installPhase = '' + ensureDir $out/bin + + bin=${gccRaw}/bin + + shopt -s nullglob + if [ -f $bin/gcc ]; then + ln -s $bin/gcc $out/bin + else + for a in $bin/*-g++; do + ln -s $bin/*-gcc $out/bin/gcc + done + fi + + if [ -f $bin/g++ ]; then + ln -s $bin/g++ $out/bin + else + for a in $bin/*-g++; do + ln -sf $bin/*-g++ $out/bin/g++ + done + fi + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 719a12695cce..61baf5434af5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3092,6 +3092,10 @@ let wrapGCC (distcc.links extraConfig)) {}; distccStdenv = lowPrio (overrideGCC stdenv distccWrapper); + distccMasquerade = callPackage ../development/tools/misc/distcc/masq.nix { + gccRaw = gcc.gcc; + }; + docutils = builderDefsPackage (import ../development/tools/documentation/docutils) { inherit python pil makeWrapper; }; From d779fc2da97bce157c9cc3a932afd70e2c1f9500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 22 Dec 2012 20:35:51 +0100 Subject: [PATCH 117/140] distccMasquerade: some fixes --- pkgs/development/tools/misc/distcc/masq.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/distcc/masq.nix b/pkgs/development/tools/misc/distcc/masq.nix index 1a1219aac976..fe2c4193e25e 100644 --- a/pkgs/development/tools/misc/distcc/masq.nix +++ b/pkgs/development/tools/misc/distcc/masq.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation { if [ -f $bin/gcc ]; then ln -s $bin/gcc $out/bin else - for a in $bin/*-g++; do + for a in $bin/*-gcc; do ln -s $bin/*-gcc $out/bin/gcc + ln -s $bin/*-gcc $out/bin/cc done fi @@ -23,6 +24,7 @@ stdenv.mkDerivation { else for a in $bin/*-g++; do ln -sf $bin/*-g++ $out/bin/g++ + ln -sf $bin/*-g++ $out/bin/c++ done fi ''; From 67c73aafe81cd510da97f9d38d9eccc91985aff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 22 Dec 2012 22:04:43 +0100 Subject: [PATCH 118/140] Fixing distccMasquerade to have gas too --- pkgs/development/tools/misc/distcc/masq.nix | 12 +++++++++++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/distcc/masq.nix b/pkgs/development/tools/misc/distcc/masq.nix index fe2c4193e25e..117480670c39 100644 --- a/pkgs/development/tools/misc/distcc/masq.nix +++ b/pkgs/development/tools/misc/distcc/masq.nix @@ -1,4 +1,4 @@ -{ stdenv, gccRaw }: +{ stdenv, gccRaw, binutils }: stdenv.mkDerivation { name = "distcc-masq-${gccRaw.name}"; @@ -27,5 +27,15 @@ stdenv.mkDerivation { ln -sf $bin/*-g++ $out/bin/c++ done fi + + bbin=${binutils}/bin + if [ -f $bbin/as ]; then + ln -s $bbin/as $out/bin + else + for a in $bbin/*-as; do + ln -sf $bbin/*-as $out/bin/as + done + fi + ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61baf5434af5..5b50a494de3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3094,6 +3094,7 @@ let distccMasquerade = callPackage ../development/tools/misc/distcc/masq.nix { gccRaw = gcc.gcc; + binutils = binutils; }; docutils = builderDefsPackage (import ../development/tools/documentation/docutils) { From 499e686ca5ac91001f86b15f3ed050e94bde5803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 26 Dec 2012 23:32:23 +0100 Subject: [PATCH 119/140] distcc: Fixing indentation Noticed by niksnut. --- .../development/tools/misc/distcc/default.nix | 135 +++++++++--------- 1 file changed, 69 insertions(+), 66 deletions(-) diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 6101650c6def..565d7835f05d 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -4,71 +4,74 @@ }: let -name = "distcc"; -version = "3.1"; -distcc = stdenv.mkDerivation { - name = "${name}-${version}"; - src = fetchurl { - url = "http://distcc.googlecode.com/files/${name}-${version}.tar.bz2"; - sha256 = "f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89"; + name = "distcc"; + version = "3.1"; + distcc = stdenv.mkDerivation { + name = "${name}-${version}"; + src = fetchurl { + url = "http://distcc.googlecode.com/files/${name}-${version}.tar.bz2"; + sha256 = "f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89"; + }; + + buildInputs = [popt avahi pkgconfig python gtk]; + preConfigure = + '' + configureFlagsArray=( CFLAGS="-O2 -fno-strict-aliasing" + CXXFLAGS="-O2 -fno-strict-aliasing" + --mandir=$out/share/man + ${if sysconfDir == "" then "" else "--sysconfdir=${sysconfDir}"} + ${if static then "LDFLAGS=-static" else ""} + --with${if static == true || popt == null then "" else "out"}-included-popt + --with${if avahi != null then "" else "out"}-avahi + --with${if gtk != null then "" else "out"}-gtk + --without-gnome + --enable-rfc2553 + --disable-Werror # a must on gcc 4.6 + ) + installFlags="sysconfdir=$out/etc"; + ''; + patches = [ ./20-minute-io-timeout.patch ]; + + # The test suite fails because it uses hard-coded paths, i.e. /usr/bin/gcc. + doCheck = false; + + passthru = { + # A derivation that provides gcc and g++ commands, but that + # will end up calling distcc for the given cacheDir + # + # extraConfig is meant to be sh lines exporting environment + # variables like DISTCC_HOSTS, DISTCC_DIR, ... + links = extraConfig : (runCommand "distcc-links" + { inherit (gcc) langC langCC; } + '' + mkdir -p $out/bin + if [ $langC -eq 1 ]; then + cat > $out/bin/gcc << EOF + #!/bin/sh + ${extraConfig} + exec ${distcc}/bin/distcc gcc "\$@" + EOF + chmod +x $out/bin/gcc + fi + if [ $langCC -eq 1 ]; then + cat > $out/bin/g++ << EOF + #!/bin/sh + ${extraConfig} + exec ${distcc}/bin/distcc g++ "\$@" + EOF + chmod +x $out/bin/g++ + fi + ''); + }; + + meta = { + description = "a fast, free distributed C/C++ compiler"; + homepage = "http://distcc.org"; + license = "GPL"; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; }; - - buildInputs = [popt avahi pkgconfig python gtk]; - preConfigure = - '' - configureFlagsArray=( CFLAGS="-O2 -fno-strict-aliasing" - CXXFLAGS="-O2 -fno-strict-aliasing" - --mandir=$out/share/man - ${if sysconfDir == "" then "" else "--sysconfdir=${sysconfDir}"} - ${if static then "LDFLAGS=-static" else ""} - --with${if static == true || popt == null then "" else "out"}-included-popt - --with${if avahi != null then "" else "out"}-avahi - --with${if gtk != null then "" else "out"}-gtk - --without-gnome - --enable-rfc2553 - --disable-Werror # a must on gcc 4.6 - ) - installFlags="sysconfdir=$out/etc"; - ''; - patches = [ ./20-minute-io-timeout.patch ]; - - # The test suite fails because it uses hard-coded paths, i.e. /usr/bin/gcc. - doCheck = false; - - passthru = { - # A derivation that provides gcc and g++ commands, but that - # will end up calling distcc for the given cacheDir - links = extraConfig : (runCommand "distcc-links" - { inherit (gcc) langC langCC; } - '' - mkdir -p $out/bin - if [ $langC -eq 1 ]; then - cat > $out/bin/gcc << EOF - #!/bin/sh - ${extraConfig} - exec ${distcc}/bin/distcc gcc "\$@" - EOF - chmod +x $out/bin/gcc - fi - if [ $langCC -eq 1 ]; then - cat > $out/bin/g++ << EOF - #!/bin/sh - ${extraConfig} - exec ${distcc}/bin/distcc g++ "\$@" - EOF - chmod +x $out/bin/g++ - fi - ''); - }; - - meta = { - description = "a fast, free distributed C/C++ compiler"; - homepage = "http://distcc.org"; - license = "GPL"; - - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; - }; -}; in -distcc + distcc From b21cee6f63cbbf26adb3677071d8cda597f38afa Mon Sep 17 00:00:00 2001 From: Arseniy Alekseyev Date: Sat, 22 Dec 2012 18:13:38 +0000 Subject: [PATCH 120/140] Fixed hash for the bloomfilter Haskell package For the reason, see https://github.com/haskell/cabal/issues/1017#issuecomment-8097073. --- pkgs/development/libraries/haskell/bloomfilter/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/bloomfilter/default.nix b/pkgs/development/libraries/haskell/bloomfilter/default.nix index 2545c3f4f407..7c8c2d348498 100644 --- a/pkgs/development/libraries/haskell/bloomfilter/default.nix +++ b/pkgs/development/libraries/haskell/bloomfilter/default.nix @@ -3,7 +3,7 @@ cabal.mkDerivation (self: { pname = "bloomfilter"; version = "1.2.6.10"; - sha256 = "1z2jc7588fkv42dxf0dxsrgk5pmj3xapshy1vyfwipp1q6y20x4j"; + sha256 = "162vp9riwf5q2l1hnw3g157fpwnw185fk41hkgyf8qaavcrz6slv"; buildDepends = [ deepseq ]; meta = { homepage = "https://github.com/bos/bloomfilter"; From d1e70f9b848bdd04e8e0bd9e1a1626eefdc5125f Mon Sep 17 00:00:00 2001 From: Arseniy Alekseyev Date: Thu, 27 Dec 2012 00:44:31 +0000 Subject: [PATCH 121/140] Updated sysprof from 1.0.12 to 1.2.0. Updated the sysprof package. I've removed 1.0.12 because itwas failing to build. It also allowed to simplify the expression because 1.2.0 no longer includes a kernel module. --- .../tools/profiling/sysprof/default.nix | 34 ++++--------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 154561e27e1e..b6750f889373 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -1,44 +1,24 @@ -{ fetchurl, stdenv, kernel, binutils +{ fetchurl, stdenv, binutils , pkgconfig, gtk, glib, pango, libglade }: stdenv.mkDerivation rec { - name = "sysprof-1.0.12-${kernel.version}"; + name = "sysprof-1.2.0"; src = fetchurl { - url = "http://www.daimi.au.dk/~sandmann/sysprof/sysprof-1.0.12.tar.gz"; - sha256 = "0f0z1dh97swlrkw3cbv5k2jhy5rk7wxv55hp7yhysw3idgp8wbmz"; + url = "http://www.sysprof.com/sysprof-1.2.0.tar.gz"; + sha256 = "1wb4d844rsy8qjg3z5m6rnfm72da4xwzrrkkb1q5r10sq1pkrw5s"; }; buildInputs = [ binutils pkgconfig gtk glib pango libglade ]; - patches = [ ./configure.patch ]; - - preConfigure = '' - kernelVersion=$(cd "${kernel}/lib/modules" && echo *) - echo "assuming Linux kernel version \`$kernelVersion'" - - sed -i "module/Makefile" \ - -e"s|^[[:blank:]]*KDIR[[:blank:]]*:=.*$|KDIR := ${kernel}/lib/modules/$kernelVersion/build|g ; - s|\$(KMAKE) modules_install|install sysprof-module.ko $out/share/sysprof/module|g ; - s|\\[ -e /sbin/depmod.*$|true|g" - - # XXX: We won't run `depmod' after installing the module. - ''; - - configureFlags = "--enable-kernel-module"; - - preInstall = '' - mkdir -p "$out/share/sysprof/module" - ''; - meta = { - homepage = http://www.daimi.au.dk/~sandmann/sysprof/; + homepage = http://sysprof.com/; description = "Sysprof, a system-wide profiler for Linux"; license = "GPLv2+"; longDescription = '' - Sysprof is a sampling CPU profiler for Linux that uses a kernel - module to profile the entire system, not just a single + Sysprof is a sampling CPU profiler for Linux that uses the perf_event_open + system call to profile the entire system, not just a single application. Sysprof handles shared libraries and applications do not need to be recompiled. In fact they don't even have to be restarted. From f1e15325f9918bebdf9db46511b5132816999be6 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Fri, 17 Aug 2012 01:14:28 +0400 Subject: [PATCH 122/140] maintainers: add myself to the maintainers list --- pkgs/lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index d0ba6b8b6a55..b065a50ce004 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -37,6 +37,7 @@ sander = "Sander van der Burg "; shlevy = "Shea Levy "; simons = "Peter Simons "; + smironov = "Sergey Mironov "; thammers = "Tobias Hammerschmidt "; urkud = "Yury G. Kudryashov "; viric = "Lluís Batlle i Rossell "; From c27b55667311641cad40a41a26e47f2c5d26ac52 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Thu, 27 Dec 2012 15:43:00 +0400 Subject: [PATCH 123/140] xkb_switch: command line tool to switch X keyboard layouts --- pkgs/tools/X11/xkb-switch/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/X11/xkb-switch/default.nix diff --git a/pkgs/tools/X11/xkb-switch/default.nix b/pkgs/tools/X11/xkb-switch/default.nix new file mode 100644 index 000000000000..0fc49038efee --- /dev/null +++ b/pkgs/tools/X11/xkb-switch/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchgit, cmake, libX11 }: + +stdenv.mkDerivation rec { + name = "xkb-switch-1.2"; + + src = fetchgit { + url = https://github.com/ierton/xkb-switch.git; + rev = "4c90511ecf2cacc040c97f034a13254c3fa9dfef"; + sha256 = "1jxya67v1qnvbzd0cd5gj7xrwvxyfy1rpa70l8p30p9cmw3ahk41"; + }; + + buildInputs = [ cmake libX11 ]; + + meta = { + description = "Switch X layouts from the command line"; + homepage = https://github.com/ierton/xkb-switch.git; + maintainers = with stdenv.lib.maintainers; [smironov]; + platforms = stdenv.lib.platforms.gnu; + license = "BSD"; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f972f19c3b6..b0335e66cc9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8062,6 +8062,8 @@ let base14Fonts = "${ghostscript}/share/ghostscript/fonts"; }; + xkb_switch = callPackage ../tools/X11/xkb-switch { }; + libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; xpra = callPackage ../tools/X11/xpra { From fcdf685793c7d67c9829e6452ec2164a501e783e Mon Sep 17 00:00:00 2001 From: RSzibele Date: Thu, 27 Dec 2012 16:25:39 +0100 Subject: [PATCH 124/140] Added Logisim-2.7.1. --- .../science/logic/logisim/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/science/logic/logisim/default.nix diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix new file mode 100644 index 000000000000..009bed3ffe2a --- /dev/null +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, jre }: + +let version = "2.7.1"; in + +stdenv.mkDerivation { + name = "logisim-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/circuit/2.7.x/${version}/logisim-generic-${version}.jar"; + sha256 = "1hkvc9zc7qmvjbl9579p84hw3n8wl3275246xlzj136i5b0phain"; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -pv $out/bin + cp -v $src $out/logisim.jar + + cat > $out/bin/logisim << EOF + #!${stdenv.shell} + ${jre}/bin/java -jar $out/logisim.jar + EOF + + chmod +x $out/bin/logisim + ''; + + meta = { + homepage = "http://ozark.hendrix.edu/~burch/logisim"; + description = "Logisim is an educational tool for designing and simulating digital logic circuits."; + license = "GPLv2+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b50a494de3c..2ff405ce15e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8743,6 +8743,8 @@ let leo2 = callPackage ../applications/science/logic/leo2 {}; + logisim = callPackage ../applications/science/logic/logisim {}; + matita = callPackage ../applications/science/logic/matita { ocaml = ocaml_3_11_2; inherit (ocamlPackages_3_11_2) findlib lablgtk ocaml_expat gmetadom ocaml_http From 60cb018d801b9fbc1b4ea0effd65363de22d076d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Dec 2012 20:37:04 +0100 Subject: [PATCH 125/140] youtube-dl: update to version 2012.12.11 The new build comes with man page and bash completion installed. --- pkgs/tools/misc/youtube-dl/default.nix | 32 +++++++++++--------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 1fc5c08042cb..cb5d8ed06968 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,31 +1,25 @@ -{stdenv, fetchgit, python}: +{ stdenv, fetchurl, python, pandoc }: -let pkgname = "youtube-dl"; - pkgver = "2012.09.27"; - +let + version = "2012.12.11"; in stdenv.mkDerivation { - name = "${pkgname}-${pkgver}"; + name = "youtube-dl-${version}"; - src = fetchgit { - url = "git://github.com/rg3/${pkgname}"; - rev = "refs/tags/${pkgver}"; - sha256 = "a98f3339301324ddd6620f7b1353abed807cd8dea5586d6901d7fe69bc6a397c"; + src = fetchurl { + url = "https://github.com/downloads/rg3/youtube-dl/youtube-dl.${version}.tar.gz"; + sha256 = "03zv3z8p0fi122nqj7ff8hkgqscir4s7psm03rq7dfpg1z35klmn"; }; - buildInputs = [python]; - buildPhase = "sed -i 's|#!/usr/bin/env python|#!#{python}/bin/python|' youtube-dl"; + buildInputs = [ python pandoc ]; - installPhase = '' - ensureDir $out/bin - cp youtube-dl $out/bin + configurePhase = '' + makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc ) ''; meta = { - description = "A small command-line program to download videos from YouTube.com and a few more sites"; - homepage = http://rg3.github.com/youtube-dl/; - maintainers = [ - stdenv.lib.maintainers.bluescreen303 - ]; + homepage = "http://rg3.github.com/youtube-dl/"; + description = "Command-line tool to download videos from YouTube.com and other sites"; + maintainers = [ stdenv.lib.maintainers.bluescreen303 stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ab59becf220..da4cded1ba54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1804,7 +1804,7 @@ let xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; }; - youtubeDL = callPackage ../tools/misc/youtube-dl { }; + youtubeDL = callPackage ../tools/misc/youtube-dl { inherit (haskellPackages) pandoc; }; zbar = callPackage ../tools/graphics/zbar {}; From e906757ac16467dc8dec75776d7c9ac0a41d1849 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Dec 2012 20:54:48 +0100 Subject: [PATCH 126/140] haskell-hamlet: update to version 1.1.3.1 --- pkgs/development/libraries/haskell/hamlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 609b1ad4fb8e..906a8e2759aa 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "1.1.2"; - sha256 = "0k6wnjqmap4wv0p1hvzpd8br4wr4vda9aw87agzf7pix6hwmiybq"; + version = "1.1.3.1"; + sha256 = "04qqsjrn0fh9y4z7gjf3g60w69gqxhzq7dqkraq97p3w45fijm1i"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; From f402b9bb28f8e7b721db8574bcdc5d038506732c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Dec 2012 20:54:48 +0100 Subject: [PATCH 127/140] haskell-heist: update to version 0.10.2 --- pkgs/development/libraries/haskell/heist/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index 4191536407e1..22860a85218e 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -5,14 +5,13 @@ cabal.mkDerivation (self: { pname = "heist"; - version = "0.10.1"; - sha256 = "1rwik8x2bfb0474vc1wzbqlhjgas3089g1rvphs7irfbmyki1646"; + version = "0.10.2"; + sha256 = "13v9x5dph52xddkb2dy4gfrapvihf1881fin996ag0snbma3wh68"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors filepath hashable MonadCatchIOTransformers mtl random text time unorderedContainers vector xmlhtml ]; - jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "An Haskell template system supporting both HTML5 and XML"; From 6aab84be9a575c6b614e5ffd451ac2d43d27add1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Dec 2012 20:54:48 +0100 Subject: [PATCH 128/140] haskell-http-reverse-proxy: update to version 0.1.1 --- .../libraries/haskell/http-reverse-proxy/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index 7e50b68286ce..62bc2ebac184 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -1,15 +1,15 @@ { cabal, blazeBuilder, caseInsensitive, classyPreludeConduit -, conduit, httpConduit, httpTypes, liftedBase, monadControl -, network, networkConduit, text, wai, warp, word8 +, conduit, dataDefault, httpConduit, httpTypes, liftedBase +, monadControl, network, networkConduit, text, wai, warp, word8 }: cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.1.0.7"; - sha256 = "1fshng7bcpzjq5iqnvl2qsyia9yi80b8sbif18a3w86gsw5xcakk"; + version = "0.1.1"; + sha256 = "0p04zpw1v0zhzri7wpikc0b8g7n21kgl8j8238vv7xqxapkal0pc"; buildDepends = [ blazeBuilder caseInsensitive classyPreludeConduit conduit - httpConduit httpTypes liftedBase monadControl network + dataDefault httpConduit httpTypes liftedBase monadControl network networkConduit text wai warp word8 ]; meta = { From b7b317bd428caa8a91748b748bf2f300d6cc007a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Dec 2012 20:54:48 +0100 Subject: [PATCH 129/140] haskell-monad-logger: update to version 0.2.3.2 --- pkgs/development/libraries/haskell/monad-logger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index 40f82c69a378..97078f2fb84f 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "monad-logger"; - version = "0.2.3.1"; - sha256 = "15f85cf1nsy3xbjgikrn8cr09r70h8n2c67bpbxnfjna3ak94gkn"; + version = "0.2.3.2"; + sha256 = "0b5jfmzmsb7pdawcm5i74sy934q2d78pjs39invas502kx5bxzk5"; buildDepends = [ conduit fastLogger monadControl mtl resourcet text transformers transformersBase From 6444a5f6d147a7a0982a406ddc30f3eb5749060f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Dec 2012 20:54:48 +0100 Subject: [PATCH 130/140] haskell-persistent-postgresql: update to version 1.1.2.1 --- .../libraries/haskell/persistent-postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix index e09a9b8d161e..8fdc9f641aac 100644 --- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-postgresql"; - version = "1.1.2"; - sha256 = "06ylfijm59akdzb6kd0qs5kw3qyn5ig7q9wbj0a8sgkf8hs2mmad"; + version = "1.1.2.1"; + sha256 = "1iz6w9isva1drbr37c8f42g3nnl78sp27ydaj0975yqyp7nh7and"; buildDepends = [ aeson conduit monadControl persistent postgresqlLibpq postgresqlSimple text time transformers From 9284872e1c0a9b985f72b1ac7c320f9b0dd976a6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Dec 2012 20:54:48 +0100 Subject: [PATCH 131/140] haskell-persistent: update to version 1.1.3.1 --- pkgs/development/libraries/haskell/persistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 817047fd5c08..1cec3d609b54 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "1.1.2"; - sha256 = "1khzbmdw3ham8ig58srvcdsz4j5r9mg2s2ackm1f40851fa0642r"; + version = "1.1.3.1"; + sha256 = "12gv2gjkrf7qchlv6kj0an8bvpkin8vdhdkxg4ck9ydw7hh292v2"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit liftedBase monadControl monadLogger pathPieces poolConduit From dc9ea53ad9f6914142adcab7be3c640390a8f78d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Dec 2012 20:54:48 +0100 Subject: [PATCH 132/140] haskell-shakespeare-js: update to version 1.1.1 --- pkgs/development/libraries/haskell/shakespeare-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index 228e35bab467..a7238ba52eb3 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "1.1.0"; - sha256 = "0rb1fim6xvpgc2in71drxgimh1z75p72zj0k6hwh2hyfwkj2yh9p"; + version = "1.1.1"; + sha256 = "1xzhb3ipax2489311hmiaxp9i44099bsbclcj3ds0rhdfa62xarg"; buildDepends = [ aeson shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; From bfa35ee90f948183d30e820d8dec23d42ddaa588 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Dec 2012 20:54:48 +0100 Subject: [PATCH 133/140] haskell-shelly: update to version 0.15.4 --- pkgs/development/libraries/haskell/shelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index a0ae240f6718..15245bfe0bcd 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "0.15.3.3"; - sha256 = "0g062rzpcksnszcjln9z39lw9cd084k0zs9pbr23s1985xkf6cj7"; + version = "0.15.4"; + sha256 = "1b8fn5fa350hhlswn97g6zn9454nzn9sz60x55j959phwys0fcdk"; buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; From ce545c402e4c562210aa0e3bc1218575b4144b5c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Dec 2012 20:54:48 +0100 Subject: [PATCH 134/140] haskell-yesod-core: update to version 1.1.7 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 75b36eb0aeba..6f17a9a51774 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.1.6.1"; - sha256 = "0pk7pxqp9g5pkbba2na503az9pghgqvs538pcz2k3r3cpb6nhgpa"; + version = "1.1.7"; + sha256 = "1z47h7ghhi8mvmrc0rcwb3si1bq4623i5x127k8fahcy6qk4qls8"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes From 166d32986bb679a8188aebddba1e1820f22dd529 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Dec 2012 20:54:48 +0100 Subject: [PATCH 135/140] haskell-yesod-static: update to version 1.1.1.2 --- pkgs/development/libraries/haskell/yesod-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index ada24ea3193e..7923b6e9e8e3 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.1.1.1"; - sha256 = "1wp3ijiwsai9npf6zl0bq3fi4rbh0qjy8bii3d178sariv7588js"; + version = "1.1.1.2"; + sha256 = "0x3vrzqqddi4fmbivmy5pi66jmnc5fh68j5fjfxn5nyhp4n6z0sw"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed httpTypes systemFilepath text transformers unixCompat wai From 7314885b726b7385aec6c716d780f500bb62588b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Dec 2012 20:54:48 +0100 Subject: [PATCH 136/140] haskell-yesod-test: update to version 0.3.3 --- .../libraries/haskell/yesod-test/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index ebbbc3f939fc..b03274902e67 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -1,17 +1,18 @@ -{ cabal, attoparsec, blazeHtml, blazeMarkup, caseInsensitive, hspec -, htmlConduit, httpTypes, HUnit, monadControl, network, persistent -, poolConduit, text, transformers, wai, waiTest, xmlConduit -, xmlTypes +{ cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup +, caseInsensitive, cookie, hspec, htmlConduit, httpTypes, HUnit +, monadControl, network, persistent, poolConduit, text, time +, transformers, wai, waiTest, xmlConduit, xmlTypes }: cabal.mkDerivation (self: { pname = "yesod-test"; - version = "0.3.2"; - sha256 = "1wd5iwar6jxbv0p7p47js4spivwhph98h403bnmf3dl7069nyjcs"; + version = "0.3.3"; + sha256 = "1jb410r905wd26swh2rk59nbyy389gcfz261adhb69awmsyql5x3"; buildDepends = [ - attoparsec blazeHtml blazeMarkup caseInsensitive hspec htmlConduit - httpTypes HUnit monadControl network persistent poolConduit text - transformers wai waiTest xmlConduit xmlTypes + attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive + cookie hspec htmlConduit httpTypes HUnit monadControl network + persistent poolConduit text time transformers wai waiTest + xmlConduit xmlTypes ]; meta = { homepage = "http://www.yesodweb.com"; From 1e30c001f4781a5c3b3aa2956f3d622b1d0b0df2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Dec 2012 20:54:48 +0100 Subject: [PATCH 137/140] haskell-yesod: update to version 1.1.7.2 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 717bba2853c9..50365296270d 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.1.7.1"; - sha256 = "01sic3s3mwn67das6cffvndpf4c6n612hd183bvw4a80h7mbaqxz"; + version = "1.1.7.2"; + sha256 = "0mxxzcmp63sdn7g30ilp40dsj2iccajc9gpxycnqxqabdzhqkbm0"; isLibrary = true; isExecutable = true; buildDepends = [ From 5872a8eae864352bf452c0079bcd10696013f47f Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 28 Dec 2012 02:16:31 +0100 Subject: [PATCH 138/140] aircrack-ng: update --- pkgs/tools/networking/aircrack-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index ea4f517000a2..c616ba9ee160 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchsvn, libpcap, openssl, zlib, wirelesstools}: let - rev = "2178"; + rev = "2212"; in stdenv.mkDerivation rec { name = "aircrack-ng-1.1-${rev}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchsvn { url = "http://trac.aircrack-ng.org/svn/trunk"; inherit rev; - sha256 = "d16fd3a4e918fd6a855c0d0ae0c863247a45189e6ec35c0c7082d3d07b6438db"; + sha256 = "80e567b4e4bc501721cd58f7efadcd13fc3b235a41486174826694a6e701ce09"; }; buildInputs = [libpcap openssl zlib]; From 60de7967da5ab22c503ad5a3a582f091ded0ea5d Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 28 Dec 2012 02:17:04 +0100 Subject: [PATCH 139/140] weechat: update and adding pycrypto support (for fish.py plugin) --- .../networking/irc/weechat/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index eb1a9c4474f4..ba7953d737cf 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -1,20 +1,27 @@ { stdenv, fetchurl, ncurses, openssl, perl, python, aspell, gnutls -, zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile }: +, zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile +, pythonPackages, makeWrapper }: stdenv.mkDerivation rec { - version = "0.3.9"; + version = "0.3.9.2"; name = "weechat-${version}"; src = fetchurl { url = "http://weechat.org/files/src/${name}.tar.gz"; - sha256 = "8666c788cbb212036197365df3ba3cf964a23e4f644d76ea51d66dbe3be593bb"; + sha256 = "114cffqwnrqx8r4dslz7sc4i4ky4akzh863rnzaw3dnn9ky9r503"; }; buildInputs = [ ncurses perl python openssl aspell gnutls zlib curl pkgconfig - libgcrypt ruby lua5 tcl guile + libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper ]; + postInstall = '' + wrapProgram "$out/bin/weechat-curses" \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages" + ''; + meta = { homepage = http://http://www.weechat.org/; description = "A fast, light and extensible chat client"; From fde74242bf41d199ad68db90c5ce4d35f6c2c51b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 28 Dec 2012 20:20:37 +0100 Subject: [PATCH 140/140] gcc47: Adding gcc mode, cross-building. It's useful to build toolchains for armv7-m, to set thumb mode. It doesn't support arm mode. chaoflow needed it. --- pkgs/development/compilers/gcc/4.7/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix index 60ef44f2a901..5ab7166204e9 100644 --- a/pkgs/development/compilers/gcc/4.7/default.nix +++ b/pkgs/development/compilers/gcc/4.7/default.nix @@ -89,9 +89,11 @@ let version = "4.7.2"; gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null cross; gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null cross; gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null cross; + gccMode = stdenv.lib.attrByPath [ "gcc" "mode" ] null cross; withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; + withMode = if gccMode != null then " --with-mode=${gccMode}" else ""; crossMingw = (cross != null && cross.libc == "msvcrt"); crossConfigureFlags = @@ -99,6 +101,7 @@ let version = "4.7.2"; withArch + withCpu + withAbi + + withMode + (if (crossMingw && crossStageStatic) then " --with-headers=${libcCross}/include" + " --with-gcc" +