From 3f928466df1b03735e6bf44ed63847c5718f317b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 22 Aug 2013 21:40:37 +0200 Subject: [PATCH 01/98] jing-trang: update to version 20091111 Also add meta attributes and a wrapper for jing so that it can be invoked directly from the shell as "jing" (similar to Debian/Ubuntu). Trang already has such a wrapper. --- pkgs/tools/text/xml/jing/default.nix | 21 +++++++++++++++------ pkgs/tools/text/xml/jing/unzip-builder.sh | 8 ++++++++ pkgs/tools/text/xml/trang/default.nix | 21 +++++++++++++++------ 3 files changed, 38 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/text/xml/jing/default.nix b/pkgs/tools/text/xml/jing/default.nix index 5b7c0803fc8..5737fff14f5 100644 --- a/pkgs/tools/text/xml/jing/default.nix +++ b/pkgs/tools/text/xml/jing/default.nix @@ -1,13 +1,22 @@ -{stdenv, fetchurl, unzip} : +{ stdenv, fetchurl, unzip, jre }: stdenv.mkDerivation { - name = "jing-20030619"; + name = "jing-20091111"; builder = ./unzip-builder.sh; src = fetchurl { - url = http://www.thaiopensource.com/download/jing-20030619.zip; - md5 = "f9b0775d8740f16ab3df82ad3707a093"; + url = https://jing-trang.googlecode.com/files/jing-20091111.zip; + sha256 = "134h2r22r64v5yk4v8mhl6r893dlw5vzx9daf2sj2mbbma004sap"; }; - inherit unzip; -} \ No newline at end of file + inherit unzip jre; + + meta = with stdenv.lib; { + description = "A RELAX NG validator in Java"; + # The homepage is www.thaiopensource.com, but it links to googlecode.com + # for downloads and call it the "project site". + homepage = http://www.thaiopensource.com/relaxng/jing.html; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/tools/text/xml/jing/unzip-builder.sh b/pkgs/tools/text/xml/jing/unzip-builder.sh index 5f8738da51c..c02920e5a69 100755 --- a/pkgs/tools/text/xml/jing/unzip-builder.sh +++ b/pkgs/tools/text/xml/jing/unzip-builder.sh @@ -4,3 +4,11 @@ source $stdenv/setup $unzip/bin/unzip $src mkdir -p $out mv $name/* $out + +cat > "$out/bin/jing" < Date: Thu, 22 Aug 2013 22:06:45 +0200 Subject: [PATCH 02/98] duply: platforms.unix -> platforms.linux Dependency ncftp fails to build on freebsd and darwin. --- pkgs/tools/backup/duply/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index affedcae73a..5e95ede695c 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation { homepage = http://duply.net/; license = licenses.gpl2; maintainers = [ maintainers.bjornfor ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } From 993deb1a4a96971f0de41fa596bb2ddd134ef171 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 13 Mar 2013 15:05:30 +0100 Subject: [PATCH 03/98] Hopefully a fixed version of Refactor: introduce isType reducing redundancy. Coding-by-sed wasn't a good idea :( --- pkgs/lib/options.nix | 6 +++--- pkgs/lib/properties.nix | 16 ++++++++-------- pkgs/lib/systems.nix | 8 ++++---- pkgs/lib/types.nix | 3 ++- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix index 620de84e707..a7d1a3483a0 100644 --- a/pkgs/lib/options.nix +++ b/pkgs/lib/options.nix @@ -11,10 +11,10 @@ with import ./properties.nix; rec { - inherit (lib) typeOf; + inherit (lib) isType; - isOption = attrs: (typeOf attrs) == "option"; + isOption = isType "option"; mkOption = attrs: attrs // { _type = "option"; # name (this is the name of the attributem it is automatically generated by the traversal) @@ -190,7 +190,7 @@ rec { defValue = builtins.getAttr defName defs; optValue = builtins.getAttr defName opts; in - if typeOf defValue == "option" + if isOption defValue then # `defValue' is an option. if hasAttr defName opts diff --git a/pkgs/lib/properties.nix b/pkgs/lib/properties.nix index eeac27ae70c..22aa8d891d8 100644 --- a/pkgs/lib/properties.nix +++ b/pkgs/lib/properties.nix @@ -11,13 +11,13 @@ with import ./attrsets.nix; rec { - inherit (lib) typeOf; + inherit (lib) isType; # Tell that nothing is defined. When properties are evaluated, this type # is used to remove an entry. Thus if your property evaluation semantic # implies that you have to mute the content of an attribute, then your # property should produce this value. - isNotdef = attrs: (typeOf attrs) == "notdef"; + isNotdef = isType "notdef"; mkNotdef = {_type = "notdef";}; # General property type, it has a property attribute and a content @@ -32,7 +32,7 @@ rec { # - onGlobalDelay: run on all copied properties. # - onEval: run on an evaluated property. # - onGlobalEval: run on a list of property stack on top of their values. - isProperty = attrs: (typeOf attrs) == "property"; + isProperty = isType "property"; mkProperty = p@{property, content, ...}: p // { _type = "property"; }; @@ -187,7 +187,7 @@ rec { # and interpreted by the underlying system using properties (modules). # Create a "Merge" property which only contains a condition. - isMerge = attrs: (typeOf attrs) == "merge"; + isMerge = isType "merge"; mkMerge = content: mkProperty { property = { _type = "merge"; @@ -204,7 +204,7 @@ rec { # is ignore. # Create a "If" property which only contains a condition. - isIf = attrs: (typeOf attrs) == "if"; + isIf = isType "if"; mkIf = condition: content: mkProperty { property = { _type = "if"; @@ -271,7 +271,7 @@ rec { # priorities between values. The default priority is 100. The lowest # priorities are kept. The template argument must reproduce the same # attribute set hierarchy to override leaves of the hierarchy. - isOverride = attrs: (typeOf attrs) == "override"; + isOverride = isType "override"; mkOverrideTemplate = priority: template: content: mkProperty { property = { _type = "override"; @@ -371,7 +371,7 @@ rec { # of the list used by the merge function. And the highest ranked # definition would be the last. Definitions which does not have any rank # value have the default rank of 100. - isOrder = attrs: (typeOf attrs) == "order"; + isOrder = isType "order"; mkOrder = rank: content: mkProperty { property = { _type = "order"; @@ -434,7 +434,7 @@ rec { # properties on top of the option definition is nice for user manipulation # but require to check if the content of the property is not another # property. Such testing implies to verify if this is an attribute set - # and if it possess the type 'property'. (see isProperty & typeOf) + # and if it possess the type 'property'. (see isProperty & typeOf/isType) # # To avoid strict evaluation of option definitions, 'mkFixStrictness' is # introduced. This property protects an option definition by replacing diff --git a/pkgs/lib/systems.nix b/pkgs/lib/systems.nix index 09d04042f1c..1ef869fb012 100644 --- a/pkgs/lib/systems.nix +++ b/pkgs/lib/systems.nix @@ -15,7 +15,7 @@ in rec { - isSignificantByte = x: typeOf x == "significant-byte"; + isSignificantByte = isType "significant-byte"; significantBytes = setTypes "significant-byte" { bigEndian = {}; littleEndian = {}; @@ -37,7 +37,7 @@ rec { }; - isExecFormat = x: typeOf x == "exec-format"; + isExecFormat = isType "exec-format"; execFormats = setTypes "exec-format" { aout = {}; # a.out elf = {}; @@ -47,7 +47,7 @@ rec { }; - isKernel = x: typeOf x == "kernel"; + isKernel = isType "kernel"; kernels = with execFormats; setTypes "kernel" { cygwin = { execFormat = pe; }; @@ -61,7 +61,7 @@ rec { }; - isArchitecture = x: typeOf x == "architecture"; + isArchitecture = isType "architecture"; architectures = setTypes "architecture" { apple = {}; pc = {}; diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix index 9dce885b182..156d72ac5e7 100644 --- a/pkgs/lib/types.nix +++ b/pkgs/lib/types.nix @@ -10,6 +10,7 @@ with import ./trivial.nix; rec { + isType = type: x: (x._type or "") == type; hasType = x: isAttrs x && x ? _type; typeOf = x: x._type or ""; @@ -26,7 +27,7 @@ rec { # hasOptions (boolean: whatever this option contains an option set) # delayOnGlobalEval (boolean: should properties go through the evaluation of this option) # docPath (path concatenated to the option name contained in the option set) - isOptionType = attrs: typeOf attrs == "option-type"; + isOptionType = isType "option-type"; mkOptionType = { name , check ? (x: true) From edd2d907a001506715beab28af01bd3be4f430f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 22 Aug 2013 22:52:10 +0200 Subject: [PATCH 04/98] Remove jing_tools expression (now contained in jing expression itself) The jing expression now creates its own "jing" wrapper script, so there is no need for jing_tools anymore. jing hasn't been updated in years, so I assume (or hope) that not many (if any) have jing_tools in their configuration.nix. If you do, just change it to jing and it should behave the same. --- pkgs/tools/text/xml/jing/jing-script.nix | 12 ------------ pkgs/tools/text/xml/jing/script-builder.sh | 14 -------------- pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/release-python.nix | 1 - 4 files changed, 29 deletions(-) delete mode 100644 pkgs/tools/text/xml/jing/jing-script.nix delete mode 100644 pkgs/tools/text/xml/jing/script-builder.sh diff --git a/pkgs/tools/text/xml/jing/jing-script.nix b/pkgs/tools/text/xml/jing/jing-script.nix deleted file mode 100644 index d6433f43a0c..00000000000 --- a/pkgs/tools/text/xml/jing/jing-script.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl, jre, unzip} : - -stdenv.mkDerivation { - name = "jing-tools-20030619"; - builder = ./script-builder.sh; - - jing = (import ./default.nix) { - inherit stdenv fetchurl unzip; - }; - - inherit jre; -} \ No newline at end of file diff --git a/pkgs/tools/text/xml/jing/script-builder.sh b/pkgs/tools/text/xml/jing/script-builder.sh deleted file mode 100644 index d9cc8849276..00000000000 --- a/pkgs/tools/text/xml/jing/script-builder.sh +++ /dev/null @@ -1,14 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/bin - -cat >> $out/bin/jing < Date: Fri, 23 Aug 2013 09:01:12 +0300 Subject: [PATCH 05/98] Trivial change of wording of error messages --- pkgs/lib/options.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix index a7d1a3483a0..e8e01083a77 100644 --- a/pkgs/lib/options.nix +++ b/pkgs/lib/options.nix @@ -66,7 +66,7 @@ rec { if all opt.check list then opt.merge list else - throw "One of option ${name} values is of a bad type."; + throw "One of option ${name} values has a bad type."; } else opt; @@ -77,7 +77,7 @@ rec { if opt.check opt.default then opt.default else - throw "The default value of option ${name} is of a bad type."; + throw "The default value of option ${name} has a bad type."; } else opt; From 183ae4c812c281605a717582dd81434082a2124f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 23 Aug 2013 09:57:12 +0200 Subject: [PATCH 06/98] Adding the python package 'muttils' --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 903f48b2fa4..59707c58de8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3138,6 +3138,25 @@ pythonPackages = modules // import ./python-packages-generated.nix { }); + muttils = buildPythonPackage (rec { + name = "muttils-1.3"; + + src = fetchurl { + url = http://www.blacktrash.org/hg/muttils/archive/8bb26094df06.tar.bz2; + sha256 = "1a4kxa0fpgg6rdj5p4kggfn8xpniqh8v5kbiaqc6wids02m7kag6"; + }; + + # Tests don't work + doCheck = false; + + meta = { + description = "Utilities for use with console mail clients, like mutt"; + homepage = http://www.blacktrash.org/hg/muttils; + license = "GPLv2+"; + }; + }); + + MySQL_python = buildPythonPackage { name = "MySQL-python-1.2.3"; From 5303fb0f0f5aa7eee8bc356537b16856e0489289 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Fri, 23 Aug 2013 10:26:29 +0200 Subject: [PATCH 07/98] qemu: Update to 1.6.0 --- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index dcf5b4e5009..b826434549f 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -7,14 +7,14 @@ , x86Only ? false }: -let n = "qemu-1.5.2"; in +let n = "qemu-1.6.0"; in stdenv.mkDerivation rec { name = n + (if x86Only then "-x86-only" else ""); src = fetchurl { url = "http://wiki.qemu.org/download/${n}.tar.bz2"; - sha256 = "0l52jwlxmwp9g3jpq0g7ix9dq4qgh46nd2h58lh47f0a35yi8qgn"; + sha256 = "0j6bnaa93fyqwzg07krx5w1fb88ap1yz1hp84ilkpm16va5facii"; }; buildInputs = From 5b9227c5a815edb78fbb8ab15b5738251af1e61b Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Fri, 23 Aug 2013 11:21:08 +0200 Subject: [PATCH 08/98] libvirt: Update to 1.1.1 --- pkgs/development/libraries/libvirt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index e1e4a759e06..06ead3ca23f 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -3,14 +3,14 @@ , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils }: -let version = "1.1.0"; in +let version = "1.1.1"; in stdenv.mkDerivation { name = "libvirt-${version}"; src = fetchurl { url = "http://libvirt.org/sources/libvirt-${version}.tar.gz"; - sha256 = "0a39cwvzwf79gv3zw5mwp9q9n792rr1m0rl9ji39bdgcjxb7d7nf"; + sha256 = "1hi27d5pld925g1azx8jq0wv557wpkd6xrq6lzm91cdr2lg1wvyw"; }; buildInputs = From 7ef49ddee538f203d09ab314964d29d448b63fb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 23 Aug 2013 12:41:19 +0200 Subject: [PATCH 09/98] setuptools: add note why darwin tests are disabled --- pkgs/development/python-modules/setuptools/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 4c719e7dc42..bd1cb756f27 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; + # tests fail on darwin, see http://bitbucket.org/pypa/setuptools/issue/55/1-failure-lc_all-c-python33m-setuppy-test doCheck = (!stdenv.isDarwin); checkPhase = '' From a327b681649e3d6cdfaa201cf0bbd0d8537fb145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 23 Aug 2013 12:41:48 +0200 Subject: [PATCH 10/98] pypy: add setuphook for PYTHONPATH --- .../development/interpreters/pypy/2.0/default.nix | 1 + .../interpreters/pypy/2.0/setup-hook.sh | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/interpreters/pypy/2.0/setup-hook.sh diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix index 2dd681239a6..fb64d804056 100644 --- a/pkgs/development/interpreters/pypy/2.0/default.nix +++ b/pkgs/development/interpreters/pypy/2.0/default.nix @@ -47,6 +47,7 @@ let --replace "libraries = ['curses']" "libraries = ['ncurses']" ''; + setupHook = ./setup-hook.sh; doCheck = true; checkPhase = '' diff --git a/pkgs/development/interpreters/pypy/2.0/setup-hook.sh b/pkgs/development/interpreters/pypy/2.0/setup-hook.sh new file mode 100644 index 00000000000..96a04cb05dd --- /dev/null +++ b/pkgs/development/interpreters/pypy/2.0/setup-hook.sh @@ -0,0 +1,15 @@ +addPythonPath() { + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.0/site-packages +} + +toPythonPath() { + local paths="$1" + local result= + for i in $paths; do + p="$i/lib/pypy2.0/site-packages" + result="${result}${result:+:}$p" + done + echo $result +} + +envHooks=(${envHooks[@]} addPythonPath) From 50c0290f5178750784e15d5155c122f23b0babc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 23 Aug 2013 12:45:46 +0200 Subject: [PATCH 11/98] pypy: 2.0 -> 2.1 --- pkgs/development/interpreters/pypy/2.0/default.nix | 6 +++--- pkgs/development/interpreters/pypy/2.0/setup-hook.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix index fb64d804056..d02d5a8cb67 100644 --- a/pkgs/development/interpreters/pypy/2.0/default.nix +++ b/pkgs/development/interpreters/pypy/2.0/default.nix @@ -5,8 +5,8 @@ assert zlibSupport -> zlib != null; let - majorVersion = "2.0"; - version = "${majorVersion}.2"; + majorVersion = "2.1"; + version = "${majorVersion}"; pythonVersion = "2.7"; libPrefix = "pypy${majorVersion}"; @@ -17,7 +17,7 @@ let src = fetchurl { url = "https://bitbucket.org/pypy/pypy/downloads/pypy-${version}-src.tar.bz2"; - sha256 = "0g2cajs6m3yf0lak5f18ccs6j77cf5xvbm4h6y5l1qlqdc6wk48r"; + sha256 = "05vz7ya6jh5pw5yl607cf1rvdhwxj5d4ip0vpgb1gc9rjxn0dcri"; }; buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ] diff --git a/pkgs/development/interpreters/pypy/2.0/setup-hook.sh b/pkgs/development/interpreters/pypy/2.0/setup-hook.sh index 96a04cb05dd..87874f0370b 100644 --- a/pkgs/development/interpreters/pypy/2.0/setup-hook.sh +++ b/pkgs/development/interpreters/pypy/2.0/setup-hook.sh @@ -1,12 +1,12 @@ addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.0/site-packages + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.1/site-packages } toPythonPath() { local paths="$1" local result= for i in $paths; do - p="$i/lib/pypy2.0/site-packages" + p="$i/lib/pypy2.1/site-packages" result="${result}${result:+:}$p" done echo $result From a09d595c77c035a37248e9a01b9b0eb374d570eb Mon Sep 17 00:00:00 2001 From: modulistic Date: Fri, 23 Aug 2013 13:52:35 +0200 Subject: [PATCH 12/98] Add 'modulistic' 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 97bc8b915b8..78c77f61f4e 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -31,6 +31,7 @@ lovek323 = "Jason O'Conal "; ludo = "Ludovic Courtès "; marcweber = "Marc Weber "; + modulistic = "Pablo Costa "; mornfall = "Petr Ročkai "; offline = "Jaka Hudoklin "; orbitz = "Malcolm Matalka "; From cca6a6724c296e8a03e856b9f443b07179f4acbe Mon Sep 17 00:00:00 2001 From: modulistic Date: Fri, 23 Aug 2013 14:05:36 +0200 Subject: [PATCH 13/98] i3 window manager: version bump from 4.5.1 to 4.6 --- .../window-managers/i3/default.nix | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 9f9aaa5d665..f6d2dc4cfe5 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.5.1"; + version = "4.6"; src = fetchurl { url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "bae55f1c7c4a21d71aae182e4fab6038ba65ba4be5d1ceff9e269f4f74b823f2"; + sha256 = "1qand44hjqz84f2xzd0mmyk9vpsm7iwz6446s4ivdj6f86213lpm"; }; buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm @@ -20,12 +20,21 @@ stdenv.mkDerivation rec { configurePhase = "makeFlags=PREFIX=$out"; - meta = { - description = "i3 is a tiling window manager"; - homepage = "http://i3wm.org"; - maintainers = [ stdenv.lib.maintainers.garbas ]; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; + meta = with stdenv.lib; { + description = "A tiling window manager"; + homepage = "http://i3wm.org"; + maintainers = with maintainers; [ garbas modulistic ]; + license = licenses.bsd3; + platforms = platforms.all; + + longDescription = '' + A tiling window manager primarily targeted at advanced users and + developers. Based on a tree as data structure, supports tiling, + stacking, and tabbing layouts, handled dynamically, as well as + floating windows. Configured via plain text file. Multi-monitor. + UTF-8 clean. + ''; }; } + From e0819b1e2657dbfdd820eb8120807094cadf5fbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 23 Aug 2013 15:05:49 +0200 Subject: [PATCH 14/98] fcron: 3.0.4 -> 3.1.2 --- pkgs/tools/system/fcron/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix index 233a0c39d17..58719c682cb 100644 --- a/pkgs/tools/system/fcron/default.nix +++ b/pkgs/tools/system/fcron/default.nix @@ -2,28 +2,26 @@ # restart using 'killall -TERM fcron; fcron -b # use convert-fcrontab to update fcrontab files -{ stdenv, fetchurl, perl }: +{ stdenv, fetchurl, perl, busybox, vim }: -stdenv.mkDerivation { - name = "fcron-3.0.4"; +stdenv.mkDerivation rec { + name = "fcron-3.1.2"; src = fetchurl { - url = http://fcron.free.fr/archives/fcron-3.0.4.src.tar.gz; - sha256 = "15kgphsfa0nqgjd8yxyz947x2xyljj4iyh298kw4c8bz6iznqxn8"; + url = "http://fcron.free.fr/archives/${name}.src.tar.gz"; + sha256 = "0p8sn4m3frh2x2llafq2gbcm46rfrn6ck4qi0d0v3ql6mfx9k4hw"; }; buildInputs = [ perl ]; configureFlags = - [ "--with-sendmail=/var/setuid-wrappers/sendmail" - "--with-editor=/var/run/current-system/sw/bin/vi" + [ "--with-sendmail=${busybox}/sbin/sendmail" + "--with-editor=${vim}/bin/vi" # TODO customizable "--with-bootinstall=no" "--sysconfdir=/etc" # fcron would have been default user/grp "--with-username=root" "--with-groupname=root" - # fcron must not try to verify that sendmail has already been installed int /var/setuid-wrappers/sendmail - "--disable-checks" ]; installTargets = "install-staged"; # install does also try to change permissions of /etc/* files @@ -52,5 +50,6 @@ stdenv.mkDerivation { description="A command scheduler with extended capabilities over cron and anacron"; homepage = http://fcron.free.fr; license = "GPLv2"; + platforms = stdenv.lib.platforms.all; }; } From 21bd48f4395d8a58d8b734840b64aac47fe41223 Mon Sep 17 00:00:00 2001 From: Danylo Hlynskyi Date: Fri, 23 Aug 2013 17:14:44 +0300 Subject: [PATCH 15/98] Add convenient executable name to libreoffice ... so you can run libreoffice from command-line with `libreoffice` instead of `soffice` --- pkgs/applications/office/libreoffice/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 6e3f83caae3..ebc65394081 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -115,6 +115,7 @@ stdenv.mkDerivation rec { for a in sbase scalc sdraw smath swriter spadmin simpress soffice; do ln -s $out/lib/libreoffice/program/$a $out/bin/$a done + ln -s $out/bin/soffice $out/bin/libreoffice ''; configureFlags = [ From cbfe6c0e8df5d5334f0f7d3c22f018f457c86018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 23 Aug 2013 17:05:50 +0200 Subject: [PATCH 16/98] pypy: patch ncurses name correctly --- pkgs/development/interpreters/pypy/{2.0 => 2.1}/default.nix | 2 +- pkgs/development/interpreters/pypy/{2.0 => 2.1}/setup-hook.sh | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/interpreters/pypy/{2.0 => 2.1}/default.nix (97%) rename pkgs/development/interpreters/pypy/{2.0 => 2.1}/setup-hook.sh (100%) diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.1/default.nix similarity index 97% rename from pkgs/development/interpreters/pypy/2.0/default.nix rename to pkgs/development/interpreters/pypy/2.1/default.nix index d02d5a8cb67..f80a1dc7242 100644 --- a/pkgs/development/interpreters/pypy/2.0/default.nix +++ b/pkgs/development/interpreters/pypy/2.1/default.nix @@ -44,7 +44,7 @@ let --replace "/usr/include/ncurses/curses.h" "${ncurses}/include/curses.h" \ --replace "ncurses/curses.h" "${ncurses}/include/curses.h" \ --replace "ncurses/term.h" "${ncurses}/include/term.h" \ - --replace "libraries = ['curses']" "libraries = ['ncurses']" + --replace "libraries=['curses']" "libraries=['ncurses']" ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/interpreters/pypy/2.0/setup-hook.sh b/pkgs/development/interpreters/pypy/2.1/setup-hook.sh similarity index 100% rename from pkgs/development/interpreters/pypy/2.0/setup-hook.sh rename to pkgs/development/interpreters/pypy/2.1/setup-hook.sh From 17662a9a6eb6789cc07d06e048e890be6d11fbd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 23 Aug 2013 17:52:37 +0200 Subject: [PATCH 17/98] pypy: forgot to commit all-packages changes --- 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 0eea3c8db1a..eceb85ef5d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3151,7 +3151,7 @@ let libX11 = xlibs.libX11; }; - pypy = callPackage ../development/interpreters/pypy/2.0 { }; + pypy = callPackage ../development/interpreters/pypy/2.1 { }; pythonFull = python27Full; python26Full = callPackage ../development/interpreters/python/wrapper.nix { From b86b1b81f575415e9f6094313f8af2458484eccd Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 23 Aug 2013 19:00:28 +0300 Subject: [PATCH 18/98] Calligra: update to 2.7.2 --- pkgs/applications/office/calligra/default.nix | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 1b692586e0c..137e7be019f 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,24 +1,33 @@ { stdenv, fetchurl, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa , kdepimlibs, createresources ? null, eigen, qca2, exiv2, soprano, marble, lcms2 , fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, popplerQt4 -, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular }: +, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular +, libvisio, kactivities, mysql, postgresql, freetds, xbase, openexr, ilmbase + }: stdenv.mkDerivation rec { - name = "calligra-2.5.5"; + name = "calligra-2.7.2"; src = fetchurl { - url = "mirror://kde/stable/${name}/${name}.tar.bz2"; - sha256 = "0h9idadrcyjvd0mkwri4lg310mzpna6s0pvc7b7r3267wzjbn9kw"; + url = "mirror://kde/stable/${name}/${name}.tar.xz"; + sha256 = "1awnvv62fp5bjhi6fys37s6lpzxaig4v15m1zjlgxq82ig61w6sq"; }; nativeBuildInputs = [ cmake perl pkgconfig ]; - patches = [ ./fix-kde4.10-build.patch ]; +# patches = [ ./fix-kde4.10-build.patch ]; + +# TODO: package Vc, libWPS, OCIO, OpenShiva, QtShiva, Spnav, m2mml +# TODO: not found popplerQt4 buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype sqlite icu libwpd libwpg popplerQt4 libkdcraw libxslt fftw glew gsl - shared_desktop_ontologies okular ]; + shared_desktop_ontologies okular + libvisio kactivities mysql postgresql freetds xbase openexr +]; + + NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; meta = { description = "A Qt/KDE office suite, formely known as koffice"; From a10812f7921d1f9aa4d0329ead7d861a79785141 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Wed, 14 Aug 2013 15:02:07 +0200 Subject: [PATCH 19/98] Add emacs24-nox: emacs built without X (or GTK) libraries. This commit also fixes an issue where pkgconfig was only added as a dependency when gtk support was enabled. This made ./configure unable to find other libraries (libtiff, libxml2, gnutls, and others). --- pkgs/applications/editors/emacs-24/default.nix | 17 +++++++++-------- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 0e4c9a14d20..fbb7d7a4b16 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -2,9 +2,9 @@ , pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls , alsaLib +, withX ? true }: -assert (gtk != null) -> (pkgconfig != null); assert (libXft != null) -> libpng != null; # probably a bug assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise @@ -19,14 +19,15 @@ stdenv.mkDerivation rec { }; buildInputs = - [ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif - libtiff librsvg libXft gconf libxml2 imagemagick gnutls alsaLib - ] - ++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ] - ++ stdenv.lib.optional stdenv.isLinux dbus; + [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo ] + ++ stdenv.lib.optional stdenv.isLinux dbus + ++ stdenv.lib.optionals withX [ + x11 libXaw Xaw3d libXpm libpng libjpeg libungif + libtiff librsvg libXft imagemagick gtk + ]; configureFlags = - (if gtk != null then + (if withX then [ "--with-x-toolkit=gtk" "--with-xft"] else [ "--with-x-toolkit=no" ]) @@ -69,7 +70,7 @@ EOF homepage = "http://www.gnu.org/software/emacs/"; license = "GPLv3+"; - maintainers = with maintainers; [ chaoflow lovek323 simons ]; + maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny ]; platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eceb85ef5d0..c3e4ce5aa92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7375,6 +7375,10 @@ let else stdenv; }; + emacs24-nox = (appendToName "nox" (emacs24.override { + withX = false; + })); + emacsPackages = emacs: self: let callPackage = newScope self; in rec { inherit emacs; From fc101c01a537b087e146ac91defb20464b4edcca Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 23 Aug 2013 23:20:03 -0700 Subject: [PATCH 20/98] zfs-0.6.2 and spl-0.6.2 Enable parallelBuilding, too. --- pkgs/os-specific/linux/spl/default.nix | 8 +++++--- pkgs/os-specific/linux/zfs/default.nix | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 75ff2893972..6a9a4cc963f 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, kernelDev, perl, autoconf, automake, libtool, coreutils, gawk }: stdenv.mkDerivation { - name = "spl-0.6.1-${kernelDev.version}"; + name = "spl-0.6.2-${kernelDev.version}"; src = fetchurl { - url = "http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.1.tar.gz"; - sha256 = "1bnianc00bkpdbcmignzqfv9yr8h6vj56wfl7lkhi9a5m5b3xakb"; + url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.2.tar.gz; + sha256 = "196scl8q0bkkak6m0p1l1fz254cgsizqm73bf9wk3iynamq7qmrw"; }; patches = [ ./install_prefix.patch ]; @@ -27,6 +27,8 @@ stdenv.mkDerivation { --with-linux-obj=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build ''; + enableParallelBuilding = true; + meta = { description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index ac07474d3f4..06615d170a1 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, kernelDev, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }: stdenv.mkDerivation { - name = "zfs-0.6.1-${kernelDev.version}"; + name = "zfs-0.6.2-${kernelDev.version}"; src = fetchurl { - url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.1.tar.gz; - sha256 = "1ykph9d4p70mam6lvcx0zld6d34gch15dsilds5ncbxh0m52knl0"; + url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.2.tar.gz; + sha256 = "18b5f18k8mwb17r5ippsilmp1a2sqjw9fwn0z82159dkhsadg33b"; }; patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ]; @@ -33,6 +33,8 @@ stdenv.mkDerivation { --with-spl=${spl}/libexec/spl ''; + enableParallelBuilding = true; + meta = { description = "ZFS Filesystem Linux Kernel module"; longDescription = '' From 2f2eb135be136c6efe804d8b113150bd2d55f0b8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 Aug 2013 12:19:56 +0200 Subject: [PATCH 21/98] Don't prefer 'emacs24-nox' over the normal 'emacs24' attribute. --- 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 c3e4ce5aa92..74623b9c61b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7375,7 +7375,7 @@ let else stdenv; }; - emacs24-nox = (appendToName "nox" (emacs24.override { + emacs24-nox = lowPrio (appendToName "nox" (emacs24.override { withX = false; })); From 27d77bfc182fc01731d07fa17a4f32565477aa4c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Aug 2013 10:10:44 +0200 Subject: [PATCH 22/98] haskell-syb: add version 0.4.1 --- pkgs/development/libraries/haskell/syb/0.4.1.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/syb/0.4.1.nix diff --git a/pkgs/development/libraries/haskell/syb/0.4.1.nix b/pkgs/development/libraries/haskell/syb/0.4.1.nix new file mode 100644 index 00000000000..63fb364511f --- /dev/null +++ b/pkgs/development/libraries/haskell/syb/0.4.1.nix @@ -0,0 +1,15 @@ +{ cabal, HUnit, mtl }: + +cabal.mkDerivation (self: { + pname = "syb"; + version = "0.4.1"; + sha256 = "1lkh4rrqdzvb8kyry07x2z88v478hrw5cp8wmhjgpg0ck8ywncma"; + testDepends = [ HUnit mtl ]; + meta = { + homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; + description = "Scrap Your Boilerplate"; + 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 4c7fb8602a5..c49e3d6bcf8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -164,7 +164,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexPosix = self.regexPosix_0_95_2; split = self.split_0_2_2; stm = self.stm_2_4_2; - syb = self.syb_0_4_0; + syb = self.syb_0_4_1; text = self.text_0_11_3_1; transformers = self.transformers_0_3_0_0; unorderedContainers = self.unorderedContainers_0_2_3_0; @@ -1836,6 +1836,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); syb_0_3_6_2 = callPackage ../development/libraries/haskell/syb/0.3.6.2.nix {}; syb_0_3_7 = callPackage ../development/libraries/haskell/syb/0.3.7.nix {}; syb_0_4_0 = callPackage ../development/libraries/haskell/syb/0.4.0.nix {}; + syb_0_4_1 = callPackage ../development/libraries/haskell/syb/0.4.1.nix {}; syb = null; # by default, we assume that syb ships with GHC, which is # true for the older GHC versions From 938a27d1bf5d508f3650e5cd5e0759852458c9df Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Aug 2013 10:14:22 +0200 Subject: [PATCH 23/98] haskell-Graphalyze: delete obsolete package This library hasn't compiled in ages. --- .../libraries/haskell/Graphalyze/default.nix | 18 ------------------ pkgs/top-level/haskell-packages.nix | 2 -- 2 files changed, 20 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/Graphalyze/default.nix diff --git a/pkgs/development/libraries/haskell/Graphalyze/default.nix b/pkgs/development/libraries/haskell/Graphalyze/default.nix deleted file mode 100644 index d61abc7a245..00000000000 --- a/pkgs/development/libraries/haskell/Graphalyze/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, bktrees, fgl, filepath, graphviz, pandoc, random, text -, time -}: - -cabal.mkDerivation (self: { - pname = "Graphalyze"; - version = "0.14.0.1"; - sha256 = "1prgszkrnb22x9xkwmxbvb9w1h78ffig9268f3q3y65knggmwp1x"; - buildDepends = [ - bktrees fgl filepath graphviz pandoc random text time - ]; - meta = { - description = "Graph-Theoretic Analysis library"; - license = "unknown"; - 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 c49e3d6bcf8..a3048514fb7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1077,8 +1077,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); libc = pkgs.stdenv.gcc.libc; }; - Graphalyze = callPackage ../development/libraries/haskell/Graphalyze {}; - graphviz = callPackage ../development/libraries/haskell/graphviz {}; groupoids = callPackage ../development/libraries/haskell/groupoids {}; From b92c0c28960d89379a9a7b229dda515c1a5f3d4d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Aug 2013 10:14:41 +0200 Subject: [PATCH 24/98] haskell-SourceGraph: delete obsolete package This library hasn't compiled in ages. --- .../tools/haskell/SourceGraph/default.nix | 21 ------------------- pkgs/top-level/haskell-packages.nix | 4 ---- 2 files changed, 25 deletions(-) delete mode 100644 pkgs/development/tools/haskell/SourceGraph/default.nix diff --git a/pkgs/development/tools/haskell/SourceGraph/default.nix b/pkgs/development/tools/haskell/SourceGraph/default.nix deleted file mode 100644 index 17d19106481..00000000000 --- a/pkgs/development/tools/haskell/SourceGraph/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ cabal, Cabal, fgl, filepath, Graphalyze, graphviz, haskellSrcExts -, mtl, multiset, random -}: - -cabal.mkDerivation (self: { - pname = "SourceGraph"; - version = "0.7.0.5"; - sha256 = "0lbgs5a0ivn44bmc242hynsvczvxq2snz1fyjf13mrpfx8j5n8gk"; - isLibrary = false; - isExecutable = true; - buildDepends = [ - Cabal fgl filepath Graphalyze graphviz haskellSrcExts mtl multiset - random - ]; - meta = { - description = "Static code analysis using graph-theoretic techniques"; - license = "GPL"; - 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 a3048514fb7..e85e5c36d46 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2289,10 +2289,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hslogger = callPackage ../development/tools/haskell/hslogger {}; - SourceGraph = callPackage ../development/tools/haskell/SourceGraph { - haskellSrcExts = self.haskellSrcExts_1_11_1; - }; - tar = callPackage ../development/libraries/haskell/tar {}; threadscope = callPackage ../development/tools/haskell/threadscope {}; From ab006e69c4bf68a4d6fe9139b76a0d32f1a2f198 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Aug 2013 10:18:45 +0200 Subject: [PATCH 25/98] haskell-tasty: add version 0.2 --- .../libraries/haskell/tasty-hunit/default.nix | 13 +++++++++++++ .../haskell/tasty-smallcheck/default.nix | 14 ++++++++++++++ .../libraries/haskell/tasty/default.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 6 ++++++ 4 files changed, 50 insertions(+) create mode 100644 pkgs/development/libraries/haskell/tasty-hunit/default.nix create mode 100644 pkgs/development/libraries/haskell/tasty-smallcheck/default.nix create mode 100644 pkgs/development/libraries/haskell/tasty/default.nix diff --git a/pkgs/development/libraries/haskell/tasty-hunit/default.nix b/pkgs/development/libraries/haskell/tasty-hunit/default.nix new file mode 100644 index 00000000000..8bfaf3e4365 --- /dev/null +++ b/pkgs/development/libraries/haskell/tasty-hunit/default.nix @@ -0,0 +1,13 @@ +{ cabal, HUnit, mtl, tasty }: + +cabal.mkDerivation (self: { + pname = "tasty-hunit"; + version = "0.2"; + sha256 = "1476ac3rsaag9rfgglzs65wqlkzm09xzdz47ksyj3a4c6ajba1kw"; + buildDepends = [ HUnit mtl tasty ]; + meta = { + description = "HUnit support for the Tasty test framework"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix new file mode 100644 index 00000000000..b5b718cf04e --- /dev/null +++ b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix @@ -0,0 +1,14 @@ +{ cabal, async, smallcheck, tagged, tasty }: + +cabal.mkDerivation (self: { + pname = "tasty-smallcheck"; + version = "0.2"; + sha256 = "1xw0l1bikwavyq7s8q71a92x87mg7z65mk32nn5qx0zxwqsfb5l4"; + buildDepends = [ async smallcheck tagged tasty ]; + meta = { + homepage = "https://github.com/feuerbach/tasty"; + description = "SmallCheck support for the Tasty test framework"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix new file mode 100644 index 00000000000..b9f403bcc3d --- /dev/null +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -0,0 +1,17 @@ +{ cabal, ansiTerminal, mtl, optparseApplicative, regexPosix, stm +, tagged +}: + +cabal.mkDerivation (self: { + pname = "tasty"; + version = "0.2"; + sha256 = "1shd4bl0wb67abs7vv3cagvpinkz2348fh7fdh3rq8l5g1jflp8q"; + buildDepends = [ + ansiTerminal mtl optparseApplicative regexPosix stm tagged + ]; + meta = { + description = "Modern and extensible testing framework"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e85e5c36d46..cdfdce27fb4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1920,6 +1920,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); tagstreamConduit = callPackage ../development/libraries/haskell/tagstream-conduit {}; + tasty = callPackage ../development/libraries/haskell/tasty {}; + + tastyHunit = callPackage ../development/libraries/haskell/tasty-hunit {}; + + tastySmallcheck = callPackage ../development/libraries/haskell/tasty-smallcheck {}; + templateDefault = callPackage ../development/libraries/haskell/template-default {}; temporary = callPackage ../development/libraries/haskell/temporary {}; From 8216bc5bc4d8133c6e490130ef0e82244afc2215 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Aug 2013 10:18:58 +0200 Subject: [PATCH 26/98] haskell-contravariant: update to version 0.4.4 --- pkgs/development/libraries/haskell/contravariant/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix index 7978a4185af..d38058a25de 100644 --- a/pkgs/development/libraries/haskell/contravariant/default.nix +++ b/pkgs/development/libraries/haskell/contravariant/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "contravariant"; - version = "0.4.3"; - sha256 = "1hhcsy5bshi2yx8618wxa40gax5wfapnbgdmv1acgjyxb6vbmsp6"; + version = "0.4.4"; + sha256 = "1b4422wpcyvrf4r7rr8c8wa008f5ykaxs17vr4plp91rcczr87s4"; buildDepends = [ tagged transformers transformersCompat ]; meta = { homepage = "http://github.com/ekmett/contravariant/"; From 3c56bcd0adc2e9cefec8a10ae404660cdf1274a3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Aug 2013 10:18:58 +0200 Subject: [PATCH 27/98] haskell-crypto-cipher-tests: update to version 0.0.4 --- .../libraries/haskell/crypto-cipher-tests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix index 3e93912b3a7..12118a37540 100644 --- a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix +++ b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "crypto-cipher-tests"; - version = "0.0.2"; - sha256 = "1jzci2a6827jgiklj8sh7pjl7g4igk2j6mim20619i4rk6x0lhgz"; + version = "0.0.4"; + sha256 = "1c725zj94d6n33wldyzlm1qd32a0ais0w221ykpgs49rrd6hrpbh"; buildDepends = [ byteable cryptoCipherTypes HUnit mtl QuickCheck securemem testFramework testFrameworkHunit testFrameworkQuickcheck2 From 86a35f8b8d9830a1f4a8b43d24122c9171999506 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Aug 2013 10:18:58 +0200 Subject: [PATCH 28/98] haskell-crypto-cipher-types: update to version 0.0.4 --- .../libraries/haskell/crypto-cipher-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix index 378ccf3dbcc..f1665950a55 100644 --- a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-cipher-types"; - version = "0.0.2"; - sha256 = "1vjf9g1w7ja8x42k6hq6pcw7jvviw9rq512ncdqd7j20411zjbf4"; + version = "0.0.4"; + sha256 = "0ipwplw1mn6amjxk2i5sksxvfsnf2fv8rnrgyncl21mp1gbnq7h0"; buildDepends = [ byteable securemem ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-cipher"; From 47c084a6a1bf6c7d02015f1a5589fed04225ea87 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Aug 2013 10:18:58 +0200 Subject: [PATCH 29/98] haskell-cryptocipher: update to version 0.5.2 --- pkgs/development/libraries/haskell/cryptocipher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix index 6efca94a651..0f99ccdfe38 100644 --- a/pkgs/development/libraries/haskell/cryptocipher/default.nix +++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "cryptocipher"; - version = "0.5.1"; - sha256 = "118sabi90qjyqbvfincn737c4mi9mvjij1dzx7k9rsgad47p0753"; + version = "0.5.2"; + sha256 = "0ffd3w2hvi1zbhgk0xvgbnlfzzwijbrs5b9b4g2vc5p69wkv24zr"; isLibrary = true; isExecutable = true; buildDepends = [ From 2635ef463e4bcc634d359f2d2e2a9cd8f080d7bb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Aug 2013 10:18:59 +0200 Subject: [PATCH 30/98] haskell-derive: update to version 2.5.12 --- pkgs/development/libraries/haskell/derive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix index 906c51fc072..7fe2fdcba9f 100644 --- a/pkgs/development/libraries/haskell/derive/default.nix +++ b/pkgs/development/libraries/haskell/derive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "derive"; - version = "2.5.11"; - sha256 = "0934k49kpp32wffpvpk2sia7frd9ik56k6ghy6d6j31cabxf9m8r"; + version = "2.5.12"; + sha256 = "17agsdarxm22z4g911layb5g11gg8r1p2ar86pg1ch1q0jnhfqxr"; isLibrary = true; isExecutable = true; buildDepends = [ From fb720f8caadab5e5652d81e902f6f12eaf93517e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Aug 2013 10:18:59 +0200 Subject: [PATCH 31/98] haskell-monoid-extras: update to version 0.3.1.0 --- .../libraries/haskell/monoid-extras/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix index 969ab8bd0b8..2025ceaffe5 100644 --- a/pkgs/development/libraries/haskell/monoid-extras/default.nix +++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix @@ -1,10 +1,10 @@ -{ cabal, semigroups }: +{ cabal, semigroupoids, semigroups }: cabal.mkDerivation (self: { pname = "monoid-extras"; - version = "0.3.0.0"; - sha256 = "1bb8yq2vja80177h3wfadkjkwvcrszx0nq6m5n10f4lh9spvr087"; - buildDepends = [ semigroups ]; + version = "0.3.1.0"; + sha256 = "0nxdkx0j67nb41ingp1yl0appfx64ikf5709f48469qbaf3pgax3"; + buildDepends = [ semigroupoids semigroups ]; meta = { description = "Various extra monoid-related definitions and utilities"; license = self.stdenv.lib.licenses.bsd3; From a2a7e611a33646ccca1b9278bb226eb1fb25fc88 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Aug 2013 10:18:59 +0200 Subject: [PATCH 32/98] haskell-postgresql-simple: update to version 0.3.6.0 --- .../libraries/haskell/postgresql-simple/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index 2b99bb2eb6c..f9fa750b4b3 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.3.5.0"; - sha256 = "09w9cdjn9jvmcwh63ydjl8p28xfhrhy448y211z3carx2zwryshi"; + version = "0.3.6.0"; + sha256 = "1qszr3k7cihizbaq3naj134gavkpamk8q3g02rsilzvn0ivq8wb8"; buildDepends = [ attoparsec blazeBuilder blazeTextual postgresqlLibpq text time transformers vector From 0b46d3c76b69cfabe65ff52d8ad384f09fbf1f66 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Aug 2013 10:18:59 +0200 Subject: [PATCH 33/98] haskell-securemem: update to version 0.1.3 --- pkgs/development/libraries/haskell/securemem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/securemem/default.nix b/pkgs/development/libraries/haskell/securemem/default.nix index cc031470593..5b6fc4e95ca 100644 --- a/pkgs/development/libraries/haskell/securemem/default.nix +++ b/pkgs/development/libraries/haskell/securemem/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "securemem"; - version = "0.1.2"; - sha256 = "1szb530jw7666cnrfa8988p2b5scl2bfafi8kgslf7xi5yv7grqh"; + version = "0.1.3"; + sha256 = "1kycpk73vh8wwxzn35hmv36vwsc9r4g53f2fy6bn21q9gfm2r90j"; buildDepends = [ byteable ]; meta = { homepage = "http://github.com/vincenthz/hs-securemem"; From c359bac0a3e7aaeb72fd6b8a0a614bb7704dd560 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Aug 2013 10:18:59 +0200 Subject: [PATCH 34/98] haskell-stylish-haskell: update to version 0.5.8.0 --- .../development/libraries/haskell/stylish-haskell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index 5c1059e634c..74646c9acca 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "stylish-haskell"; - version = "0.5.7.0"; - sha256 = "12ka5lyp28fy8gablhymxdldl792ycr8d51lsknhldb54pmklf73"; + version = "0.5.8.0"; + sha256 = "1wjrn4cq47jjmqkb2zv02x90l2mv6n7zh4mvcav25s9bwvvca10r"; isLibrary = true; isExecutable = true; buildDepends = [ From fe2acafee750f9addcfeecb1469373f686448336 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Aug 2013 10:18:59 +0200 Subject: [PATCH 35/98] haskell-hlint: update to version 1.8.51 --- pkgs/development/tools/haskell/hlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index c6640873a52..d1d03c2c890 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.8.50"; - sha256 = "02gbqlyi1c82jjzy9ipmrvxcyizvs86af7z35x9wz3imlnzx1l6c"; + version = "1.8.51"; + sha256 = "0cm78921ksysiz81x3m7kjq343fr46fpm61cw367aljd86lhivv1"; isLibrary = true; isExecutable = true; buildDepends = [ From 37440d740c494a807521eea46941b3fbcde42b2c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Aug 2013 11:52:00 +0200 Subject: [PATCH 36/98] haskell-hoogle: update to version 4.2.19 --- .../libraries/haskell/hoogle/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 1e722a186dc..dfca21b1ce3 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -1,18 +1,23 @@ -{ cabal, binary, blazeBuilder, Cabal, caseInsensitive, cmdargs -, conduit, filepath, haskellSrcExts, httpTypes, parsec, random -, safe, tagsoup, time, transformers, uniplate, wai, warp +{ cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive +, cmdargs, conduit, deepseq, filepath, haskellSrcExts, hspec +, hspecExpectations, httpTypes, HUnit, parsec, random, safe +, systemFileio, tagsoup, text, time, transformers, uniplate, wai +, warp }: cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.16"; - sha256 = "1hamwqhndrkajm4xvxxfhr2rnlmf3z2ysyfxx3y6d24jawjyqf8a"; + version = "4.2.19"; + sha256 = "0mfmb3ky93gicwd1i4n3xfhlr3y6zgc4dv2nrilrr9l0kfka37f8"; isLibrary = true; isExecutable = true; buildDepends = [ - binary blazeBuilder Cabal caseInsensitive cmdargs conduit filepath - haskellSrcExts httpTypes parsec random safe tagsoup time - transformers uniplate wai warp + aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit + deepseq filepath haskellSrcExts httpTypes parsec random safe + tagsoup text time transformers uniplate wai warp + ]; + testDepends = [ + conduit hspec hspecExpectations HUnit systemFileio transformers ]; meta = { homepage = "http://www.haskell.org/hoogle/"; From 67167c9170aec411ab9f68137f6e343dce022c92 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Aug 2013 11:52:57 +0200 Subject: [PATCH 37/98] haskell-src-exts: add version 1.14.0 and drop obsolete 1.11.1 --- .../haskell-src-exts/{1.11.1.nix => 1.14.0.nix} | 13 +++++++++---- pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/haskell-src-exts/{1.11.1.nix => 1.14.0.nix} (55%) diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.14.0.nix similarity index 55% rename from pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix rename to pkgs/development/libraries/haskell/haskell-src-exts/1.14.0.nix index 1918260cc62..16595e33156 100644 --- a/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix +++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.14.0.nix @@ -1,14 +1,19 @@ -{ cabal, cpphs, happy }: +{ cabal, cpphs, filepath, happy, smallcheck, tasty, tastyHunit +, tastySmallcheck +}: cabal.mkDerivation (self: { pname = "haskell-src-exts"; - version = "1.11.1"; - sha256 = "1jqf8l81zw7x5ryf8h2n0b2636yhxkfp3j4ndbqw6hc7i5q581m6"; + version = "1.14.0"; + sha256 = "070khsw56xwyrclamv5wckj9na2xbzibv702xx52ik2wbs21dr0d"; buildDepends = [ cpphs ]; + testDepends = [ + filepath smallcheck tasty tastyHunit tastySmallcheck + ]; buildTools = [ happy ]; doCheck = false; meta = { - homepage = "http://code.haskell.org/haskell-src-exts"; + homepage = "https://github.com/haskell-suite/haskell-src-exts"; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cdfdce27fb4..a949a56fa0b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1114,8 +1114,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellSrc_1_0_1_5 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.5.nix {}; haskellSrc = self.haskellSrc_1_0_1_5; - haskellSrcExts_1_11_1 = callPackage ../development/libraries/haskell/haskell-src-exts/1.11.1.nix {}; haskellSrcExts_1_13_5 = callPackage ../development/libraries/haskell/haskell-src-exts/1.13.5.nix {}; + haskellSrcExts_1_14_0 = callPackage ../development/libraries/haskell/haskell-src-exts/1.14.0.nix {}; haskellSrcExts = self.haskellSrcExts_1_13_5; haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {}; From 3bf9a5a7730ac1fd2a2a850d3003803fbd453bd6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Aug 2013 11:58:16 +0200 Subject: [PATCH 38/98] Switch hoogle, hlint, derive, and stylish-haskell to the latest version of haskell-src-exts. --- pkgs/top-level/haskell-packages.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a949a56fa0b..bb946f2a8b1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -830,7 +830,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); deepseqTh = callPackage ../development/libraries/haskell/deepseq-th {}; - derive = callPackage ../development/libraries/haskell/derive {}; + derive = callPackage ../development/libraries/haskell/derive { + haskellSrcExts = self.haskellSrcExts_1_14_0; + }; dependentMap = callPackage ../development/libraries/haskell/dependent-map {}; @@ -1189,7 +1191,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hoauth = callPackage ../development/libraries/haskell/hoauth {}; - hoogle = callPackage ../development/libraries/haskell/hoogle {}; + hoogle = callPackage ../development/libraries/haskell/hoogle { + haskellSrcExts = self.haskellSrcExts_1_14_0; + }; hopenssl = callPackage ../development/libraries/haskell/hopenssl {}; @@ -1825,7 +1829,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); strptime = callPackage ../development/libraries/haskell/strptime {}; - stylishHaskell = callPackage ../development/libraries/haskell/stylish-haskell {}; + stylishHaskell = callPackage ../development/libraries/haskell/stylish-haskell { + haskellSrcExts = self.haskellSrcExts_1_14_0; + }; syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {}; syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {}; @@ -2291,7 +2297,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hasktags = callPackage ../development/tools/haskell/hasktags {}; - hlint = callPackage ../development/tools/haskell/hlint {}; + hlint = callPackage ../development/tools/haskell/hlint { + haskellSrcExts = self.haskellSrcExts_1_14_0; + }; hslogger = callPackage ../development/tools/haskell/hslogger {}; From 384292b4d553862d99f5a4d9afc3f6a665da033e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Aug 2013 12:14:04 +0200 Subject: [PATCH 39/98] haskell-hoogle: disable test suite to fix the build Running 1 test suites... Test suite hoogle-test: RUNNING... hoogle-test: datadir/testdata.txt: openFile: does not exist (No such file or directory) Test suite hoogle-test: FAIL Test suite logged to: dist/test/hoogle-4.2.19-hoogle-test.log 0 of 1 test suites (0 of 1 test cases) passed. --- pkgs/development/libraries/haskell/hoogle/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index dfca21b1ce3..c4039458d76 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -19,6 +19,7 @@ cabal.mkDerivation (self: { testDepends = [ conduit hspec hspecExpectations HUnit systemFileio transformers ]; + doCheck = false; meta = { homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; From 1a3667773f8898c47bdd17f497f7bd910c8ec9a3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Aug 2013 11:47:13 +0200 Subject: [PATCH 40/98] haskell-MissingH: update to version 1.2.0.2 --- pkgs/development/libraries/haskell/MissingH/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix index b87c47f04be..59656d51978 100644 --- a/pkgs/development/libraries/haskell/MissingH/default.nix +++ b/pkgs/development/libraries/haskell/MissingH/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "MissingH"; - version = "1.2.0.1"; - sha256 = "0hxyf82g2rz36ks6n136p6brgs0r9cnxfkh4xgl6iw11wbq2rb5m"; + version = "1.2.0.2"; + sha256 = "1wrrfa8dy0h0c53f1zjzwdkj8wkwsbi6qhv35wwlaz39dk32c4nn"; buildDepends = [ filepath hslogger HUnit mtl network parsec random regexCompat time ]; From dd476c7276c03c0b50f02773422a75f333d618bc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Aug 2013 11:47:14 +0200 Subject: [PATCH 41/98] haskell-comonad-transformers: update to version 3.1 --- .../libraries/haskell/comonad-transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix index 45b218a40f7..ef0ffe06198 100644 --- a/pkgs/development/libraries/haskell/comonad-transformers/default.nix +++ b/pkgs/development/libraries/haskell/comonad-transformers/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "comonad-transformers"; - version = "3.0.4"; - sha256 = "1jvg08vmi47p8ji1llci02lk675q93pm6dd8imqj6xjrq34g4x9a"; + version = "3.1"; + sha256 = "024l437xfi0bkbn3121xi8slwsh9jby9a92qg1m5y0nmxzs9lxda"; buildDepends = [ comonad contravariant distributive semigroupoids semigroups transformers From 3740307b5b3658673995b0ac4d09648279fd42b5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Aug 2013 11:47:14 +0200 Subject: [PATCH 42/98] haskell-xml-conduit: update to version 1.1.0.7 --- pkgs/development/libraries/haskell/xml-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index bd21eee5aa9..4e965c2ebaa 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "1.1.0.6"; - sha256 = "08kz982c95hcni6zbrflv8kqvy7wccb19plsmwczhzcsifam5a9k"; + version = "1.1.0.7"; + sha256 = "04yg2mif9s3hsm5c18mf6rmw22j8prs8a1272fz25vzxzljfs2r9"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup conduit dataDefault deepseq failure From eb703936d064596842b4588c48af278a81a70d9f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Aug 2013 11:47:14 +0200 Subject: [PATCH 43/98] haskell-cabal2ghci: update to version 0.0.1.1 --- pkgs/development/tools/haskell/cabal2ghci/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2ghci/default.nix b/pkgs/development/tools/haskell/cabal2ghci/default.nix index cd7bf9dc9d1..f8adaee4671 100644 --- a/pkgs/development/tools/haskell/cabal2ghci/default.nix +++ b/pkgs/development/tools/haskell/cabal2ghci/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cabal2ghci"; - version = "0.0.1.0"; - sha256 = "0l5225gwm6j25694cp94d4z31i1p68pq6js3psbr7m204q409dr5"; + version = "0.0.1.1"; + sha256 = "1fg3pr25f78a6b8nqxvxki4z3fvgx4i6zkmpl992a0iarycqdrsg"; isLibrary = false; isExecutable = true; buildDepends = [ From db9383d93b7af92c22062111a536b5c319e3c58b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Aug 2013 11:47:14 +0200 Subject: [PATCH 44/98] haskell-hslogger: update to version 1.2.2 --- pkgs/development/tools/haskell/hslogger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/hslogger/default.nix b/pkgs/development/tools/haskell/hslogger/default.nix index 4443637def4..f99a4585ec6 100644 --- a/pkgs/development/tools/haskell/hslogger/default.nix +++ b/pkgs/development/tools/haskell/hslogger/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hslogger"; - version = "1.2.1"; - sha256 = "1vfdf7i6fd4mb3rn57z3wn7bhw4z5g47f4vggb4sms5rg4zqqly5"; + version = "1.2.2"; + sha256 = "0j15nma6yf3cxb9j232kif1a836zmncfyklz9wp1mx064nblr5jf"; isLibrary = true; isExecutable = true; buildDepends = [ mtl network time ]; From 5ba7c2a24f78c43573f64a3654a52d094f78f753 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Aug 2013 11:54:56 +0200 Subject: [PATCH 45/98] haskell-cabal2nix: update to version 1.54 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 29585256216..4e2bbf63b31 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.53"; - sha256 = "1xhvxx5maj03rc6zd8bcqwzyn3b9yqxsbzgdh4d9ss4myn8x2zp3"; + version = "1.54"; + sha256 = "169syf99gs0gj44hcnpgx0xvrmz5mq70hb6bq6ydma9ivjvz2jg4"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; From baf22bd8f6c13bc66c2718c41f28db950ac070e1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 Aug 2013 11:24:22 +0200 Subject: [PATCH 46/98] haskell-diagrams: update to version 0.7.1 --- pkgs/development/libraries/haskell/diagrams/diagrams.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix index 84d3d9bbf48..efa63bdc0b7 100644 --- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix +++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "diagrams"; - version = "0.7"; - sha256 = "08ibmxzykb9v8y7ars9jz2qyss8ln8i6j87sm31bq5g9kvpy287c"; + version = "0.7.1"; + sha256 = "0rdpp26zvimdhdw0jpw6w606jkzkqdx0pq4051fkyk2mldwk9ipj"; buildDepends = [ diagramsContrib diagramsCore diagramsLib diagramsSvg ]; From cc14d21bc26a54794b598d937811af16616df677 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 Aug 2013 11:24:22 +0200 Subject: [PATCH 47/98] haskell-http-conduit: update to version 1.9.4.3 --- 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 f6a06e33515..eb7f1a0d468 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.9.4.2"; - sha256 = "13qjf3c3qkaqdi7qp1iqywvsbsiqq8brbzwh8idaj1bhl9jizwhx"; + version = "1.9.4.3"; + sha256 = "0lmshqv1ybim4201nb9wskyhg4fnslbm4ymvlmhn5zx0nwd777p9"; buildDepends = [ asn1Data base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie cprngAes dataDefault From 82e1c8a34bef74cb14b9c8005faf198066d465ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 24 Aug 2013 19:55:00 +0200 Subject: [PATCH 48/98] v8: build binaries for unix platforms --- pkgs/development/libraries/v8/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 25deb9eb351..3fc3138ef52 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -53,4 +53,10 @@ stdenv.mkDerivation { install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.gcc.gcc}/lib/libgcc_s.1.dylib $out/bin/d8 install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.gcc.gcc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib '' else null; + + meta = with stdenv.lib; { + description = "V8 is Google's open source JavaScript engine"; + platforms = platforms.unix; + license = licenses.bsd3; + }; } From 03dd7deef21b2bd59b46137e14130b00a6be33b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 24 Aug 2013 19:55:28 +0200 Subject: [PATCH 49/98] node-packages: add ungit and update packages --- pkgs/top-level/node-packages-generated.nix | 1266 +++++++++++++++++--- 1 file changed, 1098 insertions(+), 168 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index d3477447d8c..7bb1a67c489 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -115,6 +115,23 @@ ]; passthru.names = [ "adm-zip" ]; }; + full."ambi"."~2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "ambi-2.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ambi/-/ambi-2.0.0.tgz"; + sha1 = "42c2bf98e8d101aa4da28a812678a5dbe36ada66"; + }) + ]; + buildInputs = + (self.nativeDeps."ambi"."~2.0.0" or []); + deps = [ + self.full."typechecker"."~2.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "ambi" ]; + }; full."amdefine"."*" = lib.makeOverridable self.buildNodePackage { name = "amdefine-0.0.8"; src = [ @@ -429,6 +446,22 @@ ]; passthru.names = [ "async" ]; }; + full."async"."0.2.9" = lib.makeOverridable self.buildNodePackage { + name = "async-0.2.9"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz"; + sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; + }) + ]; + buildInputs = + (self.nativeDeps."async"."0.2.9" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "async" ]; + }; full."async"."0.2.x" = lib.makeOverridable self.buildNodePackage { name = "async-0.2.9"; src = [ @@ -612,6 +645,28 @@ ]; passthru.names = [ "backoff" ]; }; + full."bal-util"."~2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "bal-util-2.0.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bal-util/-/bal-util-2.0.5.tgz"; + sha1 = "b5a3b78e520b17892dfa051d2a819e8a48455b9c"; + }) + ]; + buildInputs = + (self.nativeDeps."bal-util"."~2.0.0" or []); + deps = [ + self.full."ambi"."~2.0.0" + self.full."eachr"."~2.0.2" + self.full."extendr"."~2.0.1" + self.full."safefs"."~3.0.1" + self.full."taskgroup"."~3.1.1" + self.full."typechecker"."~2.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "bal-util" ]; + }; full."base64id"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "base64id-0.1.0"; src = [ @@ -765,11 +820,11 @@ passthru.names = [ "boom" ]; }; full."bower".">=0.9.0" = lib.makeOverridable self.buildNodePackage { - name = "bower-1.2.2"; + name = "bower-1.2.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/bower/-/bower-1.2.2.tgz"; - sha1 = "f6bc27b0a3b87d201c9223792795b6d7fd31b6c0"; + url = "http://registry.npmjs.org/bower/-/bower-1.2.4.tgz"; + sha1 = "7dce66cef5ffab8ef56c053d8df5aa1f1356cfac"; }) ]; buildInputs = @@ -817,11 +872,11 @@ passthru.names = [ "bower" ]; }; full."bower-config"."~0.4.3" = lib.makeOverridable self.buildNodePackage { - name = "bower-config-0.4.3"; + name = "bower-config-0.4.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/bower-config/-/bower-config-0.4.3.tgz"; - sha1 = "6d3d9d31967c76daf140eca4b06924b13daccc89"; + url = "http://registry.npmjs.org/bower-config/-/bower-config-0.4.4.tgz"; + sha1 = "33c6a772397f24d46322a294b415128a6e3090ff"; }) ]; buildInputs = @@ -1276,16 +1331,16 @@ ]; passthru.names = [ "chalk" ]; }; - full."character-parser"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "character-parser-1.0.2"; + full."character-parser"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "character-parser-1.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/character-parser/-/character-parser-1.0.2.tgz"; - sha1 = "55384d6afcf8c6b9dd483e8347646a790e4545e7"; + url = "http://registry.npmjs.org/character-parser/-/character-parser-1.2.0.tgz"; + sha1 = "94134d6e5d870a39be359f7d22460935184ddef6"; }) ]; buildInputs = - (self.nativeDeps."character-parser"."1.0.2" or []); + (self.nativeDeps."character-parser"."1.2.0" or []); deps = [ ]; peerDependencies = [ @@ -1570,6 +1625,24 @@ ]; passthru.names = [ "cmd-shim" ]; }; + full."cmd-shim"."~1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "cmd-shim-1.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-1.1.0.tgz"; + sha1 = "e69fe26e9a8b9040c7b61dc8ad6b04d7dbabe767"; + }) + ]; + buildInputs = + (self.nativeDeps."cmd-shim"."~1.1.0" or []); + deps = [ + self.full."mkdirp"."~0.3.3" + self.full."graceful-fs"."1.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "cmd-shim" ]; + }; full."coffee-script"."*" = lib.makeOverridable self.buildNodePackage { name = "coffee-script-1.6.3"; src = [ @@ -1684,11 +1757,11 @@ passthru.names = [ "colors" ]; }; full."colors"."0.6.x" = lib.makeOverridable self.buildNodePackage { - name = "colors-0.6.1"; + name = "colors-0.6.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/colors/-/colors-0.6.1.tgz"; - sha1 = "59c7799f6c91e0e15802980a98ed138b3c78f4e9"; + url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; + sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; }) ]; buildInputs = @@ -1700,11 +1773,11 @@ passthru.names = [ "colors" ]; }; full."colors"."0.x.x" = lib.makeOverridable self.buildNodePackage { - name = "colors-0.6.1"; + name = "colors-0.6.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/colors/-/colors-0.6.1.tgz"; - sha1 = "59c7799f6c91e0e15802980a98ed138b3c78f4e9"; + url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; + sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; }) ]; buildInputs = @@ -1797,18 +1870,17 @@ ]; passthru.names = [ "commander" ]; }; - full."commander"."1.3.2" = lib.makeOverridable self.buildNodePackage { - name = "commander-1.3.2"; + full."commander"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "commander-2.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-1.3.2.tgz"; - sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5"; + url = "http://registry.npmjs.org/commander/-/commander-2.0.0.tgz"; + sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928"; }) ]; buildInputs = - (self.nativeDeps."commander"."1.3.2" or []); + (self.nativeDeps."commander"."2.0.0" or []); deps = [ - self.full."keypress"."0.1.x" ]; peerDependencies = [ ]; @@ -1887,6 +1959,32 @@ ]; passthru.names = [ "configstore" ]; }; + full."connect"."2.7.11" = lib.makeOverridable self.buildNodePackage { + name = "connect-2.7.11"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/connect/-/connect-2.7.11.tgz"; + sha1 = "f561d5eef70b8d719c397f724d34ba4065c77a3e"; + }) + ]; + buildInputs = + (self.nativeDeps."connect"."2.7.11" or []); + deps = [ + self.full."qs"."0.6.5" + self.full."formidable"."1.0.14" + self.full."cookie-signature"."1.0.1" + self.full."buffer-crc32"."0.2.1" + self.full."cookie"."0.0.5" + self.full."send"."0.1.1" + self.full."bytes"."0.2.0" + self.full."fresh"."0.1.0" + self.full."pause"."0.0.1" + self.full."debug"."*" + ]; + peerDependencies = [ + ]; + passthru.names = [ "connect" ]; + }; full."connect"."2.7.5" = lib.makeOverridable self.buildNodePackage { name = "connect-2.7.5"; src = [ @@ -2791,6 +2889,23 @@ ]; passthru.names = [ "dtrace-provider" ]; }; + full."eachr"."~2.0.2" = lib.makeOverridable self.buildNodePackage { + name = "eachr-2.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/eachr/-/eachr-2.0.2.tgz"; + sha1 = "f1100c5bb1619f6ee86a0661fe604e3a9ad7559d"; + }) + ]; + buildInputs = + (self.nativeDeps."eachr"."~2.0.2" or []); + deps = [ + self.full."typechecker"."~2.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "eachr" ]; + }; full."editor"."0.0.4" = lib.makeOverridable self.buildNodePackage { name = "editor-0.0.4"; src = [ @@ -3090,6 +3205,33 @@ ]; passthru.names = [ "express" ]; }; + full."express"."3.2.6" = lib.makeOverridable self.buildNodePackage { + name = "express-3.2.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/express/-/express-3.2.6.tgz"; + sha1 = "d8a9fe065adc23c5b41ec2c689c672b261430ffc"; + }) + ]; + buildInputs = + (self.nativeDeps."express"."3.2.6" or []); + deps = [ + self.full."connect"."2.7.11" + self.full."commander"."0.6.1" + self.full."range-parser"."0.0.4" + self.full."mkdirp"."0.3.4" + self.full."cookie"."0.1.0" + self.full."buffer-crc32"."0.2.1" + self.full."fresh"."0.1.0" + self.full."methods"."0.0.1" + self.full."send"."0.1.0" + self.full."cookie-signature"."1.0.1" + self.full."debug"."*" + ]; + peerDependencies = [ + ]; + passthru.names = [ "express" ]; + }; full."express"."3.x" = lib.makeOverridable self.buildNodePackage { name = "express-3.3.5"; src = [ @@ -3197,6 +3339,23 @@ passthru.names = [ "extend" ]; }; "extend" = self.full."extend"."*"; + full."extendr"."~2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "extendr-2.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/extendr/-/extendr-2.0.1.tgz"; + sha1 = "d8ab375fcbb833e4ba2cd228540f04e4aa07de90"; + }) + ]; + buildInputs = + (self.nativeDeps."extendr"."~2.0.1" or []); + deps = [ + self.full."typechecker"."~2.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "extendr" ]; + }; full."extsprintf"."1.0.0" = lib.makeOverridable self.buildNodePackage { name = "extsprintf-1.0.0"; src = [ @@ -3313,6 +3472,24 @@ ]; passthru.names = [ "findup-sync" ]; }; + full."findup-sync"."~0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "findup-sync-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.1.2.tgz"; + sha1 = "da2b96ca9f800e5a13d0a11110f490b65f62e96d"; + }) + ]; + buildInputs = + (self.nativeDeps."findup-sync"."~0.1.2" or []); + deps = [ + self.full."glob"."~3.1.21" + self.full."lodash"."~1.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "findup-sync" ]; + }; full."flatiron"."*" = lib.makeOverridable self.buildNodePackage { name = "flatiron-0.3.8"; src = [ @@ -3457,6 +3634,28 @@ passthru.names = [ "forever-monitor" ]; }; "forever-monitor" = self.full."forever-monitor"."*"; + full."forever-monitor"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "forever-monitor-1.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.1.0.tgz"; + sha1 = "439ce036f999601cff551aea7f5151001a869ef9"; + }) + ]; + buildInputs = + (self.nativeDeps."forever-monitor"."1.1.0" or []); + deps = [ + self.full."broadway"."0.2.x" + self.full."minimatch"."0.0.x" + self.full."pkginfo"."0.x.x" + self.full."ps-tree"."0.0.x" + self.full."watch"."0.5.x" + self.full."utile"."0.1.x" + ]; + peerDependencies = [ + ]; + passthru.names = [ "forever-monitor" ]; + }; full."forever-monitor"."1.2.2" = lib.makeOverridable self.buildNodePackage { name = "forever-monitor-1.2.2"; src = [ @@ -3518,18 +3717,18 @@ passthru.names = [ "form-data" ]; }; full."form-data"."~0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "form-data-0.1.0"; + name = "form-data-0.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-0.1.0.tgz"; - sha1 = "d36b59baf9b292bb2e5034d7a6079b2bd1e9df83"; + url = "http://registry.npmjs.org/form-data/-/form-data-0.1.1.tgz"; + sha1 = "0d5f2805647b45533ba10bc8a59cf17d1efa5f12"; }) ]; buildInputs = (self.nativeDeps."form-data"."~0.1.0" or []); deps = [ self.full."combined-stream"."~0.0.4" - self.full."mime"."~1.2.9" + self.full."mime"."~1.2.11" self.full."async"."~0.2.9" ]; peerDependencies = [ @@ -3827,39 +4026,40 @@ passthru.names = [ "fstream-npm" ]; }; full."generator-angular"."*" = lib.makeOverridable self.buildNodePackage { - name = "generator-angular-0.3.1"; + name = "generator-angular-0.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.3.1.tgz"; - sha1 = "124d8752a0252b2ba833285ee3415a455d0b4bdd"; + url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.4.0.tgz"; + sha1 = "4fbaaa87b829f3f2fc72fac3da1fa47ff801ca1d"; }) ]; buildInputs = (self.nativeDeps."generator-angular"."*" or []); deps = [ - self.full."yeoman-generator"."~0.12.0" + self.full."yeoman-generator"."~0.13.0" ]; peerDependencies = [ - self.full."generator-karma"."~0.4.0" + self.full."generator-karma"."~0.5.0" self.full."yo".">=1.0.0-rc.1.1" ]; passthru.names = [ "generator-angular" ]; }; "generator-angular" = self.full."generator-angular"."*"; - full."generator-karma"."~0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "generator-karma-0.4.1"; + full."generator-karma"."~0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "generator-karma-0.5.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-karma/-/generator-karma-0.4.1.tgz"; - sha1 = "50ee26e3e9d246d2f2a1ada72c5f4a7bf1c08a0b"; + url = "http://registry.npmjs.org/generator-karma/-/generator-karma-0.5.0.tgz"; + sha1 = "3b9dc1154e232a135c0e4598834540977038617d"; }) ]; buildInputs = - (self.nativeDeps."generator-karma"."~0.4.0" or []); + (self.nativeDeps."generator-karma"."~0.5.0" or []); deps = [ - self.full."yeoman-generator"."~0.12.0" + self.full."yeoman-generator"."~0.13.0" ]; peerDependencies = [ + self.full."yo".">=1.0.0-rc.1.1" ]; passthru.names = [ "generator-karma" ]; }; @@ -3881,22 +4081,22 @@ passthru.names = [ "generator-mocha" ]; }; full."generator-webapp"."*" = lib.makeOverridable self.buildNodePackage { - name = "generator-webapp-0.2.7"; + name = "generator-webapp-0.3.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.2.7.tgz"; - sha1 = "3d8f776719910802f4bf5156d6473f435c5fd570"; + url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.3.1.tgz"; + sha1 = "def094ddf1b079fd1e33fe381bc898c4f094bd1e"; }) ]; buildInputs = (self.nativeDeps."generator-webapp"."*" or []); deps = [ - self.full."yeoman-generator"."~0.12.3" + self.full."yeoman-generator"."~0.13.1" self.full."cheerio"."~0.12.1" ]; peerDependencies = [ - self.full."generator-mocha"."~0.1.1" self.full."yo".">=1.0.0-rc.1.1" + self.full."generator-mocha"."~0.1.1" ]; passthru.names = [ "generator-webapp" ]; }; @@ -4061,6 +4261,22 @@ ]; passthru.names = [ "glob" ]; }; + full."graceful-fs"."1.2" = lib.makeOverridable self.buildNodePackage { + name = "graceful-fs-1.2.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; + sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; + }) + ]; + buildInputs = + (self.nativeDeps."graceful-fs"."1.2" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "graceful-fs" ]; + }; full."graceful-fs"."2" = lib.makeOverridable self.buildNodePackage { name = "graceful-fs-2.0.0"; src = [ @@ -4141,6 +4357,22 @@ ]; passthru.names = [ "graceful-fs" ]; }; + full."graceful-fs"."~1.2.2" = lib.makeOverridable self.buildNodePackage { + name = "graceful-fs-1.2.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; + sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; + }) + ]; + buildInputs = + (self.nativeDeps."graceful-fs"."~1.2.2" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "graceful-fs" ]; + }; full."graceful-fs"."~2" = lib.makeOverridable self.buildNodePackage { name = "graceful-fs-2.0.0"; src = [ @@ -4835,6 +5067,26 @@ ]; passthru.names = [ "ini" ]; }; + full."init-package-json"."0.0.10" = lib.makeOverridable self.buildNodePackage { + name = "init-package-json-0.0.10"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.10.tgz"; + sha1 = "7baf10535227e0878105a04e44b78f132475da6a"; + }) + ]; + buildInputs = + (self.nativeDeps."init-package-json"."0.0.10" or []); + deps = [ + self.full."promzard"."~0.2.0" + self.full."read"."~1.0.1" + self.full."read-package-json"."1" + self.full."semver"."2.x" + ]; + peerDependencies = [ + ]; + passthru.names = [ "init-package-json" ]; + }; full."init-package-json"."0.0.11" = lib.makeOverridable self.buildNodePackage { name = "init-package-json-0.0.11"; src = [ @@ -4856,11 +5108,11 @@ passthru.names = [ "init-package-json" ]; }; full."inquirer"."~0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "inquirer-0.2.4"; + name = "inquirer-0.2.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/inquirer/-/inquirer-0.2.4.tgz"; - sha1 = "55dd181ad7826153a2bc959635a3ae8013311d64"; + url = "http://registry.npmjs.org/inquirer/-/inquirer-0.2.5.tgz"; + sha1 = "6b49a9cbe03de776122211f174ef9fe2822c08f6"; }) ]; buildInputs = @@ -4876,11 +5128,11 @@ passthru.names = [ "inquirer" ]; }; full."inquirer"."~0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "inquirer-0.2.4"; + name = "inquirer-0.2.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/inquirer/-/inquirer-0.2.4.tgz"; - sha1 = "55dd181ad7826153a2bc959635a3ae8013311d64"; + url = "http://registry.npmjs.org/inquirer/-/inquirer-0.2.5.tgz"; + sha1 = "6b49a9cbe03de776122211f174ef9fe2822c08f6"; }) ]; buildInputs = @@ -4896,11 +5148,11 @@ passthru.names = [ "inquirer" ]; }; full."inquirer"."~0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "inquirer-0.2.4"; + name = "inquirer-0.2.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/inquirer/-/inquirer-0.2.4.tgz"; - sha1 = "55dd181ad7826153a2bc959635a3ae8013311d64"; + url = "http://registry.npmjs.org/inquirer/-/inquirer-0.2.5.tgz"; + sha1 = "6b49a9cbe03de776122211f174ef9fe2822c08f6"; }) ]; buildInputs = @@ -5018,21 +5270,21 @@ passthru.names = [ "isbinaryfile" ]; }; full."jade"."*" = lib.makeOverridable self.buildNodePackage { - name = "jade-0.34.1"; + name = "jade-0.35.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jade/-/jade-0.34.1.tgz"; - sha1 = "6cb1f0928adfe9be7323d0b57e507e5c3c70f650"; + url = "http://registry.npmjs.org/jade/-/jade-0.35.0.tgz"; + sha1 = "75ec1d966a1203733613e8c180e2aa8685c16da9"; }) ]; buildInputs = (self.nativeDeps."jade"."*" or []); deps = [ - self.full."commander"."1.3.2" + self.full."commander"."2.0.0" self.full."mkdirp"."0.3.x" self.full."transformers"."2.1.0" - self.full."character-parser"."1.0.2" - self.full."monocle"."0.1.50" + self.full."character-parser"."1.2.0" + self.full."monocle"."1.1.50" self.full."with"."~1.1.0" self.full."constantinople"."~1.0.1" ]; @@ -5060,21 +5312,21 @@ passthru.names = [ "jade" ]; }; full."jade".">= 0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "jade-0.34.1"; + name = "jade-0.35.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jade/-/jade-0.34.1.tgz"; - sha1 = "6cb1f0928adfe9be7323d0b57e507e5c3c70f650"; + url = "http://registry.npmjs.org/jade/-/jade-0.35.0.tgz"; + sha1 = "75ec1d966a1203733613e8c180e2aa8685c16da9"; }) ]; buildInputs = (self.nativeDeps."jade".">= 0.0.1" or []); deps = [ - self.full."commander"."1.3.2" + self.full."commander"."2.0.0" self.full."mkdirp"."0.3.x" self.full."transformers"."2.1.0" - self.full."character-parser"."1.0.2" - self.full."monocle"."0.1.50" + self.full."character-parser"."1.2.0" + self.full."monocle"."1.1.50" self.full."with"."~1.1.0" self.full."constantinople"."~1.0.1" ]; @@ -5291,15 +5543,15 @@ passthru.names = [ "junk" ]; }; full."karma"."*" = lib.makeOverridable self.buildNodePackage { - name = "karma-0.10.1"; + name = "karma-0.10.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma/-/karma-0.10.1.tgz"; - sha1 = "eaa70b63dc67edb4883809c9be4e47e8b334e704"; + url = "http://registry.npmjs.org/karma/-/karma-0.10.2.tgz"; + sha1 = "4e100bd346bb24a1260dcd34b5b3d2d4a9b27b17"; }) (fetchurl { - url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.0.tgz"; - sha1 = "94c805915c90a7cd8c32cb0829984865e27246fa"; + url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.2.tgz"; + sha1 = "4f4b8271ffbb7aba543daf38bbc004f4f7f28da3"; }) (fetchurl { url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.1.0.tgz"; @@ -5366,15 +5618,15 @@ }; "karma" = self.full."karma"."*"; full."karma".">=0.9" = lib.makeOverridable self.buildNodePackage { - name = "karma-0.10.1"; + name = "karma-0.10.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma/-/karma-0.10.1.tgz"; - sha1 = "eaa70b63dc67edb4883809c9be4e47e8b334e704"; + url = "http://registry.npmjs.org/karma/-/karma-0.10.2.tgz"; + sha1 = "4e100bd346bb24a1260dcd34b5b3d2d4a9b27b17"; }) (fetchurl { - url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.0.tgz"; - sha1 = "94c805915c90a7cd8c32cb0829984865e27246fa"; + url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.2.tgz"; + sha1 = "4f4b8271ffbb7aba543daf38bbc004f4f7f28da3"; }) (fetchurl { url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.1.0.tgz"; @@ -5440,15 +5692,15 @@ passthru.names = [ "karma" "karma-jasmine" "karma-requirejs" "karma-coffee-preprocessor" "karma-html2js-preprocessor" "karma-chrome-launcher" "karma-firefox-launcher" "karma-phantomjs-launcher" "karma-script-launcher" ]; }; full."karma".">=0.9.3" = lib.makeOverridable self.buildNodePackage { - name = "karma-0.10.1"; + name = "karma-0.10.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma/-/karma-0.10.1.tgz"; - sha1 = "eaa70b63dc67edb4883809c9be4e47e8b334e704"; + url = "http://registry.npmjs.org/karma/-/karma-0.10.2.tgz"; + sha1 = "4e100bd346bb24a1260dcd34b5b3d2d4a9b27b17"; }) (fetchurl { - url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.0.tgz"; - sha1 = "94c805915c90a7cd8c32cb0829984865e27246fa"; + url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.2.tgz"; + sha1 = "4f4b8271ffbb7aba543daf38bbc004f4f7f28da3"; }) (fetchurl { url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.1.0.tgz"; @@ -5662,12 +5914,28 @@ passthru.names = [ "libyaml" ]; }; "libyaml" = self.full."libyaml"."*"; - full."lockfile"."~0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "lockfile-0.4.0"; + full."lockfile"."~0.3.2" = lib.makeOverridable self.buildNodePackage { + name = "lockfile-0.3.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/lockfile/-/lockfile-0.4.0.tgz"; - sha1 = "0f815a7ee7c3d603ddec6fbfa8a212b5645d54c5"; + url = "http://registry.npmjs.org/lockfile/-/lockfile-0.3.4.tgz"; + sha1 = "932b63546e4915f81b71924b36187740358eda03"; + }) + ]; + buildInputs = + (self.nativeDeps."lockfile"."~0.3.2" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "lockfile" ]; + }; + full."lockfile"."~0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "lockfile-0.4.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lockfile/-/lockfile-0.4.2.tgz"; + sha1 = "ab91f5d3745bc005ae4fa34d078910d1f2b9612d"; }) ]; buildInputs = @@ -5775,11 +6043,11 @@ passthru.names = [ "lodash" ]; }; full."log4js"."~0.6.3" = lib.makeOverridable self.buildNodePackage { - name = "log4js-0.6.7"; + name = "log4js-0.6.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/log4js/-/log4js-0.6.7.tgz"; - sha1 = "9a9eaa28ee056071c7a628e629dde2e57362bb6f"; + url = "http://registry.npmjs.org/log4js/-/log4js-0.6.8.tgz"; + sha1 = "86baebdcaf8ef989295d65a07773f7e32093d0b6"; }) ]; buildInputs = @@ -6041,6 +6309,22 @@ ]; passthru.names = [ "mime" ]; }; + full."mime"."~1.2.11" = lib.makeOverridable self.buildNodePackage { + name = "mime-1.2.11"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }) + ]; + buildInputs = + (self.nativeDeps."mime"."~1.2.11" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "mime" ]; + }; full."mime"."~1.2.2" = lib.makeOverridable self.buildNodePackage { name = "mime-1.2.11"; src = [ @@ -6331,6 +6615,22 @@ ]; passthru.names = [ "mkdirp" ]; }; + full."mkdirp"."0.3.4" = lib.makeOverridable self.buildNodePackage { + name = "mkdirp-0.3.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.4.tgz"; + sha1 = "f8c81d213b7299a031f193a57d752a17d2f6c7d8"; + }) + ]; + buildInputs = + (self.nativeDeps."mkdirp"."0.3.4" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "mkdirp" ]; + }; full."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage { name = "mkdirp-0.3.5"; src = [ @@ -6468,6 +6768,22 @@ passthru.names = [ "mocha" ]; }; "mocha" = self.full."mocha"."*"; + full."moment"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "moment-2.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/moment/-/moment-2.0.0.tgz"; + sha1 = "2bbc5b44c321837693ab6efcadbd46ed946211fe"; + }) + ]; + buildInputs = + (self.nativeDeps."moment"."2.0.0" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "moment" ]; + }; full."moment"."2.1.0" = lib.makeOverridable self.buildNodePackage { name = "moment-2.1.0"; src = [ @@ -6485,11 +6801,11 @@ passthru.names = [ "moment" ]; }; full."mongodb"."*" = lib.makeOverridable self.buildNodePackage { - name = "mongodb-1.3.18"; + name = "mongodb-1.3.19"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.18.tgz"; - sha1 = "9dd1ba4f6c2c04c014a9aabb8f194c1c0ee7da5d"; + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.19.tgz"; + sha1 = "f229db24098f019d86d135aaf8a1ab5f2658b1d4"; }) ]; buildInputs = @@ -6537,16 +6853,16 @@ ]; passthru.names = [ "mongodb" ]; }; - full."mongodb"."1.3.18" = lib.makeOverridable self.buildNodePackage { - name = "mongodb-1.3.18"; + full."mongodb"."1.3.19" = lib.makeOverridable self.buildNodePackage { + name = "mongodb-1.3.19"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.18.tgz"; - sha1 = "9dd1ba4f6c2c04c014a9aabb8f194c1c0ee7da5d"; + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.19.tgz"; + sha1 = "f229db24098f019d86d135aaf8a1ab5f2658b1d4"; }) ]; buildInputs = - (self.nativeDeps."mongodb"."1.3.18" or []); + (self.nativeDeps."mongodb"."1.3.19" or []); deps = [ self.full."bson"."0.2.2" self.full."kerberos"."0.0.3" @@ -6556,25 +6872,25 @@ passthru.names = [ "mongodb" ]; }; full."mongoose"."*" = lib.makeOverridable self.buildNodePackage { - name = "mongoose-3.7.2"; + name = "mongoose-3.7.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongoose/-/mongoose-3.7.2.tgz"; - sha1 = "e7550bb44ce1eaa9fc78223360d43b2722caa258"; + url = "http://registry.npmjs.org/mongoose/-/mongoose-3.7.3.tgz"; + sha1 = "32c707bd919db3ae534326042be0b9ef9ee7ff57"; }) ]; buildInputs = (self.nativeDeps."mongoose"."*" or []); deps = [ self.full."hooks"."0.2.1" - self.full."mongodb"."1.3.18" + self.full."mongodb"."1.3.19" self.full."ms"."0.1.0" self.full."sliced"."0.0.5" self.full."muri"."0.3.1" self.full."mpromise"."0.3.0" self.full."mpath"."0.1.1" self.full."regexp-clone"."0.0.1" - self.full."mquery"."0.2.4" + self.full."mquery"."0.3.1" ]; peerDependencies = [ ]; @@ -6604,18 +6920,18 @@ passthru.names = [ "mongoose" ]; }; full."mongoose"."3.6.x" = lib.makeOverridable self.buildNodePackage { - name = "mongoose-3.6.17"; + name = "mongoose-3.6.18"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.17.tgz"; - sha1 = "2f53a041fe28974f3e536aabd81dd4bb31e2abd0"; + url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.18.tgz"; + sha1 = "cdf41325433ea795a1b3632ef1d7591db487d224"; }) ]; buildInputs = (self.nativeDeps."mongoose"."3.6.x" or []); deps = [ self.full."hooks"."0.2.1" - self.full."mongodb"."1.3.18" + self.full."mongodb"."1.3.19" self.full."ms"."0.1.0" self.full."sliced"."0.0.5" self.full."muri"."0.3.1" @@ -6662,16 +6978,16 @@ passthru.names = [ "mongoose-schema-extend" ]; }; "mongoose-schema-extend" = self.full."mongoose-schema-extend"."*"; - full."monocle"."0.1.50" = lib.makeOverridable self.buildNodePackage { - name = "monocle-0.1.50"; + full."monocle"."1.1.50" = lib.makeOverridable self.buildNodePackage { + name = "monocle-1.1.50"; src = [ (fetchurl { - url = "http://registry.npmjs.org/monocle/-/monocle-0.1.50.tgz"; - sha1 = "9a7cbd0ccc10de95fd78a04b9beb2482ae4940b7"; + url = "http://registry.npmjs.org/monocle/-/monocle-1.1.50.tgz"; + sha1 = "e21b059d99726d958371f36240c106b8a067fa7d"; }) ]; buildInputs = - (self.nativeDeps."monocle"."0.1.50" or []); + (self.nativeDeps."monocle"."1.1.50" or []); deps = [ self.full."readdirp"."~0.2.3" ]; @@ -6745,16 +7061,16 @@ ]; passthru.names = [ "mpromise" ]; }; - full."mquery"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "mquery-0.2.4"; + full."mquery"."0.3.1" = lib.makeOverridable self.buildNodePackage { + name = "mquery-0.3.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mquery/-/mquery-0.2.4.tgz"; - sha1 = "5d6e7f7f5129aa334e7e754d3f6a93cf304b7778"; + url = "http://registry.npmjs.org/mquery/-/mquery-0.3.1.tgz"; + sha1 = "b67051685b3ec71c9dc6d0ca41385297325c4c45"; }) ]; buildInputs = - (self.nativeDeps."mquery"."0.2.4" or []); + (self.nativeDeps."mquery"."0.3.1" or []); deps = [ self.full."sliced"."0.0.5" self.full."debug"."0.7.0" @@ -6877,6 +7193,22 @@ ]; passthru.names = [ "mv" ]; }; + full."nan"."~0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "nan-0.3.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/nan/-/nan-0.3.1.tgz"; + sha1 = "672523b3fbdbc8e73213dc1951b636e98b3b176f"; + }) + ]; + buildInputs = + (self.nativeDeps."nan"."~0.3.0" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "nan" ]; + }; full."natural"."0.0.69" = lib.makeOverridable self.buildNodePackage { name = "natural-0.0.69"; src = [ @@ -7099,6 +7431,35 @@ passthru.names = [ "node-gyp" ]; }; "node-gyp" = self.full."node-gyp"."*"; + full."node-gyp"."~0.10.2" = lib.makeOverridable self.buildNodePackage { + name = "node-gyp-0.10.9"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.9.tgz"; + sha1 = "de5e20f75ee291975d67c105a5653b981bf8974f"; + }) + ]; + buildInputs = + (self.nativeDeps."node-gyp"."~0.10.2" or []); + deps = [ + self.full."glob"."3" + self.full."graceful-fs"."2" + self.full."fstream"."0" + self.full."minimatch"."0" + self.full."mkdirp"."0" + self.full."nopt"."2" + self.full."npmlog"."0" + self.full."osenv"."0" + self.full."request"."2" + self.full."rimraf"."2" + self.full."semver"."~2.1" + self.full."tar"."0" + self.full."which"."1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "node-gyp" ]; + }; full."node-gyp"."~0.10.9" = lib.makeOverridable self.buildNodePackage { name = "node-gyp-0.10.9"; src = [ @@ -7412,11 +7773,11 @@ passthru.names = [ "nopt" ]; }; full."normalize-package-data"."~0.2" = lib.makeOverridable self.buildNodePackage { - name = "normalize-package-data-0.2.1"; + name = "normalize-package-data-0.2.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.1.tgz"; - sha1 = "6c13a4b7ab1bca0323265418d354666da2e5ad43"; + url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.2.tgz"; + sha1 = "9efde8d32a96e797ea61f8b4916e0f48a5ad83d9"; }) ]; buildInputs = @@ -7430,11 +7791,11 @@ passthru.names = [ "normalize-package-data" ]; }; full."npm"."*" = lib.makeOverridable self.buildNodePackage { - name = "npm-1.3.8"; + name = "npm-1.3.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-1.3.8.tgz"; - sha1 = "fe271a4ca2b7077d6e45c1ce2a29e905327dc4d8"; + url = "http://registry.npmjs.org/npm/-/npm-1.3.9.tgz"; + sha1 = "dbf815e1661845046e82105a705f8df1735bb1ee"; }) ]; buildInputs = @@ -7487,6 +7848,63 @@ passthru.names = [ "npm" ]; }; "npm" = self.full."npm"."*"; + full."npm"."1.3.1" = lib.makeOverridable self.buildNodePackage { + name = "npm-1.3.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/npm/-/npm-1.3.1.tgz"; + sha1 = "c64f1c82362254cd4804a3dea5efbe6ec396460c"; + }) + ]; + buildInputs = + (self.nativeDeps."npm"."1.3.1" or []); + deps = [ + self.full."semver"."~2.0.8" + self.full."ini"."~1.1.0" + self.full."slide"."~1.1.4" + self.full."abbrev"."~1.0.4" + self.full."graceful-fs"."~1.2.2" + self.full."minimatch"."~0.2.12" + self.full."nopt"."~2.1.1" + self.full."rimraf"."~2.2.0" + self.full."request"."~2.21.0" + self.full."which"."1" + self.full."tar"."~0.1.17" + self.full."fstream"."~0.1.22" + self.full."block-stream"."*" + self.full."inherits"."1" + self.full."mkdirp"."~0.3.3" + self.full."read"."~1.0.4" + self.full."lru-cache"."~2.3.0" + self.full."node-gyp"."~0.10.2" + self.full."fstream-npm"."~0.1.3" + self.full."uid-number"."0" + self.full."archy"."0" + self.full."chownr"."0" + self.full."npmlog"."0.0.3" + self.full."ansi"."~0.1.2" + self.full."npm-registry-client"."~0.2.25" + self.full."read-package-json"."~1.1.0" + self.full."read-installed"."~0.2.2" + self.full."glob"."~3.2.1" + self.full."init-package-json"."0.0.10" + self.full."osenv"."0" + self.full."lockfile"."~0.3.2" + self.full."retry"."~0.6.0" + self.full."once"."~1.1.1" + self.full."npmconf"."~0.1.1" + self.full."opener"."~1.3.0" + self.full."chmodr"."~0.1.0" + self.full."cmd-shim"."~1.1.0" + self.full."sha"."~1.0.1" + self.full."editor"."0.0.4" + self.full."child-process-close"."~0.1.1" + self.full."npm-user-validate"."0.0.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "npm" ]; + }; full."npm-registry-client"."0.2.27" = lib.makeOverridable self.buildNodePackage { name = "npm-registry-client-0.2.27"; src = [ @@ -7513,6 +7931,32 @@ ]; passthru.names = [ "npm-registry-client" ]; }; + full."npm-registry-client"."~0.2.25" = lib.makeOverridable self.buildNodePackage { + name = "npm-registry-client-0.2.28"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.28.tgz"; + sha1 = "959141fc0180d7b1ad089e87015a8a2142a8bffc"; + }) + ]; + buildInputs = + (self.nativeDeps."npm-registry-client"."~0.2.25" or []); + deps = [ + self.full."request"."2 >=2.25.0" + self.full."graceful-fs"."~2.0.0" + self.full."semver"."~2.1.0" + self.full."slide"."~1.1.3" + self.full."chownr"."0" + self.full."mkdirp"."~0.3.3" + self.full."rimraf"."~2" + self.full."retry"."0.6.0" + self.full."couch-login"."~0.1.18" + self.full."npmlog"."*" + ]; + peerDependencies = [ + ]; + passthru.names = [ "npm-registry-client" ]; + }; full."npm-registry-client"."~0.2.28" = lib.makeOverridable self.buildNodePackage { name = "npm-registry-client-0.2.28"; src = [ @@ -7625,6 +8069,30 @@ ]; passthru.names = [ "npmconf" ]; }; + full."npmconf"."~0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "npmconf-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.2.tgz"; + sha1 = "99af8122f0067802436a5b71dbf8c3539697e62c"; + }) + ]; + buildInputs = + (self.nativeDeps."npmconf"."~0.1.1" or []); + deps = [ + self.full."config-chain"."~1.1.1" + self.full."inherits"."~2.0.0" + self.full."once"."~1.1.1" + self.full."mkdirp"."~0.3.3" + self.full."osenv"."0.0.3" + self.full."nopt"."2" + self.full."semver"."2" + self.full."ini"."~1.1.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "npmconf" ]; + }; full."npmconf"."~0.1.2" = lib.makeOverridable self.buildNodePackage { name = "npmconf-0.1.2"; src = [ @@ -7683,6 +8151,23 @@ ]; passthru.names = [ "npmlog" ]; }; + full."npmlog"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "npmlog-0.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.3.tgz"; + sha1 = "c424ad1531af402eef8da201fc3d63bdbd37dacb"; + }) + ]; + buildInputs = + (self.nativeDeps."npmlog"."0.0.3" or []); + deps = [ + self.full."ansi"."~0.1.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "npmlog" ]; + }; full."npmlog"."0.0.4" = lib.makeOverridable self.buildNodePackage { name = "npmlog-0.0.4"; src = [ @@ -7950,6 +8435,23 @@ ]; passthru.names = [ "optimist" ]; }; + full."optimist"."~0.3.4" = lib.makeOverridable self.buildNodePackage { + name = "optimist-0.3.7"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; + sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; + }) + ]; + buildInputs = + (self.nativeDeps."optimist"."~0.3.4" or []); + deps = [ + self.full."wordwrap"."~0.0.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "optimist" ]; + }; full."optimist"."~0.3.5" = lib.makeOverridable self.buildNodePackage { name = "optimist-0.3.7"; src = [ @@ -8117,6 +8619,24 @@ passthru.names = [ "passport" ]; }; "passport" = self.full."passport"."*"; + full."passport"."0.1.17" = lib.makeOverridable self.buildNodePackage { + name = "passport-0.1.17"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/passport/-/passport-0.1.17.tgz"; + sha1 = "2cd503be0d35f33a9726d00ad2654786643a23fc"; + }) + ]; + buildInputs = + (self.nativeDeps."passport"."0.1.17" or []); + deps = [ + self.full."pkginfo"."0.2.x" + self.full."pause"."0.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "passport" ]; + }; full."passport"."~0.1.1" = lib.makeOverridable self.buildNodePackage { name = "passport-0.1.17"; src = [ @@ -8191,6 +8711,24 @@ passthru.names = [ "passport-local" ]; }; "passport-local" = self.full."passport-local"."*"; + full."passport-local"."0.1.6" = lib.makeOverridable self.buildNodePackage { + name = "passport-local-0.1.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/passport-local/-/passport-local-0.1.6.tgz"; + sha1 = "fb0cf828048db931b67d19985c7aa06dd377a9db"; + }) + ]; + buildInputs = + (self.nativeDeps."passport-local"."0.1.6" or []); + deps = [ + self.full."pkginfo"."0.2.x" + self.full."passport"."~0.1.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "passport-local" ]; + }; full."pause"."0.0.1" = lib.makeOverridable self.buildNodePackage { name = "pause-0.0.1"; src = [ @@ -8665,6 +9203,25 @@ passthru.names = [ "rbytes" ]; }; "rbytes" = self.full."rbytes"."*"; + full."rc"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "rc-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/rc/-/rc-0.3.0.tgz"; + sha1 = "caffdaafc17e8608e50db0c6ee63f1c344d9ac58"; + }) + ]; + buildInputs = + (self.nativeDeps."rc"."0.3.0" or []); + deps = [ + self.full."optimist"."~0.3.4" + self.full."deep-extend"."~0.2.5" + self.full."ini"."~1.1.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "rc" ]; + }; full."read"."1" = lib.makeOverridable self.buildNodePackage { name = "read-1.0.5"; src = [ @@ -9600,12 +10157,29 @@ passthru.names = [ "s3http" ]; }; "s3http" = self.full."s3http"."*"; - full."sax"."0.5.x" = lib.makeOverridable self.buildNodePackage { - name = "sax-0.5.4"; + full."safefs"."~3.0.1" = lib.makeOverridable self.buildNodePackage { + name = "safefs-3.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/sax/-/sax-0.5.4.tgz"; - sha1 = "a3a4e1a9cf182bb547156c5232a49a1c3732ff7d"; + url = "http://registry.npmjs.org/safefs/-/safefs-3.0.1.tgz"; + sha1 = "a4fd36bcd4805782f0d702e97b47323eafc94cb8"; + }) + ]; + buildInputs = + (self.nativeDeps."safefs"."~3.0.1" or []); + deps = [ + self.full."taskgroup".">=3 <3.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "safefs" ]; + }; + full."sax"."0.5.x" = lib.makeOverridable self.buildNodePackage { + name = "sax-0.5.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/sax/-/sax-0.5.5.tgz"; + sha1 = "b1ec13d77397248d059bcc18bb9530d8210bb5d3"; }) ]; buildInputs = @@ -9617,11 +10191,11 @@ passthru.names = [ "sax" ]; }; full."sax".">=0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "sax-0.5.4"; + name = "sax-0.5.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/sax/-/sax-0.5.4.tgz"; - sha1 = "a3a4e1a9cf182bb547156c5232a49a1c3732ff7d"; + url = "http://registry.npmjs.org/sax/-/sax-0.5.5.tgz"; + sha1 = "b1ec13d77397248d059bcc18bb9530d8210bb5d3"; }) ]; buildInputs = @@ -9697,6 +10271,22 @@ ]; passthru.names = [ "semver" ]; }; + full."semver"."2.0.8" = lib.makeOverridable self.buildNodePackage { + name = "semver-2.0.8"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/semver/-/semver-2.0.8.tgz"; + sha1 = "f5c28ba4a6d56bd1d9dbe34aed288d69366a73c6"; + }) + ]; + buildInputs = + (self.nativeDeps."semver"."2.0.8" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "semver" ]; + }; full."semver"."2.x" = lib.makeOverridable self.buildNodePackage { name = "semver-2.1.0"; src = [ @@ -9793,6 +10383,22 @@ ]; passthru.names = [ "semver" ]; }; + full."semver"."~2.0.8" = lib.makeOverridable self.buildNodePackage { + name = "semver-2.0.11"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; + sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; + }) + ]; + buildInputs = + (self.nativeDeps."semver"."~2.0.8" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "semver" ]; + }; full."semver"."~2.1" = lib.makeOverridable self.buildNodePackage { name = "semver-2.1.0"; src = [ @@ -9865,6 +10471,26 @@ ]; passthru.names = [ "send" ]; }; + full."send"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "send-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/send/-/send-0.1.1.tgz"; + sha1 = "0bcfcbd03def6e2d8612e1abf8f4895b450c60c8"; + }) + ]; + buildInputs = + (self.nativeDeps."send"."0.1.1" or []); + deps = [ + self.full."debug"."*" + self.full."mime"."~1.2.9" + self.full."fresh"."0.1.0" + self.full."range-parser"."0.0.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "send" ]; + }; full."send"."0.1.4" = lib.makeOverridable self.buildNodePackage { name = "send-0.1.4"; src = [ @@ -9933,12 +10559,29 @@ ]; passthru.names = [ "setimmediate" ]; }; - full."sha"."~1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "sha-1.2.2"; + full."sha"."~1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "sha-1.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/sha/-/sha-1.2.2.tgz"; - sha1 = "f2aa387e8182631fd5f462bd80250d37a8920e62"; + url = "http://registry.npmjs.org/sha/-/sha-1.0.1.tgz"; + sha1 = "9b87a92113103e7406f7e7ef00006f3fa1975122"; + }) + ]; + buildInputs = + (self.nativeDeps."sha"."~1.0.1" or []); + deps = [ + self.full."graceful-fs"."1.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "sha" ]; + }; + full."sha"."~1.2.1" = lib.makeOverridable self.buildNodePackage { + name = "sha-1.2.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/sha/-/sha-1.2.3.tgz"; + sha1 = "3a96ef3054a0fe0b87c9aa985824a6a736fc0329"; }) ]; buildInputs = @@ -10017,11 +10660,11 @@ passthru.names = [ "sigmund" ]; }; full."simplesmtp".">= 0.1.22" = lib.makeOverridable self.buildNodePackage { - name = "simplesmtp-0.3.7"; + name = "simplesmtp-0.3.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.7.tgz"; - sha1 = "2e5319c5dea8824be88d5dba9a6dc85551cad76b"; + url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.8.tgz"; + sha1 = "64bea183c9d95211e17e21e228a20312661def09"; }) ]; buildInputs = @@ -10246,6 +10889,26 @@ ]; passthru.names = [ "socket.io" ]; }; + full."socket.io"."0.9.16" = lib.makeOverridable self.buildNodePackage { + name = "socket.io-0.9.16"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz"; + sha1 = "3bab0444e49b55fbbc157424dbd41aa375a51a76"; + }) + ]; + buildInputs = + (self.nativeDeps."socket.io"."0.9.16" or []); + deps = [ + self.full."socket.io-client"."0.9.16" + self.full."policyfile"."0.0.4" + self.full."base64id"."0.1.0" + self.full."redis"."0.7.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "socket.io" ]; + }; full."socket.io"."~0.9.13" = lib.makeOverridable self.buildNodePackage { name = "socket.io-0.9.16"; src = [ @@ -10326,11 +10989,11 @@ }; "sockjs" = self.full."sockjs"."*"; full."source-map"."*" = lib.makeOverridable self.buildNodePackage { - name = "source-map-0.1.28"; + name = "source-map-0.1.29"; src = [ (fetchurl { - url = "http://registry.npmjs.org/source-map/-/source-map-0.1.28.tgz"; - sha1 = "9cae9d9b8352fb030f77c4e12226cc28cb251f39"; + url = "http://registry.npmjs.org/source-map/-/source-map-0.1.29.tgz"; + sha1 = "39d571a0988fb7a548a676c4de72db78914d173c"; }) ]; buildInputs = @@ -10344,11 +11007,11 @@ }; "source-map" = self.full."source-map"."*"; full."source-map"."~0.1.7" = lib.makeOverridable self.buildNodePackage { - name = "source-map-0.1.28"; + name = "source-map-0.1.29"; src = [ (fetchurl { - url = "http://registry.npmjs.org/source-map/-/source-map-0.1.28.tgz"; - sha1 = "9cae9d9b8352fb030f77c4e12226cc28cb251f39"; + url = "http://registry.npmjs.org/source-map/-/source-map-0.1.29.tgz"; + sha1 = "39d571a0988fb7a548a676c4de72db78914d173c"; }) ]; buildInputs = @@ -10394,6 +11057,23 @@ ]; passthru.names = [ "ssh-agent" ]; }; + full."ssh2"."0.2.8" = lib.makeOverridable self.buildNodePackage { + name = "ssh2-0.2.8"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ssh2/-/ssh2-0.2.8.tgz"; + sha1 = "50acd6d7a7fb4da18ef4364737bb9a5066bf689d"; + }) + ]; + buildInputs = + (self.nativeDeps."ssh2"."0.2.8" or []); + deps = [ + self.full."streamsearch"."0.1.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "ssh2" ]; + }; full."stack-trace"."0.0.x" = lib.makeOverridable self.buildNodePackage { name = "stack-trace-0.0.7"; src = [ @@ -10464,6 +11144,22 @@ passthru.names = [ "stream-splitter-transform" ]; }; "stream-splitter-transform" = self.full."stream-splitter-transform"."*"; + full."streamsearch"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "streamsearch-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; + sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; + }) + ]; + buildInputs = + (self.nativeDeps."streamsearch"."0.1.2" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "streamsearch" ]; + }; full."stringify-object"."~0.1.4" = lib.makeOverridable self.buildNodePackage { name = "stringify-object-0.1.5"; src = [ @@ -10537,6 +11233,28 @@ ]; passthru.names = [ "sudo-block" ]; }; + full."superagent"."0.14.7" = lib.makeOverridable self.buildNodePackage { + name = "superagent-0.14.7"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/superagent/-/superagent-0.14.7.tgz"; + sha1 = "5740625d9c6343381b03b2ff95a3c988415fc406"; + }) + ]; + buildInputs = + (self.nativeDeps."superagent"."0.14.7" or []); + deps = [ + self.full."qs"."0.6.5" + self.full."formidable"."1.0.9" + self.full."mime"."1.2.5" + self.full."emitter-component"."1.0.0" + self.full."methods"."0.0.1" + self.full."cookiejar"."1.3.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "superagent" ]; + }; full."superagent"."0.15.1" = lib.makeOverridable self.buildNodePackage { name = "superagent-0.15.1"; src = [ @@ -10751,6 +11469,42 @@ ]; passthru.names = [ "tar" ]; }; + full."taskgroup".">=3 <3.2" = lib.makeOverridable self.buildNodePackage { + name = "taskgroup-3.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/taskgroup/-/taskgroup-3.1.2.tgz"; + sha1 = "81fec5dc7eb647fd5a0ba8ed02ee3a730244ca16"; + }) + ]; + buildInputs = + (self.nativeDeps."taskgroup".">=3 <3.2" or []); + deps = [ + self.full."ambi"."~2.0.0" + self.full."eventemitter2"."~0.4.11" + ]; + peerDependencies = [ + ]; + passthru.names = [ "taskgroup" ]; + }; + full."taskgroup"."~3.1.1" = lib.makeOverridable self.buildNodePackage { + name = "taskgroup-3.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/taskgroup/-/taskgroup-3.1.2.tgz"; + sha1 = "81fec5dc7eb647fd5a0ba8ed02ee3a730244ca16"; + }) + ]; + buildInputs = + (self.nativeDeps."taskgroup"."~3.1.1" or []); + deps = [ + self.full."ambi"."~2.0.0" + self.full."eventemitter2"."~0.4.11" + ]; + peerDependencies = [ + ]; + passthru.names = [ "taskgroup" ]; + }; full."temp"."*" = lib.makeOverridable self.buildNodePackage { name = "temp-0.5.1"; src = [ @@ -10769,6 +11523,38 @@ passthru.names = [ "temp" ]; }; "temp" = self.full."temp"."*"; + full."temp"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "temp-0.5.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/temp/-/temp-0.5.0.tgz"; + sha1 = "605fa983bcbed88bac99370bc5bf934678cb289e"; + }) + ]; + buildInputs = + (self.nativeDeps."temp"."0.5.0" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "temp" ]; + }; + full."text-table"."~0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "text-table-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/text-table/-/text-table-0.1.1.tgz"; + sha1 = "9aa4347a39b6950cd24190264576f62db6e52d93"; + }) + ]; + buildInputs = + (self.nativeDeps."text-table"."~0.1.1" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "text-table" ]; + }; full."throttleit"."~0.0.2" = lib.makeOverridable self.buildNodePackage { name = "throttleit-0.0.2"; src = [ @@ -10949,6 +11735,22 @@ ]; passthru.names = [ "tunnel-agent" ]; }; + full."typechecker"."~2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "typechecker-2.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/typechecker/-/typechecker-2.0.1.tgz"; + sha1 = "e18e99be60762c01bde38ef02f9a067ed887c454"; + }) + ]; + buildInputs = + (self.nativeDeps."typechecker"."~2.0.1" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "typechecker" ]; + }; full."uglify-js"."1.2.5" = lib.makeOverridable self.buildNodePackage { name = "uglify-js-1.2.5"; src = [ @@ -11105,6 +11907,22 @@ passthru.names = [ "underscore" ]; }; "underscore" = self.full."underscore"."*"; + full."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage { + name = "underscore-1.4.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; + sha1 = "61a6a32010622afa07963bf325203cf12239d604"; + }) + ]; + buildInputs = + (self.nativeDeps."underscore"."1.4.4" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "underscore" ]; + }; full."underscore"."1.4.x" = lib.makeOverridable self.buildNodePackage { name = "underscore-1.4.4"; src = [ @@ -11201,6 +12019,41 @@ ]; passthru.names = [ "underscore.string" ]; }; + full."ungit"."*" = lib.makeOverridable self.buildNodePackage { + name = "ungit-0.1.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ungit/-/ungit-0.1.6.tgz"; + sha1 = "83c7aa319fea9201ae1b5ed43612303881b593d2"; + }) + ]; + buildInputs = + (self.nativeDeps."ungit"."*" or []); + deps = [ + self.full."express"."3.2.6" + self.full."superagent"."0.14.7" + self.full."underscore"."1.4.4" + self.full."temp"."0.5.0" + self.full."watchr"."2.4.3" + self.full."socket.io"."0.9.16" + self.full."moment"."2.0.0" + self.full."async"."0.2.9" + self.full."ssh2"."0.2.8" + self.full."rc"."0.3.0" + self.full."uuid"."1.4.1" + self.full."winston"."0.7.1" + self.full."passport"."0.1.17" + self.full."passport-local"."0.1.6" + self.full."npm"."1.3.1" + self.full."semver"."2.0.8" + self.full."forever-monitor"."1.1.0" + self.full."open"."0.0.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "ungit" ]; + }; + "ungit" = self.full."ungit"."*"; full."unzip"."~0.1.7" = lib.makeOverridable self.buildNodePackage { name = "unzip-0.1.8"; src = [ @@ -11365,6 +12218,22 @@ ]; passthru.names = [ "utile" ]; }; + full."uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { + name = "uuid-1.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/uuid/-/uuid-1.4.1.tgz"; + sha1 = "a337828580d426e375b8ee11bd2bf901a596e0b8"; + }) + ]; + buildInputs = + (self.nativeDeps."uuid"."1.4.1" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "uuid" ]; + }; full."validator"."0.4.x" = lib.makeOverridable self.buildNodePackage { name = "validator-0.4.28"; src = [ @@ -11535,6 +12404,28 @@ ]; passthru.names = [ "watch" ]; }; + full."watchr"."2.4.3" = lib.makeOverridable self.buildNodePackage { + name = "watchr-2.4.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/watchr/-/watchr-2.4.3.tgz"; + sha1 = "b7e32fc1cc7a730043a73b3fc6559ad2283af79e"; + }) + ]; + buildInputs = + (self.nativeDeps."watchr"."2.4.3" or []); + deps = [ + self.full."bal-util"."~2.0.0" + self.full."typechecker"."~2.0.1" + self.full."extendr"."~2.0.1" + self.full."eachr"."~2.0.2" + self.full."safefs"."~3.0.1" + self.full."taskgroup"."~3.1.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "watchr" ]; + }; full."websocket-driver".">=0.2.0" = lib.makeOverridable self.buildNodePackage { name = "websocket-driver-0.2.2"; src = [ @@ -11760,17 +12651,18 @@ passthru.names = [ "wordwrap" ]; }; full."ws"."0.4.x" = lib.makeOverridable self.buildNodePackage { - name = "ws-0.4.28"; + name = "ws-0.4.29"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ws/-/ws-0.4.28.tgz"; - sha1 = "03bcea020195847d1184c6c08f45baaf12322eee"; + url = "http://registry.npmjs.org/ws/-/ws-0.4.29.tgz"; + sha1 = "4b79ef62b4f3f782a05ba56b41b122d1252d4f90"; }) ]; buildInputs = (self.nativeDeps."ws"."0.4.x" or []); deps = [ self.full."commander"."~0.6.1" + self.full."nan"."~0.3.0" self.full."tinycolor"."0.x" self.full."options".">=0.0.5" ]; @@ -11941,20 +12833,20 @@ ]; passthru.names = [ "yeoman-generator" ]; }; - full."yeoman-generator"."~0.12.0" = lib.makeOverridable self.buildNodePackage { - name = "yeoman-generator-0.12.3"; + full."yeoman-generator"."~0.13.0" = lib.makeOverridable self.buildNodePackage { + name = "yeoman-generator-0.13.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.12.3.tgz"; - sha1 = "a11288e7ed11c46efd816b268eeea96acd960d1f"; + url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.3.tgz"; + sha1 = "5e0f0a74d6ebb61e72689d446404c200e915d14c"; }) ]; buildInputs = - (self.nativeDeps."yeoman-generator"."~0.12.0" or []); + (self.nativeDeps."yeoman-generator"."~0.13.0" or []); deps = [ self.full."cheerio"."~0.12.0" - self.full."request"."~2.21.0" - self.full."rimraf"."~2.1.4" + self.full."request"."~2.25.0" + self.full."rimraf"."~2.2.0" self.full."tar"."~0.1.17" self.full."diff"."~1.0.4" self.full."mime"."~1.2.9" @@ -11962,8 +12854,6 @@ self.full."lodash"."~1.3.0" self.full."mkdirp"."~0.3.5" self.full."glob"."~3.2.0" - self.full."nopt"."~2.1.1" - self.full."cli-table"."~0.2.0" self.full."debug"."~0.7.2" self.full."isbinaryfile"."~0.1.8" self.full."dargs"."~0.1.0" @@ -11971,25 +12861,28 @@ self.full."inquirer"."~0.2.0" self.full."iconv-lite"."~0.2.10" self.full."shelljs"."~0.1.4" + self.full."findup-sync"."~0.1.2" + self.full."chalk"."~0.2.0" + self.full."text-table"."~0.1.1" ]; peerDependencies = [ ]; passthru.names = [ "yeoman-generator" ]; }; - full."yeoman-generator"."~0.12.3" = lib.makeOverridable self.buildNodePackage { - name = "yeoman-generator-0.12.3"; + full."yeoman-generator"."~0.13.1" = lib.makeOverridable self.buildNodePackage { + name = "yeoman-generator-0.13.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.12.3.tgz"; - sha1 = "a11288e7ed11c46efd816b268eeea96acd960d1f"; + url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.3.tgz"; + sha1 = "5e0f0a74d6ebb61e72689d446404c200e915d14c"; }) ]; buildInputs = - (self.nativeDeps."yeoman-generator"."~0.12.3" or []); + (self.nativeDeps."yeoman-generator"."~0.13.1" or []); deps = [ self.full."cheerio"."~0.12.0" - self.full."request"."~2.21.0" - self.full."rimraf"."~2.1.4" + self.full."request"."~2.25.0" + self.full."rimraf"."~2.2.0" self.full."tar"."~0.1.17" self.full."diff"."~1.0.4" self.full."mime"."~1.2.9" @@ -11997,8 +12890,6 @@ self.full."lodash"."~1.3.0" self.full."mkdirp"."~0.3.5" self.full."glob"."~3.2.0" - self.full."nopt"."~2.1.1" - self.full."cli-table"."~0.2.0" self.full."debug"."~0.7.2" self.full."isbinaryfile"."~0.1.8" self.full."dargs"."~0.1.0" @@ -12006,23 +12897,62 @@ self.full."inquirer"."~0.2.0" self.full."iconv-lite"."~0.2.10" self.full."shelljs"."~0.1.4" + self.full."findup-sync"."~0.1.2" + self.full."chalk"."~0.2.0" + self.full."text-table"."~0.1.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "yeoman-generator" ]; + }; + full."yeoman-generator"."~0.13.2" = lib.makeOverridable self.buildNodePackage { + name = "yeoman-generator-0.13.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.3.tgz"; + sha1 = "5e0f0a74d6ebb61e72689d446404c200e915d14c"; + }) + ]; + buildInputs = + (self.nativeDeps."yeoman-generator"."~0.13.2" or []); + deps = [ + self.full."cheerio"."~0.12.0" + self.full."request"."~2.25.0" + self.full."rimraf"."~2.2.0" + self.full."tar"."~0.1.17" + self.full."diff"."~1.0.4" + self.full."mime"."~1.2.9" + self.full."underscore.string"."~2.3.1" + self.full."lodash"."~1.3.0" + self.full."mkdirp"."~0.3.5" + self.full."glob"."~3.2.0" + self.full."debug"."~0.7.2" + self.full."isbinaryfile"."~0.1.8" + self.full."dargs"."~0.1.0" + self.full."async"."~0.2.8" + self.full."inquirer"."~0.2.0" + self.full."iconv-lite"."~0.2.10" + self.full."shelljs"."~0.1.4" + self.full."findup-sync"."~0.1.2" + self.full."chalk"."~0.2.0" + self.full."text-table"."~0.1.1" ]; peerDependencies = [ ]; passthru.names = [ "yeoman-generator" ]; }; full."yo"."*" = lib.makeOverridable self.buildNodePackage { - name = "yo-1.0.0-rc.1.4"; + name = "yo-1.0.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/yo/-/yo-1.0.0-rc.1.4.tgz"; - sha1 = "9c416c7006e94e756eb52a7a6884127b41f62ca6"; + url = "http://registry.npmjs.org/yo/-/yo-1.0.3.tgz"; + sha1 = "7235b66201eb66e523204a463a0ed2cf3c2ee45b"; }) ]; buildInputs = (self.nativeDeps."yo"."*" or []); deps = [ - self.full."yeoman-generator"."~0.12.3" + self.full."yeoman-generator"."~0.13.2" self.full."nopt"."~2.1.1" self.full."lodash"."~1.3.1" self.full."update-notifier"."~0.1.3" @@ -12040,17 +12970,17 @@ }; "yo" = self.full."yo"."*"; full."yo".">=1.0.0-rc.1.1" = lib.makeOverridable self.buildNodePackage { - name = "yo-1.0.0-rc.1.4"; + name = "yo-1.0.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/yo/-/yo-1.0.0-rc.1.4.tgz"; - sha1 = "9c416c7006e94e756eb52a7a6884127b41f62ca6"; + url = "http://registry.npmjs.org/yo/-/yo-1.0.3.tgz"; + sha1 = "7235b66201eb66e523204a463a0ed2cf3c2ee45b"; }) ]; buildInputs = (self.nativeDeps."yo".">=1.0.0-rc.1.1" or []); deps = [ - self.full."yeoman-generator"."~0.12.3" + self.full."yeoman-generator"."~0.13.2" self.full."nopt"."~2.1.1" self.full."lodash"."~1.3.1" self.full."update-notifier"."~0.1.3" From 952aa0e71934b40ced4042f4dabf34ca84c929f4 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 25 Aug 2013 01:01:13 +0300 Subject: [PATCH 50/98] KDE: we don't really support anything but Linux right now, so no reason to have all those evaluation errors. --- pkgs/desktops/kde-4.10/kde-package/default.nix | 3 ++- pkgs/desktops/kde-4.10/l10n/default.nix | 3 ++- pkgs/desktops/kde-4.11/kde-package/default.nix | 3 ++- pkgs/desktops/kde-4.11/l10n/default.nix | 3 ++- pkgs/desktops/kde-4.8/kde-package/default.nix | 3 ++- pkgs/desktops/kde-4.8/l10n/default.nix | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/kde-4.10/kde-package/default.nix b/pkgs/desktops/kde-4.10/kde-package/default.nix index cd2860920d6..8a6e8e16751 100644 --- a/pkgs/desktops/kde-4.10/kde-package/default.nix +++ b/pkgs/desktops/kde-4.10/kde-package/default.nix @@ -19,7 +19,8 @@ rec { # Default meta attribute defMeta = { homepage = http://www.kde.org; - inherit (qt4.meta) platforms maintainers; + platforms = stdenv.lib.platforms.linux; + inherit (qt4.meta) maintainers; }; # KDE package built from the whole tarball diff --git a/pkgs/desktops/kde-4.10/l10n/default.nix b/pkgs/desktops/kde-4.10/l10n/default.nix index 57d41fb35bf..c9fab80bffb 100644 --- a/pkgs/desktops/kde-4.10/l10n/default.nix +++ b/pkgs/desktops/kde-4.10/l10n/default.nix @@ -23,7 +23,8 @@ let meta = { description = "KDE translation for ${lang}"; license = "GPL"; - inherit (kdelibs.meta) maintainers platforms homepage; + platforms = stdenv.lib.platforms.linux; + inherit (kdelibs.meta) maintainers homepage; }; }; diff --git a/pkgs/desktops/kde-4.11/kde-package/default.nix b/pkgs/desktops/kde-4.11/kde-package/default.nix index cd2860920d6..8a6e8e16751 100644 --- a/pkgs/desktops/kde-4.11/kde-package/default.nix +++ b/pkgs/desktops/kde-4.11/kde-package/default.nix @@ -19,7 +19,8 @@ rec { # Default meta attribute defMeta = { homepage = http://www.kde.org; - inherit (qt4.meta) platforms maintainers; + platforms = stdenv.lib.platforms.linux; + inherit (qt4.meta) maintainers; }; # KDE package built from the whole tarball diff --git a/pkgs/desktops/kde-4.11/l10n/default.nix b/pkgs/desktops/kde-4.11/l10n/default.nix index 57d41fb35bf..c9fab80bffb 100644 --- a/pkgs/desktops/kde-4.11/l10n/default.nix +++ b/pkgs/desktops/kde-4.11/l10n/default.nix @@ -23,7 +23,8 @@ let meta = { description = "KDE translation for ${lang}"; license = "GPL"; - inherit (kdelibs.meta) maintainers platforms homepage; + platforms = stdenv.lib.platforms.linux; + inherit (kdelibs.meta) maintainers homepage; }; }; diff --git a/pkgs/desktops/kde-4.8/kde-package/default.nix b/pkgs/desktops/kde-4.8/kde-package/default.nix index cd2860920d6..8a6e8e16751 100644 --- a/pkgs/desktops/kde-4.8/kde-package/default.nix +++ b/pkgs/desktops/kde-4.8/kde-package/default.nix @@ -19,7 +19,8 @@ rec { # Default meta attribute defMeta = { homepage = http://www.kde.org; - inherit (qt4.meta) platforms maintainers; + platforms = stdenv.lib.platforms.linux; + inherit (qt4.meta) maintainers; }; # KDE package built from the whole tarball diff --git a/pkgs/desktops/kde-4.8/l10n/default.nix b/pkgs/desktops/kde-4.8/l10n/default.nix index 57d41fb35bf..c9fab80bffb 100644 --- a/pkgs/desktops/kde-4.8/l10n/default.nix +++ b/pkgs/desktops/kde-4.8/l10n/default.nix @@ -23,7 +23,8 @@ let meta = { description = "KDE translation for ${lang}"; license = "GPL"; - inherit (kdelibs.meta) maintainers platforms homepage; + platforms = stdenv.lib.platforms.linux; + inherit (kdelibs.meta) maintainers homepage; }; }; From cf9a8f5d257c02001295906306d59211597abe9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 25 Aug 2013 10:55:15 +0200 Subject: [PATCH 51/98] getmail: 4.20.0 -> 4.42.0 --- pkgs/tools/networking/getmail/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 147a9673abf..06e7789eca3 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, buildPythonPackage }: buildPythonPackage rec { - name = "getmail-4.20.0"; + name = "getmail-4.42.0"; namePrefix = ""; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; - sha256 = "17cpyra61virk1d223w8pdwhv2qzhbwdbnrr1ab1znf4cv9m3knn"; + sha256 = "0n6sxp8vwa19ffr7bagzwp0hvxfjiy43xpz9sa1qmsyjs7c3xdqj"; }; doCheck = false; @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = { description = "A program for retrieving mail"; - maintainers = [ stdenv.lib.maintainers.raskin ]; + maintainers = [ stdenv.lib.maintainers.raskin stdenv.lib.maintainers.iElectric ]; platforms = stdenv.lib.platforms.linux; }; } From 75d8d312e87cdce2d69d6167d3963a3d85b5d8a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 25 Aug 2013 10:55:33 +0200 Subject: [PATCH 52/98] add ungit to node-packages.json --- pkgs/top-level/node-packages.json | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 3e21fd62865..05892068dc8 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -74,6 +74,7 @@ , "generator-angular" , "statsd" , "karma" +, "ungit" , { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" } , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " } ] From 61021c57393138b3e9f7d587c3751ea1c362bc39 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 24 Aug 2013 18:35:44 +0200 Subject: [PATCH 53/98] bbswitch: upgrade to 0.7 --- pkgs/os-specific/linux/bbswitch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index 692ec0df5bd..675fe7695af 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -2,7 +2,7 @@ let baseName = "bbswitch"; - version = "0.6"; + version = "0.7"; name = "${baseName}-${version}-${kernelDev.version}"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/Bumblebee-Project/${baseName}/archive/v${version}.tar.gz"; - sha256 = "1y1wggfrlpxybz5cvrbvvpqa2hh6ncazzdlg9c94sx40n6p5dcf4"; + sha256 = "0na6gfnvmp5fjbm430ms342hmrsbr6cf78n6hldqb8js2ry3f8dw"; }; preBuild = '' From c9318f4d2d28d9716699c92280eccb4f12638aef Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 25 Aug 2013 09:49:20 +0200 Subject: [PATCH 54/98] calibre: upgrade to 1.0 Upstream insists on using private qt headers. We do not want nixpkgs' qt to export those. So I provided a small hack to take them directly from qt's source tarball. I made sure everything uses the normal system qt and headers, except for the 1 .so file (qt_hack) that needs these private headers. Because of this, there is barely any increate in size or buildtime. --- pkgs/applications/misc/calibre/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 01060909f3d..559a4d3ea0b 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -4,24 +4,31 @@ }: stdenv.mkDerivation rec { - name = "calibre-0.9.11"; + name = "calibre-1.0.0"; # 0.9.12+ versions won't build due to missing qt4 private headers: https://bugs.launchpad.net/calibre/+bug/1094719 src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "0jjs2cx222pbv4nrivlxag5fxa0v9m63x7arcll6xi173zdn4gg8"; + sha256 = "0qz369n46ijk8jbbgwnvj3v0byp5npn2zdb4lvc6mwa143mr6d62"; }; inherit python; nativeBuildInputs = [ makeWrapper pkgconfig ]; + patchPhase = '' + tar xf ${qt48.src} + sed -i setup/build_environment.py \ + -e "s|^qt_private_inc = .*|qt_private_inc = ['%s/%s'%('`pwd`/qt-everywhere-opensource-src-4.8.5/include', m) for m in ('QtGui', 'QtCore')]|" + ''; + buildInputs = [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg - fontconfig podofo qt48 pil chmlib icu + fontconfig podofo qt48 pil chmlib icu sqlite libusb1 libmtp pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow - pythonPackages.sqlite3 pythonPackages.netifaces sqlite libusb1 libmtp + pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw + pythonPackages.cssselect ]; installPhase = '' From 4326c0631960119f720adbdc3a4142a26dd4f7aa Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 25 Aug 2013 18:15:19 +0200 Subject: [PATCH 55/98] calibre: fix for chroot builds (probably) --- pkgs/applications/misc/calibre/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 559a4d3ea0b..0987f961baf 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { patchPhase = '' tar xf ${qt48.src} sed -i setup/build_environment.py \ - -e "s|^qt_private_inc = .*|qt_private_inc = ['%s/%s'%('`pwd`/qt-everywhere-opensource-src-4.8.5/include', m) for m in ('QtGui', 'QtCore')]|" + -e "s|^qt_private_inc = .*|qt_private_inc = ['../qt-everywhere-opensource-src-4.8.5/include/%s'%(m) for m in ('QtGui', 'QtCore')]|" ''; buildInputs = From 378f94f5da54902e3be358e8524086e2f5e346ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 25 Aug 2013 18:41:35 +0200 Subject: [PATCH 56/98] samba: install libnss_{wins,winbind}.so This is the first step to get WINS/NetBIOS name lookup with nsswitch. --- pkgs/servers/samba/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 8b58bd8d2a2..dacfa75181f 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -68,6 +68,8 @@ stdenv.mkDerivation rec { ln -sv ../../../bin/smbspool $out/lib/cups/backend/smb mkdir -pv $out/etc/openldap/schema cp ../examples/LDAP/samba.schema $out/etc/openldap/schema + cp -v ../nsswitch/libnss_wins.so "$out/lib" + cp -v ../nsswitch/libnss_winbind.so "$out/lib" '' # */ + stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf"; From 93c4fd2855e12abd2c2720d2c4b05844a2d32291 Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Thu, 22 Aug 2013 21:50:19 +0200 Subject: [PATCH 57/98] vte: patch for alt key (close #858) Edit (vcunat): bump to latest version supporting gtk2. --- pkgs/desktops/gnome-2/desktop/vte/alt.patch | 50 +++++++++++++++++++ pkgs/desktops/gnome-2/desktop/vte/default.nix | 10 ++-- 2 files changed, 56 insertions(+), 4 deletions(-) create mode 100644 pkgs/desktops/gnome-2/desktop/vte/alt.patch diff --git a/pkgs/desktops/gnome-2/desktop/vte/alt.patch b/pkgs/desktops/gnome-2/desktop/vte/alt.patch new file mode 100644 index 00000000000..65c3ddf1fcf --- /dev/null +++ b/pkgs/desktops/gnome-2/desktop/vte/alt.patch @@ -0,0 +1,50 @@ +From a9d6a34708f846952f423d078397352858f7b1a4 Mon Sep 17 00:00:00 2001 +From: Christian Persch +Date: Sat, 12 May 2012 18:48:05 +0200 +Subject: [PATCH] keymap: Treat ALT as META + +https://bugzilla.gnome.org/show_bug.cgi?id=663779 +--- + src/vte.c | 23 ++++++++++++++--------- + 1 files changed, 14 insertions(+), 9 deletions(-) + +diff --git a/src/vte.c b/src/vte.c +index dd27e9a..0657921 100644 +--- a/src/vte.c ++++ b/src/vte.c +@@ -5170,19 +5170,24 @@ static void + vte_terminal_read_modifiers (VteTerminal *terminal, + GdkEvent *event) + { ++ GdkKeymap *keymap; + GdkModifierType modifiers; + + /* Read the modifiers. */ +- if (gdk_event_get_state((GdkEvent*)event, &modifiers)) { +- GdkKeymap *keymap; +-#if GTK_CHECK_VERSION (2, 90, 8) +- keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window)); +-#else +- keymap = gdk_keymap_get_for_display(gdk_drawable_get_display(((GdkEventAny*)event)->window)); ++ if (!gdk_event_get_state((GdkEvent*)event, &modifiers)) ++ return; ++ ++ keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window)); ++ ++ gdk_keymap_add_virtual_modifiers (keymap, &modifiers); ++ ++#if 1 ++ /* HACK! Treat ALT as META; see bug #663779. */ ++ if (modifiers & GDK_MOD1_MASK) ++ modifiers |= VTE_META_MASK; + #endif +- gdk_keymap_add_virtual_modifiers (keymap, &modifiers); +- terminal->pvt->modifiers = modifiers; +- } ++ ++ terminal->pvt->modifiers = modifiers; + } + + /* Read and handle a keypress event. */ +-- +1.7.5.1.217.g4e3aa.dirty \ No newline at end of file diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix index 00072657e06..e9928aa73cf 100644 --- a/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -2,16 +2,18 @@ , pythonSupport ? false, python, pygtk}: stdenv.mkDerivation rec { - name = "vte-0.28.0"; - + name = "vte-0.28.2"; + src = fetchurl { url = "mirror://gnome/sources/vte/0.28/${name}.tar.bz2"; - sha256 = "0blmblvjr35xajr0a07zcd58lk6x2hzympx17biw2mcym9kcarql"; + sha256 = "00zrip28issgmz2cqk5k824cbqpbixi5x7k88zxksdqpnq1f414d"; }; + patches = [ ./alt.patch ]; + buildInputs = [ intltool pkgconfig glib gtk ncurses ] ++ stdenv.lib.optionals pythonSupport [python pygtk]; - + configureFlags = '' ${if pythonSupport then "--enable-python" else "--disable-python"} ''; From efcffe61e49a827de02c3f82ff3d18684f1d96ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 25 Aug 2013 20:42:51 +0200 Subject: [PATCH 58/98] eagle: bump version 6.4.0 -> 6.5.0 And name the desktop file "eagle.desktop", not "Eagle.desktop". The user facing application name is still "Eagle"; it has nothing to do with the name of the desktop file. --- pkgs/applications/science/electronics/eagle/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/electronics/eagle/default.nix b/pkgs/applications/science/electronics/eagle/default.nix index 04c9a9b79ec..8693e45ce10 100644 --- a/pkgs/applications/science/electronics/eagle/default.nix +++ b/pkgs/applications/science/electronics/eagle/default.nix @@ -13,15 +13,15 @@ in stdenv.mkDerivation rec { name = "eagle-${version}"; - version = "6.4.0"; + version = "6.5.0"; src = fetchurl { - url = "ftp://ftp.cadsoft.de/eagle/program/6.4/eagle-lin-${version}.run"; - sha256 = "0jb44dsq4cl9rx5nam6rxsw9fsmm6fsksv9s544p2zrwnad2x2i8"; + url = "ftp://ftp.cadsoft.de/eagle/program/6.5/eagle-lin-${version}.run"; + sha256 = "17plwx2p8q2ylk0nzj5crfbdm7jc35pw7v3j8f4j81yl37l7bj22"; }; desktopItem = makeDesktopItem { - name = "Eagle"; + name = "eagle"; exec = "eagle"; icon = "eagle"; comment = "Schematic capture and PCB layout"; From 9d530a48fa0a8c726d0b37b667c059166cf05ddf Mon Sep 17 00:00:00 2001 From: Gergely Risko Date: Sun, 25 Aug 2013 21:42:46 +0200 Subject: [PATCH 59/98] Add lens-datetime haskell library --- .../libraries/haskell/lens-datetime/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/lens-datetime/default.nix diff --git a/pkgs/development/libraries/haskell/lens-datetime/default.nix b/pkgs/development/libraries/haskell/lens-datetime/default.nix new file mode 100644 index 00000000000..b1a472dfc7c --- /dev/null +++ b/pkgs/development/libraries/haskell/lens-datetime/default.nix @@ -0,0 +1,14 @@ +{ cabal, lens, time }: + +cabal.mkDerivation (self: { + pname = "lens-datetime"; + version = "0.1.1"; + sha256 = "0p93211ibq1rkh4aj69xdwan0338k35vb5qyf7zp761nghnk3d47"; + buildDepends = [ lens time ]; + meta = { + homepage = "http://github.com/klao/lens-datetime"; + description = "Lenses for Data.Time.* types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index bb946f2a8b1..7713c63c818 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1338,6 +1338,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); lens = callPackage ../development/libraries/haskell/lens {}; + lensDatetime = callPackage ../development/libraries/haskell/lens-datetime {}; + lenses = callPackage ../development/libraries/haskell/lenses {}; libffi = callPackage ../development/libraries/haskell/libffi { From b0fd3c79f72ff2a705572c93abb3d4cbf5702f7a Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 25 Aug 2013 21:56:36 +0200 Subject: [PATCH 60/98] pypi2nix: updated --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 59707c58de8..2a8bc3038e9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7014,13 +7014,13 @@ pythonPackages = modules // import ./python-packages-generated.nix { } // pkgs.lib.optionalAttrs (python.majorVersion == "2.7") { pypi2nix = pythonPackages.buildPythonPackage rec { - rev = "e231db7e8874d4543a6f0fffc46c0fffbe6108c5"; + rev = "e85eb9e75e7290c17e89822d6a5c1c52c1b59269"; name = "pypi2nix-1.0_${rev}"; src = pkgs.fetchurl { url = "https://github.com/garbas/pypi2nix/tarball/${rev}"; name = "${name}.tar.bz"; - sha256 = "0wqk6milnagr0b0v8igjp8p25d5y63pki3pkdy7hbgjxvyw8wril"; + sha256 = "0wk9019pgpc2467819cz98fdvihjkpihlh1yywfxlvn04ymb315q"; }; propagatedBuildInputs = [ pythonPackages."Distutils2-1.0a4" ]; From dd51b431649e17c94ba3a79d1455428a1fec2758 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 25 Aug 2013 21:57:10 +0200 Subject: [PATCH 61/98] Plone: fixed Pillow --- pkgs/top-level/python-packages-generated.nix | 284 +------------------ pkgs/top-level/python-packages.json | 17 ++ 2 files changed, 32 insertions(+), 269 deletions(-) diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix index 6a8f080ccac..ff86757c979 100644 --- a/pkgs/top-level/python-packages-generated.nix +++ b/pkgs/top-level/python-packages-generated.nix @@ -17,7 +17,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."zope.browserpage-3.12.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' UUIDs for content items @@ -38,7 +37,6 @@ in buildInputs = [ ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Python 2 and 3 compatibility utilities @@ -59,7 +57,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope Version Control @@ -80,7 +77,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.5" self."plone.folder-1.0.4" self."plone.uuid-1.0.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.3" self."Products.Marshall-2.1.2" self."Products.MimetypesRegistry-2.0.4" self."Products.PlacelessTranslationService-2.0.3" self."Products.PortalTransforms-2.1.2" self."Products.statusmessages-4.0" self."Products.validation-2.0" self."Products.ZSQLMethods-2.13.4" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contenttype-3.5.5" self."zope.datetime-3.4.1" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.tal-3.5.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Archetypes is a developers framework for rapidly developing and deploying rich, full featured content types within the context of Zope/CMF and Plone. @@ -101,7 +97,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."transaction-1.1.1" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Configurable Marshallers for Archetypes @@ -122,7 +117,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.memoize-1.1.1" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' BTree-based folder implementation with order support @@ -143,7 +137,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.querywidget-1.0.8" self."archetypes.referencebrowserwidget-2.4.18" self."borg.localrole-3.0.2" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."five.customerize-1.1" self."five.localsitemanager-2.0.5" self."Pillow-1.7.8" self."plone.app.blob-1.5.8" self."plone.app.collection-1.0.10" self."plone.app.content-2.1.2" self."plone.app.contentlisting-1.0.4" self."plone.app.contentmenu-2.0.8" self."plone.app.contentrules-3.0.3" self."plone.app.controlpanel-2.3.6" self."plone.app.customerize-1.2.2" self."plone.app.discussion-2.2.6" self."plone.app.folder-1.0.5" self."plone.app.form-2.2.2" self."plone.app.i18n-2.0.2" self."plone.app.jquery-1.7.2" self."plone.app.jquerytools-1.5.5" self."plone.app.layout-2.3.5" self."plone.app.linkintegrity-1.5.2" self."plone.app.locales-4.3.1" self."plone.app.portlets-2.4.4" self."plone.app.redirector-1.2" self."plone.app.search-1.1.4" self."plone.app.upgrade-1.3.3" self."plone.app.users-1.2a2" self."plone.app.uuid-1.0" self."plone.app.viewletmanager-2.0.3" self."plone.app.vocabularies-2.1.10" self."plone.app.workflow-2.1.5" self."plone.batching-1.0" self."plone.browserlayer-2.1.2" self."plone.contentrules-2.0.3" self."plone.fieldsets-2.0.2" self."plone.i18n-2.0.8" self."plone.indexer-1.0.2" self."plone.intelligenttext-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.portlet.collection-2.1.5" self."plone.portlet.static-2.0.2" self."plone.portlets-2.2" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."plone.session-3.5.3" self."plone.theme-2.1" self."plonetheme.classic-1.3.2" self."plonetheme.sunburst-1.4.4" self."Products.Archetypes-1.9.1" self."Products.ATContentTypes-2.1.13" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDiffTool-2.1" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.8" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.DCWorkflow-2.2.4" self."Products.ExtendedPathIndex-3.1" self."Products.ExternalEditor-1.1.0" self."Products.GenericSetup-1.7.3" self."Products.MimetypesRegistry-2.0.4" self."Products.PasswordResetTool-2.0.14" self."Products.PlacelessTranslationService-2.0.3" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self."Products.PluginRegistry-1.3" self."Products.PortalTransforms-2.1.2" self."Products.ResourceRegistries-2.2.9" self."Products.statusmessages-4.0" self."Products.TinyMCE-1.3.4" self.setuptools self."transaction-1.1.1" self."z3c.autoinclude-0.3.4" self."ZODB3-3.10.5" self."zope.app.locales-3.6.2" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.site-3.9.2" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' The Plone Content Management System (core) @@ -164,7 +157,6 @@ in buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.proxy-3.6.1" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' zope.deferredimport allows you to perform imports names that will only be resolved when used in the code. @@ -185,7 +177,6 @@ in buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' Waitress WSGI server @@ -206,7 +197,6 @@ in buildInputs = [ ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' Code coverage measurement for Python @@ -227,7 +217,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.3" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' workflow and security settings for Plone @@ -248,7 +237,6 @@ in buildInputs = [ ]; propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" self."eggtestinfo-0.3" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Uid product for the Zope Content Management Framework @@ -269,7 +257,6 @@ in buildInputs = [ ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Integer to Roman numerals converter @@ -290,7 +277,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.supermodel-1.2.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Tools to construct z3c.form forms @@ -311,7 +297,6 @@ in buildInputs = [ ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' US-ASCII transliterations of Unicode text @@ -332,7 +317,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."five.formlib-1.0.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' An extension to zope.formlib, which allows to group fields into different fieldsets. @@ -353,7 +337,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.memoize-1.1.1" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' redirection tool @@ -374,7 +357,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."archetypes.schemaextender-2.1.2" self."plone.app.imaging-1.0.9" self."plone.scale__storage-1.3.2" self.setuptools self."ZODB3-3.10.5" self."zope.proxy-3.6.1" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' ZODB blob support for Plone @@ -395,7 +377,6 @@ in buildInputs = [ self."nose-1.3.0" ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' WSGI request and response object @@ -416,7 +397,6 @@ in buildInputs = [ ]; propagatedBuildInputs = [ self."mechanize-0.2.5" self."pytz-2013b" self.setuptools self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Programmable browser for functional black-box tests @@ -437,7 +417,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Tools for managing themes in CMF and Plone sites @@ -458,7 +437,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self."Products.MimetypesRegistry-2.0.4" self."Products.PortalTransforms-2.1.2" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Transformations applied to HTML in Plone text fields as they are rendered @@ -479,7 +457,6 @@ in buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.security__untrustedpython-3.7.4" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Local registries for zope component architecture @@ -500,7 +477,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Batching facilities used in Plone. @@ -521,7 +497,6 @@ in buildInputs = [ ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' Python 2 and 3 compatibility utilities @@ -542,7 +517,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDiffTool-2.1" self."Products.CMFUid-2.2.1" self."Products.GenericSetup-1.7.3" self."Products.ZopeVersionControl-1.1.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.copy-3.5.0" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Versioning for Plone @@ -560,10 +534,17 @@ in md5 = "41d8688d4db72673069a6dc63b5289d6"; }; doCheck = false; - buildInputs = [ pkgs.unzip ]; + buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.unzip ]; propagatedBuildInputs = [ ]; + configurePhase = '' + sed -i "setup.py" \ + -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include("${pkgs.freetype}")|g ; + s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include("${pkgs.libjpeg}")|g ; + s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include("${pkgs.zlib}")|g ; + s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include("${pkgs.libwebp}")|g ; + s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ;' + ''; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Python Imaging Library (fork) @@ -584,7 +565,6 @@ in buildInputs = [ ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Structured Configuration Library @@ -605,7 +585,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."python-gettext-1.2" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' PTS provides a way of internationalizing (i18n'ing) and localizing (l10n'ing) software for Zope 2. @@ -626,7 +605,6 @@ in buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope Deprecation Infrastructure @@ -647,7 +625,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."transaction-1.1.1" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."zope.tales-3.5.3" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' CMFFormController provides a form validation mechanism for CMF. @@ -668,7 +645,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Data validation package for Archetypes @@ -689,7 +665,6 @@ in buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' Very basic event publishing system @@ -710,7 +685,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self."plone.transformchain-1.0.3" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope 2 integration for z3c.caching @@ -731,7 +705,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Generic Transparent Proxies @@ -752,7 +725,6 @@ in buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Component vocabularies @@ -773,7 +745,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' Zope Component Architecture @@ -794,7 +765,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.i18n-2.0.8" self."plone.memoize-1.1.1" self."plone.session-3.5.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self."Products.PluggableAuthService-1.10.0" self.setuptools self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' PlonePAS adapts the PluggableAuthService for use by Plone. @@ -815,7 +785,6 @@ in buildInputs = [ self."unittest2-0.5.1" ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' A Python Mocking and Patching Library for Testing @@ -836,7 +805,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."archetypes.referencebrowserwidget-2.4.18" self.setuptools self."zope.deprecation-3.4.1" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' ATReferenceBrowserWidget is reference widget for Archetypes. @@ -857,7 +825,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Special MultiMapping objects used in Zope2. @@ -878,7 +845,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Record-2.13.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' SQL method support for Zope 2. @@ -899,7 +865,6 @@ in buildInputs = [ self."nose-1.3.0" ]; propagatedBuildInputs = [ self."MarkupSafe-0.18" ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' A super-fast templating language that borrows the best ideas from the existing templating languages. @@ -920,7 +885,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Hook into repoze.zope2 that allows third party packages to register a sequence of hooks that will be allowed to modify the response before it is returned to the browser @@ -941,7 +905,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' zope.interface extension for defining data schemas @@ -962,7 +925,6 @@ in buildInputs = [ ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" self."eggtestinfo-0.3" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' CMFQuickInstallerTool is a facility for comfortable activation/deactivation of CMF compliant products. @@ -983,7 +945,6 @@ in buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' Zope Deprecation Infrastructure @@ -1004,7 +965,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."five.formlib-1.0.4" self."plone.app.vocabularies-2.1.10" self."plone.locking-2.0.4" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' zope.formlib integration for Plone @@ -1025,7 +985,6 @@ in buildInputs = [ ]; propagatedBuildInputs = [ self."five.formlib-1.0.4" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" self."eggtestinfo-0.3" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Default product for the Zope Content Management Framework @@ -1046,7 +1005,6 @@ in buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope process lifetime events @@ -1067,7 +1025,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Password reset tool for Plone @@ -1088,7 +1045,6 @@ in buildInputs = [ ]; propagatedBuildInputs = [ self."six-1.3.0" self."WebOb-1.2.3" ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' UNKNOWN @@ -1109,7 +1065,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Simple decorators to support synchronized methods @@ -1130,7 +1085,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Support for applying monkey patches late in the startup cycle by using ZCML configuration actions @@ -1151,7 +1105,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.i18n__zcml-3.7.4" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Adaptable string interpolation @@ -1172,7 +1125,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' The default theme for Plone 4. @@ -1193,7 +1145,6 @@ in buildInputs = [ self."nose-1.3.0" ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' Load, configure, and compose WSGI applications and servers @@ -1214,7 +1165,6 @@ in buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Sequence Sorting @@ -1235,7 +1185,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.PluggableAuthService-1.10.0" self."python-openid-2.2.5" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' OpenID authentication support for PAS @@ -1256,7 +1205,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.resource-1.0.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' UNKNOWN @@ -1277,7 +1225,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."six-1.2.0" self."zope.browser-1.3" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.site-3.9.2" self."zope.traversing-3.13.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' An advanced form and widget framework for Zope 3 @@ -1298,7 +1245,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.authentication-3.7.1" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.error-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.traversing-3.13.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope publication @@ -1319,7 +1265,6 @@ in buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.event-3.5.2" self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' zope.interface extension for defining data schemas @@ -1340,7 +1285,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope External Editor @@ -1361,7 +1305,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.batching-1.0" self."plone.i18n-2.0.8" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Content Views for Plone @@ -1382,7 +1325,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Diff tool for Plone @@ -1403,7 +1345,6 @@ in buildInputs = [ self."nose-1.3.0" ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' A tiny LRU cache implementation and decorator @@ -1424,7 +1365,6 @@ in buildInputs = [ ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Python implementation of Markdown. @@ -1445,7 +1385,6 @@ in buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."experimental.cssselect-0.3" self."lxml-2.3.6" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Diazo implements a Deliverance like language using a pure XSLT engine. With Diazo, you @@ -1469,7 +1408,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Infrastructure for maintaining a registry of available behaviors @@ -1490,7 +1428,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Basic inter-process locks @@ -1511,7 +1448,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.tal-3.5.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope Template Application Language Expression Syntax (TALES) @@ -1532,7 +1468,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."pytz-2013b" self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' This package provides a DateTime data type, as known from Zope 2.Unless you need to communicate with Zope 2 APIs, you're probablybetter off using Python's built-in datetime module. @@ -1553,7 +1488,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."zc.buildout-1.7.1" self."zope.configuration-3.7.4" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Automatically include ZCML @@ -1574,7 +1508,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' World timezone definitions, modern and historical @@ -1595,7 +1528,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."zope.interface-4.0.5" self."zope.proxy-4.1.3" self."zope.schema-4.3.2" ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' Zope Location @@ -1616,7 +1548,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.1" self."Products.CMFCore-2.2.7" self."Products.CMFEditions-2.2.8" self."Products.CMFPlacefulWorkflow-1.5.9" self."Products.DCWorkflow-2.2.4" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' check-out/check-in staging for Plone @@ -1637,7 +1568,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Markdown-2.0.3" self."plone.intelligenttext-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.MimetypesRegistry-2.0.4" self.setuptools self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' MIME based content transformations @@ -1658,7 +1588,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' zope.sendmail integration for Zope 2. @@ -1679,7 +1608,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API. @@ -1700,7 +1628,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."RestrictedPython-3.6.0" self."zExceptions-2.13.0" self."zope.sequencesort-3.4.0" self."zope.structuredtext-3.5.1" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Document Templating Markup Language (DTML) @@ -1721,7 +1648,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.form-2.2.2" self."plone.app.vocabularies-2.1.10" self."plone.app.workflow-2.1.5" self."plone.fieldsets-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.PlonePAS-4.1.1" self."Products.PortalTransforms-2.1.2" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.cachedescriptors-3.5.1" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.ramcache-1.0" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Formlib-based controlpanels for Plone. @@ -1742,7 +1668,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.browserresource-3.10.3" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Page template resource plugin for zope.browserresource @@ -1763,7 +1688,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' MIME type handling for Zope @@ -1784,7 +1708,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Docutils -- Python Documentation Utilities @@ -1795,20 +1718,19 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "beautifulsoup4-4.3.0" = self.buildPythonPackage { - name = "beautifulsoup4-4.3.0"; + "beautifulsoup4-4.3.1" = self.buildPythonPackage { + name = "beautifulsoup4-4.3.1"; src = fetchurl { - url = "https://pypi.python.org/packages/source/b/beautifulsoup4/beautifulsoup4-4.3.0.tar.gz"; - md5 = "8341b12402d942661bbfcc9f35420529"; + url = "https://pypi.python.org/packages/source/b/beautifulsoup4/beautifulsoup4-4.3.1.tar.gz"; + md5 = "508095f2784c64114e06856edc1dafed"; }; doCheck = false; buildInputs = [ ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' - Improvements to the lxml tree builder. + UNKNOWN ''; homepage = "http://www.crummy.com/software/BeautifulSoup/bs4/"; license = "MIT"; @@ -1826,7 +1748,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' nose extends unittest to make testing easier @@ -1847,7 +1768,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' Python Packaging Library @@ -1868,7 +1788,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."borg.localrole-3.0.2" self."five.localsitemanager-2.0.5" self."plone.app.folder-1.0.5" self."plone.app.portlets-2.4.4" self."plone.portlets-2.2" self."plone.session-3.5.3" self."Products.Archetypes-1.9.1" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDiffTool-2.1" self."Products.CMFEditions-2.2.8" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.contentmigration-2.1.4" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.3" self."Products.MimetypesRegistry-2.0.4" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self."Products.PortalTransforms-2.1.2" self."Products.ResourceRegistries-2.2.9" self."Products.SecureMailHost-1.1.2" self."Products.ZCatalog-2.13.23" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.ramcache-1.0" self."zope.site-3.9.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Upgrade machinery for Plone. @@ -1889,7 +1808,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.exceptions-3.6.2" self."zope.interface-3.6.7" self."zope.location-3.9.1" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' An error reporting utility for Zope3 @@ -1910,7 +1828,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self."plone.app.portlets-2.4.4" self."plone.openid-2.0.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Plone OpenID authentication support @@ -1931,7 +1848,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.globalrequest-1.0" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope 2 integration for zope.globalrequest @@ -1952,7 +1868,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Hooks to facilitate managing custom index values in Zope 2/CMF applications @@ -1973,7 +1888,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" self."zope.location-3.9.1" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Manage secrets @@ -1994,7 +1908,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."feedparser-5.0.1" self."five.customerize-1.1" self."five.formlib-1.0.4" self."plone.app.form-2.2.2" self."plone.app.i18n-2.0.2" self."plone.app.vocabularies-2.1.10" self."plone.i18n-2.0.8" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.3" self."Products.PluggableAuthService-1.10.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Plone integration for the basic plone.portlets package @@ -2015,7 +1928,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.alterego-1.0" self."plone.autoform-1.4" self."plone.behavior-1.0.2" self."plone.folder-1.0.4" self."plone.memoize-1.1.1" self."plone.rfc822-1.0.1" self."plone.supermodel-1.2.2" self."plone.synchronize-1.0.1" self."plone.uuid-1.0.3" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.dottedname-3.4.6" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.size-3.4.1" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Flexible CMF content @@ -2036,7 +1948,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' @@ -2057,7 +1968,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.lifecycleevent-3.6.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' A BTree based implementation for Zope 2's OFS. @@ -2078,7 +1988,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."DocumentTemplate-2.13.2" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' MIMETools provides the <!--#mime--> tag for DocumentTemplate. @@ -2099,7 +2008,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.exceptions-3.6.2" self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope testing framework, including the testrunner script. @@ -2120,7 +2028,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Object life-cycle events @@ -2141,7 +2048,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Metaclass for subclassable extension types @@ -2162,7 +2068,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.formlib-1.0.4" self."plone.app.form-2.2.2" self."plone.app.vocabularies-2.1.10" self."plone.contentrules-2.0.3" self."plone.memoize-1.1.1" self."plone.stringinterp-1.0.10" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.GenericSetup-1.7.3" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Plone integration for plone.contentrules @@ -2183,7 +2088,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ self."nose-1.3.0" ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' Utility library for i18n relied on by various Repoze and Pyramid packages @@ -2204,7 +2108,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' Implements a XML/HTML/XHTML Markup safe string for Python @@ -2225,7 +2128,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.security__untrustedpython-3.7.4" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.traversing-3.13.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope Page Templates @@ -2246,7 +2148,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."unittest2-0.5.1" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Python Gettext po to mo file compiler. @@ -2267,7 +2168,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' System for managing development buildouts @@ -2288,7 +2188,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.uuid-1.0.3" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Dynamically extend Archetypes schemas with named adapters. @@ -2309,7 +2208,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope 3 Template Application Languate (TAL) @@ -2330,7 +2228,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Persistence-2.13.2" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' General Zope 2 help screens. @@ -2351,7 +2248,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' cssselect parses CSS3 Selectors and translates them to XPath 1.0 @@ -2372,7 +2268,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.app.contentlisting-1.0.4" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Search user interface for Plone CMS. @@ -2393,7 +2288,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.broken-3.6.0" self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.filerepresentation-3.6.1" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.size-3.4.1" self."zope.traversing-3.13.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope Container @@ -2414,7 +2308,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.ATContentTypes-2.1.13" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Integration testing framework for Plone. @@ -2435,7 +2328,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' The new features in unittest for Python 2.7 backported to Python 2.3+. @@ -2456,7 +2348,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' zExceptions contains common exceptions used in Zope2. @@ -2477,7 +2368,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."ZODB3-3.10.5" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Persistent ExtensionClass @@ -2498,7 +2388,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' CMFDynamicViewFTI is a product for dynamic views in CMF. @@ -2519,7 +2408,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contenttype-3.5.5" self."zope.event-3.5.2" self."zope.exceptions-3.6.2" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.security__untrustedpython-3.7.4" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' The Zope publisher publishes Python objects on the web. @@ -2540,7 +2428,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' ZCML directives for configuring browser views for Zope. @@ -2561,7 +2448,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Plone specific i18n extensions. @@ -2582,7 +2468,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.schema-4.2.2" self."RestrictedPython-3.6.0" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope Security Framework @@ -2603,7 +2488,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Cache purging support for Zope 2 applications @@ -2624,7 +2508,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.component__zcml-3.9.5" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' jQuery Tools integration for Plone plus overlay and AJAX form helpers. @@ -2645,7 +2528,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope Component Architecture @@ -2666,7 +2548,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope Viewlets @@ -2687,7 +2568,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self."pytz-2013b" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.schema-4.2.2" self."zope.configuration-3.7.4" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope Internationalization Support @@ -2708,7 +2588,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.referencebrowserwidget-2.4.18" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.5" self."plone.app.layout-2.3.5" self."plone.i18n-2.0.8" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.1" self."Products.ATReferenceBrowserWidget-3.0" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.3" self."Products.MimetypesRegistry-2.0.4" self."Products.PortalTransforms-2.1.2" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."ZConfig-2.9.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.tal-3.5.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Default Content Types for Plone @@ -2729,7 +2608,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contenttype-3.5.5" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Browser resources implementation for Zope. @@ -2750,7 +2628,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Registry for managing CSS and JS @@ -2771,7 +2648,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self.setuptools self."transaction-1.1.1" self."zope.app.form-4.0.2" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' zope.formlib integration for Zope 2 @@ -2792,7 +2668,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' statusmessages provides an easy way of handling internationalized status messages managed via an BrowserRequest adapter storing status messages in client-side cookies. @@ -2813,7 +2688,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ self."nose-1.3.0" self."WebTest-2.0.7" self."zope.component-4.1.0" self."zope.interface-4.0.5" ]; propagatedBuildInputs = [ self."Chameleon-2.11" self."Mako-0.8.1" self."PasteDeploy-1.5.0" self."repoze.lru-0.6" self.setuptools self."translationstring-1.1" self."venusian-1.0a8" self."WebOb-1.2.3" self."zope.deprecation-4.0.2" self."zope.interface-4.0.5" ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' The Pyramid web application development framework, a Pylons project @@ -2834,7 +2708,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Extensions to the standard python 2.3+ datetime module @@ -2855,7 +2728,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' PloneLanguageTool allows you to set the available languages in your Plone site, select various fallback mechanisms, and control the use of flags for language selection and translations. @@ -2876,7 +2748,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Provides transforms from text/x-web-intelligent to text/html and vice versa. @@ -2897,7 +2768,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.rfc822-1.0.1" self.setuptools self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" self."plone.scale__storage-1.3.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' File types and fields for images, files and blob files with filenames @@ -2918,7 +2788,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope contenttype @@ -2939,7 +2808,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."zope.interface-4.0.5" ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' Generic Transparent Proxies @@ -2960,7 +2828,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Global way of retrieving the currently active request. @@ -2981,7 +2848,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."python-dateutil-1.5" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' RFC822 marshalling for zope.schema fields @@ -3002,7 +2868,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope sendmail @@ -3023,7 +2888,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' webdav locking support @@ -3044,7 +2908,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Object annotation mechanism @@ -3065,7 +2928,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.customerize-1.1" self."plone.browserlayer-2.1.2" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Integrate five.customerize into Plone. @@ -3084,9 +2946,8 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = true; buildInputs = [ self."nose-1.3.0" self."unittest2-0.5.1" self."pyquery-1.2.4" self."WSGIProxy2-0.2" self."PasteDeploy-1.5.0" self."mock-1.0.1" self."coverage-3.6" pkgs.unzip ]; - propagatedBuildInputs = [ self."beautifulsoup4-4.3.0" self."six-1.3.0" self."waitress-0.8.6" self."WebOb-1.2.3" ]; + propagatedBuildInputs = [ self."beautifulsoup4-4.3.1" self."six-1.3.0" self."waitress-0.8.6" self."WebOb-1.2.3" ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' Helper to test WSGI applications @@ -3107,7 +2968,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."lxml-2.3.6" self."plone.app.z3cform-0.7.3" self."plone.autoform-1.4" self."plone.registry-1.0.1" self."plone.supermodel-1.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self."Products.statusmessages-4.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope 2 and Plone integration for plone.registry @@ -3128,7 +2988,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.keyring-2.0.1" self."plone.protect-2.0.2" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Session based authentication for Zope @@ -3149,7 +3008,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.configuration-3.7.4" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Caching infrastructure for web apps @@ -3170,7 +3028,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."Persistence-2.13.2" self.setuptools self."transaction-1.1.1" self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Full text indexing for ZCatalog / Zope 2. @@ -3191,7 +3048,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' File-system Representation Interfaces @@ -3212,7 +3068,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.ramcache-1.0" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Decorators for caching the values of functions and methods @@ -3233,7 +3088,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Interfaces for Python @@ -3254,7 +3108,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Interfaces and simple adapter that give the size of an object @@ -3275,7 +3128,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.portlets-2.2" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.componentvocabulary-1.0.1" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' TTW customization of template-based Zope views @@ -3296,7 +3148,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Resolver for Python dotted names. @@ -3317,7 +3168,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.caching-1.0" self."python-dateutil-1.5" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' UNKNOWN @@ -3338,7 +3188,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" self."eggtestinfo-0.3" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' DCWorkflow product for the Zope Content Management Framework @@ -3359,7 +3208,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Translation files for Plone @@ -3380,7 +3228,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."z3c.form-3.0" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' z3c.form date and datetime widgets @@ -3401,7 +3248,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.uuid-1.0.3" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Listing of content for the Plone CMS @@ -3422,7 +3268,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."docutils-0.9.1" self."ExtensionClass-2.13.2" self."initgroups-2.13.0" self."Missing-2.13.1" self."MultiMapping-2.13.0" self."Persistence-2.13.2" self."Products.BTreeFolder2-2.13.3" self."Products.ExternalMethod-2.13.0" self."Products.MailHost-2.13.1" self."Products.MIMETools-2.13.0" self."Products.OFSP-2.13.2" self."Products.PythonScripts-2.13.2" self."Products.StandardCacheManagers-2.13.0" self."Products.ZCatalog-2.13.23" self."Products.ZCTextIndex-2.13.4" self."pytz-2013b" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."tempstorage-2.12.2" self."transaction-1.1.1" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zExceptions-2.13.0" self."zLOG-2.11.1" self."ZODB3-3.10.5" self."zope.browser-1.3" self."zope.browsermenu-3.9.1" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.contenttype-3.5.5" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.exceptions-3.6.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.processlifetime-1.0" self."zope.proxy-3.6.1" self."zope.ptresource-3.9.0" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.sendmail-3.7.5" self."zope.sequencesort-3.4.0" self."zope.site-3.9.2" self."zope.size-3.4.1" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.testbrowser-3.11.1" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."ZopeUndo-2.12.0" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope2 application server / web framework @@ -3443,7 +3288,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' This package provides support for external Python methods within a Zope 2 environment. @@ -3464,7 +3308,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Browser layer management for Zope 2 applications @@ -3485,7 +3328,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.folder-1.0.4" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Integration package for `plone.folder` into Plone @@ -3506,7 +3348,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ self."zope.event-4.0.2" ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' Fast HTML/XML Template Compiler. @@ -3527,7 +3368,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."AccessControl-3.0.6" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Cache managers for Zope 2. @@ -3548,7 +3388,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' RestrictedPython provides a restricted execution environment for Python, e.g. for running untrusted code. @@ -3569,7 +3408,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.testing-3.9.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' A RAM-based storage for ZODB @@ -3590,7 +3428,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.indexer-1.0.2" self."plone.uuid-1.0.3" self.setuptools self."zope.interface-3.6.7" self."zope.publisher-3.12.6" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Plone integration for the basic plone.uuid package @@ -3611,7 +3448,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Acquisition is a mechanism that allows objects to obtain attributes from the containment hierarchy they're in. @@ -3632,7 +3468,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope datetime @@ -3653,7 +3488,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API. @@ -3674,7 +3508,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.3" self."lxml-2.3.6" self."plone.app.content-2.1.2" self."plone.app.layout-2.3.5" self."plone.app.textfield-1.2.2" self."plone.app.uuid-1.0" self."plone.app.z3cform-0.7.3" self."plone.autoform-1.4" self."plone.behavior-1.0.2" self."plone.contentrules-2.0.3" self."plone.dexterity-2.1.3" self."plone.formwidget.namedfile-1.0.6" self."plone.namedfile__scales-2.0.2" self."plone.portlets-2.2" self."plone.rfc822-1.0.1" self."plone.schemaeditor-1.3.2" self."plone.supermodel-1.2.2" self."plone.z3cform-0.8.0" self."Products.ATContentTypes-2.1.13" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self.setuptools self."z3c.form-3.0" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Dexterity is a content type framework for CMF applications, with particular emphasis on Plone. It can be viewed as an alternative to Archetypes that is more light-weight and modular. @@ -3695,7 +3528,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope locale extraction and management utilities @@ -3716,7 +3548,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.app.portlets-2.4.4" self."plone.app.viewletmanager-2.0.3" self."plone.i18n-2.0.8" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.8" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Layout mechanisms for Plone @@ -3737,7 +3568,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.componentvocabulary-1.0.1" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope Content Type @@ -3758,7 +3588,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Stateful programmatic web browsing. @@ -3779,7 +3608,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."z3c.form-3.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' A source query widget for z3c.form. @@ -3800,7 +3628,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.3" self."plone.protect-2.0.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.formwidget.query-0.9" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' A collection of widgets, templates and other components for use with z3c.form and Plone @@ -3821,7 +3648,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."DateTime-3.0.3" self."plone.app.contentlisting-1.0.4" self."plone.app.layout-2.3.5" self."plone.app.vocabularies-2.1.10" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.globalrequest-1.0" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' UNKNOWN @@ -3842,7 +3668,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ self."zope.event-4.0.2" pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' Interfaces for Python @@ -3863,7 +3688,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."Unidecode-0.04.1" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Advanced i18n/l10n features @@ -3884,7 +3708,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' A generic content migration framework for Plone. @@ -3905,7 +3728,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Special Missing objects used in Zope2. @@ -3926,7 +3748,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Method and property caching decorators @@ -3947,7 +3768,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Browser menu implementation for Zope. @@ -3968,7 +3788,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self."transaction-1.1.1" self."zc.lockfile-1.0.2" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zope.event-3.5.2" self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope Object Database: object database and persistence @@ -3989,7 +3808,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.app.form-2.2.2" self."plone.app.jquerytools-1.5.5" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' A referencebrowser implementation for Archetypes @@ -4010,7 +3828,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope Configuration Markup Language (ZCML) @@ -4031,7 +3848,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ self."nose-1.3.0" ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' A library for deferring decorator actions @@ -4052,7 +3868,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.content-2.1.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Plone's content menu implementation @@ -4073,7 +3888,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.componentvocabulary-1.0.1" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Plone ContentRules Engine @@ -4094,7 +3908,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.keyring-2.0.1" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Security for browser forms @@ -4115,7 +3928,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Transaction management for Python @@ -4136,7 +3948,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."diazo-1.0.3" self."docutils-0.9.1" self."five.globalrequest-1.0" self."lxml-2.3.6" self."plone.app.registry-1.2.3" self."plone.resource-1.0.2" self."plone.resourceeditor-1.0" self."plone.subrequest-1.6.7" self."plone.transformchain-1.0.3" self."Products.CMFPlone-4.3.1" self."repoze.xmliter-0.5" self."roman-1.4.0" self.setuptools self."zope.traversing-3.13.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Integrates the Diazo theming engine with Plone @@ -4157,7 +3968,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."collective.monkeypatcher-1.0.1" self."plone.app.layout-2.3.5" self."plone.app.uuid-1.0" self."plone.app.z3cform-0.7.3" self."plone.indexer-1.0.2" self."plone.registry-1.0.1" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.site-3.9.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Enhanced discussion support for Plone @@ -4178,7 +3988,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' A PAS plugin which can manage local roles via an adapter lookup on the current context @@ -4199,7 +4008,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Products.ZCTextIndex-2.13.4" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope 2's indexing and search solution. @@ -4220,7 +4028,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.app.imaging-1.0.9" self."plone.app.layout-2.3.5" self."plone.caching-1.0" self."plone.namedfile__scales-2.0.2" self."plone.outputfilters-1.10" self."Products.Archetypes-1.9.1" self."Products.ResourceRegistries-2.2.9" self.setuptools self."zope.app.content-3.5.1" self."zope.schema-4.2.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Adds support for TinyMCE, a platform independent web based Javascript HTML WYSIWYG editor, to Plone. @@ -4241,7 +4048,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' OpenID support for servers and consumers. @@ -4262,7 +4068,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."lxml-2.3.6" self.setuptools self."z3c.zcmlhook-1.0b1" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Serialize Zope schema definitions to and from XML @@ -4283,7 +4088,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope Exceptions @@ -4304,7 +4108,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."five.formlib-1.0.4" self."plone.app.controlpanel-2.3.6" self."plone.app.layout-2.3.5" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' A package for all things users and groups related (specific to plone) @@ -4325,7 +4128,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.batching-1.0" self.setuptools self."z3c.form-3.0" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' plone.z3cform is a library that allows use of z3c.form with Zope 2 and the CMF. @@ -4346,7 +4148,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.registry-1.2.3" self."plone.app.z3cform-0.7.3" self."plone.cachepurging-1.0.4" self."plone.caching-1.0" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.3" self."Products.statusmessages-4.0" self."python-dateutil-1.5" self.setuptools self."z3c.form-3.0" self."z3c.zcmlhook-1.0b1" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Plone UI and default rules for plone.caching/z3c.caching @@ -4367,7 +4168,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Special Record objects used in Zope2. @@ -4388,7 +4188,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self."Record-2.13.0" self."RestrictedPython-3.6.0" self."transaction-1.1.1" self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.deferredimport-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.testing-3.9.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Security framework for Zope2. @@ -4409,7 +4208,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self."Products.PloneTestCase-0.9.17" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.testing-3.9.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Workflow policies for CMF and Plone @@ -4430,7 +4228,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Text field with MIME type support @@ -4451,7 +4248,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Very basic event publishing system @@ -4472,7 +4268,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self."cssselect-0.8" self."lxml-3.2.3" ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { description = '' A jquery-like library for python @@ -4493,7 +4288,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Convenience uid/gid helper function used in Zope2. @@ -4514,7 +4308,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self."ZConfig-2.9.1" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Daemon process control library and tools for Unix-based systems @@ -4535,7 +4328,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Low level support for dynamic modules @@ -4556,7 +4348,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Easily hook into the ZCML processing machinery @@ -4577,7 +4368,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Definition of authentication basics for the Zope Framework @@ -4598,7 +4388,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Add test information to .egg-info @@ -4619,7 +4408,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.app.form-2.2.2" self."plone.app.portlets-2.4.4" self."plone.app.vocabularies-2.1.10" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' A portlet that fetches results from a collection @@ -4640,7 +4428,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Shared Zope Toolkit browser components @@ -4661,7 +4448,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."archetypes.querywidget-1.0.8" self."plone.app.contentlisting-1.0.4" self."plone.app.form-2.2.2" self."plone.app.portlets-2.4.4" self."plone.app.vocabularies-2.1.10" self."plone.portlet.collection-2.1.5" self."plone.portlets-2.2" self."Products.Archetypes-1.9.1" self."Products.CMFCore-2.2.7" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' This package adds 'saved search' functionality to Plone. @@ -4682,7 +4468,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" self."eggtestinfo-0.3" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Calendar product for the Zope Content Management Framework @@ -4703,7 +4488,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self."Products.GenericSetup-1.7.3" self."Products.PluginRegistry-1.3" self.setuptools self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Pluggable Zope2 authentication / authorization framework @@ -4724,7 +4508,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.app.caching-1.1.4" self."plone.app.dexterity-2.0.8" self."plone.app.iterate-2.1.10" self."plone.app.openid-2.0.2" self."plone.app.theming-1.1.1" self."Products.CMFPlacefulWorkflow-1.5.9" self."Products.CMFPlone-4.3.1" self.setuptools self."wicked-1.1.10" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' The Plone Content Management System @@ -4745,7 +4528,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."zope.container-3.11.2" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' wicked is a compact syntax for doing wiki-like content linking and creation in zope and plone @@ -4766,7 +4548,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope Broken Object Interfaces @@ -4787,7 +4568,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.namedfile__scales-2.0.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Image widget for z3c.form and Plone @@ -4808,7 +4588,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.vocabularies-2.1.10" self."Products.GenericSetup-1.7.3" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.interface-3.6.7" self."zope.site-3.9.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' configurable viewlet manager @@ -4829,7 +4608,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self.setuptools self."zope.formlib-4.0.6" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Read Zope configuration state from profile dirs / tarballs @@ -4850,7 +4628,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' jQuery integration for Plone @@ -4871,7 +4648,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.autoform-1.4" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Provides through-the-web editing of a zope schema/interface. @@ -4892,7 +4668,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' StructuredText parser @@ -4913,7 +4688,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.testing-3.9.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope RAM Cache @@ -4934,7 +4708,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' ZODB undo support for Zope2. @@ -4955,7 +4728,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Resolving paths in the object hierarchy @@ -4976,7 +4748,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.tales-3.5.3" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Content Provider Framework for Zope Templates @@ -4997,7 +4768,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' The classic Plone 3 default theme. @@ -5018,7 +4788,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self."Products.GenericSetup-1.7.3" self."Products.ZSQLMethods-2.13.4" self.setuptools self."zope.app.publication-3.12.0" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope Content Management Framework core components @@ -5039,7 +4808,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."Persistence-2.13.2" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Image scaling @@ -5060,7 +4828,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.app.form-2.2.2" self."plone.app.portlets-2.4.4" self."plone.i18n-2.0.8" self."plone.portlets-2.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' A simple static HTML portlet for Plone. @@ -5081,7 +4848,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.scale__storage-1.3.2" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' User-configurable, blob-aware image scaling for Plone. @@ -5102,7 +4868,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' SecureMailHost is a reimplementation of the standard Zope2 MailHost with some security and usability enhancements. @@ -5123,7 +4888,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.memoize-1.1.1" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' An extension of zope.viewlet to support dynamic portlets @@ -5144,7 +4908,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."plone.app.jquerytools-1.5.5" self."plone.app.querystring-1.0.8" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' UNKNOWN @@ -5165,7 +4928,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Configure application plugins based on interfaces @@ -5186,7 +4948,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."lxml-2.3.6" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Wrapper for ``lxml`` trees which serializes to string upon iteration. @@ -5207,7 +4968,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self."ZConfig-2.9.1" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' A general logging facility @@ -5228,7 +4988,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.proxy-3.6.1" self."zope.schema-4.2.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope Location @@ -5249,7 +5008,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."lxml-2.3.6" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Experimental version of lxml.cssselect @@ -5270,7 +5028,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."pytz-2013b" self.setuptools self."zope.browser-1.3" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.datetime-3.4.1" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Form generation and validation library for Zope @@ -5291,7 +5048,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Pluggable object copying mechanism @@ -5312,7 +5068,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."five.globalrequest-1.0" self.setuptools self."zope.globalrequest-1.0" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Subrequests for Zope2 @@ -5333,7 +5088,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' A collection of generally useful vocabularies. @@ -5354,7 +5108,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' A debconf-like (or about:config-like) registry for storing application settings @@ -5375,7 +5128,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."AccessControl-3.0.6" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Zope catalog index for paths @@ -5396,7 +5148,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Message Identifiers for internationalization @@ -5417,7 +5168,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Manage link integrity in Plone. @@ -5438,7 +5188,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."eggtestinfo-0.3" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Action icons product for the Zope Content Management Framework @@ -5459,7 +5208,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ ]; propagatedBuildInputs = [ self.setuptools self."transaction-1.1.1" self."zope.browser-1.3" self."zope.browsermenu-3.9.1" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.datetime-3.4.1" self."zope.exceptions-3.6.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.proxy-3.6.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' The Original Zope 3 Form Framework @@ -5480,7 +5228,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."Acquisition-2.13.8" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Local site manager implementation for Zope 2 @@ -5501,7 +5248,6 @@ development, check it into Subversion, and not touch Diazo during deployment. buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."RestrictedPython-3.6.0" self.setuptools self."zExceptions-2.13.0" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { description = '' Provides support for restricted execution of Python scripts in Zope 2. diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json index cc345d5c5bc..a87f7eb78be 100644 --- a/pkgs/top-level/python-packages.json +++ b/pkgs/top-level/python-packages.json @@ -103,6 +103,23 @@ }, "Products.CMFCalendar": { "propagatedBuildInputs": [ "eggtestinfo" ] + }, + "Pillow": { + "buildInputs": [ + "pkgs.freetype", + "pkgs.libjpeg", + "pkgs.zlib", + "pkgs.libtiff", + "pkgs.libwebp" + ], + "configurePhase": [ + "sed -i \"setup.py\" \\", + " -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include(\"${pkgs.freetype}\")|g ;", + " s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include(\"${pkgs.libjpeg}\")|g ;", + " s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include(\"${pkgs.zlib}\")|g ;", + " s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include(\"${pkgs.libwebp}\")|g ;", + " s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include(\"${pkgs.libtiff}\")|g ;'" + ] } } }, From 946f219a32c8e776f10e698144427c0a2879d14a Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 25 Aug 2013 23:41:15 +0200 Subject: [PATCH 62/98] calibre: really fix building on master It turns out I hardcoded the output path that qt's tarball extracts. But that path is versioned (4.8.5 for example). As I've already merged x-updates on my own system, my qt version was different (4.8.4 vs 4.8.5). Made the path-guessing more flexible, so now it should work with any 4.8.* --- pkgs/applications/misc/calibre/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0987f961baf..c74795f52c4 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -18,8 +18,9 @@ stdenv.mkDerivation rec { patchPhase = '' tar xf ${qt48.src} + qtdir=$(realpath $(ls | grep qt | grep 4.8 | grep src)) sed -i setup/build_environment.py \ - -e "s|^qt_private_inc = .*|qt_private_inc = ['../qt-everywhere-opensource-src-4.8.5/include/%s'%(m) for m in ('QtGui', 'QtCore')]|" + -e "s|^qt_private_inc = .*|qt_private_inc = ['$qtdir/include/%s\'%(m) for m in ('QtGui', 'QtCore')]|" ''; buildInputs = From 45e975abff596d87e0d58fe919e48eac17982bad Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Mon, 26 Aug 2013 02:43:12 +0200 Subject: [PATCH 63/98] Wrap Erlang scripts to provide missing 'sed' and 'awk'. Signed-off-by: Moritz Ulrich --- pkgs/development/interpreters/erlang/R14B04.nix | 11 +++++++++-- pkgs/development/interpreters/erlang/R15B03.nix | 8 ++++++++ pkgs/development/interpreters/erlang/R16B01.nix | 9 ++++++++- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R14B04.nix b/pkgs/development/interpreters/erlang/R14B04.nix index 1d5c9ae3d39..4dd32cd806c 100644 --- a/pkgs/development/interpreters/erlang/R14B04.nix +++ b/pkgs/development/interpreters/erlang/R14B04.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, perl, gnum4, ncurses, openssl }: +{ stdenv, fetchurl, perl, gnum4, ncurses, openssl +, makeWrapper, gnused, gawk }: let version = "14B04"; in @@ -10,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0vlvjlg8vzcy6inb4vj00bnj0aarvpchzxwhmi492nv31s8kb6q9"; }; - buildInputs = [ perl gnum4 ncurses openssl ]; + buildInputs = [ perl gnum4 ncurses openssl makeWrapper ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; @@ -21,6 +22,12 @@ stdenv.mkDerivation { configureFlags = "--with-ssl=${openssl}"; + # Some erlang bin/ scripts run sed and awk + postFixup = '' + wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" + wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin" + ''; + meta = { homepage = "http://www.erlang.org/"; description = "Programming language used for massively scalable soft real-time systems"; diff --git a/pkgs/development/interpreters/erlang/R15B03.nix b/pkgs/development/interpreters/erlang/R15B03.nix index d282e45dc62..e0760db9f58 100644 --- a/pkgs/development/interpreters/erlang/R15B03.nix +++ b/pkgs/development/interpreters/erlang/R15B03.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl +, makeWrapper, gnused, gawk , wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }: assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; @@ -15,6 +16,7 @@ stdenv.mkDerivation { buildInputs = [ perl gnum4 ncurses openssl + makeWrapper ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; @@ -26,6 +28,12 @@ stdenv.mkDerivation { configureFlags = "--with-ssl=${openssl}"; + # Some erlang bin/ scripts run sed and awk + postFixup = '' + wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" + wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin" + ''; + meta = { homepage = "http://www.erlang.org/"; description = "Programming language used for massively scalable soft real-time systems"; diff --git a/pkgs/development/interpreters/erlang/R16B01.nix b/pkgs/development/interpreters/erlang/R16B01.nix index 902af75d494..168db4484b1 100644 --- a/pkgs/development/interpreters/erlang/R16B01.nix +++ b/pkgs/development/interpreters/erlang/R16B01.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl +, gnused, gawk, makeWrapper , wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }: assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; @@ -14,7 +15,7 @@ stdenv.mkDerivation { }; buildInputs = - [ perl gnum4 ncurses openssl + [ perl gnum4 ncurses openssl makeWrapper ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; @@ -26,6 +27,12 @@ stdenv.mkDerivation { configureFlags = "--with-ssl=${openssl}"; + # Some erlang bin/ scripts run sed and awk + postFixup = '' + wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" + wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin" + ''; + meta = { homepage = "http://www.erlang.org/"; description = "Programming language used for massively scalable soft real-time systems"; From e46fc8843c40e861ba740188189c9f5d5763b16c Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Mon, 26 Aug 2013 02:44:54 +0200 Subject: [PATCH 64/98] Elixir: Fix impurity with Erlang. The bash scripts of elixir contain some references to `erl'. This patch wraps the scripts and extends PATH so `erl' is available. Signed-off-by: Moritz Ulrich --- pkgs/development/interpreters/elixir/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index ffa4402a72a..3ac2368342d 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, erlang, rebar }: +{ stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils }: stdenv.mkDerivation { name = "elixir-0.10.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0gfr2bz3mw7ag9z2wb2g22n2vlyrp8dwy78fj9zi52kzl5w3vc3w"; }; - buildInputs = [ erlang rebar ]; + buildInputs = [ erlang rebar makeWrapper ]; preBuild = '' substituteInPlace rebar \ @@ -18,6 +18,17 @@ stdenv.mkDerivation { --replace "/usr/local" $out ''; + postFixup = '' + # Elixirs binaries are shell scripts which run erl. This adds some + # stuff to PATH so the scripts run without problems. + + for f in $out/bin/* + do + wrapProgram $f \ + --prefix PATH ":" "${erlang}/bin:${coreutils}/bin" + done + ''; + meta = { homepage = "http://elixir-lang.org/"; description = "Elixir is a functional, meta-programming aware language built on top of the Erlang VM."; From 52293798cc4287c835e9e31fdb748d12266369d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Aug 2013 12:18:03 +0200 Subject: [PATCH 65/98] haskell-distributed-process: drop broken package distributed-process won't compile, and upstream doesn't accept bug reports without some elaborate registration procedure. --- .../default.nix | 23 ------------- .../haskell/distributed-process/default.nix | 32 ------------------- pkgs/top-level/haskell-packages.nix | 4 --- 3 files changed, 59 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix delete mode 100644 pkgs/development/libraries/haskell/distributed-process/default.nix diff --git a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix deleted file mode 100644 index aaca850c0d7..00000000000 --- a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ cabal, binary, dataAccessor, distributedProcess, network -, networkMulticast, networkTransport, networkTransportTcp -, transformers -}: - -cabal.mkDerivation (self: { - pname = "distributed-process-simplelocalnet"; - version = "0.2.0.9"; - sha256 = "0bkb26bfpmyhh26hgznnw073kvk78ws6lqi86pxrgnnm9sx5mi21"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - binary dataAccessor distributedProcess network networkMulticast - networkTransport networkTransportTcp transformers - ]; - meta = { - homepage = "http://github.com/haskell-distributed/distributed-process"; - description = "Simple zero-configuration backend for Cloud Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix deleted file mode 100644 index 95f7993da22..00000000000 --- a/pkgs/development/libraries/haskell/distributed-process/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ cabal, ansiTerminal, binary, dataAccessor, distributedStatic -, HUnit, mtl, network, networkTransport, networkTransportTcp -, random, rank1dynamic, stm, syb, testFramework, testFrameworkHunit -, time, transformers -}: - -cabal.mkDerivation (self: { - pname = "distributed-process"; - version = "0.4.2"; - sha256 = "16w8jp66903vn089ysqdn534v0744cr2m6wkqd77zri6a0caaa6c"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - binary dataAccessor distributedStatic mtl networkTransport random - rank1dynamic stm syb time transformers - ]; - testDepends = [ - ansiTerminal binary distributedStatic HUnit network - networkTransport networkTransportTcp random stm testFramework - testFrameworkHunit - ]; - noHaddock = true; - jailbreak = true; - doCheck = false; - meta = { - homepage = "http://github.com/haskell-distributed/distributed-process"; - description = "Cloud Haskell: Erlang-style concurrency in Haskell"; - 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 7713c63c818..94f34bfd1fe 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -869,10 +869,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); directoryTree = callPackage ../development/libraries/haskell/directory-tree {}; - distributedProcess = callPackage ../development/libraries/haskell/distributed-process {}; - - distributedProcessSimplelocalnet = callPackage ../development/libraries/haskell/distributed-process-simplelocalnet {}; - distributedStatic = callPackage ../development/libraries/haskell/distributed-static {}; distributive = callPackage ../development/libraries/haskell/distributive {}; From 7ee76ebd0c59422df32d1e6836de1f5cc0f71911 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 26 Aug 2013 15:25:00 +0200 Subject: [PATCH 66/98] qemu: Revert to 1.5.2 1.6.0 breaks many VM builds because it gives incorrect RTC values to the guest. See http://hydra.nixos.org/eval/981543 http://hydra.nixos.org/eval/981440 --- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index b826434549f..dcf5b4e5009 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -7,14 +7,14 @@ , x86Only ? false }: -let n = "qemu-1.6.0"; in +let n = "qemu-1.5.2"; in stdenv.mkDerivation rec { name = n + (if x86Only then "-x86-only" else ""); src = fetchurl { url = "http://wiki.qemu.org/download/${n}.tar.bz2"; - sha256 = "0j6bnaa93fyqwzg07krx5w1fb88ap1yz1hp84ilkpm16va5facii"; + sha256 = "0l52jwlxmwp9g3jpq0g7ix9dq4qgh46nd2h58lh47f0a35yi8qgn"; }; buildInputs = From 78ae5bb3c285ba6cc8055a586a78e0380cc91369 Mon Sep 17 00:00:00 2001 From: Gergely Risko Date: Mon, 26 Aug 2013 17:15:46 +0200 Subject: [PATCH 67/98] Add noHaddock flag to modular-artihmetic Building of haddock for packages with UTF-8 source is already fixed in the stdenv-updates branch. This fixes modular-arithmetic until that branch is merged. Will send another pull request to add back haddock for that branch. --- .../development/libraries/haskell/modular-arithmetic/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/modular-arithmetic/default.nix b/pkgs/development/libraries/haskell/modular-arithmetic/default.nix index c4a77630e6a..7d53d81f7bb 100644 --- a/pkgs/development/libraries/haskell/modular-arithmetic/default.nix +++ b/pkgs/development/libraries/haskell/modular-arithmetic/default.nix @@ -4,6 +4,7 @@ cabal.mkDerivation (self: { pname = "modular-arithmetic"; version = "1.0.1.1"; sha256 = "14n83kjmz8mqjivjhwxk1zckms5z3gn77yq2hsw2yybzff2vkdkd"; + noHaddock = true; meta = { description = "A type for integers modulo some constant"; license = self.stdenv.lib.licenses.bsd3; From c7187ad59fe0c0dac70b4d5abac8cce28066ef97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 17 Aug 2013 07:17:44 +0200 Subject: [PATCH 68/98] libav: major update and refactoring (close #839) Also leaving 0_8 branch, as it's compatible with older ffmpeg versions. I'm planning that all expressions will be able to switch easily between ffmpeg and libav (whatever default we choose, but I prefer libav). Edited (twice) according to notes on the reverted b003138. --- pkgs/development/libraries/libav/default.nix | 168 ++++++++++++------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 107 insertions(+), 65 deletions(-) diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 3fb1650bf46..ce305a2880b 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -1,72 +1,112 @@ -{ stdenv, fetchurl, pkgconfig, yasm, xz -, mp3Support ? true, lame ? null -, speexSupport ? true, speex ? null -, theoraSupport ? true, libtheora ? null -, vorbisSupport ? true, libvorbis ? null -, vpxSupport ? false, libvpx ? null -, x264Support ? false, x264 ? null -, xvidSupport ? true, xvidcore ? null -, faacSupport ? false, faac ? null +{ stdenv, fetchurl, pkgconfig, yasm, bzip2, zlib +, mp3Support ? true, lame ? null +, speexSupport ? true, speex ? null +, theoraSupport ? true, libtheora ? null +, vorbisSupport ? true, libvorbis ? null +, vpxSupport ? true, libvpx ? null +, x264Support ? false, x264 ? null +, xvidSupport ? true, xvidcore ? null +, faacSupport ? false, faac ? null +, vaapiSupport ? false, libva ? null # ToDo: it has huge closure +, vdpauSupport ? true, libvdpau ? null +, freetypeSupport ? true, freetype ? null # it's small and almost everywhere +, SDL # only for avplay in $tools, adds nontrivial closure to it +, enableGPL ? true # ToDo: some additional default stuff may need GPL +, enableUnfree ? faacSupport }: -assert speexSupport -> speex != null; -assert theoraSupport -> libtheora != null; -assert vorbisSupport -> libvorbis != null; -assert vpxSupport -> libvpx != null; -assert x264Support -> x264 != null; -assert xvidSupport -> xvidcore != null; +assert faacSupport -> enableUnfree; -stdenv.mkDerivation rec { - name = "libav-0.7"; - - src = fetchurl { - url = "http://libav.org/releases/${name}.tar.xz"; - sha256 = "04pl6y53xh6xmwzz0f12mg5vh62ylp5zwwinj6dxzd8pnbjg4lsz"; +with { inherit (stdenv.lib) optional optionals; }; + +/* ToDo: + - more deps, inspiration: http://packages.ubuntu.com/raring/libav-tools + - maybe do some more splitting into outputs +*/ + +let + result = { + libav_9 = libavFun "9.8" "0r7hg9wg3cxjsmwzpa6f2p1a092g2iazyjjy23604ccskzbnirg3"; + libav_0_8 = libavFun "0.8.8" "1wnbmbs0z4f55y8r9bwb63l04zn383l1avy4c9x1ffb2xccgcp79"; }; - # `--enable-gpl' (as well as the `postproc' and `swscale') mean that - # the resulting library is GPL'ed, so it can only be used in GPL'ed - # applications. - configureFlags = [ - "--enable-gpl" - "--enable-postproc" - "--enable-swscale" - "--disable-ffserver" - "--disable-ffplay" - "--enable-shared" - "--enable-runtime-cpudetect" - ] - ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" - ++ stdenv.lib.optional speexSupport "--enable-libspeex" - ++ stdenv.lib.optional theoraSupport "--enable-libtheora" - ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis" - ++ stdenv.lib.optional vpxSupport "--enable-libvpx" - ++ stdenv.lib.optional x264Support "--enable-libx264" - ++ stdenv.lib.optional xvidSupport "--enable-libxvid" - ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"; + libavFun = version : sha256 : stdenv.mkDerivation rec { + name = "libav-${version}"; - buildInputs = [ pkgconfig lame yasm ] - ++ stdenv.lib.optional mp3Support lame - ++ stdenv.lib.optional speexSupport speex - ++ stdenv.lib.optional theoraSupport libtheora - ++ stdenv.lib.optional vorbisSupport libvorbis - ++ stdenv.lib.optional vpxSupport libvpx - ++ stdenv.lib.optional x264Support x264 - ++ stdenv.lib.optional xvidSupport xvidcore - ++ stdenv.lib.optional faacSupport faac; + src = fetchurl { + url = "http://libav.org/releases/${name}.tar.xz"; + inherit sha256; + }; + configureFlags = + assert stdenv.lib.all (x: x!=null) buildInputs; + [ + #"--enable-postproc" # it's now a separate package in upstream + "--disable-avserver" # upstream says it's in a bad state + "--enable-avplay" + "--enable-shared" + "--enable-runtime-cpudetect" + ] + ++ optionals enableGPL [ "--enable-gpl" "--enable-swscale" ] + ++ optional mp3Support "--enable-libmp3lame" + ++ optional speexSupport "--enable-libspeex" + ++ optional theoraSupport "--enable-libtheora" + ++ optional vorbisSupport "--enable-libvorbis" + ++ optional vpxSupport "--enable-libvpx" + ++ optional x264Support "--enable-libx264" + ++ optional xvidSupport "--enable-libxvid" + ++ optional faacSupport "--enable-libfaac --enable-nonfree" + ++ optional vaapiSupport "--enable-vaapi" + ++ optional vdpauSupport "--enable-vdpau" + ++ optional freetypeSupport "--enable-libfreetype" + ; - crossAttrs = { - dontSetConfigureCross = true; - configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cross.config}-" - "--enable-cross-compile" - "--target_os=linux" - "--arch=${stdenv.cross.arch}" - ]; - }; + buildInputs = [ pkgconfig lame yasm zlib bzip2 SDL ] + ++ optional mp3Support lame + ++ optional speexSupport speex + ++ optional theoraSupport libtheora + ++ optional vorbisSupport libvorbis + ++ optional vpxSupport libvpx + ++ optional x264Support x264 + ++ optional xvidSupport xvidcore + ++ optional faacSupport faac + ++ optional vaapiSupport libva + ++ optional vdpauSupport libvdpau + ++ optional freetypeSupport freetype + ; + + enableParallelBuilding = true; + + outputs = [ "out" "tools" ]; + + postInstall = '' + mkdir -p "$tools/bin" + mv "$out/bin/avplay" "$tools/bin" + cp -s "$out"/bin/* "$tools/bin/" + ''; + + doInstallCheck = true; + installCheckTarget = "check"; # tests need to be run *after* installation + + crossAttrs = { + dontSetConfigureCross = true; + configureFlags = configureFlags ++ [ + "--cross-prefix=${stdenv.cross.config}-" + "--enable-cross-compile" + "--target_os=linux" + "--arch=${stdenv.cross.arch}" + ]; + }; + + passthru = { inherit vdpauSupport; }; + + meta = with stdenv.lib; { + homepage = http://libav.org/; + description = "A complete, cross-platform solution to record, convert and stream audio and video (fork of ffmpeg)"; + license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not? + else if enableGPL then gpl2Plus else lgpl21Plus; + platforms = platforms.all; + }; + }; # libavFun + +in result - meta = { - homepage = http://libav.org/; - description = "A complete, cross-platform solution to record, convert and stream audio and video (fork of ffmpeg)"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74623b9c61b..3db0c3bd43c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4484,7 +4484,9 @@ let libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { }; - libav = callPackage ../development/libraries/libav { }; + libav = libav_9; + libav_all = callPackage ../development/libraries/libav { }; + inherit (libav_all) libav_9 libav_0_8; libavc1394 = callPackage ../development/libraries/libavc1394 { }; From de9a2c342e4c235a79357cc730307529b167e51a Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 26 Aug 2013 21:55:48 +0200 Subject: [PATCH 69/98] Make generated node expression overridable in nodePackages. --- pkgs/top-level/node-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 2c663c99dd0..2b050b1319a 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, nodejs, fetchurl, neededNatives, self }: +{ pkgs, stdenv, nodejs, fetchurl, neededNatives, self, generated ? ./node-packages-generated.nix }: { nativeDeps = { @@ -23,4 +23,4 @@ ''; /* Put manual packages below here (ideally eventually managed by npm2nix */ -} // import ./node-packages-generated.nix { inherit self fetchurl; inherit (pkgs) lib; } +} // import generated { inherit self fetchurl; inherit (pkgs) lib; } From 97b822b3bb84c0d67d31359143233b8d46ae65be Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 26 Aug 2013 22:55:14 +0200 Subject: [PATCH 70/98] nvidia-x11: Update to 319.49 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 268cdac8505..a1a16d74cfa 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -10,7 +10,8 @@ with stdenv.lib; let - versionNumber = "319.32"; + versionNumber = "319.49"; + kernel310patch = fetchurl { url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/nvidia-linux-3.10.patch?h=packages/nvidia&id=415c1daa9ccb1ec46c172b304f40929239d87af8"; name = "nvidia-linux-3.10.patch"; @@ -32,12 +33,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "02rjiizgb9mgal0qrklzjvfzybv139yv6za8xp045k7qdyqvsqzf"; + sha256 = "1ngss9zw109a5xfr3vvhf1ajqjvvqc7j3dzw9h56vddck6kpbc22"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "18268q3pa6v4ygfnlm888jmp84dmg1w9c323cr51pn5jg54vygcm"; + sha256 = "1i68jfms8033p2x0r3z4fdjcmkkhbi6yizzc0ck9ydagdgg3liwp"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; From a1c74c5603bfae0f91803e31c04062fef5346d1b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 26 Aug 2013 22:55:28 +0200 Subject: [PATCH 71/98] linux: Update to 3.4.59 --- 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 74304f5239c..8dc4b0e4ddc 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.58"; + version = "3.4.59"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "11kcxlchiz7ks61yqj29dy2mnncfxcc7qr563wby1k58rvwf8g74"; + sha256 = "19ylh9k9qykr8x29jcqv1q6agmyvzx7q5md2yxph4sykjsccqzj7"; }; features.iwlwifi = true; From efa748a1667322f5d71140cf8e1674e4f5adae7c Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 26 Aug 2013 16:47:23 +0200 Subject: [PATCH 72/98] git-and-tools/hub: Update to version 1.10.6. This now uses fetchurl instead of fetchgit to speed up fetching. Signed-off-by: aszlig --- .../version-management/git-and-tools/default.nix | 2 +- .../version-management/git-and-tools/hub/default.nix | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index b5b3d4044c5..d53ca7a0135 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -71,7 +71,7 @@ rec { hub = import ./hub { inherit (rubyLibs) rake; - inherit stdenv fetchgit groff makeWrapper; + inherit stdenv fetchurl groff makeWrapper; }; gitFastExport = import ./fast-export { diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index e545d2bc6f4..b9a053211fa 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchgit, groff, rake, makeWrapper }: +{ stdenv, fetchurl, groff, rake, makeWrapper }: stdenv.mkDerivation rec { name = "hub-${version}"; - version = "1.10.3"; + version = "1.10.6"; - src = fetchgit { - url = "git://github.com/defunkt/hub.git"; - rev = "refs/tags/v${version}"; - sha256 = "0j0krmf0sf09hhw3nsn0w1y97d67762g4qrc8080bwcx38lbyvbg"; + src = fetchurl { + url = "https://github.com/github/hub/archive/v${version}.tar.gz"; + sha256 = "0vfl1iq1927in81vd7zvp7yqqzay7pciyj87s83qfxrqyjpxn609"; }; buildInputs = [ rake makeWrapper ]; From 35229f0cf4a98921c28d918646c0f6311bdcfafc Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 26 Aug 2013 22:34:25 +0200 Subject: [PATCH 73/98] boomerang: Refactor and fix build. Thanks to @phreedom for reporting the broken URL used fetchgit, which was because I deleted my fork repository. Fortunately, in the meantime other forks got to a more "working" state and being more actively maintained than my fork. So that's why I switched using @nemerle's fork now, as it is the the most usable one out there, at least in our case. One stupid thing I've done in the first place was to use "1.0pre" as the version and the fork uses "alpha 0.3.2", so it essentially is some kind of a "downgrade" if you just look at the version. Fortunately, peer-unreviewed research based on guesswork has shown that I'm the only one using Boomerang on NixOS, so this shouldn't have a big impact on the other non-existent users. Also, this drops dependencies on boehmgc and cppunit, because building with either one or both will fail at the moment. Signed-off-by: aszlig --- pkgs/development/tools/boomerang/default.nix | 60 +++++++++++++------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 43 insertions(+), 21 deletions(-) diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix index eadeb51d1b3..a17529c2837 100644 --- a/pkgs/development/tools/boomerang/default.nix +++ b/pkgs/development/tools/boomerang/default.nix @@ -1,29 +1,49 @@ -{ stdenv, fetchgit, cmake, boehmgc, expat, cppunit }: +{ stdenv, fetchgit, cmake, expat }: -stdenv.mkDerivation { - name = "boomerang-1.0pre"; - - buildInputs = [ cmake boehmgc expat cppunit ]; - - installPhase = '' - for loaderfile in loader/*.so - do - install -vD "$loaderfile" "$out/lib/$(basename "$loaderfile")" - done - - install -vD boomerang "$out/bin/boomerang" - ''; - - patches = [ ./dlopen_path.patch ]; +stdenv.mkDerivation rec { + name = "boomerang-${version}"; + version = "0.3.2alpha"; src = fetchgit { - url = "git://github.com/aszlig/boomerang.git"; - rev = "d0b147a5dfc915a5fa8fe6c517e66a049a37bf22"; - sha256 = "6cfd95a3539ff45c18b17de76407568b0d0c17fde4e45dda54486c7eac113969"; + url = "https://github.com/nemerle/boomerang.git"; + rev = "78c6b9dd33790be43dcb07edc549161398904006"; + sha256 = "1hh8v0kcnipwrfz4d45d6pm5bzbm9wgbrdgg0ir2l7wyshbkff6i"; }; + buildInputs = [ cmake expat ]; + + postPatch = '' + sed -i -e 's/-std=c++0x/-std=c++11 -fpermissive/' CMakeLists.txt + + # Hardcode library base path ("lib/" is appended elsewhere) + sed -i -e 's|::m_base_path = "|&'"$out"'/|' loader/BinaryFileFactory.cpp + # Deactivate setting base path at runtime + sed -i -e 's/m_base_path *=[^}]*//' include/BinaryFile.h + + # Fix up shared directory locations + shared="$out/share/boomerang/" + find frontend -name '*.cpp' -print | xargs sed -i -e \ + 's|Boomerang::get()->getProgPath()|std::string("'"$shared"'")|' + + cat >> loader/CMakeLists.txt <> CMakeLists.txt < Date: Tue, 27 Aug 2013 03:56:31 +0100 Subject: [PATCH 74/98] Updated id3lib to avoid building its own zlib, fixes #867 --- pkgs/development/libraries/id3lib/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix index df8add774a1..4d94624ce78 100644 --- a/pkgs/development/libraries/id3lib/default.nix +++ b/pkgs/development/libraries/id3lib/default.nix @@ -1,9 +1,11 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, zlib}: stdenv.mkDerivation { name = "id3lib-3.8.3"; patches = [ ./id3lib-3.8.3-gcc43-1.patch ]; + + buildInputs = [ zlib ]; src = fetchurl { url = mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz; From d0f40f17b8a531f9aad8c44ec601284b6a9c2986 Mon Sep 17 00:00:00 2001 From: Jean-Alexandre Peyroux Date: Tue, 27 Aug 2013 09:28:36 +0200 Subject: [PATCH 75/98] Add The Little Brother's Database (lbdb) package --- pkgs/tools/misc/lbdb/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 21 insertions(+) create mode 100644 pkgs/tools/misc/lbdb/default.nix diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix new file mode 100644 index 00000000000..8775a7dc837 --- /dev/null +++ b/pkgs/tools/misc/lbdb/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, perl, finger_bsd }: + +let + version = "0.38"; +in + +stdenv.mkDerivation { + name = "lbdb-${version}"; + src = fetchurl { + url = "http://www.spinnaker.de/debian/lbdb_${version}.tar.gz"; + md5 = "a8e65f1400c90818ff324dc4fd67eba2"; + }; + + buildInputs = [ perl finger_bsd ]; + + meta = { + homepage = "http://www.spinnaker.de/lbdb/"; + description = "The Little Brother's Database (lbdb)"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c4d481d47b..dca9685e49b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8114,6 +8114,7 @@ let }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; + lbdb = callPackage ../tools/misc/lbdb { }; ruby_gpgme = callPackage ../development/libraries/ruby_gpgme { ruby = ruby19; From 86f39c218f7728363875db0aa13bb6c3b0209e12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 26 Aug 2013 22:42:46 +0200 Subject: [PATCH 76/98] xmlrpc-c: update old svn -> latest stable (v1.25.25) Also: - install the "xmlrpc" tool, similar to the Debian/Ubuntu package - add meta.* attributes --- .../libraries/xmlrpc-c/default.nix | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix index cd0eb3fcdcb..4a208dbc64e 100644 --- a/pkgs/development/libraries/xmlrpc-c/default.nix +++ b/pkgs/development/libraries/xmlrpc-c/default.nix @@ -1,16 +1,27 @@ -{ stdenv, fetchsvn, curl }: +{ stdenv, fetchurl, curl }: -let rev = "2262"; in -stdenv.mkDerivation { - name = "xmlrpc-c-r${rev}"; +stdenv.mkDerivation rec { + name = "xmlrpc-c-1.25.25"; + + src = fetchurl { + url = "mirror://sourceforge/xmlrpc-c/${name}.tgz"; + sha256 = "1sk33q4c6liza920rp4w803cfq0a79saq7fg1yjsp8hks7q011ml"; + }; buildInputs = [ curl ]; - preInstall = "export datarootdir=$out/share"; + # Build and install the "xmlrpc" tool (like the Debian package) + postInstall = '' + (cd tools/xmlrpc && make && make install) + ''; - src = fetchsvn { - url = http://xmlrpc-c.svn.sourceforge.net/svnroot/xmlrpc-c/advanced; - rev = "2262"; - sha256 = "1grwnczp5dq3w20rbz8bgpwl6jmw0w7cm7nbinlasf3ap5sc5ahb"; + meta = with stdenv.lib; { + description = "A lightweight RPC library based on XML and HTTP"; + homepage = http://xmlrpc-c.sourceforge.net/; + # /doc/COPYING also lists "Expat license", + # "ABYSS Web Server License" and "Python 1.5.2 License" + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; }; } From 741daef79b6d26236ac712d737933e50a1105d6d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Aug 2013 10:37:12 +0200 Subject: [PATCH 77/98] haskell-network-multicast: update to version 0.0.8 --- .../libraries/haskell/network-multicast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-multicast/default.nix b/pkgs/development/libraries/haskell/network-multicast/default.nix index 3a461a51f53..59a0d77d67c 100644 --- a/pkgs/development/libraries/haskell/network-multicast/default.nix +++ b/pkgs/development/libraries/haskell/network-multicast/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "network-multicast"; - version = "0.0.7"; - sha256 = "18qlg4cg7ci1z3mbqh5z16mxkjir0079a0rgm4qk6jbmsnvfsq43"; + version = "0.0.8"; + sha256 = "0jsbp8z2a69x5h6dc3b16wdxs0shv6438mnf5mg0jxq7xddbhph8"; buildDepends = [ network ]; meta = { description = "Simple multicast library"; From 527b448ab939eb7b0bd3d671ed22e7f10a01c56a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Aug 2013 10:37:12 +0200 Subject: [PATCH 78/98] haskell-texmath: update to version 0.6.4 --- pkgs/development/libraries/haskell/texmath/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index ec8ccd01054..cb346ac7d27 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -1,12 +1,12 @@ -{ cabal, parsec, syb, xml }: +{ cabal, pandocTypes, parsec, syb, xml }: cabal.mkDerivation (self: { pname = "texmath"; - version = "0.6.3"; - sha256 = "1ajza3p4rj318l03rffscqs6rbk635drmdciv7hhl4nljc4qmnpz"; + version = "0.6.4"; + sha256 = "090xqs14ap3c6pljqzyva46phxb1lhqayi4g098f6d77d1ygvshf"; isLibrary = true; isExecutable = true; - buildDepends = [ parsec syb xml ]; + buildDepends = [ pandocTypes parsec syb xml ]; meta = { homepage = "http://github.com/jgm/texmath"; description = "Conversion of LaTeX math formulas to MathML or OMML"; From b0688a69fe53a3f785cdeb0af781ea27296e3690 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Aug 2013 10:52:07 +0200 Subject: [PATCH 79/98] haskell-hoogle: update to version 4.2.20 --- pkgs/development/libraries/haskell/hoogle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index c4039458d76..38ee62dd5af 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.19"; - sha256 = "0mfmb3ky93gicwd1i4n3xfhlr3y6zgc4dv2nrilrr9l0kfka37f8"; + version = "4.2.20"; + sha256 = "0sff230qc9lk3kqr9azg399fsaybwqpic9pj52jyw61ffasnl2dd"; isLibrary = true; isExecutable = true; buildDepends = [ From ed522b59c64cf9cd9055c81466d819c92d6cba3e Mon Sep 17 00:00:00 2001 From: Jean-Alexandre Peyroux Date: Tue, 27 Aug 2013 11:08:11 +0200 Subject: [PATCH 80/98] Modif lbdb package. Following the remarks after the 1st commit. * add in all-packages.nix sorted alphabetically * add platforms and license in default.nix --- pkgs/tools/misc/lbdb/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index 8775a7dc837..1974935342b 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation { buildInputs = [ perl finger_bsd ]; meta = { - homepage = "http://www.spinnaker.de/lbdb/"; - description = "The Little Brother's Database (lbdb)"; + homepage = "http://www.spinnaker.de/lbdb/"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.all; + description = "The Little Brother's Database (lbdb)"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dca9685e49b..618cde136a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7927,6 +7927,8 @@ let lastwatch = callPackage ../applications/audio/lastwatch { }; + lbdb = callPackage ../tools/misc/lbdb { }; + lci = callPackage ../applications/science/logic/lci {}; ldcpp = callPackage ../applications/networking/p2p/ldcpp { @@ -8114,7 +8116,6 @@ let }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; - lbdb = callPackage ../tools/misc/lbdb { }; ruby_gpgme = callPackage ../development/libraries/ruby_gpgme { ruby = ruby19; From 991a61702567e4c621a4db7a67f787cbed9acd93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 27 Aug 2013 12:06:47 +0200 Subject: [PATCH 81/98] wesnoth: fix build, minor update, parallel builds Yes, games are the most important things in nixpkgs... not that I actually plan to play it anytime soon ;-) --- pkgs/games/wesnoth/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index b8e53b0cefb..f279127b62b 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -4,20 +4,21 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.10.5"; + version = "1.10.7"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "1rvlr8c3vzhgd33vzc1hfhiil6d7hc3px8r8p79vmp3kwi3d49zn"; + sha256 = "0gi5fzij48hmhhqxc370jxvxig5q3d70jiz56rjn8yx514s5lfwa"; }; buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost fribidi cmake freetype libpng pkgconfig lua dbus fontconfig libtool ]; - # Make the package build with the gcc currently available in Nixpkgs. - NIX_CFLAGS_COMPILE = "-Wno-ignored-qualifiers"; + cmakeFlags = [ "-DENABLE_STRICT_COMPILATION=FALSE" ]; # newer gcc problems http://gna.org/bugs/?21030 + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme"; From 38ba397afd80be7220317f89664af3826df2deb4 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 27 Aug 2013 12:03:19 +0200 Subject: [PATCH 82/98] raspberrypi-firmware: Update to latest version as of 20130826 (rev 3ab17ac25e) --- .../linux/firmware/raspberrypi/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 02d7194b500..c9893031495 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -1,11 +1,15 @@ {stdenv, fetchurl }: -stdenv.mkDerivation { - name = "raspberrypi-firmware-20160106"; +let + + rev = "3ab17ac25e"; + +in stdenv.mkDerivation { + name = "raspberrypi-firmware-${rev}"; src = fetchurl { - url = "https://github.com/raspberrypi/firmware/archive/4ade27942e.tar.gz"; - sha256 = "0f4p920vr7dcj4hprgil8baqqbnsjx1jykz0pkdx29mqy0n0xanl"; + url = "https://github.com/raspberrypi/firmware/archive/${rev}.tar.gz"; + sha256 = "080va4zz858bwwgxam8zy58gpwjpxfg7v5h1q5b4cpbzjihsxcx9"; }; installPhase = '' From c44d8970ea61f898d59d44ed0c78bd8b3a049daa Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 27 Aug 2013 12:05:13 +0200 Subject: [PATCH 83/98] raspberrypi-kernel: Updated to latest version as of 20130826 (rev 7849605f5a) --- pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix index 319c2ba42b4..fdf2f139c33 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix @@ -1,14 +1,16 @@ { stdenv, fetchurl, ... } @ args: -let rev = "91a3be5b2b"; in +let -import ./generic.nix (args // rec { + rev = "7849605f5a"; + +in import ./generic.nix (args // rec { version = "3.6.y-${rev}"; src = fetchurl { url = "https://api.github.com/repos/raspberrypi/linux/tarball/${rev}"; name = "linux-raspberrypi-${version}.tar.gz"; - sha256 = "04370b1da7610622372940decdc13ddbba2a58c9da3c3bd3e7df930a399f140d"; + sha256 = "1diwc5p6az6ipcldwmkq7hb5f15nvdgwzmypixc2vmzmc4ylarxl"; }; features.iwlwifi = true; From 757568b8fea6a3047c3d5e8ebdada171119b84f3 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Tue, 27 Aug 2013 18:57:19 +0800 Subject: [PATCH 84/98] add gtk-engine-murrine 0.98.2 --- .../themes/gtk2/gtk-engine-murrine/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix diff --git a/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix b/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix new file mode 100644 index 00000000000..81609eff55a --- /dev/null +++ b/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }: + +stdenv.mkDerivation { + name = "gtk-engine-murrine-0.98.2"; + + src = fetchurl { + url = "mirror://gnome/sources/murrine/0.98/murrine-0.98.2.tar.xz"; + sha256 = "129cs5bqw23i76h3nmc29c9mqkm9460iwc8vkl7hs4xr07h8mip9"; + }; + + buildInputs = [ pkgconfig intltool gtk2 ]; + + meta = { + description = "A very flexible theme engine"; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c4d481d47b..f79b804d3a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9327,6 +9327,8 @@ let gtk_engines = callPackage ../misc/themes/gtk2/gtk-engines { }; + gtk-engine-murrine = callPackage ../misc/themes/gtk2/gtk-engine-murrine { }; + gnome_themes_standard = callPackage ../misc/themes/gnome-themes-standard { }; xfce = xfce4_10; From 95491128cf6d8fdf54dd245a33eb588483fe0124 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 27 Aug 2013 13:03:37 +0200 Subject: [PATCH 85/98] gprolog: update to version 1.4.4, clean up installation layout, update license information --- .../development/compilers/gprolog/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix index bbc273365b9..00c5ef36a38 100644 --- a/pkgs/development/compilers/gprolog/default.nix +++ b/pkgs/development/compilers/gprolog/default.nix @@ -1,25 +1,28 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gprolog-1.4.1"; + name = "gprolog-1.4.4"; src = fetchurl { urls = [ "mirror://gnu/gprolog/${name}.tar.gz" "http://www.gprolog.org/${name}.tar.gz" ]; - sha256 = "e2819ed9c426138d3191e4d97ae5121cf97e132eecf102400f87f1e372a05b72"; + sha256 = "13miyas47bmijmadm68cbvb21n4s156gjafz7kfx9brk9djfkh0q"; }; - configurePhase = "cd src ;" - + "./configure --prefix=$out " - + "--with-install-dir=$out/share/${name} " - + "--with-examples-dir=$out/share/doc/${name}/examples " - + "--with-doc-dir=$out/share/doc/${name}"; + preConfigure = '' + cd src + configureFlagsArray=( + "--with-install-dir=$out" + "--without-links-dir" + "--with-examples-dir=$out/share/${name}/examples" + "--with-doc-dir=$out/share/${name}/doc" + ) + ''; postInstall = '' - ln -vs "$out/share/${name}/include" "$out/include" - ln -vs "$out/share/${name}/lib" "$out/lib" + mv -v $out/[A-Z]* $out/gprolog.ico $out/share/${name}/ ''; doCheck = true; @@ -27,7 +30,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/gprolog/"; description = "GNU Prolog, a free Prolog compiler with constraint solving over finite domains"; - license = "GPLv2+"; + license = stdenv.lib.licenses.lgpl3Plus; longDescription = '' GNU Prolog is a free Prolog compiler with constraint solving From 6c2985e8d7728ba6144f9cc48696d3f16d648120 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Tue, 27 Aug 2013 20:23:49 +1000 Subject: [PATCH 86/98] Update CUDA Toolkit to 5.5 --- pkgs/development/compilers/cudatoolkit/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index fdb40be320c..e3f3aeb8f77 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -3,7 +3,7 @@ } : stdenv.mkDerivation rec { - name = "cudatoolkit-4.2.9"; + name = "cudatoolkit-5.5.22"; dontPatchELF = true; dontStrip = true; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { src = if stdenv.system == "x86_64-linux" then fetchurl { - url = http://developer.download.nvidia.com/compute/cuda/4_2/rel/toolkit/cudatoolkit_4.2.9_linux_64_suse11.2.run; - sha256 = "1inngzwq520bhpdfrh5bm4cxfyf3hxj94jialjxgviri5bj9hz60"; + url = http://developer.download.nvidia.com/compute/cuda/5_5/rel/installers/cuda_5.5.22_linux_64.run; + sha256 = "b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4"; } else throw "cudatoolkit does not support platform ${stdenv.system}"; @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { unpackPhase = '' sh $src --keep --noexec + cd pkg/run_files + sh cuda-linux64-rel-5.5.22-16488124.run --keep --noexec cd pkg ''; @@ -36,7 +38,7 @@ stdenv.mkDerivation rec { --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ '{}' \; || true find . -type f -exec patchelf \ - --set-rpath $rpath:$out/lib:$out/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \ + --set-rpath $rpath:$out/lib:$out/lib64::$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \ --force-rpath \ '{}' \; || true ''; From a74ab8c0a1a83b4f9e204acb1be9b544c4d9b27b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 27 Aug 2013 14:11:23 +0200 Subject: [PATCH 87/98] cudatoolkit: fix missing dependencies Some of the java tools failed to run (notably nsight) because of missing libraries. This fixes it. --- pkgs/development/compilers/cudatoolkit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index e3f3aeb8f77..f68f918d585 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib -, xlibs, fontconfig, freetype, unixODBC, alsaLib +, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib } : stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { runtimeDependencies = [ ncurses expat python zlib xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext - fontconfig freetype unixODBC alsaLib + gtk2 glib fontconfig freetype unixODBC alsaLib ]; rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.gcc.gcc}/lib64"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ '{}' \; || true find . -type f -exec patchelf \ - --set-rpath $rpath:$out/lib:$out/lib64::$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \ + --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \ --force-rpath \ '{}' \; || true ''; From 1ffc963383decd422c095b950431dcb5a86bab58 Mon Sep 17 00:00:00 2001 From: Jean-Alexandre Peyroux Date: Tue, 27 Aug 2013 14:39:38 +0200 Subject: [PATCH 88/98] correct indent platforms line in default.nix --- pkgs/tools/misc/lbdb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index 1974935342b..a09c270c19b 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.spinnaker.de/lbdb/"; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.all; description = "The Little Brother's Database (lbdb)"; }; } From 6863b3053ca044de49f484edcca71f02751a11d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 27 Aug 2013 16:20:45 +0200 Subject: [PATCH 89/98] spice: update 0.12.3 -> 0.12.14 (latest stable) --- pkgs/development/libraries/spice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index dd16d6ef94e..2af9565e0b4 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "spice-0.12.3"; + name = "spice-0.12.4"; src = fetchurl { url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "0il50hcw87mzs3dw80a9gkidmhgf9s8691xmki3gj9358qf5xmmz"; + sha256 = "11xkdz26b39syynxm3iyjsr8q7x0v09zdli9an1ilcrfyiykw1ng"; }; buildInputs = [ pixman celt alsaLib openssl libjpeg zlib From d80e7b37992a4c60d8203d38dfe5afedc8ceaf17 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Tue, 27 Aug 2013 21:01:24 +0800 Subject: [PATCH 90/98] add mate-icon-theme 1.6.1 --- pkgs/misc/themes/mate-icon-theme/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/misc/themes/mate-icon-theme/default.nix diff --git a/pkgs/misc/themes/mate-icon-theme/default.nix b/pkgs/misc/themes/mate-icon-theme/default.nix new file mode 100644 index 00000000000..65965e46b32 --- /dev/null +++ b/pkgs/misc/themes/mate-icon-theme/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk2, iconnamingutils }: + +stdenv.mkDerivation { + name = "mate-icon-theme-1.6.1"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/1.6/mate-icon-theme-1.6.1.tar.xz"; + sha256 = "154x0mcsvjmz84vi94kjh8hpydny3ab9lbg58wxh1lskmbc2473x"; + }; + + buildInputs = [ pkgconfig intltool gtk2 iconnamingutils ]; + + meta = { + description = "Icon themes from MATE"; + homepage = "http://mate-desktop.org"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ iyzsong ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f79b804d3a4..afc11289c71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9331,6 +9331,8 @@ let gnome_themes_standard = callPackage ../misc/themes/gnome-themes-standard { }; + mate-icon-theme = callPackage ../misc/themes/mate-icon-theme { }; + xfce = xfce4_10; xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit pkgs newScope; }); From eb0aafd4c96a82fcd174f24968a670076f419214 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Tue, 27 Aug 2013 21:02:46 +0800 Subject: [PATCH 91/98] add mate-themes 1.6.1 --- pkgs/misc/themes/mate-themes/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/misc/themes/mate-themes/default.nix diff --git a/pkgs/misc/themes/mate-themes/default.nix b/pkgs/misc/themes/mate-themes/default.nix new file mode 100644 index 00000000000..0f0f41af638 --- /dev/null +++ b/pkgs/misc/themes/mate-themes/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }: + +stdenv.mkDerivation { + name = "mate-themes-1.6.1"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/1.6/mate-themes-1.6.1.tar.xz"; + sha256 = "0lm2kvlwj0rpznb0n2g1sh1r6nz0p45i7flbnxivl9gi632wdmfp"; + }; + + buildInputs = [ pkgconfig intltool iconnamingutils gtk2 ]; + + meta = { + description = "A set of themes from MATE"; + homepage = "http://mate-desktop.org"; + license = stdenv.lib.licenses.lgpl21; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ iyzsong ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afc11289c71..48fc5f68721 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9333,6 +9333,8 @@ let mate-icon-theme = callPackage ../misc/themes/mate-icon-theme { }; + mate-themes = callPackage ../misc/themes/mate-themes { }; + xfce = xfce4_10; xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit pkgs newScope; }); From 4233d989250d252a9289040ffe986667db07ba25 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Tue, 27 Aug 2013 18:23:24 +0200 Subject: [PATCH 92/98] id3v2 now also requires zlib (presumably because id3lib no longer ships it) --- pkgs/applications/audio/id3v2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix index 8a025ac6843..a7835f020d1 100644 --- a/pkgs/applications/audio/id3v2/default.nix +++ b/pkgs/applications/audio/id3v2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, id3lib, groff}: +{stdenv, fetchurl, id3lib, groff, zlib}: stdenv.mkDerivation rec { name = "id3v2-0.1.11"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./id3v2-0.1.11-track-bad-free.patch ]; nativeBuildInputs = [ groff ]; - buildInputs = [ id3lib ]; + buildInputs = [ id3lib zlib ]; configurePhase = '' export makeFlags=PREFIX=$out From 53866352c295f401c0b7877aac44120505d3cbd0 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Tue, 27 Aug 2013 19:07:16 +0200 Subject: [PATCH 93/98] nvidia driver no longer requires kernel 3.10 patch --- pkgs/os-specific/linux/nvidia-x11/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index a1a16d74cfa..455a763c7f0 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -12,12 +12,6 @@ let versionNumber = "319.49"; - kernel310patch = fetchurl { - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/nvidia-linux-3.10.patch?h=packages/nvidia&id=415c1daa9ccb1ec46c172b304f40929239d87af8"; - name = "nvidia-linux-3.10.patch"; - sha256 = "0nhzg6jdk9sf1vzj519gqi8a2n9xydhz2bcz472pss2cfgbc1ahb"; - }; - in stdenv.mkDerivation { @@ -27,7 +21,7 @@ stdenv.mkDerivation { patches = [ ./version-test.patch ] - ++ optional (!libsOnly && versionAtLeast kernelDev.version "3.10") kernel310patch; + ; src = if stdenv.system == "i686-linux" then From bed5514a6e8f1ae9776dfff71001e8d09a8ea36a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 27 Aug 2013 20:18:57 +0200 Subject: [PATCH 94/98] bittorrentsync: 1.1.42 -> 1.1.70 --- pkgs/applications/networking/bittorrentsync/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix index a8c4a535258..25a23b019d8 100644 --- a/pkgs/applications/networking/bittorrentsync/default.nix +++ b/pkgs/applications/networking/bittorrentsync/default.nix @@ -14,9 +14,9 @@ let else if stdenv.system == "i686-linux" then "ld-linux.so.2" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; - version = "1.1.42"; - sha256 = if stdenv.system == "x86_64-linux" then "07gcjzhhr8simkjjxhyzkvh3748ll81d742fz7j31nwdi34my8ri" - else if stdenv.system == "i686-linux" then "0awf5bfhb4dp4aydzrgdp3wqv1mz6ys1z45i0r1hbqszvf44xj7c" + version = "1.1.70"; + sha256 = if stdenv.system == "x86_64-linux" then "1hnyncq5439fxn1q8dkzcg2alxjkanr4q4pgqqf3nngz4cdar5vi" + else if stdenv.system == "i686-linux" then "1ijdmzl8bnb4k99vrjn5gd31hy64p9wiyxw5wc5gbpgap191h5i5" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; in stdenv.mkDerivation { From 65e5dd8f992bb3f3de38e2d22e548571ada6af29 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 27 Aug 2013 22:22:57 +0200 Subject: [PATCH 95/98] Fcron: Disable checks for root{name,group} and others. This fixes building fcron. It was complaining it couldn't check root's user name and the suggested flag (--with-rootname) didn't do anything. Signed-off-by: Moritz Ulrich --- pkgs/tools/system/fcron/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix index 58719c682cb..5a70843ff6b 100644 --- a/pkgs/tools/system/fcron/default.nix +++ b/pkgs/tools/system/fcron/default.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { # fcron would have been default user/grp "--with-username=root" "--with-groupname=root" + "--with-rootname=root" + "--with-rootgroup=root" + "--disable-checks" ]; installTargets = "install-staged"; # install does also try to change permissions of /etc/* files From 01cc4301f36d439b4f918dbb521937c09f097e7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 28 Aug 2013 00:26:06 +0200 Subject: [PATCH 96/98] Add a patched version of buildout 2.2.0 for development with nix Without this patch buildout will copy eggs from the nix store into the ./eggs directory and then try to compile them. This fails because they are read only. This patch changes the behaviour to create symlinks to eggs available in the nix store instead of copying them, and not to try to compile the eggs in the store. To differentiate this from the default buildout (which may be provided otherwise e.g. as a dependency) the executable is renamed to buildout-nix. This can be used in conjuntion with myEnvFun to create development environments which make use of the python modules available in the store while downloading any additional required eggs. A pleasant side effect is that you can conveniently replace the symlink with a copy for debugging purposes. --- .../python-modules/buildout-nix/default.nix | 21 +++++++++++++++++ .../python-modules/buildout-nix/nix.patch | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 3 +++ 3 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/buildout-nix/default.nix create mode 100644 pkgs/development/python-modules/buildout-nix/nix.patch diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix new file mode 100644 index 00000000000..26b6fb0cfcd --- /dev/null +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -0,0 +1,21 @@ +{ fetchurl, stdenv, buildPythonPackage }: + +buildPythonPackage { + name = "zc.buildout-nix-2.2.0"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zc.buildout/zc.buildout-2.2.0.tar.gz"; + md5 = "771dd9807da7d5ef5bb998991c5fdae1"; + }; + + patches = [ ./nix.patch ]; + + postInstall = "mv $out/bin/buildout{,-nix}"; + + meta = { + homepage = "http://www.buildout.org"; + description = "A software build and configuration system"; + license = stdenv.lib.licenses.zpt21; + maintainers = [ stdenv.lib.maintainers.goibhniu ]; + }; +} diff --git a/pkgs/development/python-modules/buildout-nix/nix.patch b/pkgs/development/python-modules/buildout-nix/nix.patch new file mode 100644 index 00000000000..a09163518a9 --- /dev/null +++ b/pkgs/development/python-modules/buildout-nix/nix.patch @@ -0,0 +1,23 @@ +--- a/src/zc/buildout/easy_install.py 2013-08-27 22:28:40.233718116 +0200 ++++ b/src/zc/buildout/easy_install.py 2013-08-27 22:31:07.967871186 +0200 +@@ -508,16 +508,15 @@ + self._dest, os.path.basename(dist.location)) + + if os.path.isdir(dist.location): +- # we got a directory. It must have been +- # obtained locally. Just copy it. +- shutil.copytree(dist.location, newloc) ++ # Symlink to dists in /nix/store ++ if not os.path.exists(newloc): ++ os.symlink(dist.location, newloc) + else: + + + setuptools.archive_util.unpack_archive( + dist.location, newloc) +- +- redo_pyc(newloc) ++ redo_pyc(newloc) + + # Getting the dist from the environment causes the + # distribution meta data to be read. Cloning isn't diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 59707c58de8..3cd30b715f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -126,6 +126,9 @@ pythonPackages = modules // import ./python-packages-generated.nix { inherit python buildPythonPackage pygobject pycairo; }; + # A patched version of buildout, useful for buildout based development on Nix + zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; + # packages defined here afew = buildPythonPackage rec { From 0d689828a204be47caa921068247335d392b0727 Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Wed, 28 Aug 2013 06:06:07 +0200 Subject: [PATCH 97/98] tarman: switch to newer version 0.1.3 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2a8bc3038e9..90600e6954f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6590,18 +6590,18 @@ pythonPackages = modules // import ./python-packages-generated.nix { tarman = buildPythonPackage rec { - version = "0.1.1"; + version = "0.1.3"; name = "tarman-${version}"; src = fetchurl { url = "https://pypi.python.org/packages/source/t/tarman/tarman-${version}.zip"; - sha256 = "0ppd2365hf841b58fss5pgaja0y0mwx5n0gk1p3rxx9y3r0kyfas"; + sha256 = "0ri6gj883k042xaxa2d5ymmhbw2bfcxdzhh4bz7700ibxwxxj62h"; }; buildInputs = [ pkgs.unzip unittest2 nose mock ]; propagatedBuildInputs = [ modules.curses libarchive ]; - # two tests fail + # tests are still failing doCheck = false; }; From ce57c3e917971a9241e6309e7cb8aaa7f04b319b Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 28 Aug 2013 10:56:08 +0300 Subject: [PATCH 98/98] lbdb: fix formatting --- pkgs/tools/misc/lbdb/default.nix | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index a09c270c19b..a26348f8f0f 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, perl, finger_bsd }: let - version = "0.38"; + version = "0.38"; in stdenv.mkDerivation { - name = "lbdb-${version}"; - src = fetchurl { - url = "http://www.spinnaker.de/debian/lbdb_${version}.tar.gz"; - md5 = "a8e65f1400c90818ff324dc4fd67eba2"; - }; + name = "lbdb-${version}"; + src = fetchurl { + url = "http://www.spinnaker.de/debian/lbdb_${version}.tar.gz"; + md5 = "a8e65f1400c90818ff324dc4fd67eba2"; + }; - buildInputs = [ perl finger_bsd ]; + buildInputs = [ perl finger_bsd ]; - meta = { - homepage = "http://www.spinnaker.de/lbdb/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; - description = "The Little Brother's Database (lbdb)"; - }; + meta = { + homepage = "http://www.spinnaker.de/lbdb/"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.all; + description = "The Little Brother's Database (lbdb)"; + }; }